diff --git a/.dockerignore b/.dockerignore
index 289446be7650b1..64aadf0e405875 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,6 +3,7 @@
 /.git
 /.gitignore
 /.venv
+/.webpack_cache
 /fixtures
 /node_modules
 /tests
diff --git a/.eslintrc.js b/.eslintrc.js
index acb2dfc66cf476..dfb3482ca6aa79 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,17 +2,804 @@
 
 const detectDeprecations = !!process.env.SENTRY_DETECT_DEPRECATIONS;
 
+const baseRules = {
+  /**
+   * Strict mode
+   */
+  // https://eslint.org/docs/rules/strict
+  strict: ['error', 'global'],
+
+  /**
+   * Variables
+   */
+  // https://eslint.org/docs/rules/no-shadow-restricted-names
+  'no-shadow-restricted-names': ['error'],
+
+  /**
+   * Possible errors
+   */
+  // https://eslint.org/docs/rules/no-cond-assign
+  'no-cond-assign': ['error', 'always'],
+
+  // https://eslint.org/docs/rules/no-alert
+  'no-alert': ['error'],
+
+  // https://eslint.org/docs/rules/no-constant-condition
+  'no-constant-condition': ['warn'],
+
+  // https://eslint.org/docs/rules/no-empty
+  'no-empty': ['error'],
+
+  // https://eslint.org/docs/rules/no-ex-assign
+  'no-ex-assign': ['error'],
+
+  // https://eslint.org/docs/rules/no-extra-boolean-cast
+  'no-extra-boolean-cast': ['error'],
+
+  // https://eslint.org/docs/rules/no-func-assign
+  'no-func-assign': ['error'],
+
+  // https://eslint.org/docs/rules/no-inner-declarations
+  'no-inner-declarations': ['error'],
+
+  // https://eslint.org/docs/rules/no-invalid-regexp
+  'no-invalid-regexp': ['error'],
+
+  // https://eslint.org/docs/rules/no-irregular-whitespace
+  'no-irregular-whitespace': ['error'],
+
+  // https://eslint.org/docs/rules/no-obj-calls
+  'no-obj-calls': ['error'],
+
+  // https://eslint.org/docs/rules/no-sparse-arrays
+  'no-sparse-arrays': ['error'],
+
+  // https://eslint.org/docs/rules/block-scoped-var
+  'block-scoped-var': ['error'],
+
+  /**
+   * Best practices
+   */
+  // https://eslint.org/docs/rules/consistent-return
+  'consistent-return': ['error'],
+
+  // https://eslint.org/docs/rules/default-case
+  'default-case': ['error'],
+
+  // https://eslint.org/docs/rules/dot-notation
+  'dot-notation': [
+    'error',
+    {
+      allowKeywords: true,
+    },
+  ],
+
+  // https://eslint.org/docs/rules/guard-for-in [REVISIT ME]
+  'guard-for-in': ['off'],
+
+  // https://eslint.org/docs/rules/no-caller
+  'no-caller': ['error'],
+
+  // https://eslint.org/docs/rules/no-eval
+  'no-eval': ['error'],
+
+  // https://eslint.org/docs/rules/no-extend-native
+  'no-extend-native': ['error'],
+
+  // https://eslint.org/docs/rules/no-extra-bind
+  'no-extra-bind': ['error'],
+
+  // https://eslint.org/docs/rules/no-fallthrough
+  'no-fallthrough': ['error'],
+
+  // https://eslint.org/docs/rules/no-floating-decimal
+  'no-floating-decimal': ['error'],
+
+  // https://eslint.org/docs/rules/no-implied-eval
+  'no-implied-eval': ['error'],
+
+  // https://eslint.org/docs/rules/no-lone-blocks
+  'no-lone-blocks': ['error'],
+
+  // https://eslint.org/docs/rules/no-loop-func
+  'no-loop-func': ['error'],
+
+  // https://eslint.org/docs/rules/no-multi-str
+  'no-multi-str': ['error'],
+
+  // https://eslint.org/docs/rules/no-native-reassign
+  'no-native-reassign': ['error'],
+
+  // https://eslint.org/docs/rules/no-new
+  'no-new': ['error'],
+
+  // https://eslint.org/docs/rules/no-new-func
+  'no-new-func': ['error'],
+
+  // https://eslint.org/docs/rules/no-new-wrappers
+  'no-new-wrappers': ['error'],
+
+  // https://eslint.org/docs/rules/no-octal
+  'no-octal': ['error'],
+
+  // https://eslint.org/docs/rules/no-octal-escape
+  'no-octal-escape': ['error'],
+
+  // https://eslint.org/docs/rules/no-param-reassign [REVISIT ME]
+  'no-param-reassign': ['off'],
+
+  // https://eslint.org/docs/rules/no-proto
+  'no-proto': ['error'],
+
+  // https://eslint.org/docs/rules/no-return-assign
+  'no-return-assign': ['error'],
+
+  // https://eslint.org/docs/rules/no-script-url
+  'no-script-url': ['error'],
+
+  // https://eslint.org/docs/rules/no-self-compare
+  'no-self-compare': ['error'],
+
+  // https://eslint.org/docs/rules/no-sequences
+  'no-sequences': ['error'],
+
+  // https://eslint.org/docs/rules/no-throw-literal
+  'no-throw-literal': ['error'],
+
+  // https://eslint.org/docs/rules/no-with
+  'no-with': ['error'],
+
+  // https://eslint.org/docs/rules/radix
+  radix: ['error'],
+
+  // https://eslint.org/docs/rules/space-in-brackets.html
+  'computed-property-spacing': ['error', 'never'],
+
+  // https://eslint.org/docs/rules/space-in-brackets.html
+  'array-bracket-spacing': ['error', 'never'],
+
+  // https://eslint.org/docs/rules/space-in-brackets.html
+  'object-curly-spacing': ['error', 'never'],
+
+  // https://eslint.org/docs/rules/object-shorthand
+  'object-shorthand': ['error', 'properties'],
+
+  // https://eslint.org/docs/rules/space-infix-ops.html
+  'space-infix-ops': ['error'],
+
+  // https://eslint.org/docs/rules/vars-on-top
+  'vars-on-top': ['off'],
+
+  // https://eslint.org/docs/rules/wrap-iife
+  'wrap-iife': ['error', 'any'],
+
+  // https://eslint.org/docs/rules/array-callback-return
+  'array-callback-return': ['error'],
+
+  // https://eslint.org/docs/rules/yoda
+  yoda: ['error'],
+
+  // https://eslint.org/docs/rules/no-else-return
+  'no-else-return': ['error', {allowElseIf: false}],
+
+  // https://eslint.org/docs/rules/require-await
+  'require-await': ['error'],
+
+  // https://eslint.org/docs/rules/multiline-comment-style
+  'multiline-comment-style': ['error', 'separate-lines'],
+
+  // https://eslint.org/docs/rules/spaced-comment
+  'spaced-comment': [
+    'error',
+    'always',
+    {
+      line: {markers: ['/'], exceptions: ['-', '+']},
+      block: {exceptions: ['*'], balanced: true},
+    },
+  ],
+};
+
+const reactReactRules = {
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/display-name.md
+  'react/display-name': ['off'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-multi-comp.md
+  'react/no-multi-comp': [
+    'off',
+    {
+      ignoreStateless: true,
+    },
+  ],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-fragments.md
+  'react/jsx-fragments': ['error', 'element'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-handler-names.md
+  // Ensures that any component or prop methods used to handle events are correctly prefixed.
+  'react/jsx-handler-names': [
+    'off',
+    {
+      eventHandlerPrefix: 'handle',
+      eventHandlerPropPrefix: 'on',
+    },
+  ],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-key.md
+  'react/jsx-key': ['error'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-no-undef.md
+  'react/jsx-no-undef': ['error'],
+
+  // Disabled as we use the newer JSX transform babel plugin.
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-uses-react.md
+  'react/jsx-uses-react': ['off'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-uses-vars.md
+  'react/jsx-uses-vars': ['error'],
+
+  /**
+   * Deprecation related rules
+   */
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-deprecated.md
+  'react/no-deprecated': ['error'],
+
+  // Prevent usage of the return value of React.render
+  // deprecation: https://facebook.github.io/react/docs/react-dom.html#render
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-render-return-value.md
+  'react/no-render-return-value': ['error'],
+
+  // Children should always be actual children, not passed in as a prop.
+  // When using JSX, the children should be nested between the opening and closing tags. When not using JSX, the children should be passed as additional arguments to React.createElement.
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-children-prop.md
+  'react/no-children-prop': ['error'],
+
+  // This rule helps prevent problems caused by using children and the dangerouslySetInnerHTML prop at the same time.
+  // React will throw a warning if this rule is ignored.
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-danger-with-children.md
+  'react/no-danger-with-children': ['error'],
+
+  // Prevent direct mutation of this.state
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-direct-mutation-state.md
+  'react/no-direct-mutation-state': ['error'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-did-mount-set-state.md
+  'react/no-did-mount-set-state': ['error'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-did-update-set-state.md"
+  'react/no-did-update-set-state': ['error'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-redundant-should-component-update.md
+  'react/no-redundant-should-component-update': ['error'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-typos.md
+  'react/no-typos': ['error'],
+
+  // Prevent invalid characters from appearing in markup
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-unescaped-entities.md
+  'react/no-unescaped-entities': ['off'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-unknown-property.md
+  'react/no-unknown-property': ['error', {ignore: ['css']}],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-unused-prop-types.md
+  // Disabled since this currently fails to correctly detect a lot of
+  // typescript prop type usage.
+  'react/no-unused-prop-types': ['off'],
+
+  // We do not need proptypes since we're using typescript
+  'react/prop-types': ['off'],
+
+  // When writing the render method in a component it is easy to forget to return the JSX content.
+  // This rule will warn if the return statement is missing.
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/require-render-return.md
+  'react/require-render-return': ['error'],
+
+  // Disabled as we are using the newer JSX transform babel plugin.
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/react-in-jsx-scope.md
+  'react/react-in-jsx-scope': ['off'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/self-closing-comp.md
+  'react/self-closing-comp': ['error'],
+
+  // This also causes issues with typescript
+  // See: https://github.com/yannickcr/eslint-plugin-react/issues/2066
+  //
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/sort-comp.md
+  'react/sort-comp': ['warn'],
+
+  // Disabled because of prettier
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/wrap-multilines.md
+  'react/jsx-wrap-multilines': ['off'],
+
+  // Consistent <Component booleanProp /> (never add ={true})
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-boolean-value.md
+  'react/jsx-boolean-value': ['error', 'never'],
+
+  // Consistent function component declaration styles
+  // https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules/function-component-definition.md
+  'react/function-component-definition': [
+    'error',
+    {namedComponents: 'function-declaration'},
+  ],
+};
+
+const reactImportRules = {
+  // Not recommended to be enabled with typescript-eslint
+  // https://typescript-eslint.io/linting/troubleshooting/performance-troubleshooting/#eslint-plugin-import
+  'import/no-unresolved': ['off'],
+  'import/named': ['off'],
+  'import/default': ['off'],
+  'import/export': ['off'],
+  'import/no-named-as-default-member': ['off'],
+
+  // Redflags
+  // do not allow a default import name to match a named export (airbnb: error)
+  // Issue with `DefaultIssuePlugin` and `app/plugins/index`
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-named-as-default.md
+  'import/no-named-as-default': ['off'],
+
+  // disallow use of jsdoc-marked-deprecated imports
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-deprecated.md
+  'import/no-deprecated': ['off'],
+
+  // Forbid mutable exports (airbnb: error)
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-mutable-exports.md
+  // TODO: enable?
+  'import/no-mutable-exports': ['off'],
+
+  // disallow require()
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-commonjs.md
+  'import/no-commonjs': ['off'],
+
+  // disallow AMD require/define
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-amd.md
+  'import/no-amd': ['error'],
+
+  // disallow duplicate imports
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-duplicates.md
+  'import/no-duplicates': ['error'],
+
+  // disallow namespace imports
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-namespace.md
+  'import/no-namespace': ['off'],
+
+  // Ensure consistent use of file extension within the import path
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/extensions.md
+  // TODO this fucks up getsentry
+  'import/extensions': [
+    'off',
+    'always',
+    {
+      js: 'never',
+      jsx: 'never',
+    },
+  ],
+
+  // Require a newline after the last import/require in a group
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/newline-after-import.md
+  'import/newline-after-import': ['error'],
+
+  // Require modules with a single export to use a default export (airbnb: error)
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/prefer-default-export.md
+  'import/prefer-default-export': ['off'],
+
+  // Restrict which files can be imported in a given folder
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-restricted-paths.md
+  'import/no-restricted-paths': ['off'],
+
+  // Forbid modules to have too many dependencies
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/max-dependencies.md
+  'import/max-dependencies': ['off', {max: 10}],
+
+  // Forbid import of modules using absolute paths
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-absolute-path.md
+  'import/no-absolute-path': ['error'],
+
+  // Forbid require() calls with expressions (airbnb: error)
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-dynamic-require.md
+  'import/no-dynamic-require': ['off'],
+
+  // Use webpack default chunk names
+  'import/dynamic-import-chunkname': ['off'],
+
+  // prevent importing the submodules of other modules
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-internal-modules.md
+  'import/no-internal-modules': [
+    'off',
+    {
+      allow: [],
+    },
+  ],
+
+  // Warn if a module could be mistakenly parsed as a script by a consumer
+  // leveraging Unambiguous JavaScript Grammar
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/unambiguous.md
+  // this should not be enabled until this proposal has at least been *presented* to TC39.
+  // At the moment, it"s not a thing.
+  'import/unambiguous': ['off'],
+
+  // Forbid Webpack loader syntax in imports
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-webpack-loader-syntax.md
+  'import/no-webpack-loader-syntax': ['error'],
+
+  // Prevent unassigned imports
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-unassigned-import.md
+  // importing for side effects is perfectly acceptable, if you need side effects.
+  'import/no-unassigned-import': ['off'],
+
+  // Prevent importing the default as if it were named
+  // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-named-default.md
+  'import/no-named-default': ['error'],
+
+  // Reports if a module"s default export is unnamed
+  // https://github.com/benmosher/eslint-plugin-import/blob/d9b712ac7fd1fddc391f7b234827925c160d956f/docs/rules/no-anonymous-default-export.md
+  'import/no-anonymous-default-export': [
+    'error',
+    {
+      allowArray: false,
+      allowArrowFunction: false,
+      allowAnonymousClass: false,
+      allowAnonymousFunction: false,
+      allowCallExpression: true,
+      allowLiteral: false,
+      allowObject: false,
+    },
+  ],
+};
+
+const reactJestRules = {
+  'jest/no-disabled-tests': 'error',
+};
+
+const reactRules = {
+  ...reactReactRules,
+  ...reactImportRules,
+  ...reactJestRules,
+  /**
+   * React hooks
+   */
+  'react-hooks/exhaustive-deps': 'error',
+  // Biome not yet enforcing all parts of this rule https://github.com/biomejs/biome/issues/1984
+  'react-hooks/rules-of-hooks': 'error',
+
+  /**
+   * Custom
+   */
+  // highlights literals in JSX components w/o translation tags
+  'getsentry/jsx-needs-il8n': ['off'],
+  'testing-library/render-result-naming-convention': 'off',
+  'testing-library/no-unnecessary-act': 'off',
+
+  // Disabled as we have many tests which render as simple validations
+  'jest/expect-expect': 'off',
+
+  // Disabled as we have some comment out tests that cannot be
+  // uncommented due to typescript errors.
+  'jest/no-commented-out-tests': 'off',
+
+  // Disabled as we do sometimes have conditional expects
+  'jest/no-conditional-expect': 'off',
+
+  // Useful for exporting some test utilities
+  'jest/no-export': 'off',
+
+  'typescript-sort-keys/interface': [
+    'error',
+    'asc',
+    {caseSensitive: true, natural: false, requiredFirst: true},
+  ],
+};
+
+const appRules = {
+  /**
+   * emotion rules for v10
+   *
+   * This probably aren't as necessary anymore, but let's remove when we move to v11
+   */
+  '@emotion/jsx-import': 'off',
+  '@emotion/no-vanilla': 'error',
+  '@emotion/import-from-emotion': 'error',
+  '@emotion/styled-import': 'error',
+
+  // no-undef is redundant with typescript as tsc will complain
+  // A downside is that we won't get eslint errors about it, but your editors should
+  // support tsc errors so....
+  // https://eslint.org/docs/rules/no-undef
+  'no-undef': 'off',
+
+  // Let formatter handle this
+  'arrow-body-style': 'off',
+
+  /**
+   * Need to use typescript version of these rules
+   * https://eslint.org/docs/rules/no-shadow
+   */
+  'no-shadow': 'off',
+  '@typescript-eslint/no-shadow': 'error',
+
+  // This only override the `args` rule (which is "none"). There are too many errors and it's difficult to manually
+  // fix them all, so we'll have to incrementally update.
+  // https://eslint.org/docs/rules/no-unused-vars
+  'no-unused-vars': 'off',
+  '@typescript-eslint/no-unused-vars': [
+    'error',
+    {
+      vars: 'all',
+      args: 'all',
+      // TODO(scttcper): We could enable this to enforce catch (error)
+      // https://eslint.org/docs/latest/rules/no-unused-vars#caughterrors
+      caughtErrors: 'none',
+
+      // Ignore vars that start with an underscore
+      // e.g. if you want to omit a property using object spread:
+      //
+      //   const {name: _name, ...props} = this.props;
+      //
+      varsIgnorePattern: '^_',
+      argsIgnorePattern: '^_',
+      destructuredArrayIgnorePattern: '^_',
+    },
+  ],
+
+  // https://eslint.org/docs/rules/no-use-before-define
+  'no-use-before-define': 'off',
+  // This seems to have been turned on while previously it had been off
+  '@typescript-eslint/no-use-before-define': ['off'],
+
+  /**
+   * Restricted imports, e.g. deprecated libraries, etc
+   *
+   * See: https://eslint.org/docs/rules/no-restricted-imports
+   */
+  'no-restricted-imports': [
+    'error',
+    {
+      paths: [
+        {
+          name: 'enzyme',
+          message:
+            'Please import from `sentry-test/enzyme` instead. See: https://github.com/getsentry/frontend-handbook#undefined-theme-properties-in-tests for more information',
+        },
+        {
+          name: '@testing-library/react',
+          message:
+            'Please import from `sentry-test/reactTestingLibrary` instead so that we can ensure consistency throughout the codebase',
+        },
+        {
+          name: '@testing-library/react-hooks',
+          message:
+            'Please import from `sentry-test/reactTestingLibrary` instead so that we can ensure consistency throughout the codebase',
+        },
+        {
+          name: '@testing-library/user-event',
+          message:
+            'Please import from `sentry-test/reactTestingLibrary` instead so that we can ensure consistency throughout the codebase',
+        },
+        {
+          name: '@sentry/browser',
+          message:
+            'Please import from `@sentry/react` to ensure consistency throughout the codebase.',
+        },
+        {
+          name: 'marked',
+          message:
+            "Please import marked from 'app/utils/marked' so that we can ensure sanitation of marked output",
+        },
+
+        {
+          name: 'lodash',
+          message:
+            "Please import lodash utilities individually. e.g. `import isEqual from 'lodash/isEqual';`. See https://github.com/getsentry/frontend-handbook#lodash from for information",
+        },
+        {
+          name: 'lodash/get',
+          message:
+            'Optional chaining `?.` and nullish coalescing operators `??` are available and preferred over using `lodash/get`. See https://github.com/getsentry/frontend-handbook#new-syntax for more information',
+        },
+        {
+          name: 'react-bootstrap',
+          message:
+            'Avoid usage of any react-bootstrap components as it will soon be removed',
+        },
+        {
+          name: 'sentry/utils/theme',
+          importNames: ['lightColors', 'darkColors'],
+          message:
+            "'lightColors' and 'darkColors' exports intended for use in Storybook only. Instead, use theme prop from emotion or the useTheme hook.",
+        },
+        {
+          name: 'react-router',
+          importNames: ['withRouter'],
+          message:
+            "Use 'useLocation', 'useParams', 'useNavigate', 'useRoutes' from sentry/utils instead.",
+        },
+        {
+          name: 'sentry/utils/withSentryRouter',
+          importNames: ['withSentryRouter'],
+          message:
+            "Use 'useLocation', 'useParams', 'useNavigate', 'useRoutes' from sentry/utils instead.",
+        },
+      ],
+    },
+  ],
+
+  /**
+   * Better import sorting
+   */
+  'sort-imports': 'off',
+  'import/order': 'off',
+  'simple-import-sort/imports': [
+    'error',
+    {
+      groups: [
+        // Side effect imports.
+        ['^\\u0000'],
+
+        // Node.js builtins.
+        // biome-ignore lint/correctness/noNodejsModules: Need to get the list of things!
+        [`^(${require('node:module').builtinModules.join('|')})(/|$)`],
+
+        // Packages. `react` related packages come first.
+        ['^react', '^@?\\w'],
+
+        // Test should be separate from the app
+        ['^(sentry-test|getsentry-test)(/.*|$)'],
+
+        // Internal packages.
+        ['^(sentry-locale|sentry-images)(/.*|$)'],
+
+        ['^(getsentry-images)(/.*|$)'],
+
+        ['^(app|sentry)(/.*|$)'],
+
+        // Getsentry packages.
+        ['^(admin|getsentry)(/.*|$)'],
+
+        // Style imports.
+        ['^.+\\.less$'],
+
+        // Parent imports. Put `..` last.
+        ['^\\.\\.(?!/?$)', '^\\.\\./?$'],
+
+        // Other relative imports. Put same-folder imports and `.` last.
+        ['^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'],
+      ],
+    },
+  ],
+
+  'sentry/no-digits-in-tn': ['error'],
+
+  'sentry/no-dynamic-translations': ['error'],
+
+  // https://github.com/xojs/eslint-config-xo-typescript/blob/9791a067d6a119a21a4db72c02f1da95e25ffbb6/index.js#L95
+  '@typescript-eslint/no-restricted-types': [
+    'error',
+    {
+      types: {
+        // TODO(scttcper): Turn object on to make our types more strict
+        // object: {
+        //   message: 'The `object` type is hard to use. Use `Record<string, unknown>` instead. See: https://github.com/typescript-eslint/typescript-eslint/pull/848',
+        //   fixWith: 'Record<string, unknown>'
+        // },
+        Buffer: {
+          message:
+            'Use Uint8Array instead. See: https://sindresorhus.com/blog/goodbye-nodejs-buffer',
+          suggest: ['Uint8Array'],
+        },
+        '[]': "Don't use the empty array type `[]`. It only allows empty arrays. Use `SomeType[]` instead.",
+        '[[]]':
+          "Don't use `[[]]`. It only allows an array with a single element which is an empty array. Use `SomeType[][]` instead.",
+        '[[[]]]': "Don't use `[[[]]]`. Use `SomeType[][][]` instead.",
+      },
+    },
+  ],
+  // TODO(scttcper): Turn no-empty-object-type on to make our types more strict
+  // '@typescript-eslint/no-empty-object-type': 'error',
+  // TODO(scttcper): Turn no-function on to make our types more strict
+  // '@typescript-eslint/no-unsafe-function-type': 'error',
+  '@typescript-eslint/no-wrapper-object-types': 'error',
+
+  // Naming convention enforcements
+  '@typescript-eslint/naming-convention': [
+    'error',
+    {
+      selector: 'typeLike',
+      format: ['PascalCase'],
+      leadingUnderscore: 'allow',
+    },
+    {
+      selector: 'enumMember',
+      format: ['UPPER_CASE'],
+    },
+  ],
+
+  // Don't allow lookbehind expressions in regexp as they crash safari
+  // We've accidentally used lookbehinds a few times and caused problems.
+  'no-lookahead-lookbehind-regexp/no-lookahead-lookbehind-regexp': [
+    'error',
+    'no-lookbehind',
+    'no-negative-lookbehind',
+  ],
+};
+
+const strictRules = {
+  // https://eslint.org/docs/rules/no-console
+  'no-console': ['error'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-is-mounted.md
+  'react/no-is-mounted': ['error'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-find-dom-node.md
+  // Recommended to use callback refs instead
+  'react/no-find-dom-node': ['error'],
+
+  // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-string-refs.md
+  // This is now considered legacy, callback refs preferred
+  'react/no-string-refs': ['error'],
+
+  'jest/no-large-snapshots': ['error', {maxSize: 2000}],
+
+  'sentry/no-styled-shortcut': ['error'],
+};
+
+const extendsList = [
+  'plugin:jest/recommended',
+  'plugin:jest-dom/recommended',
+  'plugin:import/typescript',
+];
+if (detectDeprecations) {
+  extendsList.push('plugin:deprecation/recommended');
+}
+
 module.exports = {
   root: true,
-  extends: detectDeprecations
-    ? ['sentry-app/strict', 'plugin:deprecation/recommended']
-    : ['sentry-app/strict'],
+  extends: extendsList,
+
+  plugins: [
+    'jest-dom',
+    'testing-library',
+    'typescript-sort-keys',
+    'react-hooks',
+    '@typescript-eslint',
+    '@emotion',
+    'import',
+    'react',
+    'sentry',
+    'simple-import-sort',
+    'no-lookahead-lookbehind-regexp',
+  ],
+
+  parser: '@typescript-eslint/parser',
 
   parserOptions: detectDeprecations
     ? {
+        warnOnUnsupportedTypeScriptVersion: false,
+        ecmaVersion: 6,
+        sourceType: 'module',
+        ecmaFeatures: {
+          jsx: true,
+          modules: true,
+          legacyDecorators: true,
+        },
         project: './tsconfig.json',
       }
-    : {},
+    : {
+        warnOnUnsupportedTypeScriptVersion: false,
+        ecmaVersion: 6,
+        sourceType: 'module',
+        ecmaFeatures: {
+          jsx: true,
+          modules: true,
+          legacyDecorators: true,
+        },
+      },
+
+  env: {
+    browser: true,
+    es6: true,
+    jest: true,
+    jquery: true, // hard-loaded into vendor.js
+  },
 
   globals: {
     require: false,
@@ -21,7 +808,25 @@ module.exports = {
     tick: true,
     jest: true,
   },
+
+  settings: {
+    react: {
+      version: '17.0.2', // React version, can not `detect` because of getsentry
+    },
+    'import/parsers': {
+      '@typescript-eslint/parser': ['.ts', '.tsx'],
+    },
+    'import/resolver': {
+      typescript: {},
+    },
+    'import/extensions': ['.js', '.jsx'],
+  },
+
   rules: {
+    ...baseRules,
+    ...reactRules,
+    ...appRules,
+    ...strictRules,
     'react-hooks/rules-of-hooks': 'error',
     'react-hooks/exhaustive-deps': [
       'error',
@@ -138,8 +943,12 @@ module.exports = {
     },
     {
       files: ['static/**/*.spec.{ts,js}', 'tests/js/**/*.{ts,js}'],
-      extends: ['plugin:testing-library/react', 'sentry-app/strict'],
+      extends: ['plugin:testing-library/react', ...extendsList],
       rules: {
+        ...baseRules,
+        ...reactRules,
+        ...appRules,
+        ...strictRules,
         // TODO(@anonrig): Remove this from eslint-sentry-config
         'space-infix-ops': 'off',
         'object-shorthand': 'off',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 53d94e25298713..9695c88749836f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -97,7 +97,7 @@ Makefile                                                 @getsentry/owners-sentr
 /src/sentry/analytics/events/relocation_*.py             @getsentry/open-source
 /src/sentry/api/endpoints/organization_fork.py           @getsentry/open-source
 /src/sentry/api/endpoints/relocation/                    @getsentry/open-source
-/src/sentry/api/serialiers/models/relocation/            @getsentry/open-source
+/src/sentry/api/serializers/models/relocation/           @getsentry/open-source
 /src/sentry/models/relocation/                           @getsentry/open-source
 /src/sentry/relocation/                                  @getsentry/open-source
 /src/sentry/tasks/relocation.py                          @getsentry/open-source
@@ -228,8 +228,6 @@ yarn.lock                                                @getsentry/owners-js-de
 /tests/snuba/api/endpoints/test_organization_events_vitals.py               @getsentry/visibility
 /tests/snuba/api/endpoints/test_organization_tagkey_values.py               @getsentry/visibility
 
-/src/sentry/api/endpoints/organization_transaction_anomaly_detection.py     @getsentry/data
-
 /src/sentry/spans/                                                          @getsentry/visibility
 /tests/sentry/spans/                                                        @getsentry/visibility
 
@@ -471,10 +469,8 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 /tests/sentry/api/endpoints/test_projects_metrics_visibility.py                  @getsentry/telemetry-experience
 /src/sentry/api/endpoints/organization_onboarding*                               @getsentry/telemetry-experience
 /tests/sentry/api/endpoints/test_organization_onboarding*                        @getsentry/telemetry-experience
-/src/sentry/api/endpoints/project_metrics_extraction_rules*                      @getsentry/telemetry-experience
-/tests/sentry/api/endpoints/test_project_metrics_extraction_rules.py             @getsentry/telemetry-experience
-/src/sentry/api/serializers/models/metrics_extraction_rules.py                   @getsentry/telemetry-experience
-/src/sentry/sentry_metrics/models/spanattributeextractionrules.py                @getsentry/telemetry-experience
+/src/sentry/api/endpoints/organization_sampling_project_span_counts.py           @getsentry/telemetry-experience
+/tests/sentry/api/endpoints/test_organization_sampling_project_span_counts.py    @getsentry/telemetry-experience
 /src/sentry/dynamic_sampling/                                                    @getsentry/telemetry-experience
 /tests/sentry/dynamic_sampling/                                                  @getsentry/telemetry-experience
 /src/sentry/release_health/metrics_sessions_v2.py                                @getsentry/telemetry-experience
@@ -484,7 +480,6 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 /tests/sentry/sentry_metrics/querying/                                           @getsentry/telemetry-experience
 /src/sentry/sentry_metrics/visibility/                                           @getsentry/telemetry-experience
 /tests/sentry/sentry_metrics/visibility/                                         @getsentry/telemetry-experience
-/src/sentry/sentry_metrics/span_attribute_extraction_rules.py                    @getsentry/telemetry-experience
 /src/sentry/sentry_metrics/extraction_rules.py                                   @getsentry/telemetry-experience
 /tests/sentry/sentry_metrics/test_extraction_rules.py                            @getsentry/telemetry-experience
 /src/sentry/snuba/metrics/                                                       @getsentry/telemetry-experience
@@ -505,6 +500,7 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 /static/app/views/performance/landing/dynamicSamplingMetricsAccuracy.spec.tsx    @getsentry/telemetry-experience
 /static/app/views/performance/landing/dynamicSamplingMetricsAccuracyAlert.tsx    @getsentry/telemetry-experience
 /static/app/views/settings/project/dynamicSampling/                              @getsentry/telemetry-experience
+/static/app/views/settings/dynamicSampling/                                      @getsentry/telemetry-experience
 /static/app/views/settings/projectMetrics/*                                      @getsentry/telemetry-experience
 /static/app/views/onboarding*                                                    @getsentry/telemetry-experience
 
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 798862b1fc592f..8dd7ae295221bf 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -337,9 +337,11 @@ jobs:
           ! grep 'Incompatible types in "yield"' .artifacts/mypy-all
           ! grep 'Module "sentry.*has no attribute' .artifacts/mypy-all
           ! grep 'No return value expected' .artifacts/mypy-all
+          ! grep 'Return value expected' .artifacts/mypy-all
           ! grep 'Unpacking a string is disallowed' .artifacts/mypy-all
           ! grep 'base class .* defined the type as.*Permission' .artifacts/mypy-all
           ! grep 'does not explicitly export attribute' .artifacts/mypy-all
+          ! grep 'gets multiple values for' .artifacts/mypy-all
 
       - name: apply blocklist changes
         if: |
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index c3480e807a39f2..fc1a79c0a975f3 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -129,7 +129,11 @@ jobs:
           # This quiets up the logs quite a bit.
           DEBUG_PRINT_LIMIT: 0
         run: |
-          JEST_TESTS=$(yarn -s jest --listTests --json) yarn test-ci --forceExit
+          if [ ${{ github.ref }} = 'refs/heads/master' ]; then
+            JEST_TESTS=$(yarn -s jest --listTests --json) yarn test-ci --forceExit --coverage
+          else
+            JEST_TESTS=$(yarn -s jest --listTests --json) yarn test-ci --forceExit
+          fi
 
       # We only upload coverage data for FE changes since it conflicts with
       # codecov's carry forward functionality.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 51f2df29192c3d..406fed5714067e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,14 +17,20 @@ jobs:
     runs-on: ubuntu-latest
     name: 'Release a new version'
     steps:
+      - name: Get auth token
+        id: token
+        uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
+        with:
+          app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
+          private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
-          token: ${{ secrets.GH_RELEASE_PAT }}
+          token: ${{ steps.token.outputs.token }}
           fetch-depth: 0
       - name: Prepare release
         uses: getsentry/action-prepare-release@d2cc2db3db92bc5b79a90c316f588f2b13626a2b # v1.5.6
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
+          GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with:
           version: ${{ github.event.inputs.version }}
           force: ${{ github.event.inputs.force }}
diff --git a/.github/workflows/test_docker_compose_acceptance.yml b/.github/workflows/test_docker_compose_acceptance.yml
index bc5a852ae2f2ff..aa81794eb085ba 100644
--- a/.github/workflows/test_docker_compose_acceptance.yml
+++ b/.github/workflows/test_docker_compose_acceptance.yml
@@ -4,7 +4,7 @@
 name: test-docker-compose-acceptance
 on:
   schedule:
-    - cron: '0 * * * *'
+    - cron: '0 0 * * *'
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
diff --git a/.github/workflows/test_docker_compose_backend.yml b/.github/workflows/test_docker_compose_backend.yml
index 0108f97c489184..179b1efee17362 100644
--- a/.github/workflows/test_docker_compose_backend.yml
+++ b/.github/workflows/test_docker_compose_backend.yml
@@ -2,7 +2,7 @@ name: test-docker-compose-backend
 
 on:
   schedule:
-    - cron: '0 * * * *'
+    - cron: '0 0 * * *'
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
diff --git a/.volta.json b/.volta.json
index 6d767601866ac6..872e9f4f1d6b99 100644
--- a/.volta.json
+++ b/.volta.json
@@ -1,6 +1,6 @@
 {
   "volta": {
-    "node": "20.13.1",
+    "node": "22.11.0",
     "yarn": "1.22.22"
   }
 }
diff --git a/CHANGES b/CHANGES
index 1fae1885ccc856..84afe672222eeb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,67 @@
+24.11.1
+-------
+
+### Various fixes & improvements
+
+- feat(toolbar): Make the login-success page have styles that blend with the login flow (#81230) by @ryan953
+- fix(issues): Revert to app external issue name (#81277) by @scttcper
+- Revert "chore(similarity): Do not send > 30 system frames to seer (#81259)" (104352cb) by @getsentry-bot
+- :wrench: chore(slos): Update Halt to Success for Bot Commands (#81271) by @iamrajjoshi
+- fix(auth): Adding scoping_organization_id to replica (#81213) by @sentaur-athena
+- chore(similarity): Do not send > 30 system frames to seer (#81259) by @jangjodi
+- fix(issues): Animate dropdown chevrons, button sizes (#81262) by @scttcper
+- feat(eap): Add missing profile.id column to EAP (#81263) by @Zylphrex
+- ref(dashboards): Modify how permissions are handled for editing/deleting dashboards (#80684) by @harshithadurai
+- feat(explore): Format numeric tags nicely in explore (#81255) by @Zylphrex
+- fix(explore): Preserve sort when adding group by (#81258) by @Zylphrex
+- ref(insights): remove insights-domain-view flag part 1 (#81241) by @DominikB2014
+- chore(alerts): Drop included and excluded projects (#81250) by @ceorourke
+- ref: fix flaky digests test (#81256) by @asottile-sentry
+- chore(sentryapps) Remove option for sentryapp RPC transition (#81245) by @markstory
+- fix(grouping): Only collect metadata timing metric when actually getting metadata (#81252) by @lobsterkatie
+- chore(performance): Remove old anomaly detection backend (#80696) by @gggritso
+- Revert "chore(similarity): Add logging for over 30 system frames (#81130)" (7b7e7955) by @getsentry-bot
+- ♻️ chore(slo): SLOs for CommitContextIntegration (#81225) by @iamrajjoshi
+- chore(widget-builder): Remove organization props (#81248) by @narsaynorath
+- chore(integrations): SourceCodeSearchEndpoint metrics (#80956) by @mifu67
+- chore(vsts): vsts installation step metrics (#80789) by @cathteng
+- Remove excluded_projects & include_all_projects columns (#81204) by @ceorourke
+- fix(issues): Wrap solutions in error boundary (#81244) by @scttcper
+
+_Plus 338 more_
+
+24.11.0
+-------
+
+### Various fixes & improvements
+
+- feat(issue-details): Add support link to dropdown (#80804) by @roggenkemper
+- fix(issues): Show 50+ Replays whenever the count is maxed out like that (#80809) by @ryan953
+- ref(replay): Refactor extractDomNodes stepper strategy into extractDomNodes.tsx (#80810) by @ryan953
+- ref: make condition_data / action_data param names match for create_project_rule (#80781) by @asottile-sentry
+- ref: explicitly install libexpat1 (#80742) by @asottile-sentry
+- ref(dashboards): Fixes and refactoring for edit access selector button (#80633) by @harshithadurai
+- feat(flamegraphs): Support functions flamegraphs for continuous profi… (#80822) by @Zylphrex
+- feature(dashboards): added grid icon (#80806) by @doralchan
+- fix(charts): Respect stacked prop in area chart (#80824) by @Zylphrex
+- fix(insights): filter out ui.action in backend, and add to mobile (#80823) by @DominikB2014
+- chore(flamegraph): Remove transactions from differential flamegraphs (#80807) by @Zylphrex
+- feat(functions): Use flamegraph as data source for slowest functions (#80791) by @Zylphrex
+- feat(dashboards): Dashboards landing page layout toggle (#80790) by @nikkikapadia
+- ref(grouping): Rename `GroupingComponent` to `BaseGroupingComponent` (#80725) by @lobsterkatie
+- feat(dynamic-sampling): Show project as active if not 100 percent (#80819) by @ArthurKnaus
+- feat(dynamic-sampling): Copy changes and doc links (#80818) by @ArthurKnaus
+- fix(releases): For semver releases, get latest release as the resolving one (#80737) by @armenzg
+- feat(dynamic-sampling): Use new span count endpoint (#80732) by @ArthurKnaus
+- feat(dynamic-sampling): Show stored span per sub-project (#80816) by @ArthurKnaus
+- fix(dynamic-sampling): set dynamic sampling project span count mql query limit (#80812) by @shellmayr
+- chore(codeowners): update telemetry experience ownership (#80813) by @shellmayr
+- fix(crons): Move limit back onto QuerySet for incident detection (#80805) by @evanpurkhiser
+- fix(grouping): Small types fixes (#80724) by @lobsterkatie
+- feat(backup): Add export checkpointer (#80711) by @azaslavsky
+
+_Plus 1276 more_
+
 24.10.0
 -------
 
diff --git a/Makefile b/Makefile
index 015c139827f4ff..bd3a6150a492b4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ all: develop
 
 PIP := python -m pip --disable-pip-version-check
 WEBPACK := yarn build-acceptance
-POSTGRES_CONTAINER := sentry_postgres
 
 freeze-requirements:
 	@python3 -S -m tools.freeze_requirements
diff --git a/api-docs/openapi.json b/api-docs/openapi.json
index d2ed03342d473f..f7cba5f6d5345f 100644
--- a/api-docs/openapi.json
+++ b/api-docs/openapi.json
@@ -135,13 +135,13 @@
     "/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/issues/": {
       "$ref": "paths/events/project-issues.json"
     },
-    "/api/0/issues/{issue_id}/tags/{key}/values/": {
+    "/api/0/organizations/{organization_id_or_slug}/issues/{issue_id}/tags/{key}/values/": {
       "$ref": "paths/events/tag-values.json"
     },
-    "/api/0/issues/{issue_id}/hashes/": {
+    "/api/0/organizations/{organization_id_or_slug}/issues/{issue_id}/hashes/": {
       "$ref": "paths/events/issue-hashes.json"
     },
-    "/api/0/issues/{issue_id}/": {
+    "/api/0/organizations/{organization_id_or_slug}/issues/{issue_id}/": {
       "$ref": "paths/events/issue-details.json"
     },
     "/api/0/organizations/{organization_id_or_slug}/releases/": {
diff --git a/api-docs/package.json b/api-docs/package.json
index f3a3cef97086e1..9e729d8af38a89 100644
--- a/api-docs/package.json
+++ b/api-docs/package.json
@@ -13,7 +13,7 @@
     "js-yaml": "^3.14.0",
     "json-diff": "^0.7.1",
     "json-refs": "^3.0.15",
-    "openapi-examples-validator": "^5.0.0",
+    "openapi-examples-validator": "^6.0.0",
     "sane": "^5.0.1"
   },
   "devDependencies": {
@@ -21,7 +21,7 @@
     "@types/json-diff": "^0.7.0"
   },
   "volta": {
-    "node": "20.13.1",
+    "node": "22.11.0",
     "yarn": "1.22.22"
   }
 }
diff --git a/api-docs/paths/events/issue-hashes.json b/api-docs/paths/events/issue-hashes.json
index 77acd0241f8cb9..5a18525f8759ac 100644
--- a/api-docs/paths/events/issue-hashes.json
+++ b/api-docs/paths/events/issue-hashes.json
@@ -4,6 +4,15 @@
     "description": "This endpoint lists an issue's hashes, which are the generated checksums used to aggregate individual events.",
     "operationId": "List an Issue's Hashes",
     "parameters": [
+      {
+        "name": "organization_id_or_slug",
+        "in": "path",
+        "description": "The ID or slug of the organization the event belongs to.",
+        "required": true,
+        "schema": {
+          "type": "string"
+        }
+      },
       {
         "name": "issue_id",
         "in": "path",
@@ -13,6 +22,16 @@
           "type": "string"
         }
       },
+      {
+        "in": "query",
+        "name": "full",
+        "schema": {
+          "type": "boolean",
+          "default": true
+        },
+        "description": "If this is set to true, the event payload will include the full event body, including the stacktrace. Set to 1 to enable.",
+        "required": false
+      },
       {
         "$ref": "../../components/parameters/pagination-cursor.json#/PaginationCursor"
       }
diff --git a/api-docs/paths/events/tag-values.json b/api-docs/paths/events/tag-values.json
index 323b3d33bc8f8d..ecba8b30675bd1 100644
--- a/api-docs/paths/events/tag-values.json
+++ b/api-docs/paths/events/tag-values.json
@@ -4,6 +4,15 @@
     "description": "Returns details for given tag key related to an issue. \n\nWhen [paginated](/api/pagination) can return at most 1000 values.",
     "operationId": "List a Tag's Values Related to an Issue",
     "parameters": [
+      {
+        "name": "organization_id_or_slug",
+        "in": "path",
+        "description": "The ID or slug of the organization the event belongs to.",
+        "required": true,
+        "schema": {
+          "type": "string"
+        }
+      },
       {
         "name": "issue_id",
         "in": "path",
diff --git a/api-docs/yarn.lock b/api-docs/yarn.lock
index 93b7bbe858a4ad..e0c3c84186dd76 100644
--- a/api-docs/yarn.lock
+++ b/api-docs/yarn.lock
@@ -25,10 +25,20 @@
   resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
   integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
 
+"@jsep-plugin/assignment@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@jsep-plugin/assignment/-/assignment-1.3.0.tgz#fcfc5417a04933f7ceee786e8ab498aa3ce2b242"
+  integrity sha512-VVgV+CXrhbMI3aSusQyclHkenWSAm95WaiKrMxRFam3JSUiIaQjoMIw2sEs/OX4XifnqeQUN4DYbJjlA8EfktQ==
+
+"@jsep-plugin/regex@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@jsep-plugin/regex/-/regex-1.0.4.tgz#cb2fc423220fa71c609323b9ba7f7d344a755fcc"
+  integrity sha512-q7qL4Mgjs1vByCaTnDFcBnV9HS7GVPJX5vyVoCgZHNSC9rjwIlmbXG5sUuorR5ndfHAIlJ8pVStxvjXHbNvtUg==
+
 "@types/js-yaml@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138"
-  integrity sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.9.tgz#cd82382c4f902fed9691a2ed79ec68c5898af4c2"
+  integrity sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==
 
 "@types/json-diff@^0.7.0":
   version "0.7.0"
@@ -36,9 +46,9 @@
   integrity sha512-20IJqupGHywtIaE6fS30iygh3dVqVdzmsnrYn/VFuRaQKxLx/RGH5K9hhCfctVxgN7KzJlnD7gYFAOrNwiCgtA==
 
 "@types/json-schema@^7.0.6":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 ajv-draft-04@^1.0.0:
   version "1.0.0"
@@ -52,15 +62,15 @@ ajv-formats@^2.1.1:
   dependencies:
     ajv "^8.0.0"
 
-ajv@^8.0.0, ajv@^8.12.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+ajv@^8.0.0, ajv@^8.17.1:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6"
+  integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==
   dependencies:
-    fast-deep-equal "^3.1.1"
+    fast-deep-equal "^3.1.3"
+    fast-uri "^3.0.1"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
-    uri-js "^4.2.2"
 
 anymatch@^3.1.1:
   version "3.1.3"
@@ -82,10 +92,15 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+asap@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -113,18 +128,21 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-call-bind@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
   dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
 
 call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa"
+  integrity sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -134,17 +152,17 @@ capture-exit@^2.0.0:
     rsvp "^4.8.4"
 
 cli-color@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.1.tgz#93e3491308691f1e46beb78b63d0fb2585e42ba6"
-  integrity sha512-eBbxZF6fqPUNnf7CLAFOersUnyYzv83tHFLSlts+OAHsNendaqv2tHCq+/MO+b3Y+9JeoUlIvobyxG/Z8GNeOg==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.4.tgz#d658080290968816b322248b7306fad2346fb2c8"
+  integrity sha512-zlnpg0jNcibNrO7GG9IeHH7maWFeCz+Ja1wx/7tZNU5ASSSSZ+/qZciM0/LHCYxSdqv5h2sdbQ/PXYdOuetXvA==
   dependencies:
     d "^1.0.1"
-    es5-ext "^0.10.53"
+    es5-ext "^0.10.64"
     es6-iterator "^2.0.3"
     memoizee "^0.4.15"
     timers-ext "^0.1.7"
 
-combined-stream@^1.0.6:
+combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -161,61 +179,73 @@ commander@~4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-component-emitter@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
-cookiejar@^2.1.0:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc"
-  integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==
+component-emitter@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17"
+  integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==
 
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+cookiejar@^2.1.3:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b"
+  integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==
 
 cross-spawn@^7.0.0:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+d@1, d@^1.0.1, d@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de"
+  integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==
   dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
+    es5-ext "^0.10.64"
+    type "^2.7.2"
 
-debug@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+debug@^4.3.4:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
   dependencies:
-    ms "^2.1.1"
+    ms "^2.1.3"
+
+define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+
+dezalgo@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
+  integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
 
 difflib@~0.2.1:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/difflib/-/difflib-0.2.4.tgz#b5e30361a6db023176d562892db85940a718f47e"
-  integrity sha1-teMDYabbAjF21WKJLbhZQKcY9H4=
+  integrity sha512-9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w==
   dependencies:
     heap ">= 0.2.0"
 
 dreamopt@~0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/dreamopt/-/dreamopt-0.8.0.tgz#5bcc80be7097e45fc489c342405ab68140a8c1d9"
-  integrity sha1-W8yAvnCX5F/EicNCQFq2gUCowdk=
+  integrity sha512-vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg==
   dependencies:
     wordwrap ">=0.0.2"
 
@@ -233,31 +263,44 @@ errno@^1.0.0:
   dependencies:
     prr "~1.0.1"
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
-  version "0.10.56"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.56.tgz#fd76bc935212203a83fef35bb58cddde26ae6c3c"
-  integrity sha512-YUhqzoMnIjMW5y8FzaMxsCu0eWCwq32GrlwhOhbQmL5OiZReWFm/KvRiYuvqf3CaG/zZ36Kyb4KfVe674cafCQ==
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14, es5-ext@~0.10.2:
+  version "0.10.64"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
+  integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
   dependencies:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.3"
+    esniff "^2.0.1"
     next-tick "^1.1.0"
 
 es6-iterator@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+  integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
   dependencies:
     d "1"
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
 es6-symbol@^3.1.1, es6-symbol@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c"
+  integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==
   dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
+    d "^1.0.2"
+    ext "^1.7.0"
 
 es6-weak-map@^2.0.3:
   version "2.0.3"
@@ -269,6 +312,16 @@ es6-weak-map@^2.0.3:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
+esniff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
+  integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.62"
+    event-emitter "^0.3.5"
+    type "^2.7.2"
+
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -277,7 +330,7 @@ esprima@^4.0.0:
 event-emitter@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+  integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -302,23 +355,28 @@ execa@^4.0.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
-ext@^1.1.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52"
-  integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
+ext@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
   dependencies:
-    type "^2.5.0"
+    type "^2.7.2"
 
-extend@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-safe-stringify@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
+  integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
+
+fast-uri@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.3.tgz#892a1c91802d5d7860de728f18608a0573142241"
+  integrity sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==
+
 fb-watchman@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
@@ -334,42 +392,49 @@ fill-range@^7.1.1:
     to-regex-range "^5.0.1"
 
 foreach@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.6.tgz#87bcc8a1a0e74000ff2bf9802110708cfb02eb6e"
+  integrity sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==
 
-form-data@^2.3.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
-  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+form-data@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48"
+  integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.6"
+    combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-formidable@^1.2.0:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.6.tgz#d2a51d60162bbc9b4a055d8457a7c75315d1a168"
-  integrity sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==
+formidable@^2.0.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.1.2.tgz#fa973a2bec150e4ce7cac15589d7a25fc30ebd89"
+  integrity sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==
+  dependencies:
+    dezalgo "^1.0.4"
+    hexoid "^1.0.0"
+    once "^1.4.0"
+    qs "^6.11.0"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-get-intrinsic@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
   dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
 
 get-stream@^5.0.0:
   version "5.2.0"
@@ -389,6 +454,13 @@ glob@^8.1.0:
     minimatch "^5.0.1"
     once "^1.3.0"
 
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
 graphlib@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da"
@@ -396,23 +468,40 @@ graphlib@^2.1.8:
   dependencies:
     lodash "^4.17.15"
 
-has-symbols@^1.0.1:
+has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
+  dependencies:
+    es-define-property "^1.0.0"
+
+has-proto@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
+
+has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+hasown@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
   dependencies:
-    function-bind "^1.1.1"
+    function-bind "^1.1.2"
 
 "heap@>= 0.2.0":
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.7.tgz#1e6adf711d3f27ce35a81fe3b7bd576c2260a8fc"
   integrity sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==
 
+hexoid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"
+  integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -421,12 +510,12 @@ human-signals@^1.1.1:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@~2.0.3:
+inherits@2, inherits@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -446,11 +535,6 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -471,10 +555,15 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+jsep@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsep/-/jsep-1.4.0.tgz#19feccbfa51d8a79f72480b4b8e40ce2e17152f0"
+  integrity sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==
+
 json-diff@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/json-diff/-/json-diff-0.7.2.tgz#237ade7cdfb882183b79f2066defdb458b995bba"
-  integrity sha512-m+rr5cvC8gML9iB8FatQpQ/NEBJ7LHUFMM4KoNfmCfhTElm42SnqslCGKpYB+Dt1NgkibRVrGP0ZAO3TOU1hpA==
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/json-diff/-/json-diff-0.7.4.tgz#b9089e2d29dd1b99cf3529dc1a5b72ca2ac7a8dc"
+  integrity sha512-FJ2P+ShDbzu9epF+kCKgoSUhPIUW7Ta7A4XlIT0L5LzgaR/z1TBF1mm0XhRGj8RlA3Xm0j+c/FsWOHDtuoYejA==
   dependencies:
     cli-color "^2.0.0"
     difflib "~0.2.1"
@@ -513,25 +602,29 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
-jsonpath-plus@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-7.2.0.tgz#7ad94e147b3ed42f7939c315d2b9ce490c5a3899"
-  integrity sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA==
+jsonpath-plus@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-10.2.0.tgz#84d680544d9868579cc7c8f59bbe153a5aad54c4"
+  integrity sha512-T9V+8iNYKFL2n2rF+w02LBOT2JjDnTjioaNFrxRy0Bv1y/hNsqR/EBK7Ojy2ythRHwmz2cRIls+9JitQGZC/sw==
+  dependencies:
+    "@jsep-plugin/assignment" "^1.3.0"
+    "@jsep-plugin/regex" "^1.0.4"
+    jsep "^1.4.0"
 
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+  integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
 
 lodash.flatmap@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz#ef8cbf408f6e48268663345305c6acc0b778702e"
-  integrity sha1-74y/QI9uSCaGYzRTBcaswLd4cC4=
+  integrity sha512-/OcpcAGWlrZyoHGeHh3cAoa6nGdX6QYtmzNP84Jqol6UEQQ2gIaU3H+0eICcjcKGl0/XF8LWOujNn9lffsnaOg==
 
 lodash.flatten@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+  integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
@@ -546,7 +639,7 @@ lodash@^4.17.15:
 lru-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
-  integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=
+  integrity sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==
   dependencies:
     es5-ext "~0.10.2"
 
@@ -558,12 +651,12 @@ makeerror@1.0.12:
     tmpl "1.0.5"
 
 memoizee@^0.4.15:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
-  integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==
+  version "0.4.17"
+  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.17.tgz#942a5f8acee281fa6fb9c620bddc57e3b7382949"
+  integrity sha512-DGqD7Hjpi/1or4F/aYAspXKNm5Yili0QDAFAY4QYvpqpgiY6+1jOfqpmByzjxbWd/T9mChbCArXAbDAsTm5oXA==
   dependencies:
-    d "^1.0.1"
-    es5-ext "^0.10.53"
+    d "^1.0.2"
+    es5-ext "^0.10.64"
     es6-weak-map "^2.0.3"
     event-emitter "^0.3.5"
     is-promise "^2.2.2"
@@ -576,10 +669,10 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-methods@^1.1.1:
+methods@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
 micromatch@^4.0.2:
   version "4.0.8"
@@ -589,22 +682,22 @@ micromatch@^4.0.2:
     braces "^3.0.3"
     picomatch "^2.3.1"
 
-mime-db@1.51.0:
-  version "1.51.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
-  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-types@^2.1.12:
-  version "2.1.34"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
-  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
-    mime-db "1.51.0"
+    mime-db "1.52.0"
 
-mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+mime@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
+  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
 
 mimic-fn@^2.1.0:
   version "2.1.0"
@@ -623,7 +716,7 @@ minimist@^1.1.1, minimist@^1.2.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-ms@^2.1.1:
+ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -631,9 +724,9 @@ ms@^2.1.1:
 native-promise-only@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
-  integrity sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=
+  integrity sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg==
 
-next-tick@1, next-tick@^1.1.0:
+next-tick@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
@@ -655,15 +748,15 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-object-inspect@^1.9.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
-  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+object-inspect@^1.13.1:
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a"
+  integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -674,12 +767,12 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-openapi-examples-validator@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/openapi-examples-validator/-/openapi-examples-validator-5.0.0.tgz#d35cbffc5f0669961f8ce514c413d0b44a153b62"
-  integrity sha512-UbyFT66im7n8yJWBMHup2VBKzWjIX0v9y+RroExPHqArUx/1kCdb39BfDra+cPiiZIwU9YYGtxwBwYyCCJAVgg==
+openapi-examples-validator@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/openapi-examples-validator/-/openapi-examples-validator-6.0.1.tgz#26ed3d425e5601f55c17b202eee22c17445d2aea"
+  integrity sha512-R8+E8hoc/s0s54O8VWWRM6FM7M7lPUPScEiESDEy1ZDvaCgb/ghiQCP6ArfU4GFu7lTaS31ujGUNC8eTZltgAQ==
   dependencies:
-    ajv "^8.12.0"
+    ajv "^8.17.1"
     ajv-draft-04 "^1.0.0"
     ajv-formats "^2.1.1"
     commander "^6.2.1"
@@ -687,12 +780,12 @@ openapi-examples-validator@^5.0.0:
     glob "^8.1.0"
     json-pointer "^0.6.2"
     json-schema-ref-parser "^9.0.9"
-    jsonpath-plus "^7.2.0"
+    jsonpath-plus "^10.2.0"
     lodash.clonedeep "^4.5.0"
     lodash.flatmap "^4.5.0"
     lodash.flatten "^4.4.0"
     lodash.merge "^4.6.2"
-    yaml "^2.2.2"
+    yaml "^2.6.1"
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
@@ -700,60 +793,51 @@ path-key@^3.0.0, path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-loader@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/path-loader/-/path-loader-1.0.10.tgz#dd3d1bd54cb6f2e6423af2ad334a41cc0bce4cf6"
-  integrity sha512-CMP0v6S6z8PHeJ6NFVyVJm6WyJjIwFvyz2b0n2/4bKdS/0uZa/9sKUlYZzubrn3zuDRU0zIuEDX9DZYQ2ZI8TA==
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/path-loader/-/path-loader-1.0.12.tgz#c5a99d464da27cfde5891d158a68807abbdfa5f5"
+  integrity sha512-n7oDG8B+k/p818uweWrOixY9/Dsr89o2TkCm6tOTex3fpdo2+BFDgR+KpB37mGKBRsBAlR8CIJMFN0OEy/7hIQ==
   dependencies:
     native-promise-only "^0.8.1"
-    superagent "^3.8.3"
+    superagent "^7.1.6"
 
 picomatch@^2.0.4, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+  integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
 pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8"
+  integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
 punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-qs@^6.5.1:
-  version "6.10.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
-  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
+qs@^6.10.3, qs@^6.11.0:
+  version "6.13.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.1.tgz#3ce5fc72bd3a8171b85c99b93c65dd20b7d1b16e"
+  integrity sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==
   dependencies:
-    side-channel "^1.0.4"
+    side-channel "^1.0.6"
 
-readable-stream@^2.3.5:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+readable-stream@^3.6.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
 
 require-from-string@^2.0.2:
   version "2.0.2"
@@ -765,10 +849,10 @@ rsvp@^4.8.4:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 sane@^5.0.1:
   version "5.0.1"
@@ -785,6 +869,23 @@ sane@^5.0.1:
     minimist "^1.1.1"
     walker "~1.0.5"
 
+semver@^7.3.7:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
+set-function-length@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -797,14 +898,15 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+side-channel@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
+  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
   dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    object-inspect "^1.13.1"
 
 signal-exit@^3.0.2:
   version "3.0.7"
@@ -819,43 +921,44 @@ slash@^3.0.0:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
-    safe-buffer "~5.1.0"
+    safe-buffer "~5.2.0"
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-superagent@^3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128"
-  integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==
-  dependencies:
-    component-emitter "^1.2.0"
-    cookiejar "^2.1.0"
-    debug "^3.1.0"
-    extend "^3.0.0"
-    form-data "^2.3.1"
-    formidable "^1.2.0"
-    methods "^1.1.1"
-    mime "^1.4.1"
-    qs "^6.5.1"
-    readable-stream "^2.3.5"
+superagent@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.6.tgz#64f303ed4e4aba1e9da319f134107a54cacdc9c6"
+  integrity sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g==
+  dependencies:
+    component-emitter "^1.3.0"
+    cookiejar "^2.1.3"
+    debug "^4.3.4"
+    fast-safe-stringify "^2.1.1"
+    form-data "^4.0.0"
+    formidable "^2.0.1"
+    methods "^1.1.2"
+    mime "2.6.0"
+    qs "^6.10.3"
+    readable-stream "^3.6.0"
+    semver "^7.3.7"
 
 timers-ext@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
-  integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.8.tgz#b4e442f10b7624a29dd2aa42c295e257150cf16c"
+  integrity sha512-wFH7+SEAcKfJpfLPkrgMPvvwnEtj8W4IurvEyrKsDleXnKLCDw71w8jltvfLa8Rm4qQxxT4jmDBYbJG/z7qoww==
   dependencies:
-    es5-ext "~0.10.46"
-    next-tick "1"
+    es5-ext "^0.10.64"
+    next-tick "^1.1.0"
 
 tmpl@1.0.5:
   version "1.0.5"
@@ -869,15 +972,10 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-
-type@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.6.0.tgz#3ca6099af5981d36ca86b78442973694278a219f"
-  integrity sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==
+type@^2.7.2:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486"
+  integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -886,10 +984,10 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 walker@~1.0.5:
   version "1.0.8"
@@ -908,14 +1006,14 @@ which@^2.0.1:
 wordwrap@>=0.0.2:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-yaml@^2.2.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
-  integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
+yaml@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773"
+  integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==
diff --git a/bin/split-silo-database b/bin/split-silo-database
index 50f0e0a5a593c1..c2c68b86b1725b 100755
--- a/bin/split-silo-database
+++ b/bin/split-silo-database
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+import os
+
 import click
 from django.apps import apps
 
@@ -30,7 +32,12 @@ def split_database(tables: list[str], source: str, destination: str, reset: bool
     command.extend([">", f"/tmp/{destination}-tables.sql"])
 
     with get_docker_client() as client:
-        postgres = client.containers.get("sentry_postgres")
+        postgres_container = (
+            "sentry_postgres"
+            if os.environ.get("USE_NEW_DEVSERVICES") != "1"
+            else "sentry-postgres-1"
+        )
+        postgres = client.containers.get(postgres_container)
 
         if verbose:
             click.echo(f">> Running {' '.join(command)}")
diff --git a/codecov.yml b/codecov.yml
index 5b1985cf566b28..953f7b57c20e87 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -4,10 +4,9 @@ coverage:
     project: false
     patch:
       frontend:
-        # codecov will not fail status checks for master
-        only_pulls: true
-        informational: false # Fail the check
-        target: 60%
+        informational: true
+        branches:
+          - master
         flags:
           - frontend
       backend:
diff --git a/devenv/config.ini b/devenv/config.ini
index 7a4a63f89afa2e..0d2654d091d8f0 100644
--- a/devenv/config.ini
+++ b/devenv/config.ini
@@ -32,14 +32,14 @@ linux_arm64_sha256 = e8378c0162b2e0e4cc1f62b29443a3305d116d09583304dbb0149fecaff
 
 [node]
 # upstream (https://nodejs.org/dist/) is not reliable enough so we've mirrored it to GCS
-darwin_x86_64 = https://storage.googleapis.com/sentry-dev-infra-assets/node/node-v20.13.1-darwin-x64.tar.xz
-darwin_x86_64_sha256 = c83bffeb4eb793da6cb61a44c422b399048a73d7a9c5eb735d9c7f5b0e8659b6
-darwin_arm64 = https://storage.googleapis.com/sentry-dev-infra-assets/node/node-v20.13.1-darwin-arm64.tar.xz
-darwin_arm64_sha256 = e8a8e78b91485bc95d20f2aa86201485593685c828ee609245ce21c5680d07ce
-linux_x86_64 = https://storage.googleapis.com/sentry-dev-infra-assets/node/node-v20.13.1-linux-x64.tar.xz
-linux_x86_64_sha256 = efc0f295dd878e510ab12ea36bbadc3db03c687ab30c07e86c7cdba7eed879a9
+darwin_x86_64 = https://storage.googleapis.com/sentry-dev-infra-assets/node/node-v22.11.0-darwin-x64.tar.xz
+darwin_x86_64_sha256 = ab28d1784625d151e3f608a9412a009118f376118ed842ae643f8c2efdfb0af6
+darwin_arm64 = https://storage.googleapis.com/sentry-dev-infra-assets/node/node-v22.11.0-darwin-arm64.tar.xz
+darwin_arm64_sha256 = c379a90c6aa605b74042a233ddcda4247b347ba5732007d280e44422cc8f9ecb
+linux_x86_64 = https://storage.googleapis.com/sentry-dev-infra-assets/node/node-v22.11.0-linux-x64.tar.xz
+linux_x86_64_sha256 = 83bf07dd343002a26211cf1fcd46a9d9534219aad42ee02847816940bf610a72
 # used for autoupdate
-version = v20.13.1
+version = v22.11.0
 yarn_version = 1.22.22
 
 [colima]
diff --git a/devenv/sync.py b/devenv/sync.py
index 431c9e68cc9045..8d42398400905a 100644
--- a/devenv/sync.py
+++ b/devenv/sync.py
@@ -72,21 +72,26 @@ def run_procs(
 
 
 # Temporary, see https://github.com/getsentry/sentry/pull/78881
-def check_minimum_version(minimum_version: str):
+def check_minimum_version(minimum_version: str) -> bool:
     version = importlib.metadata.version("sentry-devenv")
 
     parsed_version = tuple(map(int, version.split(".")))
     parsed_minimum_version = tuple(map(int, minimum_version.split(".")))
 
-    if parsed_version < parsed_minimum_version:
+    return parsed_version >= parsed_minimum_version
+
+
+def main(context: dict[str, str]) -> int:
+    minimum_version = "1.13.0"
+    if not check_minimum_version(minimum_version):
         raise SystemExit(
             f"""
 Hi! To reduce potential breakage we've defined a minimum
 devenv version ({minimum_version}) to run sync.
 
-Please run the following to update your global devenv to the minimum:
+Please run the following to update your global devenv:
 
-{constants.root}/venv/bin/pip install -U 'sentry-devenv=={minimum_version}'
+devenv update
 
 Then, use it to run sync this one time.
 
@@ -94,10 +99,6 @@ def check_minimum_version(minimum_version: str):
 """
         )
 
-
-def main(context: dict[str, str]) -> int:
-    check_minimum_version("1.13.0")
-
     repo = context["repo"]
     reporoot = context["reporoot"]
     repo_config = config.get_config(f"{reporoot}/devenv/config.ini")
@@ -107,6 +108,8 @@ def main(context: dict[str, str]) -> int:
 
     FRONTEND_ONLY = os.environ.get("SENTRY_DEVENV_FRONTEND_ONLY") is not None
 
+    USE_NEW_DEVSERVICES = os.environ.get("USE_NEW_DEVSERVICES") == "1"
+
     from devenv.lib import node
 
     node.install(
@@ -128,18 +131,26 @@ def main(context: dict[str, str]) -> int:
     venv.ensure(venv_dir, python_version, url, sha256)
 
     if constants.DARWIN:
-        colima.install(
-            repo_config["colima"]["version"],
-            repo_config["colima"][constants.SYSTEM_MACHINE],
-            repo_config["colima"][f"{constants.SYSTEM_MACHINE}_sha256"],
-            reporoot,
-        )
-        limactl.install(
-            repo_config["lima"]["version"],
-            repo_config["lima"][constants.SYSTEM_MACHINE],
-            repo_config["lima"][f"{constants.SYSTEM_MACHINE}_sha256"],
-            reporoot,
-        )
+        if check_minimum_version("1.14.2"):
+            # `devenv update`ing to >=1.14.0 will install global colima
+            # so if it's there, uninstall the repo local stuff
+            if os.path.exists(f"{constants.root}/bin/colima"):
+                binroot = f"{reporoot}/.devenv/bin"
+                colima.uninstall(binroot)
+                limactl.uninstall(binroot)
+        else:
+            colima.install(
+                repo_config["colima"]["version"],
+                repo_config["colima"][constants.SYSTEM_MACHINE],
+                repo_config["colima"][f"{constants.SYSTEM_MACHINE}_sha256"],
+                reporoot,
+            )
+            limactl.install(
+                repo_config["lima"]["version"],
+                repo_config["lima"][constants.SYSTEM_MACHINE],
+                repo_config["lima"][f"{constants.SYSTEM_MACHINE}_sha256"],
+                reporoot,
+            )
 
     if not run_procs(
         repo,
@@ -253,18 +264,35 @@ def main(context: dict[str, str]) -> int:
         print("Skipping python migrations since SENTRY_DEVENV_FRONTEND_ONLY is set.")
         return 0
 
-    # TODO: check healthchecks for redis and postgres to short circuit this
-    proc.run(
-        (
-            f"{venv_dir}/bin/{repo}",
-            "devservices",
-            "up",
-            "redis",
-            "postgres",
-        ),
-        pathprepend=f"{reporoot}/.devenv/bin",
-        exit=True,
-    )
+    if USE_NEW_DEVSERVICES:
+        # Ensure old sentry devservices is not being used, otherwise ports will conflict
+        proc.run(
+            (
+                f"{venv_dir}/bin/{repo}",
+                "devservices",
+                "down",
+            ),
+            pathprepend=f"{reporoot}/.devenv/bin",
+            exit=True,
+        )
+        proc.run(
+            (f"{venv_dir}/bin/devservices", "up", "--mode", "migrations"),
+            pathprepend=f"{reporoot}/.devenv/bin",
+            exit=True,
+        )
+    else:
+        # TODO: check healthchecks for redis and postgres to short circuit this
+        proc.run(
+            (
+                f"{venv_dir}/bin/{repo}",
+                "devservices",
+                "up",
+                "redis",
+                "postgres",
+            ),
+            pathprepend=f"{reporoot}/.devenv/bin",
+            exit=True,
+        )
 
     if not run_procs(
         repo,
@@ -281,12 +309,16 @@ def main(context: dict[str, str]) -> int:
     ):
         return 1
 
+    postgres_container = (
+        "sentry_postgres" if os.environ.get("USE_NEW_DEVSERVICES") != "1" else "sentry-postgres-1"
+    )
+
     # faster prerequisite check than starting up sentry and running createuser idempotently
     stdout = proc.run(
         (
             "docker",
             "exec",
-            "sentry_postgres",
+            postgres_container,
             "psql",
             "sentry",
             "postgres",
diff --git a/devservices/config.yml b/devservices/config.yml
index 49edafe801c617..c7c73ccb1528aa 100644
--- a/devservices/config.yml
+++ b/devservices/config.yml
@@ -19,8 +19,15 @@ x-sentry-service-config:
         mode: containerized
     postgres:
       description: Database used to store Sentry data
+    redis:
+      description: Shared instance of redis used by sentry services
+      remote:
+        repo_name: sentry-shared-redis
+        branch: main
+        repo_link: git@github.com:getsentry/sentry-shared-redis.git
   modes:
     default: [snuba, postgres, relay]
+    migrations: [postgres, redis]
 
 services:
   postgres:
@@ -46,10 +53,12 @@ services:
       - 127.0.0.1:5432:5432
     extra_hosts:
       - host.docker.internal:host-gateway
+    restart: unless-stopped
 
 networks:
   devservices:
     name: devservices
+    external: true
 
 volumes:
   postgres-data:
diff --git a/fixtures/backup/model_dependencies/detailed.json b/fixtures/backup/model_dependencies/detailed.json
index 01b5d5f9bf02a2..7cd2989f951e07 100644
--- a/fixtures/backup/model_dependencies/detailed.json
+++ b/fixtures/backup/model_dependencies/detailed.json
@@ -49,6 +49,35 @@
     "table_name": "flags_audit_log",
     "uniques": []
   },
+  "flags.flagwebhooksigningsecretmodel": {
+    "dangling": false,
+    "foreign_keys": {
+      "created_by": {
+        "kind": "HybridCloudForeignKey",
+        "model": "sentry.user",
+        "nullable": true
+      },
+      "organization": {
+        "kind": "FlexibleForeignKey",
+        "model": "sentry.organization",
+        "nullable": false
+      }
+    },
+    "model": "flags.flagwebhooksigningsecretmodel",
+    "relocation_dependencies": [],
+    "relocation_scope": "Excluded",
+    "silos": [
+      "Region"
+    ],
+    "table_name": "flags_webhooksigningsecret",
+    "uniques": [
+      [
+        "organization",
+        "provider",
+        "secret"
+      ]
+    ]
+  },
   "hybridcloud.apikeyreplica": {
     "dangling": false,
     "foreign_keys": {
@@ -90,6 +119,11 @@
         "model": "sentry.organization",
         "nullable": true
       },
+      "scoping_organization_id": {
+        "kind": "HybridCloudForeignKey",
+        "model": "sentry.organization",
+        "nullable": true
+      },
       "user_id": {
         "kind": "HybridCloudForeignKey",
         "model": "sentry.user",
@@ -452,34 +486,6 @@
     "table_name": "sentry_alertruleactivity",
     "uniques": []
   },
-  "sentry.alertruleexcludedprojects": {
-    "dangling": false,
-    "foreign_keys": {
-      "alert_rule": {
-        "kind": "FlexibleForeignKey",
-        "model": "sentry.alertrule",
-        "nullable": false
-      },
-      "project": {
-        "kind": "FlexibleForeignKey",
-        "model": "sentry.project",
-        "nullable": false
-      }
-    },
-    "model": "sentry.alertruleexcludedprojects",
-    "relocation_dependencies": [],
-    "relocation_scope": "Organization",
-    "silos": [
-      "Region"
-    ],
-    "table_name": "sentry_alertruleexcludedprojects",
-    "uniques": [
-      [
-        "alert_rule",
-        "project"
-      ]
-    ]
-  },
   "sentry.alertruleprojects": {
     "dangling": false,
     "foreign_keys": {
@@ -559,34 +565,6 @@
     "table_name": "sentry_alertruletriggeraction",
     "uniques": []
   },
-  "sentry.alertruletriggerexclusion": {
-    "dangling": false,
-    "foreign_keys": {
-      "alert_rule_trigger": {
-        "kind": "FlexibleForeignKey",
-        "model": "sentry.alertruletrigger",
-        "nullable": false
-      },
-      "query_subscription": {
-        "kind": "FlexibleForeignKey",
-        "model": "sentry.querysubscription",
-        "nullable": false
-      }
-    },
-    "model": "sentry.alertruletriggerexclusion",
-    "relocation_dependencies": [],
-    "relocation_scope": "Organization",
-    "silos": [
-      "Region"
-    ],
-    "table_name": "sentry_alertruletriggerexclusion",
-    "uniques": [
-      [
-        "alert_rule_trigger",
-        "query_subscription"
-      ]
-    ]
-  },
   "sentry.apiapplication": {
     "dangling": false,
     "foreign_keys": {
@@ -639,6 +617,11 @@
     ],
     "table_name": "sentry_apiauthorization",
     "uniques": [
+      [
+        "application",
+        "organization_id",
+        "user"
+      ],
       [
         "application",
         "user"
@@ -1407,6 +1390,34 @@
       ]
     ]
   },
+  "sentry.dashboardfavoriteuser": {
+    "dangling": false,
+    "foreign_keys": {
+      "dashboard": {
+        "kind": "FlexibleForeignKey",
+        "model": "sentry.dashboard",
+        "nullable": false
+      },
+      "user_id": {
+        "kind": "HybridCloudForeignKey",
+        "model": "sentry.user",
+        "nullable": false
+      }
+    },
+    "model": "sentry.dashboardfavoriteuser",
+    "relocation_dependencies": [],
+    "relocation_scope": "Organization",
+    "silos": [
+      "Region"
+    ],
+    "table_name": "sentry_dashboardfavoriteuser",
+    "uniques": [
+      [
+        "dashboard",
+        "user_id"
+      ]
+    ]
+  },
   "sentry.dashboardpermissions": {
     "dangling": false,
     "foreign_keys": {
@@ -2971,7 +2982,7 @@
     },
     "model": "sentry.incident",
     "relocation_dependencies": [],
-    "relocation_scope": "Organization",
+    "relocation_scope": "Global",
     "silos": [
       "Region"
     ],
@@ -2999,7 +3010,7 @@
     },
     "model": "sentry.incidentactivity",
     "relocation_dependencies": [],
-    "relocation_scope": "Organization",
+    "relocation_scope": "Global",
     "silos": [
       "Region"
     ],
@@ -3034,34 +3045,6 @@
       ]
     ]
   },
-  "sentry.incidentseen": {
-    "dangling": false,
-    "foreign_keys": {
-      "incident": {
-        "kind": "FlexibleForeignKey",
-        "model": "sentry.incident",
-        "nullable": false
-      },
-      "user_id": {
-        "kind": "HybridCloudForeignKey",
-        "model": "sentry.user",
-        "nullable": false
-      }
-    },
-    "model": "sentry.incidentseen",
-    "relocation_dependencies": [],
-    "relocation_scope": "Excluded",
-    "silos": [
-      "Region"
-    ],
-    "table_name": "sentry_incidentseen",
-    "uniques": [
-      [
-        "incident",
-        "user_id"
-      ]
-    ]
-  },
   "sentry.incidentsnapshot": {
     "dangling": false,
     "foreign_keys": {
@@ -3078,7 +3061,7 @@
     },
     "model": "sentry.incidentsnapshot",
     "relocation_dependencies": [],
-    "relocation_scope": "Organization",
+    "relocation_scope": "Global",
     "silos": [
       "Region"
     ],
@@ -3089,34 +3072,6 @@
       ]
     ]
   },
-  "sentry.incidentsubscription": {
-    "dangling": false,
-    "foreign_keys": {
-      "incident": {
-        "kind": "FlexibleForeignKey",
-        "model": "sentry.incident",
-        "nullable": false
-      },
-      "user_id": {
-        "kind": "HybridCloudForeignKey",
-        "model": "sentry.user",
-        "nullable": false
-      }
-    },
-    "model": "sentry.incidentsubscription",
-    "relocation_dependencies": [],
-    "relocation_scope": "Organization",
-    "silos": [
-      "Region"
-    ],
-    "table_name": "sentry_incidentsubscription",
-    "uniques": [
-      [
-        "incident",
-        "user_id"
-      ]
-    ]
-  },
   "sentry.incidenttrigger": {
     "dangling": false,
     "foreign_keys": {
@@ -3133,7 +3088,7 @@
     },
     "model": "sentry.incidenttrigger",
     "relocation_dependencies": [],
-    "relocation_scope": "Organization",
+    "relocation_scope": "Global",
     "silos": [
       "Region"
     ],
@@ -4062,7 +4017,7 @@
     },
     "model": "sentry.pendingincidentsnapshot",
     "relocation_dependencies": [],
-    "relocation_scope": "Organization",
+    "relocation_scope": "Global",
     "silos": [
       "Region"
     ],
@@ -6025,7 +5980,7 @@
     "relocation_dependencies": [
       "sentry.incident"
     ],
-    "relocation_scope": "Organization",
+    "relocation_scope": "Global",
     "silos": [
       "Region"
     ],
@@ -6471,12 +6426,17 @@
     ]
   },
   "workflow_engine.detector": {
-    "dangling": false,
+    "dangling": true,
     "foreign_keys": {
+      "created_by_id": {
+        "kind": "HybridCloudForeignKey",
+        "model": "sentry.user",
+        "nullable": true
+      },
       "organization": {
         "kind": "FlexibleForeignKey",
         "model": "sentry.organization",
-        "nullable": false
+        "nullable": true
       },
       "owner_team": {
         "kind": "FlexibleForeignKey",
@@ -6488,6 +6448,11 @@
         "model": "sentry.user",
         "nullable": true
       },
+      "project": {
+        "kind": "FlexibleForeignKey",
+        "model": "sentry.project",
+        "nullable": true
+      },
       "workflow_condition_group": {
         "kind": "FlexibleForeignKey",
         "model": "workflow_engine.dataconditiongroup",
@@ -6557,11 +6522,31 @@
   "workflow_engine.workflow": {
     "dangling": false,
     "foreign_keys": {
+      "created_by_id": {
+        "kind": "HybridCloudForeignKey",
+        "model": "sentry.user",
+        "nullable": true
+      },
+      "environment": {
+        "kind": "FlexibleForeignKey",
+        "model": "sentry.environment",
+        "nullable": true
+      },
       "organization": {
         "kind": "FlexibleForeignKey",
         "model": "sentry.organization",
         "nullable": false
       },
+      "owner_team": {
+        "kind": "FlexibleForeignKey",
+        "model": "sentry.team",
+        "nullable": true
+      },
+      "owner_user_id": {
+        "kind": "HybridCloudForeignKey",
+        "model": "sentry.user",
+        "nullable": true
+      },
       "when_condition_group": {
         "kind": "FlexibleForeignKey",
         "model": "workflow_engine.dataconditiongroup",
diff --git a/fixtures/backup/model_dependencies/flat.json b/fixtures/backup/model_dependencies/flat.json
index 642f0dac079596..c8a043ef9367c2 100644
--- a/fixtures/backup/model_dependencies/flat.json
+++ b/fixtures/backup/model_dependencies/flat.json
@@ -7,6 +7,10 @@
   "flags.flagauditlogmodel": [
     "sentry.organization"
   ],
+  "flags.flagwebhooksigningsecretmodel": [
+    "sentry.organization",
+    "sentry.user"
+  ],
   "hybridcloud.apikeyreplica": [
     "sentry.apikey",
     "sentry.organization"
@@ -64,10 +68,6 @@
     "sentry.alertrule",
     "sentry.user"
   ],
-  "sentry.alertruleexcludedprojects": [
-    "sentry.alertrule",
-    "sentry.project"
-  ],
   "sentry.alertruleprojects": [
     "sentry.alertrule",
     "sentry.project"
@@ -80,10 +80,6 @@
     "sentry.integration",
     "sentry.sentryapp"
   ],
-  "sentry.alertruletriggerexclusion": [
-    "sentry.alertruletrigger",
-    "sentry.querysubscription"
-  ],
   "sentry.apiapplication": [
     "sentry.user"
   ],
@@ -193,6 +189,10 @@
     "sentry.organization",
     "sentry.user"
   ],
+  "sentry.dashboardfavoriteuser": [
+    "sentry.dashboard",
+    "sentry.user"
+  ],
   "sentry.dashboardpermissions": [
     "sentry.dashboard"
   ],
@@ -424,18 +424,10 @@
     "sentry.incident",
     "sentry.project"
   ],
-  "sentry.incidentseen": [
-    "sentry.incident",
-    "sentry.user"
-  ],
   "sentry.incidentsnapshot": [
     "sentry.incident",
     "sentry.timeseriessnapshot"
   ],
-  "sentry.incidentsubscription": [
-    "sentry.incident",
-    "sentry.user"
-  ],
   "sentry.incidenttrigger": [
     "sentry.alertruletrigger",
     "sentry.incident"
@@ -895,6 +887,7 @@
   ],
   "workflow_engine.detector": [
     "sentry.organization",
+    "sentry.project",
     "sentry.team",
     "sentry.user",
     "workflow_engine.dataconditiongroup"
@@ -907,7 +900,10 @@
     "workflow_engine.workflow"
   ],
   "workflow_engine.workflow": [
+    "sentry.environment",
     "sentry.organization",
+    "sentry.team",
+    "sentry.user",
     "workflow_engine.dataconditiongroup"
   ],
   "workflow_engine.workflowdataconditiongroup": [
diff --git a/fixtures/backup/model_dependencies/sorted.json b/fixtures/backup/model_dependencies/sorted.json
index 853b78707b5191..0d3184b41b5679 100644
--- a/fixtures/backup/model_dependencies/sorted.json
+++ b/fixtures/backup/model_dependencies/sorted.json
@@ -53,12 +53,6 @@
   "workflow_engine.dataconditiongroup",
   "workflow_engine.dataconditiongroupaction",
   "workflow_engine.datasource",
-  "workflow_engine.detector",
-  "workflow_engine.detectorstate",
-  "workflow_engine.workflow",
-  "workflow_engine.workflowdataconditiongroup",
-  "workflow_engine.detectorworkflow",
-  "workflow_engine.datasourcedetector",
   "workflow_engine.datacondition",
   "sentry.savedsearch",
   "sentry.rollbackuser",
@@ -116,8 +110,12 @@
   "hybridcloud.organizationslugreservationreplica",
   "hybridcloud.externalactorreplica",
   "hybridcloud.apikeyreplica",
+  "flags.flagwebhooksigningsecretmodel",
   "flags.flagauditlogmodel",
   "feedback.feedback",
+  "workflow_engine.workflow",
+  "workflow_engine.detector",
+  "workflow_engine.datasourcedetector",
   "uptime.projectuptimesubscription",
   "sentry.userreport",
   "sentry.useroption",
@@ -191,6 +189,7 @@
   "sentry.dashboardwidget",
   "sentry.dashboardproject",
   "sentry.dashboardpermissions",
+  "sentry.dashboardfavoriteuser",
   "sentry.customdynamicsamplingruleproject",
   "sentry.commitfilechange",
   "sentry.broadcastseen",
@@ -204,6 +203,9 @@
   "sentry.apiauthorization",
   "sentry.alertrule",
   "hybridcloud.apitokenreplica",
+  "workflow_engine.workflowdataconditiongroup",
+  "workflow_engine.detectorworkflow",
+  "workflow_engine.detectorstate",
   "sentry.teamkeytransaction",
   "sentry.snubaqueryeventtype",
   "sentry.sentryappinstallation",
@@ -224,7 +226,6 @@
   "sentry.dashboardpermissionsteam",
   "sentry.alertruletrigger",
   "sentry.alertruleprojects",
-  "sentry.alertruleexcludedprojects",
   "sentry.alertruleactivity",
   "sentry.alertruleactivations",
   "sentry.alertruleactivationcondition",
@@ -233,16 +234,13 @@
   "sentry.sentryappinstallationforprovider",
   "sentry.incident",
   "sentry.dashboardwidgetqueryondemand",
-  "sentry.alertruletriggerexclusion",
   "sentry.alertruletriggeraction",
   "sentry.timeseriessnapshot",
   "sentry.servicehookproject",
   "sentry.pendingincidentsnapshot",
   "sentry.notificationmessage",
   "sentry.incidenttrigger",
-  "sentry.incidentsubscription",
   "sentry.incidentsnapshot",
-  "sentry.incidentseen",
   "sentry.incidentproject",
   "sentry.incidentactivity"
 ]
\ No newline at end of file
diff --git a/fixtures/backup/model_dependencies/truncate.json b/fixtures/backup/model_dependencies/truncate.json
index 06a3a97f4b8f4f..5dd22a1e6a9e44 100644
--- a/fixtures/backup/model_dependencies/truncate.json
+++ b/fixtures/backup/model_dependencies/truncate.json
@@ -53,12 +53,6 @@
   "workflow_engine_dataconditiongroup",
   "workflow_engine_dataconditiongroupaction",
   "workflow_engine_datasource",
-  "workflow_engine_detector",
-  "workflow_engine_detectorstate",
-  "workflow_engine_workflow",
-  "workflow_engine_workflowdataconditiongroup",
-  "workflow_engine_detectorworkflow",
-  "workflow_engine_datasourcedetector",
   "workflow_engine_datacondition",
   "sentry_savedsearch",
   "sentry_rollbackuser",
@@ -116,8 +110,12 @@
   "hybridcloud_organizationslugreservationreplica",
   "hybridcloud_externalactorreplica",
   "hybridcloud_apikeyreplica",
+  "flags_webhooksigningsecret",
   "flags_audit_log",
   "feedback_feedback",
+  "workflow_engine_workflow",
+  "workflow_engine_detector",
+  "workflow_engine_datasourcedetector",
   "uptime_projectuptimesubscription",
   "sentry_userreport",
   "sentry_useroption",
@@ -191,6 +189,7 @@
   "sentry_dashboardwidget",
   "sentry_dashboardproject",
   "sentry_dashboardpermissions",
+  "sentry_dashboardfavoriteuser",
   "sentry_customdynamicsamplingruleproject",
   "sentry_commitfilechange",
   "sentry_broadcastseen",
@@ -204,6 +203,9 @@
   "sentry_apiauthorization",
   "sentry_alertrule",
   "hybridcloud_apitokenreplica",
+  "workflow_engine_workflowdataconditiongroup",
+  "workflow_engine_detectorworkflow",
+  "workflow_engine_detectorstate",
   "sentry_performanceteamkeytransaction",
   "sentry_snubaqueryeventtype",
   "sentry_sentryappinstallation",
@@ -224,7 +226,6 @@
   "sentry_dashboardpermissionsteam",
   "sentry_alertruletrigger",
   "sentry_alertruleprojects",
-  "sentry_alertruleexcludedprojects",
   "sentry_alertruleactivity",
   "sentry_alertruleactivations",
   "sentry_alertruleactivationcondition",
@@ -233,16 +234,13 @@
   "sentry_sentryappinstallationforprovider",
   "sentry_incident",
   "sentry_dashboardwidgetqueryondemand",
-  "sentry_alertruletriggerexclusion",
   "sentry_alertruletriggeraction",
   "sentry_timeseriessnapshot",
   "sentry_servicehookproject",
   "sentry_pendingincidentsnapshot",
   "sentry_notificationmessage",
   "sentry_incidenttrigger",
-  "sentry_incidentsubscription",
   "sentry_incidentsnapshot",
-  "sentry_incidentseen",
   "sentry_incidentproject",
   "sentry_incidentactivity"
 ]
\ No newline at end of file
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..27b7cdf8c1b768
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/0001_initial.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                ("field", models.IntegerField(null=True)),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/0002_delete_pending.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/0002_delete_pending.py
new file mode 100644
index 00000000000000..c4933d32cfcede
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/0002_delete_pending.py
@@ -0,0 +1,18 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+
+    dependencies = [
+        ("bad_flow_delete_field_double_pending_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="field",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/0003_double_pending.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/0003_double_pending.py
new file mode 100644
index 00000000000000..ce220395342ff9
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/0003_double_pending.py
@@ -0,0 +1,18 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+
+    dependencies = [
+        ("bad_flow_delete_field_double_pending_app", "0002_delete_pending"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="field",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/models.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/models.py
new file mode 100644
index 00000000000000..770fa149c355ce
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_double_pending_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..4446837fa33671
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/migrations/0001_initial.py
@@ -0,0 +1,45 @@
+import django
+from django.db import migrations, models
+
+import sentry
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="FkTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                (
+                    "fk_table",
+                    sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="bad_flow_delete_field_pending_with_fk_constraint_app.fktable",
+                        db_index=False,
+                    ),
+                ),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/migrations/0002_delete_without_pending.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/migrations/0002_delete_without_pending.py
new file mode 100644
index 00000000000000..f036396f10a590
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/migrations/0002_delete_without_pending.py
@@ -0,0 +1,19 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    atomic = False
+
+    dependencies = [
+        ("bad_flow_delete_field_pending_with_fk_constraint_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="fk_table",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/migrations/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/models.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/models.py
new file mode 100644
index 00000000000000..d936d5039213f7
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_fk_constraint_app/models.py
@@ -0,0 +1,12 @@
+from django.db import models
+
+from sentry.db.models import FlexibleForeignKey
+
+
+class FkTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
+    fk_table = FlexibleForeignKey(FkTable, db_index=False)
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..fd1e8c68b7800c
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/migrations/0001_initial.py
@@ -0,0 +1,25 @@
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                ("field", models.IntegerField()),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/migrations/0002_delete_without_pending.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/migrations/0002_delete_without_pending.py
new file mode 100644
index 00000000000000..6502d91d97cd39
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/migrations/0002_delete_without_pending.py
@@ -0,0 +1,17 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    dependencies = [
+        ("bad_flow_delete_field_pending_with_not_null_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="field",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/migrations/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/models.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/models.py
new file mode 100644
index 00000000000000..770fa149c355ce
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_pending_with_not_null_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..482ebcd0ab28f4
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/migrations/0001_initial.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                ("field", models.IntegerField()),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/migrations/0002_delete_without_pending.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/migrations/0002_delete_without_pending.py
new file mode 100644
index 00000000000000..b4cad5043fc589
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/migrations/0002_delete_without_pending.py
@@ -0,0 +1,18 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+
+    dependencies = [
+        ("bad_flow_delete_field_without_pending_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="field",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/migrations/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/models.py b/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/models.py
new file mode 100644
index 00000000000000..770fa149c355ce
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_field_without_pending_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..69de29635772a4
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/0001_initial.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/0002_delete_pending.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/0002_delete_pending.py
new file mode 100644
index 00000000000000..917b83001e8a8d
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/0002_delete_pending.py
@@ -0,0 +1,17 @@
+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):
+
+    dependencies = [
+        ("bad_flow_delete_model_double_pending_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="TestTable",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/0003_double_pending.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/0003_double_pending.py
new file mode 100644
index 00000000000000..e52a64272a2020
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/0003_double_pending.py
@@ -0,0 +1,17 @@
+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):
+
+    dependencies = [
+        ("bad_flow_delete_model_double_pending_app", "0002_delete_pending"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="TestTable",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/models.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/models.py
new file mode 100644
index 00000000000000..770fa149c355ce
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_model_double_pending_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..69de29635772a4
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/migrations/0001_initial.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/migrations/0002_delete_without_pending.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/migrations/0002_delete_without_pending.py
new file mode 100644
index 00000000000000..10d83c4d9c3e39
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/migrations/0002_delete_without_pending.py
@@ -0,0 +1,17 @@
+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):
+
+    dependencies = [
+        ("bad_flow_delete_model_without_pending_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="TestTable",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/migrations/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/models.py b/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/models.py
new file mode 100644
index 00000000000000..770fa149c355ce
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_model_without_pending_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..2747f841d8a570
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/migrations/0001_initial.py
@@ -0,0 +1,45 @@
+import django
+from django.db import migrations, models
+
+import sentry
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="FkTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                (
+                    "fk_table",
+                    sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="bad_flow_delete_pending_with_fk_constraints_app.fktable",
+                        db_index=False,
+                    ),
+                ),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/migrations/0002_delete_without_pending.py b/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/migrations/0002_delete_without_pending.py
new file mode 100644
index 00000000000000..721c22b2798a0e
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/migrations/0002_delete_without_pending.py
@@ -0,0 +1,18 @@
+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):
+    atomic = False
+
+    dependencies = [
+        ("bad_flow_delete_pending_with_fk_constraints_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="TestTable",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/migrations/__init__.py b/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/models.py b/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/models.py
new file mode 100644
index 00000000000000..d936d5039213f7
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_delete_pending_with_fk_constraints_app/models.py
@@ -0,0 +1,12 @@
+from django.db import models
+
+from sentry.db.models import FlexibleForeignKey
+
+
+class FkTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
+    fk_table = FlexibleForeignKey(FkTable, db_index=False)
diff --git a/fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/__init__.py b/fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..8d119afd028622
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/migrations/0001_initial.py
@@ -0,0 +1,16 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+
+from django.db import migrations
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    allow_run_sql = False
+
+    operations = [migrations.RunSQL("select 1;")]
diff --git a/fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/migrations/__init__.py b/fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/models.py b/fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/models.py
new file mode 100644
index 00000000000000..770fa149c355ce
--- /dev/null
+++ b/fixtures/safe_migrations_apps/bad_flow_run_sql_disabled_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
diff --git a/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/__init__.py b/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..8c7786cb85d438
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/migrations/0001_initial.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.1 on 2019-09-22 21:41
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/migrations/0002_add_field_notnull_db_default.py b/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/migrations/0002_add_field_notnull_db_default.py
new file mode 100644
index 00000000000000..8ddfade9aa173b
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/migrations/0002_add_field_notnull_db_default.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.1 on 2019-09-22 21:43
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    dependencies = [
+        ("good_flow_add_column_with_notnull_db_default_app", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="testtable",
+            name="field",
+            field=models.IntegerField(db_default=0),
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/migrations/__init__.py b/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/models.py b/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/models.py
new file mode 100644
index 00000000000000..dcead4b757d81f
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_add_column_with_notnull_db_default_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(db_default=0)
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..85f25fffd727f5
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/0001_initial.py
@@ -0,0 +1,47 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+import django
+from django.db import migrations, models
+
+import sentry
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="FkTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                (
+                    "fk_table",
+                    sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="good_flow_delete_field_pending_with_fk_constraint_app.fktable",
+                        db_index=False,
+                        null=True,
+                    ),
+                ),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/0002_remove_constraints_and_pending.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/0002_remove_constraints_and_pending.py
new file mode 100644
index 00000000000000..767c38e610f98b
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/0002_remove_constraints_and_pending.py
@@ -0,0 +1,34 @@
+import django
+from django.db import migrations
+
+import sentry
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    atomic = False
+
+    dependencies = [
+        ("good_flow_delete_field_pending_with_fk_constraint_app", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="TestTable",
+            name="fk_table",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to="good_flow_delete_field_pending_with_fk_constraint_app.fktable",
+                db_index=False,
+                db_constraint=False,
+                null=True,
+            ),
+        ),
+        SafeRemoveField(
+            model_name="testtable",
+            name="fk_table",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/0003_delete.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/0003_delete.py
new file mode 100644
index 00000000000000..adae7ffa190165
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/0003_delete.py
@@ -0,0 +1,20 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    dependencies = [
+        (
+            "good_flow_delete_field_pending_with_fk_constraint_app",
+            "0002_remove_constraints_and_pending",
+        ),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="fk_table",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/models.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/models.py
new file mode 100644
index 00000000000000..e78bdd99a9322d
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_fk_constraint_app/models.py
@@ -0,0 +1,12 @@
+from django.db import models
+
+from sentry.db.models import FlexibleForeignKey
+
+
+class FkTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
+    fk_table = FlexibleForeignKey(FkTable, null=True, db_index=False)
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..1a0f0a785f5159
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/0001_initial.py
@@ -0,0 +1,37 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="FkTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                ("field", models.IntegerField(null=True)),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/0002_remove_not_null_and_pending.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/0002_remove_not_null_and_pending.py
new file mode 100644
index 00000000000000..e413d67d2a23b6
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/0002_remove_not_null_and_pending.py
@@ -0,0 +1,24 @@
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    dependencies = [
+        ("good_flow_delete_field_pending_with_not_null_app", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="TestTable",
+            name="field",
+            field=models.IntegerField(null=True),
+        ),
+        SafeRemoveField(
+            model_name="testtable",
+            name="field",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/0003_delete.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/0003_delete.py
new file mode 100644
index 00000000000000..98ed7ffbe84c48
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/0003_delete.py
@@ -0,0 +1,17 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    dependencies = [
+        ("good_flow_delete_field_pending_with_not_null_app", "0002_remove_not_null_and_pending"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="field",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/models.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/models.py
new file mode 100644
index 00000000000000..770fa149c355ce
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..0c0b198c43b88f
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/0001_initial.py
@@ -0,0 +1,55 @@
+from django.db import migrations, models
+
+from sentry.db.models import FlexibleForeignKey
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+    checked = False
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="OtherTable",
+            fields=[
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+            ],
+        ),
+        migrations.CreateModel(
+            name="M2MTable",
+            fields=[
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                (
+                    "alert_rule",
+                    FlexibleForeignKey(
+                        on_delete=models.deletion.CASCADE,
+                        to="good_flow_delete_field_pending_with_not_null_m2m_app.othertable",
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                (
+                    "excluded_projects",
+                    models.ManyToManyField(
+                        through="good_flow_delete_field_pending_with_not_null_m2m_app.M2MTable",
+                        to="good_flow_delete_field_pending_with_not_null_m2m_app.othertable",
+                    ),
+                ),
+            ],
+        ),
+        migrations.AddField(
+            model_name="m2mtable",
+            name="test_table",
+            field=FlexibleForeignKey(
+                on_delete=models.deletion.CASCADE,
+                to="good_flow_delete_field_pending_with_not_null_m2m_app.testtable",
+            ),
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/0002_delete_without_pending.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/0002_delete_without_pending.py
new file mode 100644
index 00000000000000..7cd3b1a05e1e07
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/0002_delete_without_pending.py
@@ -0,0 +1,17 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    dependencies = [
+        ("good_flow_delete_field_pending_with_not_null_m2m_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="excluded_projects",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/models.py b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/models.py
new file mode 100644
index 00000000000000..90c1bc2b9e0f5e
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_pending_with_not_null_m2m_app/models.py
@@ -0,0 +1,18 @@
+from django.db import models
+
+from sentry.db.models import FlexibleForeignKey
+
+
+class OtherTable(models.Model):
+    pass
+
+
+class M2MTable(models.Model):
+    alert_rule = FlexibleForeignKey(OtherTable)
+    test_table = FlexibleForeignKey(
+        "good_flow_delete_field_pending_with_not_null_m2m_app.TestTable"
+    )
+
+
+class TestTable(models.Model):
+    excluded_projects = models.ManyToManyField(OtherTable, through=M2MTable)
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..2540b245ec0644
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/0001_initial.py
@@ -0,0 +1,23 @@
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    initial = True
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                ("field", models.IntegerField(null=True)),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/0002_set_pending.py b/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/0002_set_pending.py
new file mode 100644
index 00000000000000..48b502df50c460
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/0002_set_pending.py
@@ -0,0 +1,17 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    dependencies = [
+        ("good_flow_delete_field_simple_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="field",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/0003_delete.py b/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/0003_delete.py
new file mode 100644
index 00000000000000..e57524bf66d90d
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/0003_delete.py
@@ -0,0 +1,17 @@
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+class Migration(CheckedMigration):
+    dependencies = [
+        ("good_flow_delete_field_simple_app", "0002_set_pending"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="testtable",
+            name="field",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/models.py b/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/models.py
new file mode 100644
index 00000000000000..f472e7d8e90506
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_field_simple_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=True)
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_model_state_app/migrations/0002_delete_model_state.py b/fixtures/safe_migrations_apps/good_flow_delete_model_state_app/migrations/0002_delete_model_state.py
index aa7a0b3105125d..4d9779f1c977f0 100644
--- a/fixtures/safe_migrations_apps/good_flow_delete_model_state_app/migrations/0002_delete_model_state.py
+++ b/fixtures/safe_migrations_apps/good_flow_delete_model_state_app/migrations/0002_delete_model_state.py
@@ -1,8 +1,7 @@
 # Generated by Django 3.1 on 2019-09-22 21:47
-
-from django.db import migrations
-
 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):
@@ -12,11 +11,5 @@ class Migration(CheckedMigration):
     ]
 
     operations = [
-        migrations.SeparateDatabaseAndState(
-            state_operations=[
-                migrations.DeleteModel(
-                    name="TestTable",
-                ),
-            ]
-        )
+        SafeDeleteModel(name="TestTable", deletion_action=DeletionAction.MOVE_TO_PENDING),
     ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_model_state_app/migrations/0003_delete_table.py b/fixtures/safe_migrations_apps/good_flow_delete_model_state_app/migrations/0003_delete_table.py
index f0a85b49040a3e..8a6e05080a31bc 100644
--- a/fixtures/safe_migrations_apps/good_flow_delete_model_state_app/migrations/0003_delete_table.py
+++ b/fixtures/safe_migrations_apps/good_flow_delete_model_state_app/migrations/0003_delete_table.py
@@ -1,16 +1,15 @@
 # Generated by Django 3.1 on 2019-09-22 21:47
-
-from django.db import migrations
-
 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):
 
     dependencies = [
-        ("good_flow_delete_model_state_app", "0001_initial"),
+        ("good_flow_delete_model_state_app", "0002_delete_model_state"),
     ]
 
     operations = [
-        migrations.RunSQL('DROP TABLE "good_flow_delete_model_state_app_testtable";'),
+        SafeDeleteModel(name="TestTable", deletion_action=DeletionAction.DELETE),
     ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..6f55cccc2e683d
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/0001_initial.py
@@ -0,0 +1,46 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+import django
+from django.db import migrations, models
+
+import sentry
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="FkTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                (
+                    "fk_table",
+                    sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="good_flow_delete_pending_with_fk_constraints_app.fktable",
+                        db_index=False,
+                    ),
+                ),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/0002_remove_constraints_and_pending.py b/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/0002_remove_constraints_and_pending.py
new file mode 100644
index 00000000000000..cdb0408e096d99
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/0002_remove_constraints_and_pending.py
@@ -0,0 +1,32 @@
+import django
+from django.db import migrations
+
+import sentry
+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):
+    atomic = False
+
+    dependencies = [
+        ("good_flow_delete_pending_with_fk_constraints_app", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="TestTable",
+            name="fk_table",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to="good_flow_delete_pending_with_fk_constraints_app.fktable",
+                db_index=False,
+                db_constraint=False,
+            ),
+        ),
+        SafeDeleteModel(
+            name="TestTable",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/0003_delete.py b/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/0003_delete.py
new file mode 100644
index 00000000000000..ac2813a8d7f014
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/0003_delete.py
@@ -0,0 +1,16 @@
+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):
+    dependencies = [
+        ("good_flow_delete_pending_with_fk_constraints_app", "0002_remove_constraints_and_pending"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="TestTable",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/models.py b/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/models.py
new file mode 100644
index 00000000000000..d936d5039213f7
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_pending_with_fk_constraints_app/models.py
@@ -0,0 +1,12 @@
+from django.db import models
+
+from sentry.db.models import FlexibleForeignKey
+
+
+class FkTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
+    fk_table = FlexibleForeignKey(FkTable, db_index=False)
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_simple_app/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_simple_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..2b6d293ee049e6
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/0001_initial.py
@@ -0,0 +1,22 @@
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    initial = True
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="TestTable",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+            ],
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/0002_set_pending.py b/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/0002_set_pending.py
new file mode 100644
index 00000000000000..c7475e451e0bcd
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/0002_set_pending.py
@@ -0,0 +1,16 @@
+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):
+    dependencies = [
+        ("good_flow_delete_simple_app", "0001_initial"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="TestTable",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/0003_delete.py b/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/0003_delete.py
new file mode 100644
index 00000000000000..796cf774758675
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/0003_delete.py
@@ -0,0 +1,16 @@
+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):
+    dependencies = [
+        ("good_flow_delete_simple_app", "0002_set_pending"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="TestTable",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/__init__.py b/fixtures/safe_migrations_apps/good_flow_delete_simple_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_delete_simple_app/models.py b/fixtures/safe_migrations_apps/good_flow_delete_simple_app/models.py
new file mode 100644
index 00000000000000..770fa149c355ce
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_delete_simple_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
diff --git a/fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/__init__.py b/fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/migrations/0001_initial.py b/fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/migrations/0001_initial.py
new file mode 100644
index 00000000000000..8939a5ba3393b7
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/migrations/0001_initial.py
@@ -0,0 +1,16 @@
+# Generated by Django 3.1 on 2019-09-22 21:47
+
+from django.db import migrations
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+
+    initial = True
+
+    dependencies = []
+
+    allow_run_sql = True
+
+    operations = [migrations.RunSQL("select 1;")]
diff --git a/fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/migrations/__init__.py b/fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/models.py b/fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/models.py
new file mode 100644
index 00000000000000..770fa149c355ce
--- /dev/null
+++ b/fixtures/safe_migrations_apps/good_flow_run_sql_enabled_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class TestTable(models.Model):
+    field = models.IntegerField(default=0, null=False)
diff --git a/fixtures/sdk_crash_detection/crash_event_android.py b/fixtures/sdk_crash_detection/crash_event_android.py
index fcac4afddd29f8..bf6634215561a9 100644
--- a/fixtures/sdk_crash_detection/crash_event_android.py
+++ b/fixtures/sdk_crash_detection/crash_event_android.py
@@ -44,7 +44,9 @@ def get_frames(
 
 
 def get_crash_event(
-    sdk_frame_module="io.sentry.Hub", system_frame_module="java.lang.reflect.Method", **kwargs
+    sdk_frame_module="io.sentry.Hub",
+    system_frame_module="java.lang.reflect.Method",
+    **kwargs,
 ) -> dict[str, object]:
     return get_crash_event_with_frames(
         get_frames(sdk_frame_module, system_frame_module),
@@ -52,6 +54,48 @@ def get_crash_event(
     )
 
 
+def get_apex_frames(
+    apex_frame_function: str,
+    apex_frame_package: str,
+    system_frame_package: str,
+) -> Sequence[MutableMapping[str, str]]:
+    frames = [
+        {
+            "function": "__pthread_start",
+            "raw_function": "__pthread_start(void*)",
+            "symbol": "_ZL15__pthread_startPv",
+            "package": "/apex/com.android.runtime/lib/bionic/libc.so",
+        },
+        {
+            "function": "__start_thread",
+            "symbol": "__start_thread",
+            "package": "/apex/com.android.art/lib64/bionic/libc.so",
+        },
+        {
+            "function": apex_frame_function,
+            "symbol": apex_frame_function,
+            "package": apex_frame_package,
+        },
+        {
+            "function": "invoke",
+            "package": system_frame_package,
+        },
+    ]
+    return frames
+
+
+def get_apex_crash_event(
+    apex_frame_function="__start_thread",
+    apex_frame_package="/apex/com.android.art/lib64/bionic/libc.so",
+    system_frame_package="/apex/com.android.art/lib64/libart.so",
+    **kwargs,
+) -> dict[str, object]:
+    return get_crash_event_with_frames(
+        get_apex_frames(apex_frame_function, apex_frame_package, system_frame_package),
+        **kwargs,
+    )
+
+
 def get_crash_event_with_frames(frames: Sequence[Mapping[str, str]], **kwargs) -> dict[str, object]:
     result = {
         "event_id": "0a52a8331d3b45089ebd74f8118d4fa1",
diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt
index f8dd6093bdd97b..196ba3eb4f87f1 100644
--- a/migrations_lockfile.txt
+++ b/migrations_lockfile.txt
@@ -6,11 +6,19 @@ To resolve this, rebase against latest master and regenerate your migration. Thi
 will then be regenerated, and you should be able to merge without conflicts.
 
 feedback: 0004_index_together
-hybridcloud: 0016_add_control_cacheversion
+
+hybridcloud: 0017_add_scoping_organization_apitokenreplica
+
 nodestore: 0002_nodestore_no_dictfield
+
 remote_subscriptions: 0003_drop_remote_subscription
+
 replays: 0004_index_together
-sentry: 0789_add_unique_constraint_to_rollbackorganization
+
+sentry: 0802_remove_grouping_auto_update_option
+
 social_auth: 0002_default_auto_field
-uptime: 0017_unique_on_timeout
-workflow_engine: 0012_data_source_type_change
+
+uptime: 0018_add_trace_sampling_field_to_uptime
+
+workflow_engine: 0014_model_additions_for_milestones
diff --git a/package.json b/package.json
index 6a20d793a6507d..0a27d0d93efa85 100644
--- a/package.json
+++ b/package.json
@@ -56,13 +56,13 @@
     "@sentry-internal/rrweb": "2.26.0",
     "@sentry-internal/rrweb-player": "2.26.0",
     "@sentry-internal/rrweb-snapshot": "2.26.0",
-    "@sentry/core": "8.39.0-dev.0",
-    "@sentry/node": "8.39.0-dev.0",
-    "@sentry/react": "8.39.0-dev.0",
+    "@sentry/core": "8.39.0-beta.0",
+    "@sentry/node": "8.39.0-beta.0",
+    "@sentry/react": "8.39.0-beta.0",
     "@sentry/release-parser": "^1.3.1",
     "@sentry/status-page-list": "^0.3.0",
-    "@sentry/types": "8.39.0-dev.0",
-    "@sentry/utils": "8.39.0-dev.0",
+    "@sentry/types": "8.39.0-beta.0",
+    "@sentry/utils": "8.39.0-beta.0",
     "@sentry/webpack-plugin": "^2.22.4",
     "@spotlightjs/spotlight": "^2.0.0-alpha.1",
     "@tanstack/react-query": "^5.56.2",
@@ -176,30 +176,43 @@
   "devDependencies": {
     "@biomejs/biome": "^1.9.1",
     "@codecov/webpack-plugin": "^1.2.0",
+    "@emotion/eslint-plugin": "^11.12.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
     "@sentry/jest-environment": "6.0.0",
-    "@sentry/profiling-node": "8.39.0-dev.0",
+    "@sentry/profiling-node": "8.39.0-beta.0",
     "@styled/typescript-styled-plugin": "^1.0.1",
     "@testing-library/dom": "10.1.0",
     "@testing-library/jest-dom": "6.4.5",
     "@testing-library/react": "16.0.0",
     "@testing-library/user-event": "14.5.2",
-    "@types/node": "^20.14.9",
+    "@types/node": "^22.9.1",
+    "@typescript-eslint/eslint-plugin": "^8.8.1",
+    "@typescript-eslint/parser": "^8.8.1",
     "babel-gettext-extractor": "^4.1.3",
     "babel-jest": "29.7.0",
     "benchmark": "^2.1.4",
     "eslint": "8.57.1",
-    "eslint-config-sentry-app": "2.9.0",
+    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jest": "^28.8.3",
+    "eslint-plugin-jest-dom": "^5.4.0",
+    "eslint-plugin-no-lookahead-lookbehind-regexp": "0.1.0",
+    "eslint-plugin-react": "^7.37.1",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-sentry": "^2.10.0",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "eslint-plugin-testing-library": "^6.3.0",
+    "eslint-plugin-typescript-sort-keys": "^3.3.0",
     "html-webpack-plugin": "^5.6.0",
     "jest": "29.7.0",
     "jest-canvas-mock": "^2.5.2",
     "jest-environment-jsdom": "29.7.0",
     "jest-fail-on-console": "3.3.0",
     "jest-junit": "16.0.0",
-    "postcss-styled-syntax": "0.6.4",
+    "postcss-styled-syntax": "0.7.0",
     "react-refresh": "0.14.0",
-    "stylelint": "16.2.1",
-    "stylelint-config-recommended": "^14.0.0",
+    "stylelint": "16.10.0",
+    "stylelint-config-recommended": "^14.0.1",
     "terser": "5.31.6",
     "tsconfig-paths": "^4.2.0",
     "webpack-dev-server": "5.1.0"
@@ -214,7 +227,7 @@
   "proxyURL": "http://localhost:8000",
   "scripts": {
     "test": "node scripts/test.js --watch",
-    "test-ci": "node scripts/test.js --ci --coverage --maxWorkers=100% --colors",
+    "test-ci": "node scripts/test.js --ci --maxWorkers=100% --colors",
     "test-debug": "node --inspect-brk scripts/test.js --runInBand",
     "test-precommit": "node scripts/test.js --bail --findRelatedTests -u",
     "test-staged": "node scripts/test.js --findRelatedTests $(git diff --name-only --cached)",
diff --git a/pyproject.toml b/pyproject.toml
index bc3ac9fa22f982..4747d1799e7acb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -121,7 +121,6 @@ module = [
     "sentry.api.base",
     "sentry.api.bases.organization_events",
     "sentry.api.bases.organizationmember",
-    "sentry.api.bases.project",
     "sentry.api.bases.team",
     "sentry.api.endpoints.accept_organization_invite",
     "sentry.api.endpoints.auth_config",
@@ -162,7 +161,6 @@ module = [
     "sentry.api.endpoints.user_subscriptions",
     "sentry.api.event_search",
     "sentry.api.helpers.group_index.index",
-    "sentry.api.helpers.group_index.update",
     "sentry.api.invite_helper",
     "sentry.api.issue_search",
     "sentry.api.paginator",
@@ -180,7 +178,6 @@ module = [
     "sentry.api.serializers.models.rule",
     "sentry.api.serializers.models.team",
     "sentry.api.serializers.rest_framework.mentions",
-    "sentry.api.serializers.rest_framework.notification_action",
     "sentry.auth.helper",
     "sentry.auth.provider",
     "sentry.auth.system",
@@ -190,20 +187,16 @@ module = [
     "sentry.eventstore.models",
     "sentry.grouping.strategies.legacy",
     "sentry.identity.bitbucket.provider",
-    "sentry.identity.github_enterprise.provider",
     "sentry.identity.gitlab.provider",
     "sentry.identity.oauth2",
     "sentry.identity.pipeline",
     "sentry.identity.providers.dummy",
-    "sentry.identity.slack.provider",
     "sentry.incidents.endpoints.bases",
     "sentry.incidents.endpoints.organization_alert_rule_details",
     "sentry.incidents.endpoints.organization_alert_rule_index",
-    "sentry.incidents.endpoints.organization_incident_comment_details",
     "sentry.incidents.endpoints.organization_incident_index",
     "sentry.incidents.subscription_processor",
     "sentry.incidents.tasks",
-    "sentry.integrations.api.bases.integration",
     "sentry.integrations.aws_lambda.integration",
     "sentry.integrations.bitbucket.client",
     "sentry.integrations.bitbucket.installed",
@@ -269,7 +262,6 @@ module = [
     "sentry.net.http",
     "sentry.net.socket",
     "sentry.notifications.notifications.activity.base",
-    "sentry.notifications.notifications.activity.release",
     "sentry.notifications.notifications.integration_nudge",
     "sentry.pipeline.base",
     "sentry.pipeline.views.base",
@@ -283,7 +275,6 @@ module = [
     "sentry.receivers.releases",
     "sentry.release_health.metrics_sessions_v2",
     "sentry.replays.endpoints.project_replay_clicks_index",
-    "sentry.replays.lib.query",
     "sentry.rules.actions.integrations.base",
     "sentry.rules.actions.integrations.create_ticket.form",
     "sentry.rules.actions.integrations.create_ticket.utils",
@@ -319,11 +310,9 @@ module = [
     "sentry.tasks.auth",
     "sentry.tasks.base",
     "sentry.testutils.cases",
-    "sentry.testutils.fixtures",
     "sentry.testutils.helpers.notifications",
     "sentry.utils.auth",
     "sentry.utils.committers",
-    "sentry.utils.services",
     "sentry.web.forms.accounts",
     "sentry.web.frontend.auth_login",
     "sentry.web.frontend.auth_organization_login",
@@ -397,6 +386,7 @@ module = [
     "sentry.grouping.ingest.*",
     "sentry.grouping.parameterization",
     "sentry.hybridcloud.*",
+    "sentry.identity.github_enterprise.*",
     "sentry.ingest.slicing",
     "sentry.integrations.models.integration_feature",
     "sentry.issues",
@@ -500,6 +490,7 @@ module = [
     "sentry.utils.redis",
     "sentry.utils.redis_metrics",
     "sentry.utils.sentry_apps.*",
+    "sentry.utils.services",
     "sentry.utils.sms",
     "sentry.utils.snowflake",
     "sentry.utils.urls",
diff --git a/requirements-base.txt b/requirements-base.txt
index bfe7d332e54808..61d5cbf7b5c977 100644
--- a/requirements-base.txt
+++ b/requirements-base.txt
@@ -13,7 +13,7 @@ cssselect>=1.0.3
 datadog>=0.49
 django-crispy-forms>=1.14.0
 django-csp>=3.8
-django-pg-zero-downtime-migrations>=0.13
+django-pg-zero-downtime-migrations>=0.16
 Django>=5.1.1
 djangorestframework>=3.15.1
 drf-spectacular>=0.26.3
@@ -60,18 +60,18 @@ rb>=1.9.0
 redis-py-cluster>=2.1.0
 redis>=3.4.1
 requests-oauthlib>=1.2.0
-requests>=2.25.1
+requests>=2.32.3
 # [start] jsonschema format validators
 rfc3339-validator>=0.1.2
 rfc3986-validator>=0.1.1
 # [end] jsonschema format validators
-sentry-arroyo>=2.16.5
-sentry-kafka-schemas>=0.1.118
+sentry-arroyo>=2.18.2
+sentry-kafka-schemas>=0.1.122
 sentry-ophio==1.0.0
-sentry-protos>=0.1.34
+sentry-protos>=0.1.37
 sentry-redis-tools>=0.1.7
-sentry-relay>=0.9.2
-sentry-sdk[http2]>=2.18.0
+sentry-relay>=0.9.3
+sentry-sdk[http2]>=2.19.2
 slack-sdk>=3.27.2
 snuba-sdk>=3.0.43
 simplejson>=3.17.6
diff --git a/requirements-dev-frozen.txt b/requirements-dev-frozen.txt
index 47eaa7f9d4ddf0..4f4e234cd10eb8 100644
--- a/requirements-dev-frozen.txt
+++ b/requirements-dev-frozen.txt
@@ -20,7 +20,7 @@ brotli==1.1.0
 build==0.8.0
 cachetools==5.3.0
 celery==5.3.5
-certifi==2023.7.22
+certifi==2024.7.4
 cffi==1.17.1
 cfgv==3.3.1
 charset-normalizer==3.4.0
@@ -36,16 +36,16 @@ cryptography==43.0.1
 cssselect==1.0.3
 cssutils==2.9.0
 datadog==0.49.1
-devservices==1.0.2
+devservices==1.0.4
 distlib==0.3.8
 distro==1.8.0
 django==5.1.1
 django-crispy-forms==1.14.0
 django-csp==3.8
-django-pg-zero-downtime-migrations==0.13
+django-pg-zero-downtime-migrations==0.16
 django-stubs-ext==5.1.1
 djangorestframework==3.15.2
-docker==6.1.3
+docker==7.1.0
 drf-spectacular==0.26.3
 email-reply-parser==0.5.12
 execnet==1.9.0
@@ -71,7 +71,7 @@ googleapis-common-protos==1.63.2
 grpc-google-iam-v1==0.13.1
 grpc-stubs==1.53.0.5
 grpcio==1.67.0
-grpcio-status==1.60.1
+grpcio-status==1.66.1
 h11==0.13.0
 h2==4.1.0
 hiredis==2.3.2
@@ -152,7 +152,7 @@ pytest-django==4.9.0
 pytest-fail-slow==0.3.0
 pytest-json-report==1.5.0
 pytest-metadata==3.1.1
-pytest-rerunfailures==14.0
+pytest-rerunfailures==15.0
 pytest-sentry==0.3.0
 pytest-xdist==3.0.2
 python-dateutil==2.9.0
@@ -170,7 +170,7 @@ redis-py-cluster==2.1.0
 referencing==0.30.2
 regex==2022.9.13
 reportlab==4.0.7
-requests==2.31.0
+requests==2.32.3
 requests-file==2.1.0
 requests-oauthlib==1.2.0
 responses==0.23.1
@@ -180,17 +180,18 @@ rpds-py==0.20.0
 rsa==4.8
 s3transfer==0.10.0
 selenium==4.16.0
-sentry-arroyo==2.16.5
+sentry-arroyo==2.18.2
 sentry-cli==2.16.0
-sentry-devenv==1.13.0
+sentry-covdefaults-disable-branch-coverage==1.0.2
+sentry-devenv==1.14.2
 sentry-forked-django-stubs==5.1.1.post1
 sentry-forked-djangorestframework-stubs==3.15.1.post2
-sentry-kafka-schemas==0.1.118
+sentry-kafka-schemas==0.1.122
 sentry-ophio==1.0.0
-sentry-protos==0.1.34
+sentry-protos==0.1.37
 sentry-redis-tools==0.1.7
-sentry-relay==0.9.2
-sentry-sdk==2.18.0
+sentry-relay==0.9.3
+sentry-sdk==2.19.2
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
 six==1.16.0
@@ -226,7 +227,7 @@ types-python-dateutil==2.8.19
 types-pytz==2022.1.2
 types-pyyaml==6.0.11
 types-redis==3.5.18
-types-requests==2.31.0.20240406
+types-requests==2.32.0.20241016
 types-setuptools==69.0.0.0
 types-simplejson==3.17.7.2
 typing-extensions==4.12.0
@@ -238,8 +239,7 @@ urllib3==2.2.2
 vine==5.1.0
 virtualenv==20.25.0
 wcwidth==0.2.10
-websocket-client==1.3.2
-werkzeug==3.0.3
+werkzeug==3.0.6
 wheel==0.38.4
 wrapt==1.17.0rc1
 wsproto==1.1.0
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 4a393a332f9598..999e42e802ae62 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,10 +1,11 @@
 --index-url https://pypi.devinfra.sentry.io/simple
 
-sentry-devenv>=1.13.0
-devservices>=1.0.2
+sentry-devenv>=1.14.2
+devservices>=1.0.4
 
 covdefaults>=2.3.0
-docker>=6
+sentry-covdefaults-disable-branch-coverage>=1.0.2
+docker>=7
 time-machine>=2.16.0
 honcho>=2
 openapi-core>=0.18.2
@@ -14,7 +15,7 @@ pytest-cov>=4.0.0
 pytest-django>=4.9.0
 pytest-fail-slow>=0.3.0
 pytest-json-report>=1.5.0
-pytest-rerunfailures>=14
+pytest-rerunfailures>=15
 pytest-sentry>=0.3.0
 pytest-xdist>=3
 responses>=0.23.1
@@ -55,6 +56,6 @@ types-pytz
 types-pyyaml
 # make sure to match close-enough to redis==
 types-redis<4
-types-requests>=2.31.0.20240406
+types-requests>=2.32.0.20241016
 types-setuptools>=68
 types-simplejson>=3.17.7.2
diff --git a/requirements-frozen.txt b/requirements-frozen.txt
index 67eab6c19f0449..82269811b9df59 100644
--- a/requirements-frozen.txt
+++ b/requirements-frozen.txt
@@ -18,7 +18,7 @@ botocore==1.34.128
 brotli==1.1.0
 cachetools==5.3.0
 celery==5.3.5
-certifi==2023.7.22
+certifi==2024.7.4
 cffi==1.17.1
 charset-normalizer==3.4.0
 click==8.1.7
@@ -35,7 +35,7 @@ distro==1.8.0
 django==5.1.1
 django-crispy-forms==1.14.0
 django-csp==3.8
-django-pg-zero-downtime-migrations==0.13
+django-pg-zero-downtime-migrations==0.16
 djangorestframework==3.15.2
 drf-spectacular==0.26.3
 email-reply-parser==0.5.12
@@ -58,7 +58,7 @@ googleapis-common-protos==1.63.2
 grpc-google-iam-v1==0.13.1
 grpc-stubs==1.53.0.5
 grpcio==1.67.0
-grpcio-status==1.60.1
+grpcio-status==1.66.1
 h11==0.14.0
 h2==4.1.0
 hiredis==2.3.2
@@ -116,7 +116,7 @@ redis-py-cluster==2.1.0
 referencing==0.30.2
 regex==2022.9.13
 reportlab==4.0.7
-requests==2.31.0
+requests==2.32.3
 requests-file==2.1.0
 requests-oauthlib==1.2.0
 rfc3339-validator==0.1.2
@@ -124,13 +124,13 @@ rfc3986-validator==0.1.1
 rpds-py==0.20.0
 rsa==4.8
 s3transfer==0.10.0
-sentry-arroyo==2.16.5
-sentry-kafka-schemas==0.1.118
+sentry-arroyo==2.18.2
+sentry-kafka-schemas==0.1.122
 sentry-ophio==1.0.0
-sentry-protos==0.1.34
+sentry-protos==0.1.37
 sentry-redis-tools==0.1.7
-sentry-relay==0.9.2
-sentry-sdk==2.18.0
+sentry-relay==0.9.3
+sentry-sdk==2.19.2
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
 six==1.16.0
diff --git a/scripts/lib.sh b/scripts/lib.sh
index e180294c46c91c..b8d054bea45d6c 100755
--- a/scripts/lib.sh
+++ b/scripts/lib.sh
@@ -7,6 +7,12 @@
 # shellcheck disable=SC2034 # Unused variables
 # shellcheck disable=SC2001 # https://github.com/koalaman/shellcheck/wiki/SC2001
 
+POSTGRES_CONTAINER="sentry_postgres"
+USE_NEW_DEVSERVICES=${USE_NEW_DEVSERVICES:-"0"}
+if [ "$USE_NEW_DEVSERVICES" == "1" ]; then
+    POSTGRES_CONTAINER="sentry-postgres-1"
+fi
+
 # This block is a safe-guard since in CI calling tput will fail and abort scripts
 if [ -z "${CI+x}" ]; then
     bold="$(tput bold)"
@@ -87,7 +93,7 @@ run-dependent-services() {
 }
 
 create-db() {
-    container_name=${POSTGRES_CONTAINER:-sentry_postgres}
+    container_name=${POSTGRES_CONTAINER}
     echo "--> Creating 'sentry' database"
     docker exec "${container_name}" createdb -h 127.0.0.1 -U postgres -E utf-8 sentry || true
     echo "--> Creating 'control', 'region' and 'secondary' database"
@@ -132,7 +138,7 @@ clean() {
 }
 
 drop-db() {
-    container_name=${POSTGRES_CONTAINER:-sentry_postgres}
+    container_name=${POSTGRES_CONTAINER}
     echo "--> Dropping existing 'sentry' database"
     docker exec "${container_name}" dropdb --if-exists -h 127.0.0.1 -U postgres sentry
     echo "--> Dropping 'control' and 'region' database"
diff --git a/scripts/upgrade-postgres.sh b/scripts/upgrade-postgres.sh
index 2378e54cc709b4..a793e0214d80dc 100755
--- a/scripts/upgrade-postgres.sh
+++ b/scripts/upgrade-postgres.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+POSTGRES_CONTAINER="sentry_postgres"
+USE_NEW_DEVSERVICES=${USE_NEW_DEVSERVICES:-"0"}
+if [ "$USE_NEW_DEVSERVICES" == "1" ]; then
+    POSTGRES_CONTAINER="sentry-postgres-1"
+fi
+
 OLD_VERSION="9.6"
 NEW_VERSION="14"
 PG_IMAGE="ghcr.io/getsentry/image-mirror-library-postgres:${NEW_VERSION}-alpine"
@@ -10,7 +16,7 @@ TMP_VOLUME_NAME="${VOLUME_NAME}_${NEW_VERSION}"
 TMP_CONTAINER="${PROJECT}_pg_migration"
 
 echo "Stop the container"
-docker stop sentry_postgres
+docker stop "${POSTGRES_CONTAINER}"
 
 echo "Check existence of a volume"
 if [[ -z "$(docker volume ls -q --filter name="^${VOLUME_NAME}$")" ]]
diff --git a/scripts/use-colima.sh b/scripts/use-colima.sh
deleted file mode 100755
index 375f9defd3d63b..00000000000000
--- a/scripts/use-colima.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-if ! [[ -x ~/.local/share/sentry-devenv/bin/colima ]]; then
-    echo "You need to install devenv! https://github.com/getsentry/devenv/#install"
-    exit 1
-fi
-
-if [[ "$(sysctl -n machdep.cpu.brand_string)" != Intel* ]]; then
-    case "$(sw_vers -productVersion)" in
-        *12.*|*13.*)
-            echo "Your ARM Mac is on a version incompatible with colima."
-            echo "Use Docker Desktop for now until you upgrade to at least MacOS 14."
-            exit 1
-            ;;
-    esac
-fi
-
-echo "Copying your postgres volume for use with colima. Will take a few minutes."
-tmpdir=$(mktemp -d)
-docker context use desktop-linux
-docker run --rm -v sentry_postgres:/from -v "${tmpdir}:/to" alpine ash -c "cd /from ; cp -a . /to" || { echo "You need to start Docker Desktop."; exit 1; }
-
-echo "Stopping Docker.app. If a 'process terminated unexpectedly' dialog appears, dismiss it."
-osascript - <<'EOF' || exit
-quit application "Docker"
-EOF
-
-# We aren't uninstalling for now - this makes rolling back to docker desktop faster.
-# Also, less breakage as people may be using things like docker-credential-desktop.
-# echo "Uninstalling docker cask (which includes Docker Desktop)."
-# brew uninstall --cask docker
-
-# We do want to get people on just the docker cli though, to enable uninstalling the cask.
-echo "Installing docker (cli only)."
-brew install docker
-# Unlinks docker (cask).
-brew unlink docker
-brew link --overwrite docker
-
-# This removes credsStore, saving it under oldCredsStore so it can be restored later.
-# The right value under colima for this is "colima", but I think vast majority of people
-# are authing their docker through gcloud, not docker cli.
-python3 <<'EOF'
-import os
-import json
-with open(os.path.expanduser("~/.docker/config.json"), "rb") as f:
-    config = json.loads(f.read())
-    credsStore = config.get("credsStore")
-    if credsStore is None:
-        exit(0)
-    config["oldCredsStore"] = credsStore
-    del config["credsStore"]
-with open(os.path.expanduser("~/.docker/config.json"), "w") as f:
-    f.write(json.dumps(config))
-EOF
-
-echo "Starting colima."
-devenv colima start
-
-echo "Recreating your postgres volume for use with colima. May take a few minutes."
-docker volume create --name sentry_postgres
-docker run --rm -v "${tmpdir}:/from" -v sentry_postgres:/to alpine ash -c "cd /from ; cp -a . /to"
-rm -rf "$tmpdir"
-
-echo "-----------------------------------------------"
-echo "All done. Start devservices at your discretion."
diff --git a/scripts/use-docker-desktop.sh b/scripts/use-docker-desktop.sh
deleted file mode 100755
index f926cf27e9df66..00000000000000
--- a/scripts/use-docker-desktop.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -e
-
-~/.local/share/sentry-devenv/bin/colima stop
-
-echo "Using docker cli from cask. You may be prompted for your password."
-# brew --prefix doesn't seem to apply here - it's just /usr/local
-sudo ln -svf /Applications/Docker.app/Contents/Resources/bin/docker "/usr/local/bin/docker"
-
-# this restores the old credsStore value
-python3 <<'EOF'
-import os
-import json
-with open(os.path.expanduser("~/.docker/config.json"), "rb") as f:
-    config = json.loads(f.read())
-    oldCredsStore = config.get("oldCredsStore")
-    if oldCredsStore is None:
-        exit(0)
-    config["credsStore"] = oldCredsStore
-    del config["oldCredsStore"]
-with open(os.path.expanduser("~/.docker/config.json"), "w") as f:
-    f.write(json.dumps(config))
-EOF
-
-echo "Starting Docker."
-open -a /Applications/Docker.app --args --unattended
-
-echo "-----------------------------------------------"
-echo "All done. Start devservices at your discretion."
diff --git a/self-hosted/Dockerfile b/self-hosted/Dockerfile
index 940b815ed64ead..d22d64e05bcd5f 100644
--- a/self-hosted/Dockerfile
+++ b/self-hosted/Dockerfile
@@ -11,6 +11,13 @@ LABEL org.opencontainers.image.authors="oss@sentry.io"
 # add our user and group first to make sure their IDs get assigned consistently
 RUN groupadd -r sentry && useradd -r -m -g sentry sentry
 
+RUN : \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        libexpat1 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
 ARG GOSU_VERSION=1.17
 ARG GOSU_SHA256=bbc4136d03ab138b1ad66fa4fc051bafc6cc7ffae632b069a53657279a450de3
 ARG TINI_VERSION=0.19.0
diff --git a/setup.cfg b/setup.cfg
index 35564b11752f7e..aae014f9aa7768 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = sentry
-version = 24.11.0.dev0
+version = 24.12.0.dev0
 description = A realtime logging and aggregation server.
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -112,7 +112,9 @@ extension =
 [coverage:run]
 omit =
     src/sentry/migrations/*
-plugins = covdefaults
+plugins =
+    covdefaults
+    sentry_covdefaults_disable_branch_coverage
 
 [coverage:report]
 # Setting this to 0 makes it falsy, and it gets ignored, so we set it to
diff --git a/src/sentry/api/authentication.py b/src/sentry/api/authentication.py
index b55aeb8d5b1716..eb0fd888294f29 100644
--- a/src/sentry/api/authentication.py
+++ b/src/sentry/api/authentication.py
@@ -422,11 +422,11 @@ def authenticate_token(self, request: Request, token_str: str) -> tuple[Any, Any
         if application_is_inactive:
             raise AuthenticationFailed("UserApplication inactive or deleted")
 
-        if token.organization_id:
+        if token.scoping_organization_id:
             # We need to make sure the organization to which the token has access is the same as the one in the URL
             organization = None
             organization_context = organization_service.get_organization_by_id(
-                id=token.organization_id
+                id=token.organization_id, include_projects=False, include_teams=False
             )
             if organization_context:
                 organization = organization_context.organization
@@ -439,29 +439,15 @@ def authenticate_token(self, request: Request, token_str: str) -> tuple[Any, Any
                         organization.slug != target_org_id_or_slug
                         and organization.id != target_org_id_or_slug
                     ):
-                        # TODO (@athena): We want to raise auth excecption here but to be sure
-                        # I soft launch this by only logging the error for now
-                        # raise AuthenticationFailed("Unauthorized organization access")
-                        logger.info(
-                            "Token has access to organization %s but wants to get access to organization %s",
-                            organization.slug,
-                            target_org_id_or_slug,
-                        )
-                else:
-                    # TODO (@athena): We want to limit org level token's access to org level endpoints only
-                    # so in the future this will be an auth exception but for now we soft launch by logging an error
-                    logger.info(
-                        "Token has only access to organization %s but is calling an endpoint for multiple organizations: %s",
-                        organization.slug,
-                        request.path_info,
+                        raise AuthenticationFailed("Unauthorized organization access.")
+                # We want to limit org scoped tokens access to org level endpoints only
+                # Except some none-org level endpoints that we added special treatments for
+                elif resolved_url.url_name not in ["sentry-api-0-organizations"]:
+                    raise AuthenticationFailed(
+                        "This token access is limited to organization endpoints."
                     )
             else:
-                # TODO (@athena): If there is an organization token we should be able to fetch organization context
-                # Otherwise we should raise an exception
-                # For now adding logging to investigate if this is a valid case we need to address
-                logger.info(
-                    "Token has access to an unknown organization: %s", token.organization_id
-                )
+                raise AuthenticationFailed("Cannot resolve organization from token.")
 
         return self.transform_auth(
             user,
diff --git a/src/sentry/api/base.py b/src/sentry/api/base.py
index f71c6b2e4f9465..fddcd7dd555142 100644
--- a/src/sentry/api/base.py
+++ b/src/sentry/api/base.py
@@ -298,7 +298,7 @@ def permission_denied(self, request, message=None, code=None):
 
         super().permission_denied(request, message, code)
 
-    def handle_exception(  # type: ignore[override]
+    def handle_exception_with_details(
         self,
         request: Request,
         exc: Exception,
@@ -321,7 +321,7 @@ def handle_exception(  # type: ignore[override]
             # Django REST Framework's built-in exception handler. If `settings.EXCEPTION_HANDLER`
             # exists and returns a response, that's used. Otherwise, `exc` is just re-raised
             # and caught below.
-            response = super().handle_exception(exc)
+            response = self.handle_exception(exc)
         except Exception as err:
             import sys
             import traceback
@@ -456,7 +456,7 @@ def dispatch(self, request: Request, *args, **kwargs) -> Response:
                 response = handler(request, *args, **kwargs)
 
         except Exception as exc:
-            response = self.handle_exception(request, exc)
+            response = self.handle_exception_with_details(request, exc)
 
         if origin:
             self.add_cors_headers(request, response)
diff --git a/src/sentry/api/bases/organization_events.py b/src/sentry/api/bases/organization_events.py
index facfbf747984e5..ff51f813e5b458 100644
--- a/src/sentry/api/bases/organization_events.py
+++ b/src/sentry/api/bases/organization_events.py
@@ -342,6 +342,8 @@ def handle_results_with_meta(
 
             if not data:
                 return {"data": [], "meta": meta}
+            if "confidence" in results:
+                return {"data": data, "meta": meta, "confidence": results["confidence"]}
             return {"data": data, "meta": meta}
 
     def handle_data(
@@ -405,7 +407,7 @@ def get_event_stats_data(
         request: Request,
         organization: Organization,
         get_event_stats: Callable[
-            [Sequence[str], str, SnubaParams, int, bool, timedelta | None], SnubaTSResult
+            [list[str], str, SnubaParams, int, bool, timedelta | None], SnubaTSResult
         ],
         top_events: int = 0,
         query_column: str = "count()",
@@ -427,7 +429,7 @@ def get_event_stats_data(
                 columns = request.GET.getlist("yAxis", _columns)
 
                 if query is None:
-                    query = request.GET.get("query")
+                    query = request.GET.get("query", "")
                 if snuba_params is None:
                     try:
                         # events-stats is still used by events v1 which doesn't require global views
@@ -567,7 +569,7 @@ def serialize_multiple_axis(
         event_result: SnubaTSResult,
         snuba_params: SnubaParams,
         columns: Sequence[str],
-        query_columns: Sequence[str],
+        query_columns: list[str],
         allow_partial_buckets: bool,
         zerofill_results: bool = True,
         dataset: Any | None = None,
diff --git a/src/sentry/api/bases/project.py b/src/sentry/api/bases/project.py
index d69deaeed98340..693828c767af83 100644
--- a/src/sentry/api/bases/project.py
+++ b/src/sentry/api/bases/project.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import http
 from collections.abc import Mapping
 from typing import Any
 
@@ -8,7 +9,7 @@
 from rest_framework.response import Response
 
 from sentry.api.base import Endpoint
-from sentry.api.exceptions import ProjectMoved, ResourceDoesNotExist
+from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.api.helpers.environments import get_environments
 from sentry.api.permissions import StaffPermissionMixin
 from sentry.api.utils import get_date_range_from_params
@@ -25,6 +26,13 @@ class ProjectEventsError(Exception):
     pass
 
 
+class ProjectMoved(Exception):
+    def __init__(self, new_url: str, slug: str):
+        self.new_url = new_url
+        self.slug = slug
+        super().__init__(new_url, slug)
+
+
 class ProjectPermission(OrganizationPermission):
     scope_map = {
         "GET": ["project:read", "project:write", "project:admin"],
@@ -40,6 +48,7 @@ def has_object_permission(self, request: Request, view, project):
         if has_org_scope and request.access.has_project_access(project):
             return has_org_scope
 
+        assert request.method is not None
         allowed_scopes = set(self.scope_map.get(request.method, []))
         return request.access.has_any_project_scope(project, allowed_scopes)
 
@@ -145,8 +154,7 @@ def convert_args(
             try:
                 # Project may have been renamed
                 # This will only happen if the passed in project_id_or_slug is a slug and not an id
-                redirect = ProjectRedirect.objects.select_related("project")
-                redirect = redirect.get(
+                redirect = ProjectRedirect.objects.select_related("project").get(
                     organization__slug__id_or_slug=organization_id_or_slug,
                     redirect_slug=project_id_or_slug,
                 )
@@ -178,7 +186,7 @@ def convert_args(
 
         bind_organization_context(project.organization)
 
-        request._request.organization = project.organization
+        request._request.organization = project.organization  # type: ignore[attr-defined]  # XXX: we should not be stuffing random attributes into HttpRequest
 
         kwargs["project"] = project
         return (args, kwargs)
@@ -199,7 +207,7 @@ def get_filter_params(self, request: Request, project, date_filter_optional=Fals
 
         return params
 
-    def handle_exception(
+    def handle_exception_with_details(
         self,
         request: Request,
         exc: Exception,
@@ -208,9 +216,9 @@ def handle_exception(
     ) -> Response:
         if isinstance(exc, ProjectMoved):
             response = Response(
-                {"slug": exc.detail["detail"]["extra"]["slug"], "detail": exc.detail["detail"]},
-                status=exc.status_code,
+                {"slug": exc.slug, "detail": {"extra": {"url": exc.new_url, "slug": exc.slug}}},
+                status=http.HTTPStatus.FOUND.value,
             )
-            response["Location"] = exc.detail["detail"]["extra"]["url"]
+            response["Location"] = exc.new_url
             return response
-        return super().handle_exception(request, exc, handler_context, scope)
+        return super().handle_exception_with_details(request, exc, handler_context, scope)
diff --git a/src/sentry/api/endpoints/event_ai_suggested_fix.py b/src/sentry/api/endpoints/event_ai_suggested_fix.py
deleted file mode 100644
index 213ec900ac702c..00000000000000
--- a/src/sentry/api/endpoints/event_ai_suggested_fix.py
+++ /dev/null
@@ -1,398 +0,0 @@
-from __future__ import annotations
-
-import logging
-import random
-from typing import Any
-
-import orjson
-from django.conf import settings
-from django.dispatch import Signal
-from django.http import HttpResponse, StreamingHttpResponse
-from openai import OpenAI, RateLimitError
-
-from sentry import eventstore
-from sentry.api.api_owners import ApiOwner
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.project import ProjectEndpoint
-from sentry.api.exceptions import ResourceDoesNotExist
-from sentry.types.ratelimit import RateLimit, RateLimitCategory
-from sentry.utils.cache import cache
-
-logger = logging.getLogger(__name__)
-
-from rest_framework.request import Request
-
-openai_policy_check = Signal()
-
-# How many stacktrace frames do we want per exception?
-MAX_STACKTRACE_FRAMES = 15
-
-# How many exceptions do we want?
-MAX_EXCEPTIONS = 3
-
-# Do we want tags?  They don't seem particularly useful
-ADD_TAGS = False
-
-FUN_PROMPT_CHOICES = [
-    "[haiku about the error]",
-    "[hip hop rhyme about the error]",
-    "[4 line rhyme about the error]",
-    "[2 stanza rhyme about the error]",
-]
-
-PROMPT = """\
-You are an assistant that analyses software errors, describing the problem with the following rules:
-
-* Be helpful, playful and a bit snarky and sarcastic
-* Do not talk about the rules in explanations
-* Use emojis frequently in the snarky greeting and closing prompt
-* The frames of a stack trace is shown with most recent call first
-* Stack frames are either from app code or third party libraries
-* Never show code examples as diff
-* When describing the problem:
-  * Explain the error and message
-  * Explain where in the code the issue happend
-  * Explain the nature of the issue
-* When proposing a solution:
-  * Explain what code changes are necessary to resolve it
-  * Explain where the solution should be
-  * Mention best practices for preventing this
-* Remember Sentry's marketing message: "Sentry can't fix this"
-
-Write the answers into the following template:
-
-```
-[snarky greeting]
-
-#### Problem Description
-
-[detailed description of the problem]
-
-#### Proposed Solution
-
-[proposed solution to fix this issue]
-
-[fixed code example]
-
-#### What Else
-
-[uplifting closing statements]
-
-___FUN_PROMPT___
-```
-"""
-
-# Theset tags are removed because they are quite unstable between different events
-# of the same issue, and typically unrelated to something that the AI assistant
-# can answer.
-BLOCKED_TAGS = frozenset(
-    [
-        "user",
-        "server_name",
-        "host",
-        "release",
-        "handled",
-        "client_os",
-        "client_os.name",
-        "browser",
-        "browser.name",
-        "environment",
-        "runtime",
-        "device",
-        "device.family",
-        "gpu",
-        "gpu.name",
-        "gpu.vendor",
-        "url",
-        "trace",
-        "otel",
-    ]
-)
-
-openai_client: OpenAI | None = None
-
-
-def get_openai_client() -> OpenAI:
-    global openai_client
-
-    if openai_client:
-        return openai_client
-
-    # this will raise if OPENAI_API_KEY is not set
-    openai_client = OpenAI(api_key=settings.OPENAI_API_KEY)
-
-    return openai_client
-
-
-def get_openai_policy(organization, user, pii_certified):
-    """Uses a signal to determine what the policy for OpenAI should be."""
-    results = openai_policy_check.send(
-        sender=EventAiSuggestedFixEndpoint,
-        organization=organization,
-        user=user,
-        pii_certified=pii_certified,
-    )
-    result = "allowed"
-
-    # Last one wins
-    for _, new_result in results:
-        if new_result is not None:
-            result = new_result
-
-    return result
-
-
-def set_if_value(d, key, value):
-    if value is not None:
-        d[key] = value
-
-
-def trim_frames(frames, frame_allowance=MAX_STACKTRACE_FRAMES):
-    frames_len = 0
-    app_frames = []
-    system_frames = []
-
-    for frame in frames:
-        frames_len += 1
-        if frame.get("in_app"):
-            app_frames.append(frame)
-        else:
-            system_frames.append(frame)
-
-    if frames_len <= frame_allowance:
-        return frames
-
-    remaining = frames_len - frame_allowance
-    app_count = len(app_frames)
-    system_allowance = max(frame_allowance - app_count, 0)
-    if system_allowance:
-        half_max = int(system_allowance / 2)
-        # prioritize trimming system frames
-        for frame in system_frames[half_max:-half_max]:
-            frame["delete"] = True
-            remaining -= 1
-    else:
-        for frame in system_frames:
-            frame["delete"] = True
-            remaining -= 1
-
-    if remaining:
-        app_allowance = app_count - remaining
-        half_max = int(app_allowance / 2)
-
-        for frame in app_frames[half_max:-half_max]:
-            frame["delete"] = True
-
-    return [x for x in frames if not x.get("delete")]
-
-
-def describe_event_for_ai(event, model):
-    detailed = model.startswith("gpt-4")
-    data = {}
-
-    msg = event.get("logentry")
-    if msg:
-        data["message"] = msg
-
-    platform = event.get("platform")
-    if platform and platform != "other":
-        data["language"] = platform
-
-    exceptions = data.setdefault("exceptions", [])
-    for idx, exc in enumerate(
-        reversed((event.get("exception", {})).get("values", ())[:MAX_EXCEPTIONS])
-    ):
-        exception: dict[str, Any] = {}
-        if idx > 0:
-            exception["raised_during_handling_of_previous_exception"] = True
-        exception["num"] = idx + 1
-        exc_type = exc.get("type")
-        if exc_type:
-            exception["type"] = exc_type
-        exception["message"] = exc.get("value")
-        mechanism = exc.get("mechanism") or {}
-        exc_meta = mechanism.get("meta")
-        if exc_meta:
-            exception["exception_info"] = exc_meta
-        if mechanism.get("handled") is False:
-            exception["unhandled"] = True
-
-        frames = exc.get("stacktrace", {}).get("frames")
-        first_in_app = True
-        if frames:
-            stacktrace = []
-            for frame in reversed(frames):
-                if frame is None:
-                    continue
-                stack_frame: dict[str, Any] = {}
-                set_if_value(stack_frame, "func", frame.get("function"))
-                set_if_value(stack_frame, "module", frame.get("module"))
-                set_if_value(stack_frame, "file", frame.get("filename"))
-                set_if_value(stack_frame, "line", frame.get("lineno"))
-                if frame.get("in_app"):
-                    stack_frame["in_app"] = True
-                crashed_here = False
-                if first_in_app:
-                    crashed_here = True
-                    stack_frame["crash"] = "here"
-                    first_in_app = False
-                line = frame.get("context_line") or ""
-                if (crashed_here and idx == 0) or detailed:
-                    pre_context = frame.get("pre_context")
-                    if pre_context:
-                        stack_frame["code_before"] = pre_context
-                    stack_frame["code"] = line
-                    post_context = frame.get("post_context")
-                    if post_context:
-                        stack_frame["code_after"] = post_context
-                # {snip} usually appears in minified lines. skip that
-                elif "{snip}" not in line:
-                    set_if_value(stack_frame, "code", line.strip())
-                stacktrace.append(stack_frame)
-            if stacktrace:
-                exception["stacktrace"] = trim_frames(stacktrace)
-        exceptions.append(exception)
-
-    if ADD_TAGS:
-        tags = data.setdefault("tags", {})
-        for tag_key, tag_value in sorted(event["tags"]):
-            if tag_key not in BLOCKED_TAGS:
-                tags[tag_key] = tag_value
-
-    return data
-
-
-def suggest_fix(event_data, model=settings.SENTRY_AI_SUGGESTED_FIX_MODEL, stream=False):
-    """Runs an OpenAI request to suggest a fix."""
-    prompt = PROMPT.replace("___FUN_PROMPT___", random.choice(FUN_PROMPT_CHOICES))
-    event_info = describe_event_for_ai(event_data, model=model)
-
-    client = get_openai_client()
-
-    response = client.chat.completions.create(
-        model=model,
-        temperature=0.7,
-        messages=[
-            {"role": "system", "content": prompt},
-            {"role": "user", "content": orjson.dumps(event_info).decode()},
-        ],
-        stream=stream,
-    )
-    if stream:
-        return reduce_stream(response)
-    return response.choices[0].message.content
-
-
-def reduce_stream(response):
-    for chunk in response:
-        delta = chunk["choices"][0]["delta"]
-        if "content" in delta:
-            yield delta["content"]
-
-
-@region_silo_endpoint
-class EventAiSuggestedFixEndpoint(ProjectEndpoint):
-    owner = ApiOwner.ML_AI
-    publish_status = {
-        "GET": ApiPublishStatus.PRIVATE,
-    }
-    enforce_rate_limit = True
-    rate_limits = {
-        "GET": {
-            RateLimitCategory.IP: RateLimit(limit=5, window=1),
-            RateLimitCategory.USER: RateLimit(limit=5, window=1),
-            RateLimitCategory.ORGANIZATION: RateLimit(limit=5, window=1),
-        },
-    }
-
-    def get(self, request: Request, project, event_id) -> HttpResponse | StreamingHttpResponse:
-        """
-        Makes AI make suggestions about an event
-        ````````````````````````````````````````
-
-        This endpoint returns a JSON response that provides helpful suggestions about how to
-        understand or resolve an event.
-        """
-        # To use this feature you need openai to be configured
-        if not settings.OPENAI_API_KEY:
-            raise ResourceDoesNotExist
-
-        event = eventstore.backend.get_event_by_id(project.id, event_id)
-        if event is None:
-            raise ResourceDoesNotExist
-
-        policy_failure = None
-        # If the option has specifically been set to False,
-        if not bool(request.organization.get_option("sentry:ai_suggested_solution", default=False)):
-            policy_failure = "organization_consent_required"
-        else:
-            # Check the OpenAI access policy
-            policy = get_openai_policy(
-                request.organization,
-                request.user,
-                pii_certified=request.GET.get("pii_certified") == "yes",
-            )
-            stream = request.GET.get("stream") == "yes"
-
-            if policy == "subprocessor":
-                policy_failure = "subprocessor"
-            elif policy == "individual_consent":
-                if request.GET.get("consent") != "yes":
-                    policy_failure = "individual_consent"
-            elif policy == "pii_certification_required":
-                policy_failure = "pii_certification_required"
-            elif policy == "allowed":
-                pass
-            else:
-                logger.warning("Unknown OpenAI policy state")
-
-        if policy_failure is not None:
-            return HttpResponse(
-                orjson.dumps({"restriction": policy_failure}),
-                content_type="application/json",
-                status=403,
-            )
-
-        # Cache the suggestion for a certain amount by primary hash, so even when new events
-        # come into the group, we are sharing the same response.
-        cache_key = "ai:" + event.get_primary_hash()
-        suggestion = cache.get(cache_key)
-        if suggestion is None:
-            try:
-                suggestion = suggest_fix(event.data, stream=stream)
-            except RateLimitError as err:
-                return HttpResponse(
-                    orjson.dumps({"error": err.response.json()["error"]}),
-                    content_type="text/plain; charset=utf-8",
-                    status=429,
-                )
-
-            if stream:
-
-                def stream_response():
-                    buffer = []
-                    for item in suggestion:
-                        buffer.append(item)
-                        yield item.encode("utf-8")
-                    cache.set(cache_key, "".join(buffer), 300)
-
-                resp = StreamingHttpResponse(stream_response(), content_type="text/event-stream")
-                # make nginx happy
-                resp["x-accel-buffering"] = "no"
-                # make webpack devserver happy
-                resp["cache-control"] = "no-transform"
-                return resp
-
-            cache.set(cache_key, suggestion, 300)
-
-        if stream:
-            return HttpResponse(
-                suggestion,
-                content_type="text/plain; charset=utf-8",
-            )
-
-        return HttpResponse(
-            orjson.dumps({"suggestion": suggestion}),
-            content_type="application/json",
-        )
diff --git a/src/sentry/api/endpoints/group_ai_autofix.py b/src/sentry/api/endpoints/group_ai_autofix.py
index 780946cd7000d8..7e5b6855cd1f5d 100644
--- a/src/sentry/api/endpoints/group_ai_autofix.py
+++ b/src/sentry/api/endpoints/group_ai_autofix.py
@@ -111,11 +111,6 @@ def _call_autofix(
                     else None
                 ),
                 "options": {
-                    "disable_codebase_indexing": features.has(
-                        "organizations:autofix-disable-codebase-indexing",
-                        group.organization,
-                        actor=user,
-                    ),
                     "comment_on_pr_with_url": pr_to_comment_on_url,
                 },
             },
@@ -161,9 +156,8 @@ def post(self, request: Request, group: Group) -> Response:
         created_at = datetime.now().isoformat()
 
         if not (
-            features.has("projects:ai-autofix", group.project)
-            or features.has("organizations:autofix", group.organization)
-            or group.organization.get_option("sentry:gen_ai_consent", False)
+            features.has("organizations:gen-ai-features", group.organization, actor=request.user)
+            and group.organization.get_option("sentry:gen_ai_consent_v2024_11_14", False)
         ):
             return self._respond_with_error("AI Autofix is not enabled for this project.", 403)
 
diff --git a/src/sentry/api/endpoints/group_ai_summary.py b/src/sentry/api/endpoints/group_ai_summary.py
index 729414a37705f2..b540a46d545347 100644
--- a/src/sentry/api/endpoints/group_ai_summary.py
+++ b/src/sentry/api/endpoints/group_ai_summary.py
@@ -170,7 +170,9 @@ def _get_trace_connected_issues(self, event: GroupEvent) -> list[Group]:
         return connected_issues
 
     def post(self, request: Request, group: Group) -> Response:
-        if not features.has("organizations:ai-summary", group.organization, actor=request.user):
+        if not features.has(
+            "organizations:gen-ai-features", group.organization, actor=request.user
+        ):
             return Response({"detail": "Feature flag not enabled"}, status=400)
 
         cache_key = "ai-group-summary-v2:" + str(group.id)
diff --git a/src/sentry/api/endpoints/group_attachments.py b/src/sentry/api/endpoints/group_attachments.py
index 4ae767fe5527cf..bb83c1cd3d0789 100644
--- a/src/sentry/api/endpoints/group_attachments.py
+++ b/src/sentry/api/endpoints/group_attachments.py
@@ -1,3 +1,7 @@
+from datetime import datetime, timedelta
+
+from django.utils import timezone
+from rest_framework.exceptions import ParseError
 from rest_framework.request import Request
 from rest_framework.response import Response
 
@@ -5,9 +9,64 @@
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import EnvironmentMixin, region_silo_endpoint
 from sentry.api.bases.group import GroupEndpoint
+from sentry.api.exceptions import ResourceDoesNotExist
+from sentry.api.helpers.environments import get_environments
+from sentry.api.helpers.events import get_query_builder_for_group
 from sentry.api.paginator import DateTimePaginator
 from sentry.api.serializers import EventAttachmentSerializer, serialize
+from sentry.api.utils import get_date_range_from_params
+from sentry.exceptions import InvalidParams, InvalidSearchQuery
 from sentry.models.eventattachment import EventAttachment, event_attachment_screenshot_filter
+from sentry.models.group import Group
+from sentry.search.events.types import ParamsType
+
+
+def get_event_ids_from_filters(
+    request: Request,
+    group: Group,
+    start: datetime | None,
+    end: datetime | None,
+) -> list[str] | None:
+    """
+    Returns a list of Event IDs matching the environment/query filters.
+    If neither are provided it will return `None`, skipping the filter by `EventAttachment.event_id` matches.
+    If at least one is provided, but nothing is matched, it will return `[]`, which will result in no attachment matches (as expected).
+    """
+    default_end = timezone.now()
+    default_start = default_end - timedelta(days=90)
+    try:
+        environments = get_environments(request, group.project.organization)
+    except ResourceDoesNotExist:
+        environments = []
+    query = request.GET.get("query", "")
+
+    # Exit early if no query or environment is specified
+    if not query and not environments:
+        return None
+
+    params: ParamsType = {
+        "project_id": [group.project_id],
+        "organization_id": group.project.organization_id,
+        "start": start if start else default_start,
+        "end": end if end else default_end,
+    }
+
+    if environments:
+        params["environment"] = [env.name for env in environments]
+
+    try:
+        snuba_query = get_query_builder_for_group(
+            query=query,
+            snuba_params=params,
+            group=group,
+            limit=10000,
+            offset=0,
+        )
+    except InvalidSearchQuery as e:
+        raise ParseError(detail=str(e))
+    referrer = f"api.group-attachments.{group.issue_category.name.lower()}"
+    results = snuba_query.run_query(referrer=referrer)
+    return [evt["id"] for evt in results["data"]]
 
 
 @region_silo_endpoint
@@ -25,6 +84,11 @@ def get(self, request: Request, group) -> Response:
 
         :pparam string issue_id: the ID of the issue to retrieve.
         :pparam list   types:    a list of attachment types to filter for.
+        :qparam string start: Beginning date. You must also provide ``end``.
+        :qparam string end: End date. You must also provide ``start``.
+        :qparam string statsPeriod: An optional stat period (defaults to ``"90d"``).
+        :qparam string query: If set, will filter to only attachments from events matching that query.
+        :qparam string environment: If set, will filter to only attachments from events within a specific environment.
         :auth: required
         """
 
@@ -36,18 +100,36 @@ def get(self, request: Request, group) -> Response:
         attachments = EventAttachment.objects.filter(group_id=group.id)
 
         types = request.GET.getlist("types") or ()
-        event_ids = request.GET.getlist("event_id") or ()
+        event_ids = request.GET.getlist("event_id") or None
         screenshot = "screenshot" in request.GET
 
+        try:
+            start, end = get_date_range_from_params(request.GET, optional=True)
+        except InvalidParams as e:
+            raise ParseError(detail=str(e))
+
+        if start:
+            attachments = attachments.filter(date_added__gte=start)
+        if end:
+            attachments = attachments.filter(date_added__lte=end)
+
+        if not event_ids:
+            event_ids = get_event_ids_from_filters(
+                request=request,
+                group=group,
+                start=start,
+                end=end,
+            )
+
         if screenshot:
             attachments = event_attachment_screenshot_filter(attachments)
         if types:
             attachments = attachments.filter(type__in=types)
-        if event_ids:
+        # If event_ids is [], we still want attachments to filter to an empty list.
+        if event_ids is not None:
             attachments = attachments.filter(event_id__in=event_ids)
 
         return self.paginate(
-            default_per_page=20,
             request=request,
             queryset=attachments,
             order_by="-date_added",
diff --git a/src/sentry/api/endpoints/group_autofix_setup_check.py b/src/sentry/api/endpoints/group_autofix_setup_check.py
index 96f1d5c20ee123..8cb0167f8fc238 100644
--- a/src/sentry/api/endpoints/group_autofix_setup_check.py
+++ b/src/sentry/api/endpoints/group_autofix_setup_check.py
@@ -7,15 +7,10 @@
 from django.conf import settings
 from rest_framework.response import Response
 
-from sentry import features
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.group import GroupEndpoint
-from sentry.api.helpers.autofix import (
-    AutofixCodebaseIndexingStatus,
-    get_project_codebase_indexing_status,
-)
 from sentry.autofix.utils import get_autofix_repos_from_project_code_mappings
 from sentry.constants import ObjectStatus
 from sentry.integrations.services.integration import integration_service
@@ -71,6 +66,11 @@ def get_repos_and_access(project: Project) -> list[dict]:
     repos_and_access: list[dict] = []
     path = "/v1/automation/codebase/repo/check-access"
     for repo in repos:
+        # We only support github for now.
+        provider = repo.get("provider")
+        if provider != "integrations:github" and provider != "github":
+            continue
+
         body = orjson.dumps(
             {
                 "repo": repo,
@@ -109,13 +109,7 @@ def get(self, request: Request, group: Group) -> Response:
         Checks if we are able to run Autofix on the given group.
         """
         org: Organization = request.organization
-        has_gen_ai_consent = org.get_option("sentry:gen_ai_consent", False)
-
-        is_codebase_indexing_disabled = features.has(
-            "organizations:autofix-disable-codebase-indexing",
-            group.organization,
-            actor=request.user,
-        )
+        has_gen_ai_consent = org.get_option("sentry:gen_ai_consent_v2024_11_14", False)
 
         integration_check = None
         # This check is to skip using the GitHub integration for Autofix in s4s.
@@ -125,16 +119,14 @@ def get(self, request: Request, group: Group) -> Response:
                 organization=org, project=group.project
             )
 
-        repos = get_repos_and_access(group.project)
-        write_access_ok = len(repos) > 0 and all(repo["ok"] for repo in repos)
-
-        codebase_indexing_ok = is_codebase_indexing_disabled
-        if not codebase_indexing_ok:
-            codebase_indexing_status = get_project_codebase_indexing_status(group.project)
-            codebase_indexing_ok = (
-                codebase_indexing_status == AutofixCodebaseIndexingStatus.UP_TO_DATE
-                or codebase_indexing_status == AutofixCodebaseIndexingStatus.INDEXING
-            )
+        write_integration_check = None
+        if request.query_params.get("check_write_access", False):
+            repos = get_repos_and_access(group.project)
+            write_access_ok = len(repos) > 0 and all(repo["ok"] for repo in repos)
+            write_integration_check = {
+                "ok": write_access_ok,
+                "repos": repos,
+            }
 
         return Response(
             {
@@ -146,12 +138,6 @@ def get(self, request: Request, group: Group) -> Response:
                     "ok": integration_check is None,
                     "reason": integration_check,
                 },
-                "githubWriteIntegration": {
-                    "ok": write_access_ok,
-                    "repos": repos,
-                },
-                "codebaseIndexing": {
-                    "ok": codebase_indexing_ok,
-                },
+                "githubWriteIntegration": write_integration_check,
             }
         )
diff --git a/src/sentry/api/endpoints/group_integration_details.py b/src/sentry/api/endpoints/group_integration_details.py
index 6698a685d65b7f..7663f366a458c0 100644
--- a/src/sentry/api/endpoints/group_integration_details.py
+++ b/src/sentry/api/endpoints/group_integration_details.py
@@ -13,6 +13,10 @@
 from sentry.integrations.api.serializers.models.integration import IntegrationSerializer
 from sentry.integrations.base import IntegrationFeatures, IntegrationInstallation
 from sentry.integrations.models.external_issue import ExternalIssue
+from sentry.integrations.project_management.metrics import (
+    ProjectManagementActionType,
+    ProjectManagementEvent,
+)
 from sentry.integrations.services.integration import RpcIntegration, integration_service
 from sentry.models.activity import Activity
 from sentry.models.group import Group
@@ -162,62 +166,72 @@ def put(self, request: Request, group, integration_id) -> Response:
         if not integration or not org_integration:
             return Response(status=404)
 
-        if not self._has_issue_feature_on_integration(integration):
-            return Response(
-                {"detail": "This feature is not supported for this integration."}, status=400
-            )
+        with ProjectManagementEvent(
+            action_type=ProjectManagementActionType.LINK_EXTERNAL_ISSUE,
+            integration=integration,
+        ).capture() as lifecycle:
+            if not self._has_issue_feature_on_integration(integration):
+                return Response(
+                    {"detail": "This feature is not supported for this integration."}, status=400
+                )
 
-        installation = integration.get_installation(organization_id=organization_id)
-        try:
-            data = installation.get_issue(external_issue_id, data=request.data)
-        except IntegrationFormError as exc:
-            return Response(exc.field_errors, status=400)
-        except IntegrationError as e:
-            return Response({"non_field_errors": [str(e)]}, status=400)
+            installation = integration.get_installation(organization_id=organization_id)
 
-        defaults = {
-            "title": data.get("title"),
-            "description": data.get("description"),
-            "metadata": data.get("metadata"),
-        }
+            try:
+                data = installation.get_issue(external_issue_id, data=request.data)
+            except IntegrationFormError as exc:
+                lifecycle.record_halt(exc)
+                return Response(exc.field_errors, status=400)
+            except IntegrationError as e:
+                lifecycle.record_failure(e)
+                return Response({"non_field_errors": [str(e)]}, status=400)
 
-        external_issue_key = installation.make_external_key(data)
-        external_issue, created = ExternalIssue.objects.get_or_create(
-            organization_id=organization_id,
-            integration_id=integration.id,
-            key=external_issue_key,
-            defaults=defaults,
-        )
+            defaults = {
+                "title": data.get("title"),
+                "description": data.get("description"),
+                "metadata": data.get("metadata"),
+            }
 
-        if created:
-            integration_issue_linked.send_robust(
-                integration=integration,
-                organization=group.project.organization,
-                user=request.user,
-                sender=self.__class__,
+            external_issue_key = installation.make_external_key(data)
+            external_issue, created = ExternalIssue.objects.get_or_create(
+                organization_id=organization_id,
+                integration_id=integration.id,
+                key=external_issue_key,
+                defaults=defaults,
             )
-        else:
-            external_issue.update(**defaults)
 
-        installation.store_issue_last_defaults(group.project, request.user, request.data)
-        try:
-            installation.after_link_issue(external_issue, data=request.data)
-        except IntegrationFormError as exc:
-            return Response(exc.field_errors, status=400)
-        except IntegrationError as e:
-            return Response({"non_field_errors": [str(e)]}, status=400)
-
-        try:
-            with transaction.atomic(router.db_for_write(GroupLink)):
-                GroupLink.objects.create(
-                    group_id=group.id,
-                    project_id=group.project_id,
-                    linked_type=GroupLink.LinkedType.issue,
-                    linked_id=external_issue.id,
-                    relationship=GroupLink.Relationship.references,
+            if created:
+                integration_issue_linked.send_robust(
+                    integration=integration,
+                    organization=group.project.organization,
+                    user=request.user,
+                    sender=self.__class__,
                 )
-        except IntegrityError:
-            return Response({"non_field_errors": ["That issue is already linked"]}, status=400)
+            else:
+                external_issue.update(**defaults)
+
+            installation.store_issue_last_defaults(group.project, request.user, request.data)
+            try:
+                installation.after_link_issue(external_issue, data=request.data)
+            except IntegrationFormError as exc:
+                lifecycle.record_halt(exc)
+                return Response(exc.field_errors, status=400)
+            except IntegrationError as e:
+                lifecycle.record_failure(e)
+                return Response({"non_field_errors": [str(e)]}, status=400)
+
+            try:
+                with transaction.atomic(router.db_for_write(GroupLink)):
+                    GroupLink.objects.create(
+                        group_id=group.id,
+                        project_id=group.project_id,
+                        linked_type=GroupLink.LinkedType.issue,
+                        linked_id=external_issue.id,
+                        relationship=GroupLink.Relationship.references,
+                    )
+            except IntegrityError as exc:
+                lifecycle.record_halt(exc)
+                return Response({"non_field_errors": ["That issue is already linked"]}, status=400)
 
         self.create_issue_activity(request, group, installation, external_issue, new=False)
 
diff --git a/src/sentry/api/endpoints/notifications/notification_actions_available.py b/src/sentry/api/endpoints/notifications/notification_actions_available.py
index 5c9727ee4af7ea..a3b7d6757f4ebc 100644
--- a/src/sentry/api/endpoints/notifications/notification_actions_available.py
+++ b/src/sentry/api/endpoints/notifications/notification_actions_available.py
@@ -7,8 +7,8 @@
 from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.constants import ObjectStatus
 from sentry.integrations.services.integration import integration_service
-from sentry.models.notificationaction import NotificationAction
 from sentry.models.organization import Organization
+from sentry.notifications.models.notificationaction import NotificationAction
 
 
 @region_silo_endpoint
diff --git a/src/sentry/api/endpoints/notifications/notification_actions_details.py b/src/sentry/api/endpoints/notifications/notification_actions_details.py
index 49ded9395c66cd..00173565a95946 100644
--- a/src/sentry/api/endpoints/notifications/notification_actions_details.py
+++ b/src/sentry/api/endpoints/notifications/notification_actions_details.py
@@ -22,8 +22,8 @@
 from sentry.apidocs.constants import RESPONSE_BAD_REQUEST, RESPONSE_NO_CONTENT
 from sentry.apidocs.examples.notification_examples import NotificationActionExamples
 from sentry.apidocs.parameters import GlobalParams, NotificationParams
-from sentry.models.notificationaction import NotificationAction
 from sentry.models.organization import Organization
+from sentry.notifications.models.notificationaction import NotificationAction
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/sentry/api/endpoints/notifications/notification_actions_index.py b/src/sentry/api/endpoints/notifications/notification_actions_index.py
index cc95b12c610ec0..57f31941465ee0 100644
--- a/src/sentry/api/endpoints/notifications/notification_actions_index.py
+++ b/src/sentry/api/endpoints/notifications/notification_actions_index.py
@@ -19,8 +19,8 @@
 from sentry.apidocs.constants import RESPONSE_BAD_REQUEST, RESPONSE_FORBIDDEN
 from sentry.apidocs.examples.notification_examples import NotificationActionExamples
 from sentry.apidocs.parameters import GlobalParams, NotificationParams, OrganizationParams
-from sentry.models.notificationaction import NotificationAction
 from sentry.models.organization import Organization
+from sentry.notifications.models.notificationaction import NotificationAction
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/sentry/api/endpoints/organization_dashboard_details.py b/src/sentry/api/endpoints/organization_dashboard_details.py
index 20241d1612703c..cbce7c14fd0f06 100644
--- a/src/sentry/api/endpoints/organization_dashboard_details.py
+++ b/src/sentry/api/endpoints/organization_dashboard_details.py
@@ -3,7 +3,6 @@
 from django.db.models import F
 from django.utils import timezone
 from drf_spectacular.utils import extend_schema
-from rest_framework.permissions import BasePermission
 from rest_framework.request import Request
 from rest_framework.response import Response
 
@@ -31,32 +30,9 @@
 READ_FEATURE = "organizations:dashboards-basic"
 
 
-class DashboardPermissions(BasePermission):
-    """
-    Django Permissions Class for managing Dashboard Edit
-    permissions defined in the DashboardPermissions Model
-    """
-
-    scope_map = {
-        "GET": ["org:read", "org:write", "org:admin"],
-        "POST": ["org:read", "org:write", "org:admin"],
-        "PUT": ["org:read", "org:write", "org:admin"],
-        "DELETE": ["org:read", "org:write", "org:admin"],
-    }
-
-    def has_object_permission(self, request: Request, view, obj):
-        if isinstance(obj, Dashboard) and features.has(
-            "organizations:dashboards-edit-access", obj.organization, actor=request.user
-        ):
-            # Check if user has permissions to edit dashboard
-            if hasattr(obj, "permissions"):
-                return obj.permissions.has_edit_permissions(request.user.id)
-        return True
-
-
 class OrganizationDashboardBase(OrganizationEndpoint):
     owner = ApiOwner.PERFORMANCE
-    permission_classes = (OrganizationDashboardsPermission, DashboardPermissions)
+    permission_classes = (OrganizationDashboardsPermission,)
 
     def convert_args(
         self, request: Request, organization_id_or_slug, dashboard_id, *args, **kwargs
@@ -221,3 +197,42 @@ def post(self, request: Request, organization, dashboard) -> Response:
         dashboard.save(update_fields=["visits", "last_visited"])
 
         return Response(status=204)
+
+
+@region_silo_endpoint
+class OrganizationDashboardFavoriteEndpoint(OrganizationDashboardBase):
+    """
+    Endpoint for managing the favorite status of dashboards for users
+    """
+
+    publish_status = {
+        "PUT": ApiPublishStatus.PRIVATE,
+    }
+
+    def put(self, request: Request, organization, dashboard) -> Response:
+        """
+        Toggle favorite status for current user by adding or removing
+        current user from dashboard favorites
+        """
+        if not features.has("organizations:dashboards-favourite", organization, actor=request.user):
+            return Response(status=404)
+
+        if not features.has(EDIT_FEATURE, organization, actor=request.user):
+            return Response(status=404)
+
+        if isinstance(dashboard, dict):
+            return Response(status=204)
+
+        is_favorited = request.data.get("isFavorited")
+        current_favorites = set(dashboard.favorited_by)
+
+        if is_favorited and request.user.id not in current_favorites:
+            current_favorites.add(request.user.id)
+        elif not is_favorited and request.user.id in current_favorites:
+            current_favorites.remove(request.user.id)
+        else:
+            return Response(status=204)
+
+        dashboard.favorited_by = current_favorites
+
+        return Response(status=204)
diff --git a/src/sentry/api/endpoints/organization_dashboard_widget_details.py b/src/sentry/api/endpoints/organization_dashboard_widget_details.py
index 9b1d56ac27393e..e4ceffa702b60e 100644
--- a/src/sentry/api/endpoints/organization_dashboard_widget_details.py
+++ b/src/sentry/api/endpoints/organization_dashboard_widget_details.py
@@ -37,6 +37,7 @@ def post(self, request: Request, organization) -> Response:
                 "projects": self.get_projects(request, organization),
                 "displayType": request.data.get("displayType"),
                 "environment": request.GET.getlist("environment"),
+                "request": request,
             },
         )
         if not serializer.is_valid():
diff --git a/src/sentry/api/endpoints/organization_dashboards.py b/src/sentry/api/endpoints/organization_dashboards.py
index da0ffa59be03c5..baf206f9ff4e59 100644
--- a/src/sentry/api/endpoints/organization_dashboards.py
+++ b/src/sentry/api/endpoints/organization_dashboards.py
@@ -48,25 +48,40 @@ def has_object_permission(self, request: Request, view, obj):
             return super().has_object_permission(request, view, obj)
 
         if isinstance(obj, Dashboard):
-            # 1. Dashboard contains certain projects
-            if obj.projects.exists():
-                return request.access.has_projects_access(obj.projects.all())
+            if features.has(
+                "organizations:dashboards-edit-access", obj.organization, actor=request.user
+            ):
+                # allow for Managers and Owners
+                if request.access.has_scope("org:write"):
+                    return True
+
+                # check if user is restricted from editing dashboard
+                if hasattr(obj, "permissions"):
+                    return obj.permissions.has_edit_permissions(request.user.id)
+
+                # if no permissions are assigned, it is considered accessible to all users
+                return True
 
-            # 2. Dashboard covers all projects or all my projects
+            else:
+                # 1. Dashboard contains certain projects
+                if obj.projects.exists():
+                    return request.access.has_projects_access(obj.projects.all())
 
-            # allow when Open Membership
-            if obj.organization.flags.allow_joinleave:
-                return True
+                # 2. Dashboard covers all projects or all my projects
 
-            # allow for Managers and Owners
-            if request.access.has_scope("org:write"):
-                return True
+                # allow when Open Membership
+                if obj.organization.flags.allow_joinleave:
+                    return True
 
-            # allow for creator
-            if request.user.id == obj.created_by_id:
-                return True
+                # allow for Managers and Owners
+                if request.access.has_scope("org:write"):
+                    return True
 
-            return False
+                # allow for creator
+                if request.user.id == obj.created_by_id:
+                    return True
+
+                return False
 
         return True
 
@@ -102,7 +117,21 @@ def get(self, request: Request, organization) -> Response:
         if not features.has("organizations:dashboards-basic", organization, actor=request.user):
             return Response(status=404)
 
-        dashboards = Dashboard.objects.filter(organization_id=organization.id)
+        if features.has("organizations:dashboards-favourite", organization, actor=request.user):
+            filter_by = request.query_params.get("filter")
+            if filter_by == "onlyFavorites":
+                dashboards = Dashboard.objects.filter(
+                    organization_id=organization.id, dashboardfavoriteuser__user_id=request.user.id
+                )
+            elif filter_by == "excludeFavorites":
+                dashboards = Dashboard.objects.exclude(
+                    organization_id=organization.id, dashboardfavoriteuser__user_id=request.user.id
+                )
+            else:
+                dashboards = Dashboard.objects.filter(organization_id=organization.id)
+        else:
+            dashboards = Dashboard.objects.filter(organization_id=organization.id)
+
         query = request.GET.get("query")
         if query:
             dashboards = dashboards.filter(title__icontains=query)
@@ -176,7 +205,15 @@ def handle_results(results):
 
         return self.paginate(
             request=request,
-            sources=[prebuilt, dashboards],
+            sources=(
+                [dashboards]
+                if features.has(
+                    "organizations:dashboards-favourite", organization, actor=request.user
+                )
+                and filter_by
+                and filter_by == "onlyFavorites"
+                else [prebuilt, dashboards]
+            ),
             paginator_cls=ChainPaginator,
             on_results=handle_results,
         )
diff --git a/src/sentry/api/endpoints/organization_derive_code_mappings.py b/src/sentry/api/endpoints/organization_derive_code_mappings.py
index 110654113c28c6..485dec0e3f3755 100644
--- a/src/sentry/api/endpoints/organization_derive_code_mappings.py
+++ b/src/sentry/api/endpoints/organization_derive_code_mappings.py
@@ -11,6 +11,7 @@
     OrganizationIntegrationsLoosePermission,
 )
 from sentry.api.serializers import serialize
+from sentry.integrations.github.integration import GitHubIntegration
 from sentry.integrations.utils.code_mapping import (
     CodeMapping,
     CodeMappingTreesHelper,
@@ -45,7 +46,7 @@ def get(self, request: Request, organization: Organization) -> Response:
             return Response(status=status.HTTP_403_FORBIDDEN)
 
         stacktrace_filename = request.GET.get("stacktraceFilename")
-        installation, _ = get_installation(organization)
+        installation, _ = get_installation(organization)  # only returns GitHub integrations
         if not installation:
             return self.respond(
                 {"text": "Could not find this integration installed on your organization"},
@@ -53,7 +54,14 @@ def get(self, request: Request, organization: Organization) -> Response:
             )
 
         # This method is specific to the GithubIntegration
-        trees = installation.get_trees_for_org()  # type: ignore[attr-defined]
+        if not isinstance(installation, GitHubIntegration):
+            return self.respond(
+                {
+                    "text": f"The {installation.model.provider} integration does not support derived code mappings"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        trees = installation.get_trees_for_org()
         trees_helper = CodeMappingTreesHelper(trees)
         possible_code_mappings: list[dict[str, str]] = []
         resp_status: int = status.HTTP_204_NO_CONTENT
diff --git a/src/sentry/api/endpoints/organization_details.py b/src/sentry/api/endpoints/organization_details.py
index 22c97e291220b2..21050245f03704 100644
--- a/src/sentry/api/endpoints/organization_details.py
+++ b/src/sentry/api/endpoints/organization_details.py
@@ -42,7 +42,6 @@
 from sentry.auth.staff import is_active_staff
 from sentry.constants import (
     ACCOUNT_RATE_LIMIT_DEFAULT,
-    AI_SUGGESTED_SOLUTION,
     ALERTS_MEMBER_WRITE_DEFAULT,
     ATTACHMENTS_ROLE_DEFAULT,
     DEBUG_FILES_ROLE_DEFAULT,
@@ -180,12 +179,6 @@
     ("relayPiiConfig", "sentry:relay_pii_config", str, None),
     ("allowJoinRequests", "sentry:join_requests", bool, JOIN_REQUESTS_DEFAULT),
     ("apdexThreshold", "sentry:apdex_threshold", int, None),
-    (
-        "aiSuggestedSolution",
-        "sentry:ai_suggested_solution",
-        bool,
-        AI_SUGGESTED_SOLUTION,
-    ),
     (
         "hideAiFeatures",
         "sentry:hide_ai_features",
@@ -282,7 +275,6 @@ class OrganizationSerializer(BaseOrganizationSerializer):
     scrubIPAddresses = serializers.BooleanField(required=False)
     scrapeJavaScript = serializers.BooleanField(required=False)
     isEarlyAdopter = serializers.BooleanField(required=False)
-    aiSuggestedSolution = serializers.BooleanField(required=False)
     hideAiFeatures = serializers.BooleanField(required=False)
     codecovAccess = serializers.BooleanField(required=False)
     githubOpenPRBot = serializers.BooleanField(required=False)
@@ -665,10 +657,6 @@ class OrganizationDetailsPutSerializer(serializers.Serializer):
         help_text="Specify `true` to opt-in to new features before they're released to the public.",
         required=False,
     )
-    aiSuggestedSolution = serializers.BooleanField(
-        help_text="Specify `true` to opt-in to [AI Suggested Solution](/product/issues/issue-details/ai-suggested-solution/) to get AI help on how to solve an issue.",
-        required=False,
-    )
     hideAiFeatures = serializers.BooleanField(
         help_text="Specify `true` to hide AI features from the organization.",
         required=False,
@@ -1048,7 +1036,7 @@ def _compute_project_target_sample_rates(self, organization):
                 error_sample_rate_fallback=None,
             )
             if current_rate:
-                project.update_option("sentry:target_sample_rate", current_rate)
+                project.update_option("sentry:target_sample_rate", round(current_rate, 4))
 
     def handle_delete(self, request: Request, organization: Organization):
         """
diff --git a/src/sentry/api/endpoints/organization_events.py b/src/sentry/api/endpoints/organization_events.py
index ca38e88b020406..938f8609eb01e1 100644
--- a/src/sentry/api/endpoints/organization_events.py
+++ b/src/sentry/api/endpoints/organization_events.py
@@ -70,12 +70,24 @@ class DiscoverDatasetSplitException(Exception):
     Referrer.API_PERFORMANCE_BROWSER_WEB_VITALS_TRANSACTIONS_SCORES.value,
     Referrer.API_PERFORMANCE_CACHE_LANDING_CACHE_TRANSACTION_LIST.value,
     Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_APDEX_AREA.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_COLD_STARTUP_AREA.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_WARM_STARTUP_AREA.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_FAILURE_RATE_AREA.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_FROZEN_FRAMES_AREA.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_SLOW_FRAMES_AREA.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_SLOW_SCREENS_BY_COLD_START.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_SLOW_SCREENS_BY_WARM_START.value,
     Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_HIGHEST_CACHE_MISS_RATE_TRANSACTIONS.value,
     Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_MOST_FROZEN_FRAMES.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_MOST_RELATED_ISSUES.value,
     Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_MOST_SLOW_FRAMES.value,
     Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_MOST_TIME_CONSUMING_DOMAINS.value,
     Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_MOST_TIME_CONSUMING_RESOURCES.value,
     Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_MOST_TIME_SPENT_DB_QUERIES.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_P50_DURATION_AREA.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_P75_DURATION_AREA.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_P95_DURATION_AREA.value,
+    Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_P99_DURATION_AREA.value,
     Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_SLOW_DB_OPS.value,
     Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_SLOW_HTTP_OPS.value,
     Referrer.API_PERFORMANCE_GENERIC_WIDGET_CHART_SLOW_RESOURCE_OPS.value,
@@ -422,7 +434,7 @@ def get(self, request: Request, organization) -> Response:
 
         def _data_fn(scoped_dataset, offset, limit, query) -> dict[str, Any]:
             if use_rpc and dataset == spans_eap:
-                spans_rpc.run_table_query(
+                return spans_rpc.run_table_query(
                     params=snuba_params,
                     query_string=query,
                     selected_columns=self.get_field_list(organization, request),
diff --git a/src/sentry/api/endpoints/organization_events_stats.py b/src/sentry/api/endpoints/organization_events_stats.py
index caa829904bf217..c2c55d1f84f076 100644
--- a/src/sentry/api/endpoints/organization_events_stats.py
+++ b/src/sentry/api/endpoints/organization_events_stats.py
@@ -1,5 +1,5 @@
-from collections.abc import Mapping, Sequence
-from datetime import datetime, timedelta
+from collections.abc import Mapping
+from datetime import timedelta
 from typing import Any
 
 import sentry_sdk
@@ -14,6 +14,7 @@
 from sentry.constants import MAX_TOP_EVENTS
 from sentry.models.dashboard_widget import DashboardWidget, DashboardWidgetTypes
 from sentry.models.organization import Organization
+from sentry.search.eap.types import SearchResolverConfig
 from sentry.search.events.types import SnubaParams
 from sentry.snuba import (
     discover,
@@ -21,10 +22,10 @@
     functions,
     metrics_enhanced_performance,
     metrics_performance,
-    profile_functions_metrics,
     spans_eap,
     spans_indexed,
     spans_metrics,
+    spans_rpc,
     transactions,
 )
 from sentry.snuba.metrics.extraction import MetricSpecType
@@ -251,7 +252,6 @@ def get(self, request: Request, organization: Organization) -> Response:
                         functions,
                         metrics_performance,
                         metrics_enhanced_performance,
-                        profile_functions_metrics,
                         spans_indexed,
                         spans_metrics,
                         spans_eap,
@@ -274,17 +274,33 @@ def get(self, request: Request, organization: Organization) -> Response:
             return Response({"detail": f"Metric type must be one of: {metric_types}"}, status=400)
 
         force_metrics_layer = request.GET.get("forceMetricsLayer") == "true"
+        use_rpc = request.GET.get("useRpc", "0") == "1"
 
         def _get_event_stats(
             scoped_dataset: Any,
-            query_columns: Sequence[str],
+            query_columns: list[str],
             query: str,
             snuba_params: SnubaParams,
             rollup: int,
             zerofill_results: bool,
-            comparison_delta: datetime | None,
+            comparison_delta: timedelta | None,
         ) -> SnubaTSResult | dict[str, SnubaTSResult]:
             if top_events > 0:
+                if use_rpc and dataset == spans_eap:
+                    return spans_rpc.run_top_events_timeseries_query(
+                        params=snuba_params,
+                        query_string=query,
+                        y_axes=query_columns,
+                        raw_groupby=self.get_field_list(organization, request),
+                        orderby=self.get_orderby(request),
+                        limit=top_events,
+                        referrer=referrer,
+                        granularity_secs=rollup,
+                        config=SearchResolverConfig(
+                            auto_fields=False,
+                            use_aggregate_conditions=False,
+                        ),
+                    )
                 return scoped_dataset.top_events_timeseries(
                     timeseries_columns=query_columns,
                     selected_columns=self.get_field_list(organization, request),
@@ -309,6 +325,22 @@ def _get_event_stats(
                     ),
                 )
 
+            if use_rpc and dataset == spans_eap:
+                return spans_rpc.run_timeseries_query(
+                    params=snuba_params,
+                    query_string=query,
+                    y_axes=query_columns,
+                    granularity_secs=rollup,
+                    referrer=referrer,
+                    config=SearchResolverConfig(
+                        auto_fields=False,
+                        use_aggregate_conditions=False,
+                    ),
+                    comparison_delta=comparison_delta,
+                )
+
+            transform_alias_to_input_format = request.GET.get("transformAliasToInputFormat") == "1"
+
             return scoped_dataset.timeseries_query(
                 selected_columns=query_columns,
                 query=query,
@@ -338,6 +370,7 @@ def _get_event_stats(
                     organization,
                     actor=request.user,
                 ),
+                transform_alias_to_input_format=transform_alias_to_input_format,
             )
 
         def get_event_stats_factory(scoped_dataset):
@@ -350,12 +383,12 @@ def get_event_stats_factory(scoped_dataset):
             dashboard_widget_id = request.GET.get("dashboardWidgetId", None)
 
             def fn(
-                query_columns: Sequence[str],
+                query_columns: list[str],
                 query: str,
                 snuba_params: SnubaParams,
                 rollup: int,
                 zerofill_results: bool,
-                comparison_delta: datetime | None,
+                comparison_delta: timedelta | None,
             ) -> SnubaTSResult | dict[str, SnubaTSResult]:
 
                 if not (metrics_enhanced and dashboard_widget_id):
@@ -519,6 +552,12 @@ def fn(
             return fn
 
         get_event_stats = get_event_stats_factory(dataset)
+        zerofill_results = not (
+            request.GET.get("withoutZerofill") == "1" and has_chart_interpolation
+        )
+        if use_rpc:
+            # The rpc will usually zerofill for us so we don't need to do it ourselves
+            zerofill_results = False
 
         try:
             return Response(
@@ -528,9 +567,7 @@ def fn(
                     get_event_stats,
                     top_events,
                     allow_partial_buckets=allow_partial_buckets,
-                    zerofill_results=not (
-                        request.GET.get("withoutZerofill") == "1" and has_chart_interpolation
-                    ),
+                    zerofill_results=zerofill_results,
                     comparison_delta=comparison_delta,
                     dataset=dataset,
                 ),
diff --git a/src/sentry/api/endpoints/organization_fork.py b/src/sentry/api/endpoints/organization_fork.py
index 52ed47960682c5..5a1aff9d7e50a7 100644
--- a/src/sentry/api/endpoints/organization_fork.py
+++ b/src/sentry/api/endpoints/organization_fork.py
@@ -145,13 +145,14 @@ def post(self, request: Request, organization_id_or_slug) -> Response:
         # We do not create a `RelocationFile` yet. Instead, we trigger a series of RPC calls (via
         # `uploading_start`, scheduled below) to create an export of the organization we are seeking
         # duplicate from the foreign region.
+        provenance = Relocation.Provenance.SAAS_TO_SAAS
         with atomic_transaction(using=(router.db_for_write(Relocation))):
             new_relocation: Relocation = Relocation.objects.create(
                 creator_id=request.user.id,
                 owner_id=owner.id,
                 step=Relocation.Step.UPLOADING.value,
-                scheduled_pause_at_step=get_autopause_value(),
-                provenance=Relocation.Provenance.SAAS_TO_SAAS,
+                scheduled_pause_at_step=get_autopause_value(provenance),
+                provenance=provenance,
                 want_org_slugs=[org_mapping.slug],
             )
 
diff --git a/src/sentry/api/endpoints/organization_index.py b/src/sentry/api/endpoints/organization_index.py
index 0cf1493ab8776f..45dfb2131681c4 100644
--- a/src/sentry/api/endpoints/organization_index.py
+++ b/src/sentry/api/endpoints/organization_index.py
@@ -1,3 +1,5 @@
+import logging
+
 from django.conf import settings
 from django.db import IntegrityError
 from django.db.models import Count, Q, Sum
@@ -35,6 +37,8 @@
 from sentry.signals import org_setup_complete, terms_accepted
 from sentry.users.services.user.service import user_service
 
+logger = logging.getLogger(__name__)
+
 
 class OrganizationPostSerializer(BaseOrganizationSerializer):
     defaultTeam = serializers.BooleanField(required=False)
@@ -120,6 +124,9 @@ def get(self, request: Request) -> Response:
                     "organization"
                 )
             )
+            if request.auth and request.auth.organization_id is not None and queryset.count() > 1:
+                # If a token is limited to one organization, this endpoint should only return that one organization
+                queryset = queryset.filter(id=request.auth.organization_id)
 
         query = request.GET.get("query")
         if query:
diff --git a/src/sentry/api/endpoints/organization_member/index.py b/src/sentry/api/endpoints/organization_member/index.py
index d92ac5988194c2..a1c2654784fadb 100644
--- a/src/sentry/api/endpoints/organization_member/index.py
+++ b/src/sentry/api/endpoints/organization_member/index.py
@@ -137,6 +137,10 @@ def validate_role(self, role):
         return self.validate_orgRole(role)
 
     def validate_orgRole(self, role):
+        if role == "billing" and features.has(
+            "organizations:invite-billing", self.context["organization"]
+        ):
+            return role
         role_obj = next((r for r in self.context["allowed_roles"] if r.id == role), None)
         if role_obj is None:
             raise serializers.ValidationError(
@@ -314,13 +318,18 @@ def post(self, request: Request, organization) -> Response:
         """
         Add or invite a member to an organization.
         """
-        if not features.has("organizations:invite-members", organization, actor=request.user):
+        assigned_org_role = request.data.get("orgRole") or request.data.get("role")
+        billing_bypass = assigned_org_role == "billing" and features.has(
+            "organizations:invite-billing", organization
+        )
+        if not billing_bypass and not features.has(
+            "organizations:invite-members", organization, actor=request.user
+        ):
             return Response(
                 {"organization": "Your organization is not allowed to invite members"}, status=403
             )
 
         allowed_roles = get_allowed_org_roles(request, organization, creating_org_invite=True)
-        assigned_org_role = request.data.get("orgRole") or request.data.get("role")
 
         # We allow requests from integration tokens to invite new members as the member role only
         if not allowed_roles and request.access.is_integration_token:
diff --git a/src/sentry/api/endpoints/organization_member_unreleased_commits.py b/src/sentry/api/endpoints/organization_member_unreleased_commits.py
deleted file mode 100644
index 4d49426ab48613..00000000000000
--- a/src/sentry/api/endpoints/organization_member_unreleased_commits.py
+++ /dev/null
@@ -1,92 +0,0 @@
-from django.db import connections
-
-from sentry.api.api_owners import ApiOwner
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import OrganizationMemberEndpoint
-from sentry.api.serializers import serialize
-from sentry.models.commit import Commit
-from sentry.models.repository import Repository
-from sentry.users.services.user.service import user_service
-
-# TODO(dcramer): once LatestRepoReleaseEnvironment is backfilled, change this query to use the new
-# schema [performance]
-query = """
-select c1.*
-from sentry_commit c1
-join (
-    select max(c2.date_added) as date_added, c2.repository_id
-    from sentry_commit as c2
-    join (
-        select distinct commit_id from sentry_releasecommit
-        where organization_id = %%s
-    ) as rc2
-    on c2.id = rc2.commit_id
-    group by c2.repository_id
-) as cmax
-on c1.repository_id = cmax.repository_id
-where c1.date_added > cmax.date_added
-and c1.author_id IN (
-    select id
-    from sentry_commitauthor
-    where organization_id = %%s
-    and upper(email) IN (%s)
-)
-order by c1.date_added desc
-"""
-
-quote_name = connections["default"].ops.quote_name
-
-
-from rest_framework.request import Request
-from rest_framework.response import Response
-
-
-@region_silo_endpoint
-class OrganizationMemberUnreleasedCommitsEndpoint(OrganizationMemberEndpoint):
-    owner = ApiOwner.UNOWNED
-    publish_status = {
-        "GET": ApiPublishStatus.UNKNOWN,
-    }
-
-    def get(self, request: Request, organization, member) -> Response:
-        user = user_service.get_user(member.user_id)
-        if user is None:
-            email_list = []
-        else:
-            email_list = [e.email for e in user.useremails if e.is_verified]
-
-        if not email_list:
-            return self.respond(
-                {"commits": [], "repositories": {}, "errors": {"missing_emails": True}}
-            )
-
-        params = [organization.id, organization.id]
-        for e in email_list:
-            params.append(e.upper())
-
-        queryset = Commit.objects.raw(query % (", ".join("%s" for _ in email_list),), params)
-
-        results = list(queryset)
-
-        if results:
-            repos = list(Repository.objects.filter(id__in={r.repository_id for r in results}))
-        else:
-            repos = []
-
-        return self.respond(
-            {
-                "commits": [
-                    {
-                        "id": c.key,
-                        "message": c.message,
-                        "dateCreated": c.date_added,
-                        "repositoryID": str(c.repository_id),
-                    }
-                    for c in results
-                ],
-                "repositories": {
-                    str(r.id): d for r, d in zip(repos, serialize(repos, request.user))
-                },
-            }
-        )
diff --git a/src/sentry/api/endpoints/organization_metrics_samples.py b/src/sentry/api/endpoints/organization_metrics_samples.py
deleted file mode 100644
index f81916c0159c8d..00000000000000
--- a/src/sentry/api/endpoints/organization_metrics_samples.py
+++ /dev/null
@@ -1,107 +0,0 @@
-import sentry_sdk
-from rest_framework import serializers
-from rest_framework.exceptions import ParseError
-from rest_framework.request import Request
-from rest_framework.response import Response
-
-from sentry.api.api_owners import ApiOwner
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
-from sentry.api.paginator import GenericOffsetPaginator
-from sentry.api.utils import handle_query_errors
-from sentry.exceptions import InvalidSearchQuery
-from sentry.models.organization import Organization
-from sentry.sentry_metrics.querying.samples_list import get_sample_list_executor_cls
-from sentry.snuba.metrics.naming_layer.mri import is_mri
-from sentry.snuba.referrer import Referrer
-from sentry.utils.dates import get_rollup_from_request
-from sentry.utils.snuba import SnubaError
-
-
-class MetricsSamplesSerializer(serializers.Serializer):
-    mri = serializers.CharField(required=True)
-    field = serializers.ListField(required=True, allow_empty=False, child=serializers.CharField())
-    max = serializers.FloatField(required=False)
-    min = serializers.FloatField(required=False)
-    operation = serializers.CharField(required=False)
-    query = serializers.CharField(required=False)
-    referrer = serializers.CharField(required=False)
-    sort = serializers.CharField(required=False)
-
-    def validate_mri(self, mri: str) -> str:
-        if not is_mri(mri):
-            raise serializers.ValidationError(f"Invalid MRI: {mri}")
-
-        return mri
-
-
-@region_silo_endpoint
-class OrganizationMetricsSamplesEndpoint(OrganizationEventsV2EndpointBase):
-    publish_status = {
-        "GET": ApiPublishStatus.EXPERIMENTAL,
-    }
-    owner = ApiOwner.TELEMETRY_EXPERIENCE
-    snuba_methods = ["GET"]
-
-    def get(self, request: Request, organization: Organization) -> Response:
-        try:
-            snuba_params = self.get_snuba_params(request, organization)
-        except NoProjects:
-            return Response(status=404)
-
-        try:
-            rollup = get_rollup_from_request(
-                request,
-                snuba_params.end_date - snuba_params.start_date,
-                default_interval=None,
-                error=InvalidSearchQuery(),
-            )
-        except InvalidSearchQuery:
-            rollup = 3600  # use a default of 1 hour
-
-        serializer = MetricsSamplesSerializer(data=request.GET)
-        if not serializer.is_valid():
-            return Response(serializer.errors, status=400)
-
-        serialized = serializer.validated_data
-
-        executor_cls = get_sample_list_executor_cls(serialized["mri"])
-        if not executor_cls:
-            raise ParseError(f"Unsupported MRI: {serialized['mri']}")
-
-        sort = serialized.get("sort")
-        if sort is not None:
-            column = sort[1:] if sort.startswith("-") else sort
-            if not executor_cls.supports_sort(column):
-                raise ParseError(f"Unsupported sort: {sort} for MRI")
-
-        executor = executor_cls(
-            mri=serialized["mri"],
-            snuba_params=snuba_params,
-            fields=serialized["field"],
-            operation=serialized.get("operation"),
-            query=serialized.get("query", ""),
-            min=serialized.get("min"),
-            max=serialized.get("max"),
-            sort=serialized.get("sort"),
-            rollup=rollup,
-            referrer=Referrer.API_ORGANIZATION_METRICS_SAMPLES,
-        )
-
-        with handle_query_errors():
-            try:
-                return self.paginate(
-                    request=request,
-                    paginator=GenericOffsetPaginator(data_fn=executor.get_matching_spans),
-                    on_results=lambda results: self.handle_results_with_meta(
-                        request,
-                        organization,
-                        snuba_params.project_ids,
-                        results,
-                        standard_meta=True,
-                    ),
-                )
-            except SnubaError as exc:
-                sentry_sdk.capture_exception(exc)
-                raise
diff --git a/src/sentry/api/endpoints/organization_onboarding_tasks.py b/src/sentry/api/endpoints/organization_onboarding_tasks.py
index bdb047816d7dbf..7d72ba0339af03 100644
--- a/src/sentry/api/endpoints/organization_onboarding_tasks.py
+++ b/src/sentry/api/endpoints/organization_onboarding_tasks.py
@@ -43,7 +43,7 @@ def post(self, request: Request, organization) -> Response:
         # Cannot skip unskippable tasks
         if (
             status == OnboardingTaskStatus.SKIPPED
-            and task_id not in onboarding_tasks.get_skippable_tasks(organization)
+            and task_id not in onboarding_tasks.get_skippable_tasks(organization, request.user)
         ):
             return Response(status=422)
 
@@ -63,7 +63,7 @@ def post(self, request: Request, organization) -> Response:
         )
 
         if rows_affected or created:
-            onboarding_tasks.try_mark_onboarding_complete(organization.id)
+            onboarding_tasks.try_mark_onboarding_complete(organization.id, request.user)
 
         return Response(status=204)
 
diff --git a/src/sentry/api/endpoints/organization_profiling_profiles.py b/src/sentry/api/endpoints/organization_profiling_profiles.py
index 46fb9e0217b46f..3dbd6da5031f69 100644
--- a/src/sentry/api/endpoints/organization_profiling_profiles.py
+++ b/src/sentry/api/endpoints/organization_profiling_profiles.py
@@ -1,4 +1,3 @@
-import sentry_sdk
 from django.http import HttpResponse
 from rest_framework import serializers
 from rest_framework.exceptions import ParseError
@@ -15,13 +14,7 @@
 from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
-from sentry.profiles.flamegraph import (
-    FlamegraphExecutor,
-    get_chunks_from_spans_metadata,
-    get_profile_ids,
-    get_profiles_with_function,
-    get_spans_from_group,
-)
+from sentry.profiles.flamegraph import FlamegraphExecutor
 from sentry.profiles.profile_chunks import get_chunk_ids
 from sentry.profiles.utils import proxy_profiling_service
 from sentry.snuba.dataset import Dataset, StorageKey
@@ -71,36 +64,6 @@ def get(self, request: Request, organization: Organization) -> HttpResponse:
         if not features.has("organizations:profiling", organization, actor=request.user):
             return Response(status=404)
 
-        if not features.has(
-            "organizations:continuous-profiling-compat", organization, actor=request.user
-        ):
-            snuba_params = self.get_snuba_params(request, organization)
-
-            project_ids = snuba_params.project_ids
-            if len(project_ids) > 1:
-                raise ParseError(detail="You cannot get a flamegraph from multiple projects.")
-
-            if request.query_params.get("fingerprint"):
-                sentry_sdk.set_tag("data source", "functions")
-                function_fingerprint = int(request.query_params["fingerprint"])
-
-                profile_ids = get_profiles_with_function(
-                    organization.id,
-                    project_ids[0],
-                    function_fingerprint,
-                    snuba_params,
-                    request.GET.get("query", ""),
-                )
-            else:
-                sentry_sdk.set_tag("data source", "profiles")
-                profile_ids = get_profile_ids(snuba_params, request.query_params.get("query", None))
-
-            return proxy_profiling_service(
-                method="POST",
-                path=f"/organizations/{organization.id}/projects/{project_ids[0]}/flamegraph",
-                json_data=profile_ids,
-            )
-
         try:
             snuba_params = self.get_snuba_params(request, organization)
         except NoProjects:
@@ -163,38 +126,6 @@ def get(self, request: Request, organization: Organization) -> HttpResponse:
         )
 
 
-@region_silo_endpoint
-class OrganizationProfilingChunksFlamegraphEndpoint(OrganizationProfilingBaseEndpoint):
-    def get(self, request: Request, organization: Organization) -> HttpResponse:
-        if not features.has("organizations:profiling", organization, actor=request.user):
-            return Response(status=404)
-
-        snuba_params = self.get_snuba_params(request, organization)
-
-        project_ids = snuba_params.project_ids
-        if len(project_ids) != 1:
-            raise ParseError(detail="one project_id must be specified.")
-
-        span_group = request.query_params.get("span_group")
-        if span_group is None:
-            raise ParseError(detail="span_group must be specified.")
-
-        spans = get_spans_from_group(
-            organization.id,
-            project_ids[0],
-            snuba_params,
-            span_group,
-        )
-
-        chunksMetadata = get_chunks_from_spans_metadata(organization.id, project_ids[0], spans)
-
-        return proxy_profiling_service(
-            method="POST",
-            path=f"/organizations/{organization.id}/projects/{project_ids[0]}/chunks-flamegraph",
-            json_data={"chunks_metadata": chunksMetadata},
-        )
-
-
 @region_silo_endpoint
 class OrganizationProfilingHasChunksEndpoint(OrganizationProfilingBaseEndpoint):
     def get(self, request: Request, organization: Organization) -> HttpResponse:
diff --git a/src/sentry/api/endpoints/organization_sampling_project_rates.py b/src/sentry/api/endpoints/organization_sampling_project_rates.py
index c02bb7c931378d..7036c4d604000c 100644
--- a/src/sentry/api/endpoints/organization_sampling_project_rates.py
+++ b/src/sentry/api/endpoints/organization_sampling_project_rates.py
@@ -123,7 +123,7 @@ def put(self, request: Request, organization: Organization) -> Response:
         project_ids = {int(d["id"]) for d in serializer.data}
         projects = self.get_projects(request, organization, project_ids=project_ids)
 
-        rate_by_project = {d["id"]: d["sampleRate"] for d in serializer.data}
+        rate_by_project = {d["id"]: round(d["sampleRate"], 4) for d in serializer.data}
         with transaction.atomic(router.db_for_write(ProjectOption)):
             for project in projects:
                 project.update_option(OPTION_KEY, rate_by_project[project.id])
diff --git a/src/sentry/api/endpoints/organization_sampling_project_span_counts.py b/src/sentry/api/endpoints/organization_sampling_project_span_counts.py
index 3d4f79bc8d3ee4..177c107f1939b4 100644
--- a/src/sentry/api/endpoints/organization_sampling_project_span_counts.py
+++ b/src/sentry/api/endpoints/organization_sampling_project_span_counts.py
@@ -43,7 +43,7 @@ def get(self, request: Request, organization: Organization) -> Response:
             Project.objects.filter(organization=organization, status=ObjectStatus.ACTIVE)
         )
         mql = f"sum({SpanMRI.COUNT_PER_ROOT_PROJECT.value}) by (project,target_project_id)"
-        query = MQLQuery(mql=mql, order=QueryOrder.DESC)
+        query = MQLQuery(mql=mql, order=QueryOrder.DESC, limit=10000)
         results = run_queries(
             mql_queries=[query],
             start=start,
diff --git a/src/sentry/api/endpoints/organization_spans_fields.py b/src/sentry/api/endpoints/organization_spans_fields.py
index e96b3ca45efed5..dc3f0a5f03add3 100644
--- a/src/sentry/api/endpoints/organization_spans_fields.py
+++ b/src/sentry/api/endpoints/organization_spans_fields.py
@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 from datetime import timedelta
+from typing import Literal
 
 import sentry_sdk
 from google.protobuf.timestamp_pb2 import Timestamp
@@ -7,15 +8,11 @@
 from rest_framework.exceptions import ParseError
 from rest_framework.request import Request
 from rest_framework.response import Response
-from sentry_protos.snuba.v1.trace_item_attribute_pb2 import AttributeKey
-from sentry_protos.snuba.v1alpha.endpoint_tags_list_pb2 import (
-    AttributeValuesRequest,
-    AttributeValuesResponse,
-    TraceItemAttributesRequest,
-    TraceItemAttributesResponse,
+from sentry_protos.snuba.v1.endpoint_trace_item_attributes_pb2 import (
+    TraceItemAttributeNamesRequest,
+    TraceItemAttributeValuesRequest,
 )
-from sentry_protos.snuba.v1alpha.request_common_pb2 import RequestMeta, TraceItemName
-from sentry_protos.snuba.v1alpha.trace_item_attribute_pb2 import AttributeKey as AlphaAttributeKey
+from sentry_protos.snuba.v1.trace_item_attribute_pb2 import AttributeKey
 from sentry_relay.consts import SPAN_STATUS_CODE_TO_NAME
 from snuba_sdk import Condition, Op
 
@@ -29,6 +26,7 @@
 from sentry.api.serializers import serialize
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
+from sentry.search.eap.columns import translate_internal_to_public_alias
 from sentry.search.eap.spans import SearchResolver
 from sentry.search.eap.types import SearchResolverConfig
 from sentry.search.events.builder.base import BaseQueryBuilder
@@ -39,15 +37,23 @@
 from sentry.tagstore.types import TagKey, TagValue
 from sentry.utils import snuba_rpc
 
-# This causes problems if a user sends an attribute with any of these values
-# but the meta table currently can't handle that anyways
-# More users will see the 3 of these since they're on everything so lets try to make
-# the common usecase more reasonable
-TAG_NAME_MAPPING = {
-    "segment_name": "transaction",
-    "name": "span.description",
-    "service": "project",
-}
+
+def as_tag_key(name: str, type: Literal["string", "number"]):
+    key = translate_internal_to_public_alias(name, type)
+
+    if key is not None:
+        name = key
+    elif type == "number":
+        key = f"tags[{name},number]"
+    else:
+        key = name
+
+    return {
+        # key is what will be used to query the API
+        "key": key,
+        # name is what will be used to display the tag nicely in the UI
+        "name": name,
+    }
 
 
 class OrganizationSpansFieldsEndpointBase(OrganizationEventsV2EndpointBase):
@@ -62,13 +68,7 @@ class OrganizationSpansFieldsEndpointSerializer(serializers.Serializer):
         ["spans", "spansIndexed"], required=False, default="spansIndexed"
     )
     type = serializers.ChoiceField(["string", "number"], required=False)
-
-    def validate_type(self, value):
-        if value == "string":
-            return AlphaAttributeKey.Type.TYPE_STRING
-        if value == "number":
-            return AlphaAttributeKey.Type.TYPE_FLOAT
-        raise NotImplementedError
+    process = serializers.BooleanField(required=False)
 
     def validate(self, attrs):
         if attrs["dataset"] == "spans" and attrs.get("type") is None:
@@ -101,42 +101,40 @@ def get(self, request: Request, organization: Organization) -> Response:
 
         max_span_tags = options.get("performance.spans-tags-key.max")
 
-        if serialized["dataset"] == "spans" and features.has(
-            "organizations:visibility-explore-dataset", organization, actor=request.user
-        ):
-            start_timestamp = Timestamp()
-            start_timestamp.FromDatetime(
-                snuba_params.start_date.replace(hour=0, minute=0, second=0, microsecond=0)
+        if serialized["dataset"] == "spans":
+            snuba_params.start = snuba_params.start_date.replace(
+                hour=0, minute=0, second=0, microsecond=0
             )
+            snuba_params.end = snuba_params.end_date.replace(
+                hour=0, minute=0, second=0, microsecond=0
+            ) + timedelta(days=1)
 
-            end_timestamp = Timestamp()
-            end_timestamp.FromDatetime(
-                snuba_params.end_date.replace(hour=0, minute=0, second=0, microsecond=0)
-                + timedelta(days=1)
-            )
+            resolver = SearchResolver(params=snuba_params, config=SearchResolverConfig())
+            meta = resolver.resolve_meta(referrer=Referrer.API_SPANS_TAG_KEYS_RPC.value)
 
-            rpc_request = TraceItemAttributesRequest(
-                meta=RequestMeta(
-                    organization_id=organization.id,
-                    cogs_category="performance",
-                    referrer=Referrer.API_SPANS_TAG_KEYS_RPC.value,
-                    project_ids=snuba_params.project_ids,
-                    start_timestamp=start_timestamp,
-                    end_timestamp=end_timestamp,
-                    trace_item_name=TraceItemName.TRACE_ITEM_NAME_EAP_SPANS,
-                ),
+            rpc_request = TraceItemAttributeNamesRequest(
+                meta=meta,
                 limit=max_span_tags,
                 offset=0,
-                type=serialized["type"],
+                type=(
+                    AttributeKey.Type.TYPE_FLOAT
+                    if serialized["type"] == "number"
+                    else AttributeKey.Type.TYPE_STRING
+                ),
             )
-            rpc_response = snuba_rpc.rpc(rpc_request, TraceItemAttributesResponse)
+
+            rpc_response = snuba_rpc.attribute_names_rpc(rpc_request)
 
             paginator = ChainPaginator(
                 [
                     [
-                        TagKey(TAG_NAME_MAPPING.get(tag.name, tag.name))
-                        for tag in rpc_response.tags
-                        if tag.name
+                        (
+                            as_tag_key(attribute.name, serialized["type"])
+                            if serialized["process"]
+                            else TagKey(attribute.name)
+                        )
+                        for attribute in rpc_response.attributes
+                        if attribute.name
                     ],
                 ],
                 max_limit=max_span_tags,
@@ -217,9 +215,7 @@ def get(self, request: Request, organization: Organization, key: str) -> Respons
 
         executor: BaseSpanFieldValuesAutocompletionExecutor
 
-        if serialized["dataset"] == "spans" and features.has(
-            "organizations:visibility-explore-dataset", organization, actor=request.user
-        ):
+        if serialized["dataset"] == "spans":
             executor = EAPSpanFieldValuesAutocompletionExecutor(
                 organization=organization,
                 snuba_params=snuba_params,
@@ -408,15 +404,14 @@ def __init__(
         max_span_tag_values: int,
     ):
         super().__init__(organization, snuba_params, key, query, max_span_tag_values)
+        self.resolver = SearchResolver(params=snuba_params, config=SearchResolverConfig())
         self.attribute_key = self.resolve_attribute_key(key, snuba_params)
 
     def resolve_attribute_key(self, key: str, snuba_params: SnubaParams) -> AttributeKey | None:
-        resolver = SearchResolver(params=snuba_params, config=SearchResolverConfig())
-        resolved, _ = resolver.resolve_attribute(key)
-        proto = resolved.proto_definition
-        if not isinstance(proto, AttributeKey):
+        resolved, _ = self.resolver.resolve_attribute(key)
+        if resolved.search_type != "string":
             return None
-        return proto
+        return resolved.proto_definition
 
     def execute(self) -> list[TagValue]:
         if self.key in self.PROJECT_ID_KEYS:
@@ -443,31 +438,24 @@ def default_autocomplete_function(self) -> list[TagValue]:
         )
 
         query = translate_escape_sequences(self.query)
-        rpc_request = AttributeValuesRequest(
-            meta=RequestMeta(
-                organization_id=self.organization.id,
-                cogs_category="performance",
-                referrer=Referrer.API_SPANS_TAG_VALUES_RPC.value,
-                project_ids=self.snuba_params.project_ids,
-                start_timestamp=start_timestamp,
-                end_timestamp=end_timestamp,
-                trace_item_name=TraceItemName.TRACE_ITEM_NAME_EAP_SPANS,
-            ),
-            name=self.attribute_key.name,
+
+        meta = self.resolver.resolve_meta(referrer=Referrer.API_SPANS_TAG_VALUES_RPC.value)
+        rpc_request = TraceItemAttributeValuesRequest(
+            meta=meta,
+            key=self.attribute_key,
             value_substring_match=query,
             limit=self.max_span_tag_values,
-            offset=0,
         )
-        rpc_response = snuba_rpc.rpc(rpc_request, AttributeValuesResponse)
+        rpc_response = snuba_rpc.attribute_values_rpc(rpc_request)
 
         return [
             TagValue(
                 key=self.key,
-                value=tag_value,
+                value=value,
                 times_seen=None,
                 first_seen=None,
                 last_seen=None,
             )
-            for tag_value in rpc_response.values
-            if tag_value
+            for value in rpc_response.values
+            if value
         ]
diff --git a/src/sentry/api/endpoints/organization_tags.py b/src/sentry/api/endpoints/organization_tags.py
index 197210992ecd40..ccaeeeaa10d658 100644
--- a/src/sentry/api/endpoints/organization_tags.py
+++ b/src/sentry/api/endpoints/organization_tags.py
@@ -1,16 +1,18 @@
+import datetime
+
 import sentry_sdk
 from rest_framework.exceptions import ParseError
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry import tagstore
+from sentry import features, options, tagstore
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases import NoProjects
 from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.api.serializers import serialize
-from sentry.api.utils import handle_query_errors
+from sentry.api.utils import clamp_date_range, handle_query_errors
 from sentry.snuba.dataset import Dataset
 from sentry.utils.numbers import format_grouped_length
 from sentry.utils.sdk import set_measurement
@@ -39,11 +41,23 @@ def get(self, request: Request, organization) -> Response:
 
         with sentry_sdk.start_span(op="tagstore", name="get_tag_keys_for_projects"):
             with handle_query_errors():
+                start = filter_params["start"]
+                end = filter_params["end"]
+
+                if features.has("organizations:tag-key-sample-n", organization) and start and end:
+                    # Tag queries longer than 14 days tend to time out for large customers. For getting a list of tags, clamping to 14 days is a reasonable compromise of speed vs. completeness
+                    (start, end) = clamp_date_range(
+                        (start, end),
+                        datetime.timedelta(
+                            days=options.get("visibility.tag-key-max-date-range.days")
+                        ),
+                    )
+
                 results = tagstore.backend.get_tag_keys_for_projects(
                     filter_params["project_id"],
                     filter_params.get("environment"),
-                    filter_params["start"],
-                    filter_params["end"],
+                    start,
+                    end,
                     use_cache=request.GET.get("use_cache", "0") == "1",
                     dataset=dataset,
                     tenant_ids={"organization_id": organization.id},
diff --git a/src/sentry/api/endpoints/organization_traces.py b/src/sentry/api/endpoints/organization_traces.py
index 19f9cf153f7438..24785b8ef0f4a8 100644
--- a/src/sentry/api/endpoints/organization_traces.py
+++ b/src/sentry/api/endpoints/organization_traces.py
@@ -12,7 +12,7 @@
 from rest_framework.exceptions import ParseError, ValidationError
 from rest_framework.request import Request
 from rest_framework.response import Response
-from snuba_sdk import And, BooleanCondition, BooleanOp, Column, Condition, Function, Op, Or
+from snuba_sdk import BooleanCondition, BooleanOp, Column, Condition, Function, Op
 from urllib3.exceptions import ReadTimeoutError
 
 from sentry import features, options
@@ -35,7 +35,6 @@
 )
 from sentry.search.events.constants import TIMEOUT_SPAN_ERROR_MESSAGE
 from sentry.search.events.types import QueryBuilderConfig, SnubaParams, WhereType
-from sentry.sentry_metrics.querying.samples_list import SpanKey, get_sample_list_executor_cls
 from sentry.snuba import discover, spans_indexed
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.referrer import Referrer
@@ -88,11 +87,6 @@ class OrganizationTracesSerializer(serializers.Serializer):
     dataset = serializers.ChoiceField(
         ["spans", "spansIndexed"], required=False, default="spansIndexed"
     )
-    metricsMax = serializers.FloatField(required=False)
-    metricsMin = serializers.FloatField(required=False)
-    metricsOp = serializers.CharField(required=False)
-    metricsQuery = serializers.CharField(required=False)
-    mri = serializers.CharField(required=False)
 
     breakdownSlices = serializers.IntegerField(default=40, min_value=1, max_value=100)
     query = serializers.ListField(
@@ -164,11 +158,6 @@ def get(self, request: Request, organization: Organization) -> Response:
             snuba_params=snuba_params,
             user_queries=serialized.get("query", []),
             sort=serialized.get("sort"),
-            metrics_max=serialized.get("metricsMax"),
-            metrics_min=serialized.get("metricsMin"),
-            metrics_operation=serialized.get("metricsOp"),
-            metrics_query=serialized.get("metricsQuery"),
-            mri=serialized.get("mri"),
             limit=self.get_per_page(request),
             breakdown_slices=serialized["breakdownSlices"],
             get_all_projects=lambda: self.get_projects(
@@ -198,11 +187,6 @@ class OrganizationTraceSpansSerializer(serializers.Serializer):
     dataset = serializers.ChoiceField(
         ["spans", "spansIndexed"], required=False, default="spansIndexed"
     )
-    metricsMax = serializers.FloatField(required=False)
-    metricsMin = serializers.FloatField(required=False)
-    metricsOp = serializers.CharField(required=False)
-    metricsQuery = serializers.CharField(required=False)
-    mri = serializers.CharField(required=False)
 
     field = serializers.ListField(required=True, allow_empty=False, child=serializers.CharField())
     sort = serializers.ListField(required=False, allow_empty=True, child=serializers.CharField())
@@ -245,11 +229,6 @@ def get(self, request: Request, organization: Organization, trace_id: str) -> Re
             fields=serialized["field"],
             user_queries=serialized.get("query", []),
             sort=serialized.get("sort"),
-            metrics_max=serialized.get("metricsMax"),
-            metrics_min=serialized.get("metricsMin"),
-            metrics_operation=serialized.get("metricsOp"),
-            metrics_query=serialized.get("metricsQuery"),
-            mri=serialized.get("mri"),
         )
 
         return self.paginate(
@@ -311,7 +290,9 @@ def get(self, request: Request, organization: Organization) -> Response:
         zerofill = not (
             request.GET.get("withoutZerofill") == "1"
             and features.get(
-                "organizations:performance-chart-interpolation", organization, actor=request.user
+                "organizations:performance-chart-interpolation",
+                organization,
+                actor=request.user,
             )
         )
 
@@ -358,11 +339,6 @@ def __init__(
         snuba_params: SnubaParams,
         user_queries: list[str],
         sort: str | None,
-        metrics_max: float | None,
-        metrics_min: float | None,
-        metrics_operation: str | None,
-        metrics_query: str | None,
-        mri: str | None,
         limit: int,
         breakdown_slices: int,
         get_all_projects: Callable[[], list[Project]],
@@ -371,11 +347,6 @@ def __init__(
         self.snuba_params = snuba_params
         self.user_queries = process_user_queries(snuba_params, user_queries, dataset)
         self.sort = sort
-        self.metrics_max = metrics_max
-        self.metrics_min = metrics_min
-        self.metrics_operation = metrics_operation
-        self.metrics_query = metrics_query
-        self.mri = mri
         self.offset = 0
         self.limit = limit
         self.breakdown_slices = breakdown_slices
@@ -499,76 +470,8 @@ def get_traces_matching_conditions(
         self,
         snuba_params: SnubaParams,
     ) -> tuple[datetime, datetime, list[str]]:
-        if self.mri is not None:
-            sentry_sdk.set_tag("mri", self.mri)
-            return self.get_traces_matching_metric_conditions(snuba_params)
-
         return self.get_traces_matching_span_conditions(snuba_params)
 
-    def get_traces_matching_metric_conditions(
-        self,
-        snuba_params: SnubaParams,
-    ) -> tuple[datetime, datetime, list[str]]:
-        assert self.mri is not None
-
-        executor_cls = get_sample_list_executor_cls(self.mri)
-        if executor_cls is None:
-            raise ParseError(detail=f"Unsupported MRI: {self.mri}")
-
-        executor = executor_cls(
-            mri=self.mri,
-            snuba_params=snuba_params,
-            fields=["trace"],
-            max=self.metrics_max,
-            min=self.metrics_min,
-            operation=self.metrics_operation,
-            query=self.metrics_query,
-            referrer=Referrer.API_TRACE_EXPLORER_METRICS_SPANS_LIST,
-        )
-
-        trace_ids, timestamps = executor.get_matching_traces(MAX_SNUBA_RESULTS)
-
-        min_timestamp = snuba_params.end
-        max_timestamp = snuba_params.start
-        assert min_timestamp is not None
-        assert max_timestamp is not None
-
-        for timestamp in timestamps:
-            min_timestamp = min(min_timestamp, timestamp)
-            max_timestamp = max(max_timestamp, timestamp)
-
-        if not trace_ids or min_timestamp > max_timestamp:
-            return min_timestamp, max_timestamp, []
-
-        self.refine_params(min_timestamp, max_timestamp)
-
-        if self.user_queries:
-            # If there are user queries, further refine the trace ids by applying them
-            # leaving us with only traces where the metric exists and matches the user
-            # queries.
-            (
-                min_timestamp,
-                max_timestamp,
-                trace_ids,
-            ) = self.get_traces_matching_span_conditions_in_traces(snuba_params, trace_ids)
-
-            if not trace_ids:
-                return min_timestamp, max_timestamp, []
-        else:
-            # No user queries so take the first N trace ids as our list
-            min_timestamp = snuba_params.end
-            max_timestamp = snuba_params.start
-            assert min_timestamp is not None
-            assert max_timestamp is not None
-
-            trace_ids = trace_ids[: self.limit]
-            timestamps = timestamps[: self.limit]
-            for timestamp in timestamps:
-                min_timestamp = min(min_timestamp, timestamp)
-                max_timestamp = max(max_timestamp, timestamp)
-
-        return min_timestamp, max_timestamp, trace_ids
-
     def get_traces_matching_span_conditions(
         self,
         snuba_params: SnubaParams,
@@ -947,7 +850,8 @@ def get_trace_info(trace: str) -> tuple[str, str, float] | tuple[None, None, Non
                 "numErrors": traces_errors.get(row["trace"], 0),
                 "numOccurrences": traces_occurrences.get(row["trace"], 0),
                 "matchingSpans": row[MATCHING_COUNT_ALIAS],
-                "numSpans": row["count()"],
+                # In EAP mode, we have to use `count_sample()` to avoid extrapolation
+                "numSpans": row.get("count()") or row.get("count_sample()") or 0,
                 "project": info[0],
                 "name": info[1],
                 "rootDuration": info[2],
@@ -1066,7 +970,7 @@ def get_traces_metas_query_eap(
             query=None,
             selected_columns=[
                 "trace",
-                "count()",
+                "count_sample()",
                 "first_seen()",
                 "last_seen()",
             ],
@@ -1227,74 +1131,30 @@ def __init__(
         fields: list[str],
         user_queries: list[str],
         sort: list[str] | None,
-        metrics_max: float | None,
-        metrics_min: float | None,
-        metrics_operation: str | None,
-        metrics_query: str | None,
-        mri: str | None,
     ):
         self.dataset = dataset
         self.snuba_params = snuba_params
         self.trace_id = trace_id
         self.fields = fields
         self.user_queries = process_user_queries(snuba_params, user_queries, dataset)
-        self.metrics_max = metrics_max
-        self.metrics_min = metrics_min
-        self.metrics_operation = metrics_operation
-        self.metrics_query = metrics_query
-        self.mri = mri
         self.sort = sort
 
     def execute(self, offset: int, limit: int):
         with handle_span_query_errors():
-            span_keys = self.get_metrics_span_keys()
-
-        with handle_span_query_errors():
-            spans = self.get_user_spans(
+            return self.get_user_spans(
                 self.snuba_params,
-                span_keys,
                 offset=offset,
                 limit=limit,
             )
 
-        return spans
-
-    def get_metrics_span_keys(self) -> list[SpanKey] | None:
-        if self.mri is None:
-            return None
-
-        executor_cls = get_sample_list_executor_cls(self.mri)
-        if executor_cls is None:
-            raise ParseError(detail=f"Unsupported MRI: {self.mri}")
-
-        executor = executor_cls(
-            mri=self.mri,
-            snuba_params=self.snuba_params,
-            fields=["trace"],
-            max=self.metrics_max,
-            min=self.metrics_min,
-            operation=self.metrics_operation,
-            query=self.metrics_query,
-            referrer=Referrer.API_TRACE_EXPLORER_METRICS_SPANS_LIST,
-        )
-
-        span_keys = executor.get_matching_spans_from_traces(
-            [self.trace_id],
-            MAX_SNUBA_RESULTS,
-        )
-
-        return span_keys
-
     def get_user_spans(
         self,
         snuba_params: SnubaParams,
-        span_keys: list[SpanKey] | None,
         limit: int,
         offset: int,
     ):
         user_spans_query = self.get_user_spans_query(
             snuba_params,
-            span_keys,
             limit=limit,
             offset=offset,
         )
@@ -1312,15 +1172,12 @@ def get_user_spans(
     def get_user_spans_query(
         self,
         snuba_params: SnubaParams,
-        span_keys: list[SpanKey] | None,
         limit: int,
         offset: int,
     ) -> BaseQueryBuilder:
         if self.dataset == Dataset.EventsAnalyticsPlatform:
-            # span_keys is not supported in EAP mode because that's a legacy
-            # code path to support metrics that no longer exists
             return self.get_user_spans_query_eap(snuba_params, limit, offset)
-        return self.get_user_spans_query_indexed(snuba_params, span_keys, limit, offset)
+        return self.get_user_spans_query_indexed(snuba_params, limit, offset)
 
     def get_user_spans_query_eap(
         self,
@@ -1382,7 +1239,6 @@ def get_user_spans_query_eap(
     def get_user_spans_query_indexed(
         self,
         snuba_params: SnubaParams,
-        span_keys: list[SpanKey] | None,
         limit: int,
         offset: int,
     ) -> BaseQueryBuilder:
@@ -1410,69 +1266,30 @@ def get_user_spans_query_indexed(
 
         conditions = []
 
-        if span_keys is None:
-            # Next we have to turn the user queries into the appropriate conditions in
-            # the SnQL that we produce.
+        # Next we have to turn the user queries into the appropriate conditions in
+        # the SnQL that we produce.
 
-            # There are multiple sets of user conditions that needs to be satisfied
-            # and if a span satisfy any of them, it should be considered.
-            #
-            # To handle this use case, we want to OR all the user specified
-            # conditions together in this query.
-            for where in user_conditions:
-                if len(where) > 1:
-                    conditions.append(BooleanCondition(op=BooleanOp.AND, conditions=where))
-                elif len(where) == 1:
-                    conditions.append(where[0])
-
-            if len(conditions) > 1:
-                # More than 1 set of conditions were specified, we want to show
-                # spans that match any 1 of them so join the conditions with `OR`s.
-                user_spans_query.add_conditions(
-                    [BooleanCondition(op=BooleanOp.OR, conditions=conditions)]
-                )
-            elif len(conditions) == 1:
-                # Only 1 set of user conditions were specified, simply insert them into
-                # the final query.
-                user_spans_query.add_conditions([conditions[0]])
-        else:
-            # Next if there are known span_keys, we only try to fetch those spans
-            # This are the additional conditions to better take advantage of the ORDER BY
-            # on the spans table. This creates a list of conditions to be `OR`ed together
-            # that can will be used by ClickHouse to narrow down the granules.
-            #
-            # The span ids are not in this condition because they are more effective when
-            # specified within the `PREWHERE` clause. So, it's in a separate condition.
-            conditions = [
-                And(
-                    [
-                        Condition(user_spans_query.column("span.group"), Op.EQ, key.group),
-                        Condition(
-                            user_spans_query.column("timestamp"),
-                            Op.EQ,
-                            datetime.fromisoformat(key.timestamp),
-                        ),
-                    ]
-                )
-                for key in span_keys
-            ]
+        # There are multiple sets of user conditions that needs to be satisfied
+        # and if a span satisfy any of them, it should be considered.
+        #
+        # To handle this use case, we want to OR all the user specified
+        # conditions together in this query.
+        for where in user_conditions:
+            if len(where) > 1:
+                conditions.append(BooleanCondition(op=BooleanOp.AND, conditions=where))
+            elif len(where) == 1:
+                conditions.append(where[0])
 
-            if len(conditions) == 1:
-                order_by_condition = conditions[0]
-            else:
-                order_by_condition = Or(conditions)
-
-            # Using `IN` combined with putting the list in a SnQL "tuple" triggers an optimizer
-            # in snuba where it
-            # 1. moves the condition into the `PREWHERE` clause
-            # 2. maps the ids to the underlying UInt64 and uses the bloom filter index
-            span_id_condition = Condition(
-                user_spans_query.column("id"),
-                Op.IN,
-                Function("tuple", [key.span_id for key in span_keys]),
+        if len(conditions) > 1:
+            # More than 1 set of conditions were specified, we want to show
+            # spans that match any 1 of them so join the conditions with `OR`s.
+            user_spans_query.add_conditions(
+                [BooleanCondition(op=BooleanOp.OR, conditions=conditions)]
             )
-
-            user_spans_query.add_conditions([order_by_condition, span_id_condition])
+        elif len(conditions) == 1:
+            # Only 1 set of user conditions were specified, simply insert them into
+            # the final query.
+            user_spans_query.add_conditions([conditions[0]])
 
         return user_spans_query
 
diff --git a/src/sentry/api/endpoints/organization_transaction_anomaly_detection.py b/src/sentry/api/endpoints/organization_transaction_anomaly_detection.py
deleted file mode 100644
index b3bd015ccb08d5..00000000000000
--- a/src/sentry/api/endpoints/organization_transaction_anomaly_detection.py
+++ /dev/null
@@ -1,143 +0,0 @@
-from collections import namedtuple
-from datetime import datetime, timedelta, timezone
-
-import orjson
-from django.conf import settings
-from rest_framework.request import Request
-from rest_framework.response import Response
-from urllib3 import Retry
-
-from sentry import features
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import OrganizationEventsEndpointBase
-from sentry.api.utils import get_date_range_from_params, handle_query_errors
-from sentry.net.http import connection_from_url
-from sentry.snuba.metrics_enhanced_performance import timeseries_query
-
-ads_connection_pool = connection_from_url(
-    settings.SEER_ANOMALY_DETECTION_URL,
-    retries=Retry(
-        total=5,
-        status_forcelist=[408, 429, 502, 503, 504],
-    ),
-    timeout=settings.SEER_ANOMALY_DETECTION_TIMEOUT,
-)
-
-MappedParams = namedtuple("MappedParams", ["query_start", "query_end", "granularity"])
-
-
-def get_anomalies(snuba_io):
-    response = ads_connection_pool.urlopen(
-        "POST",
-        "/anomaly/predict",
-        body=orjson.dumps(snuba_io, option=orjson.OPT_UTC_Z),
-        headers={"content-type": "application/json;charset=utf-8"},
-    )
-    return Response(orjson.loads(response.data), status=200)
-
-
-def get_time_params(start: datetime, end: datetime) -> MappedParams:
-    """
-    Takes visualization start/end timestamps
-    and returns the start/end/granularity
-    of the snuba query that we should execute
-    Attributes:
-    start: datetime representing start of visualization window
-    end: datetime representing end of visualization window
-    Returns:
-    results: namedtuple containing
-        query_start: datetime representing start of query window
-        query_end: datetime representing end of query window
-        granularity: granularity to use (in seconds)
-    """
-    anomaly_detection_range = end - start
-
-    if anomaly_detection_range > timedelta(days=14):
-        snuba_range = timedelta(days=90)
-        granularity = 3600
-
-    elif anomaly_detection_range > timedelta(days=1):
-        granularity = 1200
-        snuba_range = timedelta(days=28)
-
-    else:
-        snuba_range = timedelta(days=14)
-        granularity = 600
-
-    additional_time_needed = snuba_range - anomaly_detection_range
-    now = datetime.now(timezone.utc)
-    start_limit = now - timedelta(days=90)
-    end_limit = now
-    start = max(start, start_limit)
-    end = min(end, end_limit)
-    # By default, expand windows equally in both directions
-    window_increase = additional_time_needed / 2
-    query_start, query_end = None, None
-
-    # If window will go back farther than 90 days, use today - 90 as start
-    if start - window_increase < start_limit:
-        query_start = now - timedelta(days=90)
-        additional_time_needed -= start - query_start
-        window_increase = additional_time_needed
-    # If window extends beyond today, use today as end
-    if end + window_increase > end_limit:
-        query_end = now
-        additional_time_needed -= query_end - end
-        window_increase = additional_time_needed
-
-    query_start = query_start or max(start - window_increase, start_limit)
-    query_end = query_end or min(end + window_increase, end_limit)
-
-    return MappedParams(
-        query_start,
-        query_end,
-        granularity,
-    )
-
-
-@region_silo_endpoint
-class OrganizationTransactionAnomalyDetectionEndpoint(OrganizationEventsEndpointBase):
-    publish_status = {
-        "GET": ApiPublishStatus.PRIVATE,
-    }
-
-    def has_feature(self, organization, request):
-        return features.has(
-            "organizations:performance-anomaly-detection-ui", organization, actor=request.user
-        )
-
-    def get(self, request: Request, organization) -> Response:
-        if not self.has_feature(organization, request):
-            return Response(status=404)
-
-        start, end = get_date_range_from_params(request.GET)
-        time_params = get_time_params(start, end)
-        snuba_params = self.get_snuba_params(request, organization)
-        query = request.GET.get("query")
-        query = f"{query} event.type:transaction" if query else "event.type:transaction"
-
-        datetime_format = "%Y-%m-%d %H:%M:%S"
-        ads_request = {
-            "query": query,
-            "start": start.strftime(datetime_format),
-            "end": end.strftime(datetime_format),
-            "granularity": time_params.granularity,
-        }
-
-        # overwrite relevant time params
-        snuba_params.start = time_params.query_start
-        snuba_params.end = time_params.query_end
-
-        with handle_query_errors():
-            snuba_response = timeseries_query(
-                selected_columns=["count()"],
-                query=query,
-                snuba_params=snuba_params,
-                rollup=time_params.granularity,
-                referrer="transaction-anomaly-detection",
-                zerofill_results=False,
-            )
-            ads_request["data"] = snuba_response.data["data"]
-
-            return get_anomalies(ads_request)
diff --git a/src/sentry/api/endpoints/organization_user_rollback.py b/src/sentry/api/endpoints/organization_user_rollback.py
index ac6a7120fe792e..2441357b07e978 100644
--- a/src/sentry/api/endpoints/organization_user_rollback.py
+++ b/src/sentry/api/endpoints/organization_user_rollback.py
@@ -1,5 +1,4 @@
 from rest_framework import status
-from rest_framework.permissions import BasePermission
 from rest_framework.request import Request
 from rest_framework.response import Response
 
@@ -16,19 +15,12 @@
 from sentry.models.rollbackuser import RollbackUser
 
 
-class MemberPermission(BasePermission):
-    scope_map = {
-        "GET": ["member:read"],
-    }
-
-
 @region_silo_endpoint
 class OrganizationRollbackUserEndpoint(OrganizationEndpoint):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
     owner = ApiOwner.ISSUES
-    permission_classes = (MemberPermission,)
 
     def get(self, request: Request, organization: Organization) -> Response:
         """
diff --git a/src/sentry/api/endpoints/project_autofix_codebase_index_status.py b/src/sentry/api/endpoints/project_autofix_codebase_index_status.py
deleted file mode 100644
index 7ed2bb1fde4365..00000000000000
--- a/src/sentry/api/endpoints/project_autofix_codebase_index_status.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from __future__ import annotations
-
-import logging
-
-from rest_framework.response import Response
-
-from sentry.api.api_owners import ApiOwner
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.project import ProjectEndpoint
-from sentry.api.helpers.autofix import get_project_codebase_indexing_status
-from sentry.models.project import Project
-
-logger = logging.getLogger(__name__)
-
-from rest_framework.request import Request
-
-
-@region_silo_endpoint
-class ProjectAutofixCodebaseIndexStatusEndpoint(ProjectEndpoint):
-    publish_status = {
-        "GET": ApiPublishStatus.EXPERIMENTAL,
-    }
-    owner = ApiOwner.ML_AI
-
-    def get(self, request: Request, project: Project) -> Response:
-        """
-        Create a codebase index for for a project's repositories, uses the code mapping to determine which repositories to index
-        """
-        status = get_project_codebase_indexing_status(project)
-
-        return Response({"status": status}, status=200)
diff --git a/src/sentry/api/endpoints/project_autofix_create_codebase_index.py b/src/sentry/api/endpoints/project_autofix_create_codebase_index.py
deleted file mode 100644
index c79dd86ef3e94d..00000000000000
--- a/src/sentry/api/endpoints/project_autofix_create_codebase_index.py
+++ /dev/null
@@ -1,72 +0,0 @@
-from __future__ import annotations
-
-import logging
-
-import orjson
-import requests
-from django.conf import settings
-from rest_framework.response import Response
-
-from sentry.api.api_owners import ApiOwner
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.project import ProjectEndpoint, ProjectPermission
-from sentry.autofix.utils import get_autofix_repos_from_project_code_mappings
-from sentry.models.project import Project
-from sentry.seer.signed_seer_api import get_seer_salted_url, sign_with_seer_secret
-
-logger = logging.getLogger(__name__)
-
-from rest_framework.request import Request
-
-
-class ProjectAutofixCreateCodebaseIndexPermission(ProjectPermission):
-    scope_map = {
-        # We might want to re-evaluate this for LA/EA whether a user needs to have write access to the project to create a codebase index (probably yes?)
-        "POST": ["project:read", "project:write", "project:admin"],
-    }
-
-
-@region_silo_endpoint
-class ProjectAutofixCreateCodebaseIndexEndpoint(ProjectEndpoint):
-    publish_status = {
-        "POST": ApiPublishStatus.EXPERIMENTAL,
-    }
-    owner = ApiOwner.ML_AI
-
-    permission_classes = (ProjectAutofixCreateCodebaseIndexPermission,)
-
-    def post(self, request: Request, project: Project) -> Response:
-        """
-        Create a codebase index for for a project's repositories, uses the code mapping to determine which repositories to index
-        """
-        repos = get_autofix_repos_from_project_code_mappings(project)
-        path = "/v1/automation/codebase/index/create"
-
-        for repo in repos:
-            body = orjson.dumps(
-                {
-                    "organization_id": project.organization.id,
-                    "project_id": project.id,
-                    "repo": repo,
-                }
-            )
-
-            url, salt = get_seer_salted_url(f"{settings.SEER_AUTOFIX_URL}{path}")
-            response = requests.post(
-                url,
-                data=body,
-                headers={
-                    "content-type": "application/json;charset=utf-8",
-                    **sign_with_seer_secret(
-                        salt,
-                        body=body,
-                    ),
-                },
-            )
-
-            response.raise_for_status()
-
-        return Response(
-            status=202,
-        )
diff --git a/src/sentry/api/endpoints/project_details.py b/src/sentry/api/endpoints/project_details.py
index 343aa481007697..62150f916098bb 100644
--- a/src/sentry/api/endpoints/project_details.py
+++ b/src/sentry/api/endpoints/project_details.py
@@ -752,8 +752,12 @@ def put(self, request: Request, project) -> Response:
             if project.update_option("sentry:origins", result["allowedDomains"]):
                 changed_proj_settings["sentry:origins"] = result["allowedDomains"]
         if result.get("targetSampleRate") is not None:
-            if project.update_option("sentry:target_sample_rate", result["targetSampleRate"]):
-                changed_proj_settings["sentry:target_sample_rate"] = result["targetSampleRate"]
+            if project.update_option(
+                "sentry:target_sample_rate", round(result["targetSampleRate"], 4)
+            ):
+                changed_proj_settings["sentry:target_sample_rate"] = round(
+                    result["targetSampleRate"], 4
+                )
         if "dynamicSamplingBiases" in result:
             updated_biases = get_user_biases(user_set_biases=result["dynamicSamplingBiases"])
             if project.update_option("sentry:dynamic_sampling_biases", updated_biases):
diff --git a/src/sentry/api/endpoints/project_filters.py b/src/sentry/api/endpoints/project_filters.py
index 899e28cac08d13..afeddac6afd1cb 100644
--- a/src/sentry/api/endpoints/project_filters.py
+++ b/src/sentry/api/endpoints/project_filters.py
@@ -1,26 +1,51 @@
+from typing import TypedDict
+
+from drf_spectacular.utils import extend_schema
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.project import ProjectEndpoint
+from sentry.apidocs.constants import RESPONSE_FORBIDDEN
+from sentry.apidocs.examples.project_examples import ProjectExamples
+from sentry.apidocs.parameters import GlobalParams
+from sentry.apidocs.utils import inline_sentry_response_serializer
 from sentry.ingest import inbound_filters
 
 
+class ProjectFilterResponse(TypedDict):
+    id: str
+    active: bool | list[str]
+
+
 @region_silo_endpoint
+@extend_schema(tags=["Projects"])
 class ProjectFiltersEndpoint(ProjectEndpoint):
+    owner = ApiOwner.UNOWNED
     publish_status = {
-        "GET": ApiPublishStatus.UNKNOWN,
+        "GET": ApiPublishStatus.PUBLIC,
     }
 
+    @extend_schema(
+        operation_id="List a Project's Data Filters",
+        parameters=[
+            GlobalParams.ORG_ID_OR_SLUG,
+            GlobalParams.PROJECT_ID_OR_SLUG,
+        ],
+        responses={
+            200: inline_sentry_response_serializer(
+                "ProjectFilterResponse", list[ProjectFilterResponse]
+            ),
+            403: RESPONSE_FORBIDDEN,
+        },
+        examples=ProjectExamples.GET_PROJECT_FILTERS,
+    )
     def get(self, request: Request, project) -> Response:
         """
-        List a project's filters
-
         Retrieve a list of filters for a given project.
-
-            {method} {path}
-
+        `active` will be either a boolean or a list for the legacy browser filters.
         """
         results = []
         for flt in inbound_filters.get_all_filter_specs():
diff --git a/src/sentry/api/endpoints/project_rule_actions.py b/src/sentry/api/endpoints/project_rule_actions.py
index 73ba633945a4fd..9463d252144670 100644
--- a/src/sentry/api/endpoints/project_rule_actions.py
+++ b/src/sentry/api/endpoints/project_rule_actions.py
@@ -5,7 +5,6 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry import features
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
@@ -15,7 +14,6 @@
 from sentry.models.rule import Rule
 from sentry.rules.processing.processor import activate_downstream_actions
 from sentry.shared_integrations.exceptions import IntegrationFormError
-from sentry.utils.safe import safe_execute
 from sentry.utils.samples import create_sample_event
 
 
@@ -66,15 +64,7 @@ def post(self, request: Request, project) -> Response:
             project, platform=project.platform, default="javascript", tagged=True
         )
 
-        if features.has(
-            "projects:verbose-test-alert-reporting", project=project, actor=request.user
-        ):
-            return self.execute_future_on_test_event(test_event, rule)
-        else:
-            # Old existing behavior to wrap this in a handler which buries exceptions
-            for callback, futures in activate_downstream_actions(rule, test_event).values():
-                safe_execute(callback, test_event, futures)
-            return Response()
+        return self.execute_future_on_test_event(test_event, rule)
 
     def execute_future_on_test_event(
         self,
diff --git a/src/sentry/api/endpoints/relocations/index.py b/src/sentry/api/endpoints/relocations/index.py
index b493fde70bc72c..c6cacef17f791d 100644
--- a/src/sentry/api/endpoints/relocations/index.py
+++ b/src/sentry/api/endpoints/relocations/index.py
@@ -140,11 +140,18 @@ def validate_relocation_uniqueness(owner: RpcUser | AnonymousUser | User) -> Res
     return None
 
 
-def get_autopause_value() -> int | None:
+def get_autopause_value(provenance: Relocation.Provenance) -> int | None:
     try:
-        return Relocation.Step[options.get("relocation.autopause")].value
+        return Relocation.Step[options.get(f"relocation.autopause.{str(provenance)}")].value
     except KeyError:
-        return None
+        # DEPRECATED: for now, we fall through to the old `relocation.autopause` if the more
+        # specific `relocation.autopause.*` does not exist OR is set to the default, an empty
+        # string. Once we remove the old setting, this block can go away, and we can use the mre
+        # specific autopause only.
+        try:
+            return Relocation.Step[options.get("relocation.autopause")].value
+        except KeyError:
+            return None
 
 
 @region_silo_endpoint
@@ -263,12 +270,14 @@ def post(self, request: Request) -> Response:
         with atomic_transaction(
             using=(router.db_for_write(Relocation), router.db_for_write(RelocationFile))
         ):
+            provenance = Relocation.Provenance.SELF_HOSTED
             relocation: Relocation = Relocation.objects.create(
                 creator_id=request.user.id,
                 owner_id=owner.id,
                 want_org_slugs=org_slugs,
                 step=Relocation.Step.UPLOADING.value,
-                scheduled_pause_at_step=get_autopause_value(),
+                scheduled_pause_at_step=get_autopause_value(provenance),
+                provenance=provenance,
             )
             RelocationFile.objects.create(
                 relocation=relocation,
diff --git a/src/sentry/api/endpoints/relocations/retry.py b/src/sentry/api/endpoints/relocations/retry.py
index 4f80e14b5d5505..1986bc3c015c38 100644
--- a/src/sentry/api/endpoints/relocations/retry.py
+++ b/src/sentry/api/endpoints/relocations/retry.py
@@ -111,7 +111,10 @@ def post(self, request: Request, relocation_uuid: str) -> Response:
                 owner_id=relocation.owner_id,
                 want_org_slugs=relocation.want_org_slugs,
                 step=Relocation.Step.UPLOADING.value,
-                scheduled_pause_at_step=get_autopause_value(),
+                scheduled_pause_at_step=get_autopause_value(
+                    Relocation.Provenance(relocation.provenance)
+                ),
+                provenance=relocation.provenance,
             )
 
             relocation_retry_link_promo_code.send_robust(
diff --git a/src/sentry/api/endpoints/seer_rpc.py b/src/sentry/api/endpoints/seer_rpc.py
index 8ad06295ed6c8a..7cedd5e2b31d22 100644
--- a/src/sentry/api/endpoints/seer_rpc.py
+++ b/src/sentry/api/endpoints/seer_rpc.py
@@ -153,7 +153,7 @@ def get_organization_slug(*, org_id: int) -> dict:
 
 def get_organization_autofix_consent(*, org_id: int) -> dict:
     org: Organization = Organization.objects.get(id=org_id)
-    consent = org.get_option("sentry:gen_ai_consent", False)
+    consent = org.get_option("sentry:gen_ai_consent_v2024_11_14", False)
     github_extension_enabled = org_id in options.get("github-extension.enabled-orgs")
     return {
         "consent": consent or github_extension_enabled,
diff --git a/src/sentry/api/endpoints/team_projects.py b/src/sentry/api/endpoints/team_projects.py
index c13586e89d3c22..697c447e00b047 100644
--- a/src/sentry/api/endpoints/team_projects.py
+++ b/src/sentry/api/endpoints/team_projects.py
@@ -13,6 +13,7 @@
 from sentry.api.bases.team import TeamEndpoint, TeamPermission
 from sentry.api.fields.sentry_slug import SentrySerializerSlugField
 from sentry.api.helpers.default_inbound_filters import set_default_inbound_filters
+from sentry.api.helpers.default_symbol_sources import set_default_symbol_sources
 from sentry.api.paginator import OffsetPaginator
 from sentry.api.serializers import ProjectSummarySerializer, serialize
 from sentry.api.serializers.models.project import OrganizationProjectResponse, ProjectSerializer
@@ -203,6 +204,8 @@ def post(self, request: Request, team: Team) -> Response:
             if project.platform and project.platform.startswith("javascript"):
                 set_default_inbound_filters(project, team.organization)
 
+            set_default_symbol_sources(project)
+
             self.create_audit_entry(
                 request=request,
                 organization=team.organization,
diff --git a/src/sentry/api/endpoints/user_notification_settings_options.py b/src/sentry/api/endpoints/user_notification_settings_options.py
index a381d1eee7858f..c72a7b778c23ad 100644
--- a/src/sentry/api/endpoints/user_notification_settings_options.py
+++ b/src/sentry/api/endpoints/user_notification_settings_options.py
@@ -8,7 +8,7 @@
 from sentry.api.exceptions import ParameterValidationError
 from sentry.api.serializers import serialize
 from sentry.api.validators.notifications import validate_type
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.serializers import NotificationSettingsOptionSerializer
 from sentry.notifications.validators import UserNotificationSettingOptionWithValueSerializer
 from sentry.users.api.bases.user import UserEndpoint
diff --git a/src/sentry/api/endpoints/user_notification_settings_options_detail.py b/src/sentry/api/endpoints/user_notification_settings_options_detail.py
index 53e73e039e850d..e7f46bcca4207c 100644
--- a/src/sentry/api/endpoints/user_notification_settings_options_detail.py
+++ b/src/sentry/api/endpoints/user_notification_settings_options_detail.py
@@ -6,7 +6,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import control_silo_endpoint
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.users.api.bases.user import UserEndpoint
 from sentry.users.models.user import User
 
diff --git a/src/sentry/api/endpoints/user_notification_settings_providers.py b/src/sentry/api/endpoints/user_notification_settings_providers.py
index dff386dae28821..ac5184fc109bf3 100644
--- a/src/sentry/api/endpoints/user_notification_settings_providers.py
+++ b/src/sentry/api/endpoints/user_notification_settings_providers.py
@@ -10,7 +10,7 @@
 from sentry.api.serializers import serialize
 from sentry.api.validators.notifications import validate_type
 from sentry.integrations.types import PERSONAL_NOTIFICATION_PROVIDERS
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.serializers import NotificationSettingsProviderSerializer
 from sentry.notifications.types import NotificationSettingsOptionEnum
 from sentry.notifications.validators import UserNotificationSettingsProvidersDetailsSerializer
diff --git a/src/sentry/api/exceptions.py b/src/sentry/api/exceptions.py
index bc33cc12997bdd..2e5689a148aacd 100644
--- a/src/sentry/api/exceptions.py
+++ b/src/sentry/api/exceptions.py
@@ -50,16 +50,6 @@ def __init__(self, message: str, context: list[str] | None = None) -> None:
         super().__init__(message=message, context=".".join(context or []))
 
 
-class ProjectMoved(SentryAPIException):
-    status_code = status.HTTP_302_FOUND
-    # code/message currently don't get used
-    code = "resource-moved"
-    message = "Resource has been moved"
-
-    def __init__(self, new_url, slug):
-        super().__init__(url=new_url, slug=slug)
-
-
 class SsoRequired(SentryAPIException):
     status_code = status.HTTP_401_UNAUTHORIZED
     code = "sso-required"
diff --git a/src/sentry/api/helpers/autofix.py b/src/sentry/api/helpers/autofix.py
deleted file mode 100644
index 3d6e8f51057f8d..00000000000000
--- a/src/sentry/api/helpers/autofix.py
+++ /dev/null
@@ -1,58 +0,0 @@
-import enum
-
-import orjson
-import requests
-from django.conf import settings
-
-from sentry.autofix.utils import get_autofix_repos_from_project_code_mappings
-from sentry.seer.signed_seer_api import get_seer_salted_url, sign_with_seer_secret
-
-
-class AutofixCodebaseIndexingStatus(str, enum.Enum):
-    UP_TO_DATE = "up_to_date"
-    INDEXING = "indexing"
-    NOT_INDEXED = "not_indexed"
-
-
-def get_project_codebase_indexing_status(project):
-    repos = get_autofix_repos_from_project_code_mappings(project)
-
-    if not repos:
-        return None
-
-    statuses = []
-    path = "/v1/automation/codebase/index/status"
-    for repo in repos:
-        body = orjson.dumps(
-            {
-                "organization_id": project.organization.id,
-                "project_id": project.id,
-                "repo": repo,
-            },
-            option=orjson.OPT_UTC_Z,
-        )
-
-        url, salt = get_seer_salted_url(f"{settings.SEER_AUTOFIX_URL}{path}")
-        response = requests.post(
-            url,
-            data=body,
-            headers={
-                "content-type": "application/json;charset=utf-8",
-                **sign_with_seer_secret(
-                    salt,
-                    body=body,
-                ),
-            },
-        )
-
-        response.raise_for_status()
-
-        statuses.append(response.json()["status"])
-
-    if any(status == AutofixCodebaseIndexingStatus.NOT_INDEXED for status in statuses):
-        return AutofixCodebaseIndexingStatus.NOT_INDEXED
-
-    if any(status == AutofixCodebaseIndexingStatus.INDEXING for status in statuses):
-        return AutofixCodebaseIndexingStatus.INDEXING
-
-    return AutofixCodebaseIndexingStatus.UP_TO_DATE
diff --git a/src/sentry/api/helpers/default_symbol_sources.py b/src/sentry/api/helpers/default_symbol_sources.py
new file mode 100644
index 00000000000000..4615d9fd6cf443
--- /dev/null
+++ b/src/sentry/api/helpers/default_symbol_sources.py
@@ -0,0 +1,14 @@
+from sentry.models.project import Project
+from sentry.projects.services.project import RpcProject
+
+DEFAULT_SYMBOL_SOURCES = {
+    "electron": ["ios", "microsoft", "electron"],
+    "javascript-electron": ["ios", "microsoft", "electron"],
+}
+
+
+def set_default_symbol_sources(project: Project | RpcProject):
+    if project.platform and project.platform in DEFAULT_SYMBOL_SOURCES:
+        project.update_option(
+            "sentry:builtin_symbol_sources", DEFAULT_SYMBOL_SOURCES[project.platform]
+        )
diff --git a/src/sentry/api/helpers/group_index/update.py b/src/sentry/api/helpers/group_index/update.py
index 1806baea8be1d4..a95ebdfdbf8149 100644
--- a/src/sentry/api/helpers/group_index/update.py
+++ b/src/sentry/api/helpers/group_index/update.py
@@ -4,12 +4,13 @@
 import re
 from collections import defaultdict
 from collections.abc import Mapping, MutableMapping, Sequence
-from typing import Any
+from typing import Any, NotRequired, TypedDict
 from urllib.parse import urlparse
 
 import rest_framework
+from django.contrib.auth.models import AnonymousUser
 from django.db import IntegrityError, router, transaction
-from django.db.models import Q
+from django.db.models import Q, QuerySet
 from django.db.models.signals import post_save
 from django.utils import timezone as django_timezone
 from rest_framework import serializers
@@ -24,11 +25,12 @@
 from sentry.integrations.tasks.kick_off_status_syncs import kick_off_status_syncs
 from sentry.issues.grouptype import GroupCategory
 from sentry.issues.ignored import handle_archived_until_escalating, handle_ignored
-from sentry.issues.merge import handle_merge
+from sentry.issues.merge import MergedGroup, handle_merge
 from sentry.issues.priority import update_priority
 from sentry.issues.status_change import handle_status_update, infer_substatus
 from sentry.issues.update_inbox import update_inbox
 from sentry.models.activity import Activity, ActivityIntegration
+from sentry.models.commit import Commit
 from sentry.models.group import STATUS_UPDATE_CHOICES, Group, GroupStatus
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.groupbookmark import GroupBookmark
@@ -36,7 +38,6 @@
 from sentry.models.grouphistory import record_group_history_from_activity_type
 from sentry.models.groupinbox import GroupInboxRemoveAction, remove_group_from_inbox
 from sentry.models.grouplink import GroupLink
-from sentry.models.grouprelease import GroupRelease
 from sentry.models.groupresolution import GroupResolution
 from sentry.models.groupseen import GroupSeen
 from sentry.models.groupshare import GroupShare
@@ -61,11 +62,23 @@
 logger = logging.getLogger(__name__)
 
 
+class MultipleProjectsError(Exception):
+    pass
+
+
+class ResolutionParams(TypedDict):
+    release: Release
+    type: int | None
+    status: int | None
+    actor_id: int | None
+    current_release_version: NotRequired[str]
+
+
 def handle_discard(
     request: Request,
     group_list: Sequence[Group],
     projects: Sequence[Project],
-    user: User,
+    user,
 ) -> Response:
     for project in projects:
         if not features.has("projects:discard-groups", project, actor=user):
@@ -106,12 +119,14 @@ def handle_discard(
 
 
 def self_subscribe_and_assign_issue(
-    acting_user: User | RpcUser | None, group: Group, self_assign_issue: str
+    acting_user, group: Group, self_assign_issue: str
 ) -> Actor | None:
-    # Used during issue resolution to assign to acting user
-    # returns None if the user didn't elect to self assign on resolution
-    # or the group is assigned already, otherwise returns Actor
-    # representation of current user
+    """
+    Used during issue resolution to assign to acting user
+    returns None if the user didn't elect to self assign on resolution
+    or the group is assigned already, otherwise returns Actor
+    representation of current user
+    """
     if acting_user:
         GroupSubscription.objects.subscribe(
             subscriber=acting_user, group=group, reason=GroupSubscriptionReason.status_change
@@ -122,9 +137,7 @@ def self_subscribe_and_assign_issue(
     return None
 
 
-def get_current_release_version_of_group(
-    group: Group, follows_semver: bool = False
-) -> Release | None:
+def get_current_release_version_of_group(group: Group, follows_semver: bool = False) -> str | None:
     """
     Function that returns the latest release version associated with a Group, and by latest we
     mean either most recent (date) or latest in semver versioning scheme
@@ -137,23 +150,9 @@ def get_current_release_version_of_group(
     """
     current_release_version = None
     if follows_semver:
-        try:
-            # This sets current_release_version to the latest semver version associated with a group
-            order_by_semver_desc = [f"-{col}" for col in Release.SEMVER_COLS]
-            current_release_version = (
-                Release.objects.filter_to_semver()
-                .filter(
-                    id__in=GroupRelease.objects.filter(
-                        project_id=group.project.id, group_id=group.id
-                    ).values_list("release_id"),
-                )
-                .annotate_prerelease_column()
-                .order_by(*order_by_semver_desc)
-                .values_list("version", flat=True)[:1]
-                .get()
-            )
-        except Release.DoesNotExist:
-            pass
+        release = greatest_semver_release(group.project)
+        if release is not None:
+            current_release_version = release.version
     else:
         # This sets current_release_version to the most recent release associated with a group
         # In order to be able to do that, `use_cache` has to be set to False. Otherwise,
@@ -169,26 +168,103 @@ def update_groups(
     group_ids: Sequence[int | str] | None,
     projects: Sequence[Project],
     organization_id: int,
-    search_fn: SearchFunction | None,
-    user: RpcUser | User | None = None,
+    search_fn: SearchFunction | None = None,
+    user: RpcUser | User | AnonymousUser | None = None,
     data: Mapping[str, Any] | None = None,
 ) -> Response:
     # If `user` and `data` are passed as parameters then they should override
     # the values in `request`.
     user = user or request.user
+    acting_user = user if user and user.is_authenticated else None
     data = data or request.data
 
-    if group_ids:
-        group_list = Group.objects.filter(
-            project__organization_id=organization_id, project__in=projects, id__in=group_ids
+    try:
+        group_ids, group_list = get_group_ids_and_group_list(
+            organization_id, projects, group_ids, search_fn
         )
-        # filter down group ids to only valid matches
-        group_ids = [g.id for g in group_list]
-        if not group_ids:
-            return Response(status=204)
-    else:
-        group_list = None
+    except ValidationError:
+        logger.exception("Error getting group ids and group list")  # Track the error in Sentry
+        return Response(
+            {"detail": "Invalid query. Error getting group ids and group list"}, status=400
+        )
+
+    if not group_ids or not group_list:
+        return Response({"detail": "No groups found"}, status=204)
+
+    serializer = validate_request(request, projects, data)
+
+    if serializer is None:
+        logger.error("Error validating request. Investigate.")
+        return Response(status=500)
+
+    result = dict(serializer.validated_data)
+
+    acting_user = user if user.is_authenticated else None
+
+    # so we won't have to requery for each group
+    project_lookup = {g.project_id: g.project for g in group_list}
+    group_project_ids = {g.project_id for g in group_list}
+    # filter projects down to only those that have groups in the search results
+    projects = [p for p in projects if p.id in group_project_ids]
 
+    queryset = Group.objects.filter(id__in=group_ids)
+
+    discard = result.get("discard")
+    if discard:
+        return handle_discard(request, list(queryset), projects, acting_user)
+
+    status_details = result.pop("statusDetails", result)
+    status = result.get("status")
+    res_type = None
+    if "priority" in result:
+        handle_priority(
+            priority=result["priority"],
+            group_list=group_list,
+            acting_user=acting_user,
+            project_lookup=project_lookup,
+        )
+    if status in ("resolved", "resolvedInNextRelease"):
+        try:
+            result, res_type = handle_resolve_in_release(
+                status,
+                status_details,
+                group_list,
+                projects,
+                project_lookup,
+                acting_user,
+                user,
+                result,
+            )
+        except MultipleProjectsError:
+            return Response({"detail": "Cannot set resolved for multiple projects."}, status=400)
+    elif status:
+        result = handle_other_status_updates(
+            result,
+            group_list,
+            projects,
+            project_lookup,
+            status_details,
+            acting_user,
+            user,
+        )
+
+    return prepare_response(
+        result,
+        group_list,
+        project_lookup,
+        projects,
+        acting_user,
+        data,
+        res_type,
+        request.META.get("HTTP_REFERER", ""),
+    )
+
+
+def validate_request(
+    request: Request,
+    projects: Sequence[Project],
+    data: Mapping[str, Any],
+) -> GroupValidator | None:
     serializer = None
     # TODO(jess): We may want to look into refactoring GroupValidator
     # to support multiple projects, but this is pretty complicated
@@ -205,16 +281,74 @@ def update_groups(
         )
         if not serializer.is_valid():
             raise serializers.ValidationError(serializer.errors)
+    return serializer
 
-    if serializer is None:
-        return
 
-    result = dict(serializer.validated_data)
+def get_group_ids_and_group_list(
+    organization_id: int,
+    projects: Sequence[Project],
+    group_ids: Sequence[int | str] | None,
+    search_fn: SearchFunction | None,
+) -> tuple[list[int | str], list[Group]]:
+    """
+    Gets group IDs and group list based on provided filters.
 
-    # so we won't have to requery for each group
-    project_lookup = {p.id: p for p in projects}
+    Args:
+        organization_id: ID of the organization
+        projects: Sequence of projects to filter groups by
+        group_ids: Optional sequence of specific group IDs to fetch
+        search_fn: Optional search function to find groups if no IDs provided
 
-    acting_user = user if user.is_authenticated else None
+    Returns:
+        Tuple of:
+            - List of group IDs that were found
+            - List of Group objects that were found
+
+    Notes:
+        - If group_ids provided, filters to only valid groups in the org/projects
+        - If no group_ids but search_fn provided, uses search to find groups
+        - Limited to BULK_MUTATION_LIMIT results when using search
+    """
+    _group_ids: list[int | str] = []
+    _group_list: list[Group] = []
+
+    if group_ids:
+        _group_list = list(
+            Group.objects.filter(
+                project__organization_id=organization_id, project__in=projects, id__in=group_ids
+            )
+        )
+        # filter down group ids to only valid matches
+        _group_ids = [g.id for g in _group_list]
+
+    if search_fn and not _group_ids:
+        # It can raise ValidationError
+        cursor_result, _ = search_fn(
+            {
+                "limit": BULK_MUTATION_LIMIT,
+                "paginator_options": {"max_limit": BULK_MUTATION_LIMIT},
+            }
+        )
+
+        _group_list = list(cursor_result)
+        _group_ids = [g.id for g in _group_list]
+
+    return _group_ids, _group_list
+
+
+def handle_resolve_in_release(
+    status: str,
+    status_details: Mapping[str, Any],
+    group_list: Sequence[Group],
+    projects: Sequence[Project],
+    project_lookup: Mapping[int, Project],
+    acting_user,
+    user: RpcUser | User | AnonymousUser,
+    result: MutableMapping[str, Any],
+) -> tuple[dict[str, Any], int | None]:
+    res_type = None
+    release = None
+    commit = None
     self_assign_issue = "0"
     if acting_user:
         user_options = user_option_service.get_many(
@@ -222,396 +356,401 @@ def update_groups(
         )
         if user_options:
             self_assign_issue = user_options[0].value
-    if search_fn and not group_ids:
+    res_status = None
+    if status == "resolvedInNextRelease" or status_details.get("inNextRelease"):
+        # TODO(jess): We may want to support this for multi project, but punting on it for now
+        if len(projects) > 1:
+            raise MultipleProjectsError()
+        # may not be a release yet
+        release = status_details.get("inNextRelease") or get_release_to_resolve_by(projects[0])
+
+        activity_type = ActivityType.SET_RESOLVED_IN_RELEASE.value
+        activity_data = {
+            # no version yet
+            "version": ""
+        }
+
+        serialized_user = user_service.serialize_many(filter=dict(user_ids=[user.id]), as_user=user)
+        new_status_details = {
+            "inNextRelease": True,
+        }
+        if serialized_user:
+            new_status_details["actor"] = serialized_user[0]
+        res_type = GroupResolution.Type.in_next_release
+        res_type_str = "in_next_release"
+        res_status = GroupResolution.Status.pending
+    elif status_details.get("inUpcomingRelease"):
+        if len(projects) > 1:
+            raise MultipleProjectsError()
+        release = status_details.get("inUpcomingRelease") or most_recent_release(projects[0])
+        activity_type = ActivityType.SET_RESOLVED_IN_RELEASE.value
+        activity_data = {"version": ""}
+
+        serialized_user = user_service.serialize_many(filter=dict(user_ids=[user.id]), as_user=user)
+        new_status_details = {
+            "inUpcomingRelease": True,
+        }
+        if serialized_user:
+            new_status_details["actor"] = serialized_user[0]
+        res_type = GroupResolution.Type.in_upcoming_release
+        res_type_str = "in_upcoming_release"
+        res_status = GroupResolution.Status.pending
+    elif status_details.get("inRelease"):
+        # TODO(jess): We could update validation to check if release
+        # applies to multiple projects, but I think we agreed to punt
+        # on this for now
+        if len(projects) > 1:
+            raise MultipleProjectsError()
+        release = status_details["inRelease"]
+        activity_type = ActivityType.SET_RESOLVED_IN_RELEASE.value
+        activity_data = {
+            # no version yet
+            "version": release.version
+        }
+
+        serialized_user = user_service.serialize_many(filter=dict(user_ids=[user.id]), as_user=user)
+        new_status_details = {
+            "inRelease": release.version,
+        }
+        if serialized_user:
+            new_status_details["actor"] = serialized_user[0]
+        res_type = GroupResolution.Type.in_release
+        res_type_str = "in_release"
+        res_status = GroupResolution.Status.resolved
+    elif status_details.get("inCommit"):
+        # TODO(jess): Same here, this is probably something we could do, but
+        # punting for now.
+        if len(projects) > 1:
+            raise MultipleProjectsError()
+        commit = status_details["inCommit"]
+        activity_type = ActivityType.SET_RESOLVED_IN_COMMIT.value
+        activity_data = {"commit": commit.id}
+        serialized_user = user_service.serialize_many(filter=dict(user_ids=[user.id]), as_user=user)
+
+        new_status_details = {
+            "inCommit": serialize(commit, user),
+        }
+        if serialized_user:
+            new_status_details["actor"] = serialized_user[0]
+        res_type_str = "in_commit"
+    else:
+        res_type_str = "now"
+        activity_type = ActivityType.SET_RESOLVED.value
+        activity_data = {}
+        new_status_details = {}
+
+    metrics.incr("group.resolved", instance=res_type_str, skip_internal=True)
+
+    # if we've specified a commit, let's see if its already been released
+    # this will allow us to associate the resolution to a release as if we
+    # were simply using 'inRelease' above
+    # Note: this is different than the way commit resolution works on deploy
+    # creation, as a given deploy is connected to an explicit release, and
+    # in this case we're simply choosing the most recent release which contains
+    # the commit.
+    if commit and not release:
+        # TODO(jess): If we support multiple projects for release / commit resolution,
+        # we need to update this to find the release for each project (we shouldn't assume
+        # it's the same)
         try:
-            cursor_result, _ = search_fn(
-                {
-                    "limit": BULK_MUTATION_LIMIT,
-                    "paginator_options": {"max_limit": BULK_MUTATION_LIMIT},
-                }
+            release = most_recent_release_matching_commit(projects, commit)
+            res_type = GroupResolution.Type.in_release
+            res_status = GroupResolution.Status.resolved
+        except IndexError:
+            release = None
+    for group in group_list:
+        with transaction.atomic(router.db_for_write(Group)):
+            process_group_resolution(
+                group,
+                group_list,
+                release,
+                commit,
+                res_type,
+                res_status,
+                acting_user,
+                user,
+                self_assign_issue,
+                activity_type,
+                activity_data,
+                result,
             )
-        except ValidationError as exc:
-            return Response({"detail": str(exc)}, status=400)
-
-        group_list = list(cursor_result)
-        group_ids = [g.id for g in group_list]
-
-    is_bulk = len(group_ids) > 1
-
-    group_project_ids = {g.project_id for g in group_list}
-    # filter projects down to only those that have groups in the search results
-    projects = [p for p in projects if p.id in group_project_ids]
-
-    queryset = Group.objects.filter(id__in=group_ids)
 
-    discard = result.get("discard")
-    if discard:
-        return handle_discard(request, list(queryset), projects, acting_user)
+        issue_resolved.send_robust(
+            organization_id=projects[0].organization_id,
+            user=(acting_user or user),
+            group=group,
+            project=project_lookup[group.project_id],
+            resolution_type=res_type_str,
+            sender=update_groups,
+        )
 
-    status_details = result.pop("statusDetails", result)
-    status = result.get("status")
-    release = None
-    commit = None
-    res_type = None
-    activity_type = None
-    activity_data: MutableMapping[str, Any | None] | None = None
-    if "priority" in result:
-        handle_priority(
-            priority=result["priority"],
-            group_list=group_list,
-            actor=acting_user,
-            project_lookup=project_lookup,
+        kick_off_status_syncs.apply_async(
+            kwargs={"project_id": group.project_id, "group_id": group.id}
         )
-    if status in ("resolved", "resolvedInNextRelease"):
-        res_status = None
-        if status == "resolvedInNextRelease" or status_details.get("inNextRelease"):
-            # TODO(jess): We may want to support this for multi project, but punting on it for now
-            if len(projects) > 1:
-                return Response(
-                    {"detail": "Cannot set resolved in next release for multiple projects."},
-                    status=400,
-                )
-            # may not be a release yet
-            release = status_details.get("inNextRelease") or get_latest_release(projects[0])
 
-            activity_type = ActivityType.SET_RESOLVED_IN_RELEASE.value
-            activity_data = {
-                # no version yet
-                "version": ""
-            }
+    result.update({"status": "resolved", "statusDetails": new_status_details})
 
-            serialized_user = user_service.serialize_many(
-                filter=dict(user_ids=[user.id]), as_user=user
-            )
-            new_status_details = {
-                "inNextRelease": True,
-            }
-            if serialized_user:
-                new_status_details["actor"] = serialized_user[0]
-            res_type = GroupResolution.Type.in_next_release
-            res_type_str = "in_next_release"
-            res_status = GroupResolution.Status.pending
-        elif status_details.get("inUpcomingRelease"):
-            if len(projects) > 1:
-                return Response(
-                    {"detail": "Cannot set resolved in upcoming release for multiple projects."},
-                    status=400,
-                )
-            release = (
-                status_details.get("inUpcomingRelease")
-                or Release.objects.filter(
-                    projects=projects[0], organization_id=projects[0].organization_id
-                )
-                .extra(select={"sort": "COALESCE(date_released, date_added)"})
-                .order_by("-sort")[0]
-            )
-            activity_type = ActivityType.SET_RESOLVED_IN_RELEASE.value
-            activity_data = {"version": ""}
+    return dict(result), res_type
 
-            serialized_user = user_service.serialize_many(
-                filter=dict(user_ids=[user.id]), as_user=user
-            )
-            new_status_details = {
-                "inUpcomingRelease": True,
-            }
-            if serialized_user:
-                new_status_details["actor"] = serialized_user[0]
-            res_type = GroupResolution.Type.in_upcoming_release
-            res_type_str = "in_upcoming_release"
-            res_status = GroupResolution.Status.pending
-        elif status_details.get("inRelease"):
-            # TODO(jess): We could update validation to check if release
-            # applies to multiple projects, but I think we agreed to punt
-            # on this for now
-            if len(projects) > 1:
-                return Response(
-                    {"detail": "Cannot set resolved in release for multiple projects."}, status=400
-                )
-            release = status_details["inRelease"]
-            activity_type = ActivityType.SET_RESOLVED_IN_RELEASE.value
-            activity_data = {
-                # no version yet
-                "version": release.version
-            }
 
-            serialized_user = user_service.serialize_many(
-                filter=dict(user_ids=[user.id]), as_user=user
-            )
-            new_status_details = {
-                "inRelease": release.version,
-            }
-            if serialized_user:
-                new_status_details["actor"] = serialized_user[0]
-            res_type = GroupResolution.Type.in_release
-            res_type_str = "in_release"
-            res_status = GroupResolution.Status.resolved
-        elif status_details.get("inCommit"):
-            # TODO(jess): Same here, this is probably something we could do, but
-            # punting for now.
-            if len(projects) > 1:
-                return Response(
-                    {"detail": "Cannot set resolved in commit for multiple projects."}, status=400
-                )
-            commit = status_details["inCommit"]
-            activity_type = ActivityType.SET_RESOLVED_IN_COMMIT.value
-            activity_data = {"commit": commit.id}
-            serialized_user = user_service.serialize_many(
-                filter=dict(user_ids=[user.id]), as_user=user
+def process_group_resolution(
+    group: Group,
+    group_list: Sequence[Group],
+    release: Release | None,
+    commit: Commit | None,
+    res_type: int | None,
+    res_status: int | None,
+    acting_user,
+    user: RpcUser | User | AnonymousUser,
+    self_assign_issue: str,
+    activity_type: int,
+    activity_data: MutableMapping[str, Any],
+    result: MutableMapping[str, Any],
+):
+    now = django_timezone.now()
+    resolution = None
+    created = None
+    if release:
+        # These are the parameters that are set for creating a GroupResolution
+        resolution_params: ResolutionParams = {
+            "release": release,
+            "type": res_type,
+            "status": res_status,
+            "actor_id": user.id if user and user.is_authenticated else None,
+        }
+
+        # We only set `current_release_version` if GroupResolution type is
+        # in_next_release, because we need to store information about the latest/most
+        # recent release that was associated with a group and that is required for
+        # release comparisons (i.e. handling regressions)
+        if res_type == GroupResolution.Type.in_next_release:
+            # Check if semver versioning scheme is followed
+            follows_semver = follows_semver_versioning_scheme(
+                org_id=group.project.organization_id,
+                project_id=group.project_id,
+                release_version=release.version,
             )
 
-            new_status_details = {
-                "inCommit": serialize(commit, user),
-            }
-            if serialized_user:
-                new_status_details["actor"] = serialized_user[0]
-            res_type_str = "in_commit"
-        else:
-            res_type_str = "now"
-            activity_type = ActivityType.SET_RESOLVED.value
-            activity_data = {}
-            new_status_details = {}
-
-        now = django_timezone.now()
-        metrics.incr("group.resolved", instance=res_type_str, skip_internal=True)
-
-        # if we've specified a commit, let's see if its already been released
-        # this will allow us to associate the resolution to a release as if we
-        # were simply using 'inRelease' above
-        # Note: this is different than the way commit resolution works on deploy
-        # creation, as a given deploy is connected to an explicit release, and
-        # in this case we're simply choosing the most recent release which contains
-        # the commit.
-        if commit and not release:
-            # TODO(jess): If we support multiple projects for release / commit resolution,
-            # we need to update this to find the release for each project (we shouldn't assume
-            # it's the same)
-            try:
-                release = (
-                    Release.objects.filter(projects__in=projects, releasecommit__commit=commit)
-                    .extra(select={"sort": "COALESCE(date_released, date_added)"})
-                    .order_by("-sort")[0]
-                )
-                res_type = GroupResolution.Type.in_release
-                res_status = GroupResolution.Status.resolved
-            except IndexError:
-                release = None
-        for group in group_list:
-            with transaction.atomic(router.db_for_write(Group)):
-                resolution = None
-                created = None
-                if release:
-                    resolution_params = {
-                        "release": release,
-                        "type": res_type,
-                        "status": res_status,
-                        "actor_id": user.id if user.is_authenticated else None,
-                    }
-
-                    # We only set `current_release_version` if GroupResolution type is
-                    # in_next_release, because we need to store information about the latest/most
-                    # recent release that was associated with a group and that is required for
-                    # release comparisons (i.e. handling regressions)
-                    if res_type == GroupResolution.Type.in_next_release:
-                        # Check if semver versioning scheme is followed
-                        follows_semver = follows_semver_versioning_scheme(
-                            org_id=group.organization.id,
-                            project_id=group.project.id,
-                            release_version=release.version,
+            current_release_version = get_current_release_version_of_group(group, follows_semver)
+
+            if current_release_version:
+                resolution_params.update({"current_release_version": current_release_version})
+
+                # Sets `current_release_version` for activity, since there is no point
+                # waiting for when a new release is created i.e.
+                # clear_expired_resolutions task to be run.
+                # Activity should look like "... resolved in version
+                # >current_release_version" in the UI
+                if follows_semver:
+                    activity_data.update({"current_release_version": current_release_version})
+
+                    # In semver projects, and thereby semver releases, we determine
+                    # resolutions by comparing against an expression rather than a
+                    # specific release (i.e. >current_release_version). Consequently,
+                    # at this point we can consider this GroupResolution as resolved
+                    # in release
+                    resolution_params.update(
+                        {
+                            "type": GroupResolution.Type.in_release,
+                            "status": GroupResolution.Status.resolved,
+                        }
+                    )
+                else:
+                    # If we already know the `next` release in date based ordering
+                    # when clicking on `resolvedInNextRelease` because it is already
+                    # been released, there is no point in setting GroupResolution to
+                    # be of type in_next_release but rather in_release would suffice
+
+                    try:
+                        # Get current release object from current_release_version
+                        current_release_obj = Release.objects.get(
+                            version=current_release_version,
+                            organization_id=group.project.organization_id,
                         )
 
-                        current_release_version = get_current_release_version_of_group(
-                            group=group, follows_semver=follows_semver
+                        date_order_q = Q(date_added__gt=current_release_obj.date_added) | Q(
+                            date_added=current_release_obj.date_added,
+                            id__gt=current_release_obj.id,
                         )
-                        if current_release_version:
-                            resolution_params.update(
-                                {"current_release_version": current_release_version}
+
+                        # Find the next release after the current_release_version
+                        # i.e. the release that resolves the issue
+                        resolved_in_release = (
+                            Release.objects.filter(
+                                date_order_q,
+                                projects=group.project,
+                                organization_id=group.project.organization_id,
                             )
+                            .extra(select={"sort": "COALESCE(date_released, date_added)"})
+                            .order_by("sort", "id")[:1]
+                            .get()
+                        )
 
-                            # Sets `current_release_version` for activity, since there is no point
-                            # waiting for when a new release is created i.e.
-                            # clear_expired_resolutions task to be run.
-                            # Activity should look like "... resolved in version
-                            # >current_release_version" in the UI
-                            if follows_semver:
-                                activity_data.update(
-                                    {"current_release_version": current_release_version}
-                                )
-
-                                # In semver projects, and thereby semver releases, we determine
-                                # resolutions by comparing against an expression rather than a
-                                # specific release (i.e. >current_release_version). Consequently,
-                                # at this point we can consider this GroupResolution as resolved
-                                # in release
-                                resolution_params.update(
-                                    {
-                                        "type": GroupResolution.Type.in_release,
-                                        "status": GroupResolution.Status.resolved,
-                                    }
-                                )
-                            else:
-                                # If we already know the `next` release in date based ordering
-                                # when clicking on `resolvedInNextRelease` because it is already
-                                # been released, there is no point in setting GroupResolution to
-                                # be of type in_next_release but rather in_release would suffice
-
-                                try:
-                                    # Get current release object from current_release_version
-                                    current_release_obj = Release.objects.get(
-                                        version=current_release_version,
-                                        organization_id=projects[0].organization_id,
-                                    )
-
-                                    date_order_q = Q(
-                                        date_added__gt=current_release_obj.date_added
-                                    ) | Q(
-                                        date_added=current_release_obj.date_added,
-                                        id__gt=current_release_obj.id,
-                                    )
-
-                                    # Find the next release after the current_release_version
-                                    # i.e. the release that resolves the issue
-                                    resolved_in_release = (
-                                        Release.objects.filter(
-                                            date_order_q,
-                                            projects=projects[0],
-                                            organization_id=projects[0].organization_id,
-                                        )
-                                        .extra(
-                                            select={"sort": "COALESCE(date_released, date_added)"}
-                                        )
-                                        .order_by("sort", "id")[:1]
-                                        .get()
-                                    )
-
-                                    # If we get here, we assume it exists and so we update
-                                    # GroupResolution and Activity
-                                    resolution_params.update(
-                                        {
-                                            "release": resolved_in_release,
-                                            "type": GroupResolution.Type.in_release,
-                                            "status": GroupResolution.Status.resolved,
-                                        }
-                                    )
-                                    activity_data.update({"version": resolved_in_release.version})
-                                except Release.DoesNotExist:
-                                    # If it gets here, it means we don't know the upcoming
-                                    # release yet because it does not exist, and so we should
-                                    # fall back to our current model
-                                    ...
-
-                    resolution, created = GroupResolution.objects.get_or_create(
-                        group=group, defaults=resolution_params
-                    )
-                    if not created:
-                        resolution.update(datetime=django_timezone.now(), **resolution_params)
-
-                if commit:
-                    GroupLink.objects.create(
-                        group_id=group.id,
-                        project_id=group.project_id,
-                        linked_type=GroupLink.LinkedType.commit,
-                        relationship=GroupLink.Relationship.resolves,
-                        linked_id=commit.id,
-                    )
+                        # If we get here, we assume it exists and so we update
+                        # GroupResolution and Activity
+                        resolution_params.update(
+                            {
+                                "release": resolved_in_release,
+                                "type": GroupResolution.Type.in_release,
+                                "status": GroupResolution.Status.resolved,
+                            }
+                        )
+                        activity_data.update({"version": resolved_in_release.version})
+                    except Release.DoesNotExist:
+                        # If it gets here, it means we don't know the upcoming
+                        # release yet because it does not exist, and so we should
+                        # fall back to our current model
+                        ...
+
+        resolution, created = GroupResolution.objects.get_or_create(
+            group=group, defaults=resolution_params
+        )
+        if not created:
+            resolution.update(datetime=django_timezone.now(), **resolution_params)
+
+    if commit:
+        GroupLink.objects.create(
+            group_id=group.id,
+            project_id=group.project_id,
+            linked_type=GroupLink.LinkedType.commit,
+            relationship=GroupLink.Relationship.resolves,
+            linked_id=commit.id,
+        )
 
-                affected = Group.objects.filter(id=group.id).update(
-                    status=GroupStatus.RESOLVED, resolved_at=now, substatus=None
-                )
-                if not resolution:
-                    created = affected
-
-                group.status = GroupStatus.RESOLVED
-                group.substatus = None
-                group.resolved_at = now
-                if affected and not options.get("groups.enable-post-update-signal"):
-                    post_save.send(
-                        sender=Group,
-                        instance=group,
-                        created=False,
-                        update_fields=["resolved_at", "status", "substatus"],
-                    )
-                remove_group_from_inbox(
-                    group, action=GroupInboxRemoveAction.RESOLVED, user=acting_user
-                )
-                result["inbox"] = None
-
-                assigned_to = self_subscribe_and_assign_issue(acting_user, group, self_assign_issue)
-                if assigned_to is not None:
-                    result["assignedTo"] = assigned_to
-
-                if created:
-                    activity = Activity.objects.create(
-                        project=project_lookup[group.project_id],
-                        group=group,
-                        type=activity_type,
-                        user_id=acting_user.id,
-                        ident=resolution.id if resolution else None,
-                        data=activity_data,
-                    )
-                    record_group_history_from_activity_type(group, activity_type, actor=acting_user)
+    affected = Group.objects.filter(id=group.id).update(
+        status=GroupStatus.RESOLVED, resolved_at=now, substatus=None
+    )
+    if not resolution:
+        created = bool(affected)
+
+    group.status = GroupStatus.RESOLVED
+    group.substatus = None
+    group.resolved_at = now
+    if affected and not options.get("groups.enable-post-update-signal"):
+        post_save.send(
+            sender=Group,
+            instance=group,
+            created=False,
+            update_fields=["resolved_at", "status", "substatus"],
+        )
+    remove_group_from_inbox(group, action=GroupInboxRemoveAction.RESOLVED, user=acting_user)
+    result["inbox"] = None
 
-                    # TODO(dcramer): we need a solution for activity rollups
-                    # before sending notifications on bulk changes
-                    if not is_bulk:
-                        transaction.on_commit(
-                            lambda: activity.send_notification(), router.db_for_write(Group)
-                        )
+    assigned_to = self_subscribe_and_assign_issue(acting_user, group, self_assign_issue)
+    if assigned_to is not None:
+        result["assignedTo"] = assigned_to
 
-            issue_resolved.send_robust(
-                organization_id=organization_id,
-                user=(acting_user or user),
-                group=group,
-                project=project_lookup[group.project_id],
-                resolution_type=res_type_str,
-                sender=update_groups,
-            )
+    if created:
+        activity = Activity.objects.create(
+            project=group.project,
+            group=group,
+            type=activity_type,
+            user_id=acting_user.id,
+            ident=resolution.id if resolution else None,
+            data=dict(activity_data),
+        )
+        record_group_history_from_activity_type(group, activity_type, actor=acting_user)
 
-            kick_off_status_syncs.apply_async(
-                kwargs={"project_id": group.project_id, "group_id": group.id}
-            )
+        # TODO(dcramer): we need a solution for activity rollups
+        # before sending notifications on bulk changes
+        if not len(group_list) > 1:
+            transaction.on_commit(lambda: activity.send_notification(), router.db_for_write(Group))
 
-        result.update({"status": "resolved", "statusDetails": new_status_details})
 
-    elif status:
-        new_status = STATUS_UPDATE_CHOICES[result["status"]]
-        new_substatus = (
-            SUBSTATUS_UPDATE_CHOICES[result.get("substatus")] if result.get("substatus") else None
-        )
-        new_substatus = infer_substatus(new_status, new_substatus, status_details, group_list)
+def merge_groups(
+    group_list: Sequence[Group],
+    project_lookup: Mapping[int, Project],
+    acting_user,
+    referer: str,
+) -> MergedGroup:
+    issue_stream_regex = r"^(\/organizations\/[^\/]+)?\/issues\/$"
+    similar_issues_tab_regex = r"^(\/organizations\/[^\/]+)?\/issues\/\d+\/similar\/$"
+
+    metrics.incr(
+        "grouping.merge_issues",
+        sample_rate=1.0,
+        tags={
+            # We assume that if someone's merging groups, they're from the same platform
+            "platform": group_list[0].platform or "unknown",
+            "sdk": group_list[0].sdk or "unknown",
+            # TODO: It's probably cleaner to just send this value from the front end
+            "referer": (
+                "issue stream"
+                if re.search(issue_stream_regex, referer)
+                else (
+                    "similar issues tab"
+                    if re.search(similar_issues_tab_regex, referer)
+                    else "unknown"
+                )
+            ),
+        },
+    )
+    return handle_merge(group_list, project_lookup, acting_user)
 
-        with transaction.atomic(router.db_for_write(Group)):
-            # TODO(gilbert): update() doesn't call pre_save and bypasses any substatus defaulting we have there
-            #                we should centralize the logic for validating and defaulting substatus values
-            #                and refactor pre_save and the above new_substatus assignment to account for this
-            status_updated = queryset.exclude(status=new_status).update(
-                status=new_status, substatus=new_substatus
-            )
-            GroupResolution.objects.filter(group__in=group_ids).delete()
-            if new_status == GroupStatus.IGNORED:
-                if new_substatus == GroupSubStatus.UNTIL_ESCALATING:
-                    result["statusDetails"] = handle_archived_until_escalating(
-                        group_list, acting_user, projects, sender=update_groups
-                    )
-                else:
-                    result["statusDetails"] = handle_ignored(
-                        group_ids, group_list, status_details, acting_user, user
-                    )
-                result["inbox"] = None
+
+def handle_other_status_updates(
+    result: dict[str, Any],
+    group_list: Sequence[Group],
+    projects: Sequence[Project],
+    project_lookup: Mapping[int, Project],
+    status_details: dict[str, Any],
+    acting_user,
+    user: RpcUser | User | AnonymousUser,
+) -> dict[str, Any]:
+    group_ids = [group.id for group in group_list]
+    queryset = Group.objects.filter(id__in=group_ids)
+    new_status = STATUS_UPDATE_CHOICES[result["status"]]
+    new_substatus = None
+    if result.get("substatus"):
+        new_substatus = SUBSTATUS_UPDATE_CHOICES[result["substatus"]]
+    new_substatus = infer_substatus(new_status, new_substatus, status_details, group_list)
+
+    with transaction.atomic(router.db_for_write(Group)):
+        # TODO(gilbert): update() doesn't call pre_save and bypasses any substatus defaulting we have there
+        #                we should centralize the logic for validating and defaulting substatus values
+        #                and refactor pre_save and the above new_substatus assignment to account for this
+        status_updated = queryset.exclude(status=new_status).update(
+            status=new_status, substatus=new_substatus
+        )
+        GroupResolution.objects.filter(group__in=group_ids).delete()
+        if new_status == GroupStatus.IGNORED:
+            if new_substatus == GroupSubStatus.UNTIL_ESCALATING:
+                result["statusDetails"] = handle_archived_until_escalating(
+                    group_list, acting_user, projects, sender=update_groups
+                )
             else:
-                result["statusDetails"] = {}
-        if group_list and status_updated:
-            activity_type, activity_data = handle_status_update(
-                group_list=group_list,
-                projects=projects,
-                project_lookup=project_lookup,
-                new_status=new_status,
-                new_substatus=new_substatus,
-                is_bulk=is_bulk,
-                acting_user=acting_user,
-                status_details=result.get("statusDetails", {}),
-                sender=update_groups,
-            )
+                result["statusDetails"] = handle_ignored(
+                    group_list, status_details, acting_user, user
+                )
+            result["inbox"] = None
+        else:
+            result["statusDetails"] = {}
 
+    if group_list and status_updated:
+        handle_status_update(
+            group_list=group_list,
+            projects=projects,
+            project_lookup=project_lookup,
+            new_status=new_status,
+            new_substatus=new_substatus,
+            is_bulk=len(group_ids) > 1,
+            acting_user=acting_user,
+            status_details=result.get("statusDetails", {}),
+            sender=update_groups,
+        )
+    return result
+
+
+def prepare_response(
+    result: dict[str, Any],
+    group_list: Sequence[Group],
+    project_lookup: Mapping[int, Project],
+    projects: Sequence[Project],
+    acting_user,
+    data: Mapping[str, Any],
+    res_type: int | None,
+    referer: str,
+) -> Response:
     # XXX (ahmed): hack to get the activities to work properly on issues page. Not sure of
     # what performance impact this might have & this possibly should be moved else where
     try:
@@ -640,14 +779,10 @@ def update_groups(
             acting_user,
         )
 
-    handle_has_seen(
-        result.get("hasSeen"), group_list, group_ids, project_lookup, projects, acting_user
-    )
+    handle_has_seen(result.get("hasSeen"), group_list, project_lookup, projects, acting_user)
 
     if "isBookmarked" in result:
-        handle_is_bookmarked(
-            result["isBookmarked"], group_list, group_ids, project_lookup, acting_user
-        )
+        handle_is_bookmarked(result["isBookmarked"], group_list, project_lookup, acting_user)
 
     if result.get("isSubscribed") in (True, False):
         result["subscriptionDetails"] = handle_is_subscribed(
@@ -659,38 +794,20 @@ def update_groups(
             result["isPublic"], group_list, project_lookup, acting_user
         )
 
-    # XXX(dcramer): this feels a bit shady like it should be its own endpoint.
+    # TODO: Create new endpoint for this
     if result.get("merge") and len(group_list) > 1:
         # don't allow merging cross project
-        if len(projects) > 1:
-            return Response({"detail": "Merging across multiple projects is not supported"})
-
-        referer = urlparse(request.META.get("HTTP_REFERER", "")).path
-        issue_stream_regex = r"^(\/organizations\/[^\/]+)?\/issues\/$"
-        similar_issues_tab_regex = r"^(\/organizations\/[^\/]+)?\/issues\/\d+\/similar\/$"
-
-        metrics.incr(
-            "grouping.merge_issues",
-            sample_rate=1.0,
-            tags={
-                # We assume that if someone's merging groups, they're from the same platform
-                "platform": group_list[0].platform or "unknown",
-                "sdk": group_list[0].sdk or "unknown",
-                # TODO: It's probably cleaner to just send this value from the front end
-                "referer": (
-                    "issue stream"
-                    if re.search(issue_stream_regex, referer)
-                    else (
-                        "similar issues tab"
-                        if re.search(similar_issues_tab_regex, referer)
-                        else "unknown"
-                    )
-                ),
-            },
+        if len(project_lookup) > 1:
+            return Response(
+                {"detail": "Merging across multiple projects is not supported"}, status=400
+            )
+        result["merge"] = merge_groups(
+            group_list,
+            project_lookup,
+            acting_user,
+            urlparse(referer).path,
         )
 
-        result["merge"] = handle_merge(group_list, project_lookup, acting_user)
-
     inbox = result.get("inbox", None)
     if inbox is not None:
         result["inbox"] = update_inbox(
@@ -698,45 +815,57 @@ def update_groups(
             group_list,
             project_lookup,
             acting_user,
-            http_referrer=request.META.get("HTTP_REFERER"),
+            http_referrer=referer,
             sender=update_groups,
         )
 
     return Response(result)
 
 
-def get_latest_release(project: Project) -> Release | None:
-    release = None
+def get_release_to_resolve_by(project: Project) -> Release | None:
+    follows_semver = follows_semver_versioning_scheme(
+        org_id=project.organization_id, project_id=project.id
+    )
+    return greatest_semver_release(project) if follows_semver else most_recent_release(project)
 
-    # XXX: Remove block once released
-    follows_semver = False
-    if features.has("organizations:releases-resolve-next-release-semver-fix", project.organization):
-        follows_semver = follows_semver_versioning_scheme(
-            org_id=project.organization_id, project_id=project.id
-        )
 
-    releases = Release.objects.filter(projects=project, organization_id=project.organization_id)
-    if follows_semver:
-        release = (
-            releases.filter_to_semver()
-            .annotate_prerelease_column()
-            .order_by(*[f"-{col}" for col in Release.SEMVER_COLS])
-            .first()
-        )
-    else:
-        release = (
-            releases.extra(select={"sort": "COALESCE(date_released, date_added)"})
-            .order_by("-sort")
-            .first()
-        )
-    return release
+def most_recent_release(project: Project) -> Release | None:
+    return (
+        Release.objects.filter(projects=project, organization_id=project.organization_id)
+        .extra(select={"sort": "COALESCE(date_released, date_added)"})
+        .order_by("-sort")
+        .first()
+    )
+
+
+def most_recent_release_matching_commit(
+    projects: Sequence[Project], commit: Commit
+) -> Release | None:
+    return (
+        Release.objects.filter(projects__in=projects, releasecommit__commit=commit)
+        .extra(select={"sort": "COALESCE(date_released, date_added)"})
+        .order_by("-sort")[0]
+    )
+
+
+def greatest_semver_release(project: Project) -> Release | None:
+    return get_semver_releases(project).first()
+
+
+def get_semver_releases(project: Project) -> QuerySet[Release]:
+    return (
+        Release.objects.filter(projects=project, organization_id=project.organization_id)
+        .filter_to_semver()  # type: ignore[attr-defined]
+        .annotate_prerelease_column()
+        .order_by(*[f"-{col}" for col in Release.SEMVER_COLS])
+    )
 
 
 def handle_is_subscribed(
     is_subscribed: bool,
     group_list: Sequence[Group],
-    project_lookup: dict[int, Any],
-    acting_user: User,
+    project_lookup: Mapping[int, Project],
+    acting_user,
 ) -> dict[str, str]:
     # TODO(dcramer): we could make these more efficient by first
     # querying for which `GroupSubscription` rows are present (if N > 2),
@@ -761,14 +890,14 @@ def handle_is_subscribed(
 
 def handle_is_bookmarked(
     is_bookmarked: bool,
-    group_list: Sequence[Group] | None,
-    group_ids: Sequence[Group],
-    project_lookup: dict[int, Project],
-    acting_user: User | None,
+    group_list: Sequence[Group],
+    project_lookup: Mapping[int, Project],
+    acting_user,
 ) -> None:
     """
     Creates bookmarks and subscriptions for a user, or deletes the existing bookmarks and subscriptions.
     """
+    group_ids = [group.id for group in group_list]
     if is_bookmarked:
         for group in group_list:
             GroupBookmark.objects.get_or_create(
@@ -776,13 +905,16 @@ def handle_is_bookmarked(
                 group=group,
                 user_id=acting_user.id if acting_user else None,
             )
-            GroupSubscription.objects.subscribe(
-                subscriber=acting_user, group=group, reason=GroupSubscriptionReason.bookmark
-            )
-    elif is_bookmarked is False:
+            if acting_user:
+                GroupSubscription.objects.subscribe(
+                    subscriber=acting_user,
+                    group=group,
+                    reason=GroupSubscriptionReason.bookmark,
+                )
+    elif is_bookmarked is False and acting_user is not None:
         GroupBookmark.objects.filter(
             group__in=group_ids,
-            user_id=acting_user.id if acting_user else None,
+            user_id=acting_user.id,
         ).delete()
         if group_list:
             GroupSubscription.objects.filter(
@@ -792,12 +924,11 @@ def handle_is_bookmarked(
 
 
 def handle_has_seen(
-    has_seen: Any,
+    has_seen: bool | None,
     group_list: Sequence[Group],
-    group_ids: Sequence[Group],
-    project_lookup: dict[int, Project],
+    project_lookup: Mapping[int, Project],
     projects: Sequence[Project],
-    acting_user: User | None,
+    acting_user,
 ) -> None:
     is_member_map = {
         project.id: (
@@ -816,15 +947,17 @@ def handle_has_seen(
                     project=project_lookup[group.project_id],
                     values={"last_seen": django_timezone.now()},
                 )
-    elif has_seen is False:
-        GroupSeen.objects.filter(group__in=group_ids, user_id=user_id).delete()
+    elif has_seen is False and user_id is not None:
+        GroupSeen.objects.filter(
+            group__in=[group.id for group in group_list], user_id=user_id
+        ).delete()
 
 
 def handle_priority(
     priority: str,
     group_list: Sequence[Group],
-    actor: User | None,
-    project_lookup: dict[int, Project],
+    acting_user,
+    project_lookup: Mapping[int, Project],
 ) -> None:
     for group in group_list:
         priority_value = PriorityLevel.from_str(priority) if priority else None
@@ -833,7 +966,7 @@ def handle_priority(
             group=group,
             priority=priority_value,
             sender="manual_update_priority",
-            actor=actor,
+            actor=acting_user,
             project=project_lookup[group.project_id],
         )
         group.update(priority_locked_at=django_timezone.now())
@@ -841,9 +974,9 @@ def handle_priority(
 
 def handle_is_public(
     is_public: bool,
-    group_list: list[Group],
-    project_lookup: dict[int, Project],
-    acting_user: User | None,
+    group_list: Sequence[Group],
+    project_lookup: Mapping[int, Project],
+    acting_user,
 ) -> str | None:
     """
     Handle the isPublic flag on a group update.
@@ -855,7 +988,7 @@ def handle_is_public(
     user_id = acting_user.id if acting_user else None
     share_id = None
     for group in group_list:
-        if GroupShare.objects.filter(group=group).delete():
+        if GroupShare.objects.filter(group=group).delete()[0] > 0:
             share_id = None
             Activity.objects.create(
                 project=project_lookup[group.project_id],
@@ -885,9 +1018,9 @@ def handle_assigned_to(
     assigned_actor: Actor,
     assigned_by: str | None,
     integration: str | None,
-    group_list: list[Group],
-    project_lookup: dict[int, Project],
-    acting_user: User | None,
+    group_list: Sequence[Group],
+    project_lookup: Mapping[int, Project],
+    acting_user,
 ) -> ActorSerializerResponse | None:
     """
     Handle the assignedTo field on a group update.
diff --git a/src/sentry/api/serializers/models/__init__.py b/src/sentry/api/serializers/models/__init__.py
index 55cd1ce1872ce6..dd1128c455d2a8 100644
--- a/src/sentry/api/serializers/models/__init__.py
+++ b/src/sentry/api/serializers/models/__init__.py
@@ -23,7 +23,6 @@
 from .groupseen import *  # noqa: F401,F403
 from .grouptombstone import *  # noqa: F401,F403
 from .incidentactivity import *  # noqa: F401,F403
-from .incidentseen import *  # noqa: F401,F403
 from .notification_action import *  # noqa: F401,F403
 from .organization import *  # noqa: F401,F403
 from .organization_access_request import *  # noqa: F401,F403
diff --git a/src/sentry/api/serializers/models/apiauthorization.py b/src/sentry/api/serializers/models/apiauthorization.py
index 9c3d9b795a9329..4dc4517e9e9ece 100644
--- a/src/sentry/api/serializers/models/apiauthorization.py
+++ b/src/sentry/api/serializers/models/apiauthorization.py
@@ -1,5 +1,6 @@
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.models.apiauthorization import ApiAuthorization
+from sentry.organizations.services.organization import organization_service
 
 
 @register(ApiAuthorization)
@@ -23,4 +24,9 @@ def serialize(self, obj, attrs, user, **kwargs):
             "scopes": obj.get_scopes(),
             "application": attrs["application"],
             "dateCreated": obj.date_added,
+            "organization": (
+                organization_service.serialize_organization(id=obj.organization_id)
+                if obj.organization_id
+                else None
+            ),
         }
diff --git a/src/sentry/api/serializers/models/dashboard.py b/src/sentry/api/serializers/models/dashboard.py
index 1b8731adb11c62..3528bd1e62e5de 100644
--- a/src/sentry/api/serializers/models/dashboard.py
+++ b/src/sentry/api/serializers/models/dashboard.py
@@ -6,7 +6,7 @@
 from sentry import features
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.constants import ALL_ACCESS_PROJECTS
-from sentry.models.dashboard import Dashboard
+from sentry.models.dashboard import Dashboard, DashboardFavoriteUser
 from sentry.models.dashboard_permissions import DashboardPermissions
 from sentry.models.dashboard_widget import (
     DashboardWidget,
@@ -192,6 +192,8 @@ class DashboardListResponse(TypedDict):
     createdBy: UserSerializerResponse
     widgetDisplay: list[str]
     widgetPreview: list[dict[str, str]]
+    permissions: DashboardPermissionsResponse | None
+    isFavorited: bool
 
 
 class DashboardListSerializer(Serializer):
@@ -204,6 +206,14 @@ def get_attrs(self, item_list, user, **kwargs):
             .values("dashboard_id", "order", "display_type", "detail", "id")
         )
 
+        favorited_dashboard_ids = set(
+            DashboardFavoriteUser.objects.filter(
+                user_id=user.id, dashboard_id__in=item_dict.keys()
+            ).values_list("dashboard_id", flat=True)
+        )
+
+        permissions = DashboardPermissions.objects.filter(dashboard_id__in=item_dict.keys())
+
         result = defaultdict(lambda: {"widget_display": [], "widget_preview": [], "created_by": {}})
         for widget in widgets:
             dashboard = item_dict[widget["dashboard_id"]]
@@ -237,8 +247,13 @@ def get_attrs(self, item_list, user, **kwargs):
             )
         }
 
+        for permission in permissions:
+            dashboard = item_dict[permission.dashboard_id]
+            result[dashboard]["permissions"] = serialize(permission)
+
         for dashboard in item_dict.values():
             result[dashboard]["created_by"] = serialized_users.get(str(dashboard.created_by_id))
+            result[dashboard]["is_favorited"] = dashboard.id in favorited_dashboard_ids
 
         return result
 
@@ -250,6 +265,8 @@ def serialize(self, obj, attrs, user, **kwargs) -> DashboardListResponse:
             "createdBy": attrs.get("created_by"),
             "widgetDisplay": attrs.get("widget_display", []),
             "widgetPreview": attrs.get("widget_preview", []),
+            "permissions": attrs.get("permissions", None),
+            "isFavorited": attrs.get("is_favorited", False),
         }
         return data
 
@@ -276,6 +293,7 @@ class DashboardDetailsResponse(DashboardDetailsResponseOptional):
     projects: list[int]
     filters: DashboardFilters
     permissions: DashboardPermissionsResponse | None
+    isFavorited: bool
 
 
 @register(Dashboard)
@@ -312,6 +330,7 @@ def serialize(self, obj, attrs, user, **kwargs) -> DashboardDetailsResponse:
             "projects": [project.id for project in obj.projects.all()],
             "filters": {},
             "permissions": serialize(obj.permissions) if hasattr(obj, "permissions") else None,
+            "isFavorited": user.id in obj.favorited_by,
         }
 
         if obj.filters is not None:
diff --git a/src/sentry/api/serializers/models/event.py b/src/sentry/api/serializers/models/event.py
index ccde2d14b2d637..1d2255fa2e3941 100644
--- a/src/sentry/api/serializers/models/event.py
+++ b/src/sentry/api/serializers/models/event.py
@@ -586,6 +586,7 @@ def serialize(self, obj, attrs, user, **kwargs):
         "platform": str,
         "dateCreated": datetime,
         "crashFile": str | None,
+        "metadata": dict[str, Any] | None,
     },
 )
 
@@ -642,6 +643,7 @@ def serialize(self, obj: BaseEvent, attrs, user, **kwargs) -> SimpleEventSeriali
             "dateCreated": obj.datetime,
             # Needed to generate minidump links in UI
             "crashFile": attrs["crash_file"],
+            "metadata": obj.get_event_metadata(),
         }
 
         return response
diff --git a/src/sentry/api/serializers/models/incidentseen.py b/src/sentry/api/serializers/models/incidentseen.py
deleted file mode 100644
index 68f02b3b5632ba..00000000000000
--- a/src/sentry/api/serializers/models/incidentseen.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from sentry.api.serializers import Serializer, register
-from sentry.incidents.models.incident import IncidentSeen
-from sentry.users.services.user.serial import serialize_generic_user
-from sentry.users.services.user.service import user_service
-
-
-@register(IncidentSeen)
-class IncidentSeenSerializer(Serializer):
-    def get_attrs(self, item_list, user, **kwargs):
-        item_users = user_service.serialize_many(
-            filter={
-                "user_ids": [i.user_id for i in item_list],
-            },
-            as_user=serialize_generic_user(user),
-        )
-        user_map = {d["id"]: d for d in item_users}
-
-        result = {}
-        for item in item_list:
-            result[item] = {"user": user_map[str(item.user_id)]}
-        return result
-
-    def serialize(self, obj, attrs, user, **kwargs):
-        data = attrs["user"]
-        data["lastSeen"] = obj.last_seen
-        return data
diff --git a/src/sentry/api/serializers/models/notification_action.py b/src/sentry/api/serializers/models/notification_action.py
index eb04e8a33781ea..52b1cf3aaabe32 100644
--- a/src/sentry/api/serializers/models/notification_action.py
+++ b/src/sentry/api/serializers/models/notification_action.py
@@ -4,7 +4,7 @@
 from django.contrib.auth.models import AnonymousUser
 
 from sentry.api.serializers import Serializer, register
-from sentry.models.notificationaction import (
+from sentry.notifications.models.notificationaction import (
     ActionService,
     ActionTarget,
     ActionTrigger,
diff --git a/src/sentry/api/serializers/models/organization.py b/src/sentry/api/serializers/models/organization.py
index 281f6108427e3e..57fe4a7765e958 100644
--- a/src/sentry/api/serializers/models/organization.py
+++ b/src/sentry/api/serializers/models/organization.py
@@ -30,7 +30,6 @@
 from sentry.auth.services.auth import RpcOrganizationAuthConfig, auth_service
 from sentry.constants import (
     ACCOUNT_RATE_LIMIT_DEFAULT,
-    AI_SUGGESTED_SOLUTION,
     ALERTS_MEMBER_WRITE_DEFAULT,
     ATTACHMENTS_ROLE_DEFAULT,
     DATA_CONSENT_DEFAULT,
@@ -482,7 +481,6 @@ class DetailedOrganizationSerializerResponse(_DetailedOrganizationSerializerResp
     pendingAccessRequests: int
     onboardingTasks: list[OnboardingTasksSerializerResponse]
     codecovAccess: bool
-    aiSuggestedSolution: bool
     hideAiFeatures: bool
     githubPRBot: bool
     githubOpenPRBot: bool
@@ -599,9 +597,6 @@ def serialize(  # type: ignore[explicit-override, override]
                 ),
                 "relayPiiConfig": str(obj.get_option("sentry:relay_pii_config") or "") or None,
                 "codecovAccess": bool(obj.flags.codecov_access),
-                "aiSuggestedSolution": bool(
-                    obj.get_option("sentry:ai_suggested_solution", AI_SUGGESTED_SOLUTION)
-                ),
                 "hideAiFeatures": bool(
                     obj.get_option("sentry:hide_ai_features", HIDE_AI_FEATURES_DEFAULT)
                 ),
@@ -614,7 +609,9 @@ def serialize(  # type: ignore[explicit-override, override]
                 "githubNudgeInvite": bool(
                     obj.get_option("sentry:github_nudge_invite", GITHUB_COMMENT_BOT_DEFAULT)
                 ),
-                "genAIConsent": bool(obj.get_option("sentry:gen_ai_consent", DATA_CONSENT_DEFAULT)),
+                "genAIConsent": bool(
+                    obj.get_option("sentry:gen_ai_consent_v2024_11_14", DATA_CONSENT_DEFAULT)
+                ),
                 "aggregatedDataConsent": bool(
                     obj.get_option("sentry:aggregated_data_consent", DATA_CONSENT_DEFAULT)
                 ),
@@ -698,7 +695,13 @@ def serialize(  # type: ignore[explicit-override, override]
         if sample_rate is not None:
             context["planSampleRate"] = sample_rate
 
-        desired_sample_rate, _ = get_org_sample_rate(org_id=obj.id, default_sample_rate=sample_rate)
+        if is_project_mode_sampling(obj):
+            desired_sample_rate = None
+        else:
+            desired_sample_rate, _ = get_org_sample_rate(
+                org_id=obj.id, default_sample_rate=sample_rate
+            )
+
         if desired_sample_rate is not None:
             context["desiredSampleRate"] = desired_sample_rate
 
diff --git a/src/sentry/api/serializers/models/plugin.py b/src/sentry/api/serializers/models/plugin.py
index 410985ab4572cd..41e3092eb0a7b1 100644
--- a/src/sentry/api/serializers/models/plugin.py
+++ b/src/sentry/api/serializers/models/plugin.py
@@ -6,8 +6,6 @@
 from sentry.api.serializers import Serializer
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.project import Project
-from sentry.utils.assets import get_asset_url
-from sentry.utils.http import absolute_uri
 
 # Dict with the plugin_name as the key, and enabling_feature_name as the value
 SHADOW_DEPRECATED_PLUGINS = {
@@ -70,10 +68,6 @@ def serialize(self, obj, attrs, user, **kwargs):
             "metadata": obj.get_metadata(),
             "contexts": contexts,
             "status": obj.get_status(),
-            "assets": [
-                {"url": absolute_uri(get_asset_url(obj.asset_key or obj.slug, asset))}
-                for asset in obj.get_assets()
-            ],
             "doc": doc,
             "firstPartyAlternative": getattr(obj, "alternative", None),
             "deprecationDate": (
diff --git a/src/sentry/api/serializers/models/project.py b/src/sentry/api/serializers/models/project.py
index 9574a289bfb6c1..840d4af67c0dce 100644
--- a/src/sentry/api/serializers/models/project.py
+++ b/src/sentry/api/serializers/models/project.py
@@ -78,6 +78,9 @@
     "first-event-severity-calculation",
     "alert-filters",
     "servicehooks",
+    "similarity-embeddings",
+    "similarity-embeddings-delete-by-hash",
+    "similarity-embeddings-backfill",
 }
 
 
@@ -770,14 +773,16 @@ def serialize(
         )
         if not self._collapse(LATEST_DEPLOYS_KEY):
             context[LATEST_DEPLOYS_KEY] = attrs["deploys"]
-        if "stats" in attrs:
-            context.update(stats=attrs["stats"])
-        if "transactionStats" in attrs:
-            context.update(transactionStats=attrs["transactionStats"])
-        if "sessionStats" in attrs:
-            context.update(sessionStats=attrs["sessionStats"])
-        if "options" in attrs:
-            context.update(options=attrs["options"])
+
+        if attrs["has_access"] or user.is_staff:
+            if "stats" in attrs:
+                context.update(stats=attrs["stats"])
+            if "transactionStats" in attrs:
+                context.update(transactionStats=attrs["transactionStats"])
+            if "sessionStats" in attrs:
+                context.update(sessionStats=attrs["sessionStats"])
+            if "options" in attrs:
+                context.update(options=attrs["options"])
 
         return context
 
diff --git a/src/sentry/api/serializers/rest_framework/dashboard.py b/src/sentry/api/serializers/rest_framework/dashboard.py
index 7d2fa91c3e9a9c..2c0a022186a181 100644
--- a/src/sentry/api/serializers/rest_framework/dashboard.py
+++ b/src/sentry/api/serializers/rest_framework/dashboard.py
@@ -4,6 +4,7 @@
 from enum import Enum
 from typing import TypedDict
 
+import sentry_sdk
 from django.db.models import Max
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field, extend_schema_serializer
@@ -26,6 +27,7 @@
     DashboardWidgetTypes,
     DatasetSourcesTypes,
 )
+from sentry.models.organization import Organization
 from sentry.models.team import Team
 from sentry.relay.config.metric_extraction import get_current_widget_specs, widget_exceeds_max_specs
 from sentry.search.events.builder.discover import UnresolvedQuery
@@ -38,6 +40,7 @@
     set_or_create_on_demand_state,
 )
 from sentry.tasks.relay import schedule_invalidate_project_config
+from sentry.users.models.user import User
 from sentry.utils.dates import parse_stats_period
 from sentry.utils.strings import oxfordize_list
 
@@ -171,6 +174,33 @@ class DashboardWidgetQuerySerializer(CamelSnakeSerializer[Dashboard]):
 
     validate_id = validate_id
 
+    def get_metrics_features(
+        self, organization: Organization | None, user: User | None
+    ) -> dict[str, bool | None]:
+        if organization is None or user is None:
+            return {}
+
+        feature_names = [
+            "organizations:mep-rollout-flag",
+            "organizations:dynamic-sampling",
+            "organizations:performance-use-metrics",
+            "organizations:dashboards-mep",
+        ]
+        batch_features = features.batch_has(
+            feature_names,
+            organization=organization,
+            actor=user,
+        )
+
+        return (
+            batch_features.get(f"organization:{organization.id}", {})
+            if batch_features is not None
+            else {
+                feature_name: features.has(feature_name, organization=organization, actor=user)
+                for feature_name in feature_names
+            }
+        )
+
     def validate(self, data):
         if not data.get("id"):
             keys = set(data.keys())
@@ -185,7 +215,7 @@ def validate(self, data):
         # Validate the query that would be created when run.
         conditions = self._get_attr(data, "conditions", "")
         orderby = self._get_attr(data, "orderby", "")
-        is_table = is_table_display_type(self.context.get("displayType"))
+        is_table = is_table_display_type(self.context.get("display_type"))
         columns = self._get_attr(data, "columns", []).copy()
         aggregates = self._get_attr(data, "aggregates", []).copy()
         fields = columns + aggregates
@@ -226,6 +256,17 @@ def validate(self, data):
             data["issue_query_error"] = {"conditions": [f"Invalid conditions: {err}"]}
 
         try:
+            batch_features = self.get_metrics_features(
+                self.context.get("organization"), self.context.get("user")
+            )
+            use_metrics = bool(
+                (
+                    batch_features.get("organizations:mep-rollout-flag", False)
+                    and batch_features.get("organizations:dynamic-sampling", False)
+                )
+                or batch_features.get("organizations:performance-use-metrics", False)
+                or batch_features.get("organizations:dashboards-mep", False)
+            )
             # When using the eps/epm functions, they require an interval argument
             # or to provide the start/end so that the interval can be computed.
             # This uses a hard coded start/end to ensure the validation succeeds
@@ -239,6 +280,7 @@ def validate(self, data):
                         "aggregates_only": not is_table,
                     },
                     use_aggregate_conditions=True,
+                    has_metrics=use_metrics,
                 ),
             )
 
@@ -312,7 +354,24 @@ def validate_display_type(self, display_type):
         return DashboardWidgetDisplayTypes.get_id_for_type_name(display_type)
 
     def validate_widget_type(self, widget_type):
-        return DashboardWidgetTypes.get_id_for_type_name(widget_type)
+        widget_type = DashboardWidgetTypes.get_id_for_type_name(widget_type)
+        if widget_type == DashboardWidgetTypes.DISCOVER or widget_type is None:
+            sentry_sdk.set_context(
+                "dashboard",
+                {
+                    "org_slug": self.context["organization"].slug,
+                },
+            )
+            sentry_sdk.capture_message("Created or updated widget with discover dataset.")
+            if features.has(
+                "organizations:deprecate-discover-widget-type",
+                self.context["organization"],
+                actor=self.context["request"].user,
+            ):
+                raise serializers.ValidationError(
+                    "Attribute value `discover` is deprecated. Please use `error-events` or `transaction-like`"
+                )
+        return widget_type
 
     validate_id = validate_id
 
@@ -321,6 +380,20 @@ def validate_interval(self, interval):
             raise serializers.ValidationError("Invalid interval")
         return interval
 
+    def to_internal_value(self, data):
+        # Update the context for the queries serializer because the display type is
+        # required for validation of the queries
+        queries_serializer = self.fields["queries"]
+        additional_context = {}
+
+        if data.get("display_type"):
+            additional_context["display_type"] = data.get("display_type")
+        if self.context.get("request") and self.context["request"].user:
+            additional_context["user"] = self.context["request"].user
+
+        queries_serializer.context.update(additional_context)
+        return super().to_internal_value(data)
+
     def validate(self, data):
         query_errors = []
         all_columns: set[str] = set()
@@ -567,7 +640,9 @@ def validate(self, data):
             permissions = data.get("permissions")
             if permissions and self.instance:
                 currentUser = self.context["request"].user
-                if self.instance.created_by_id != currentUser.id:
+                # managers and owners
+                has_write_access = self.context["request"].access.has_scope("org:write")
+                if self.instance.created_by_id != currentUser.id and not has_write_access:
                     raise serializers.ValidationError(
                         "Only the Dashboard Creator may modify Dashboard Edit Access"
                     )
diff --git a/src/sentry/api/serializers/rest_framework/notification_action.py b/src/sentry/api/serializers/rest_framework/notification_action.py
index 98f2048de063e6..a0df4108607086 100644
--- a/src/sentry/api/serializers/rest_framework/notification_action.py
+++ b/src/sentry/api/serializers/rest_framework/notification_action.py
@@ -1,3 +1,4 @@
+from collections.abc import Sequence
 from typing import TypedDict
 
 from django.db import router, transaction
@@ -9,13 +10,17 @@
 from sentry.constants import SentryAppInstallationStatus
 from sentry.integrations.services.integration import integration_service
 from sentry.integrations.slack.utils.channel import get_channel_id, validate_channel_id
-from sentry.models.notificationaction import ActionService, ActionTarget, NotificationAction
 from sentry.models.project import Project
+from sentry.notifications.models.notificationaction import (
+    ActionService,
+    ActionTarget,
+    NotificationAction,
+)
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 from sentry.utils.strings import oxfordize_list
 
 
-def format_choices_text(choices: list[tuple[int, str]]):
+def format_choices_text(choices: Sequence[tuple[int, str]]):
     choices_as_display_text = [f"'{display_text}'" for (_, display_text) in choices]
     return oxfordize_list(choices_as_display_text)
 
@@ -29,7 +34,7 @@ def format_choices_text(choices: list[tuple[int, str]]):
 
 
 # Note the ordering of fields affects the Spike Protection API Documentation
-class NotificationActionInputData(TypedDict):
+class NotificationActionInputData(TypedDict, total=False):
     trigger_type: int
     service_type: int
     integration_id: int
@@ -156,6 +161,11 @@ def validate_integration_and_service(self, data: NotificationActionInputData):
                 }
             )
         integration = integration_service.get_integration(integration_id=data.get("integration_id"))
+        if integration is None:
+            raise serializers.ValidationError(
+                f"Service type of '{service_provider}' requires having an active integration"
+            )
+
         if integration and service_provider != integration.provider:
             raise serializers.ValidationError(
                 {
@@ -247,7 +257,7 @@ def validate_discord_channel(
     ) -> NotificationActionInputData:
         """
         Validates that SPECIFIC targets for DISCORD service have the following target data:
-            target_display: Discord channel id
+            target_display: Discord channel name
             target_identifier: Discord channel id
         NOTE: Reaches out to via discord integration to verify channel
         """
@@ -259,12 +269,12 @@ def validate_discord_channel(
         ):
             return data
 
-        channel_name = data.get("target_display")
-        channel_id = data.get("target_identifier")
+        channel_name = data.get("target_display", None)
+        channel_id = data.get("target_identifier", None)
 
-        if not channel_id and channel_name:
+        if channel_id is None or channel_name is None:
             raise serializers.ValidationError(
-                {"target_identifier": "Did not receive a discord channel id."}
+                {"target_identifier": "Did not receive a discord channel id or name."}
             )
 
         try:
@@ -276,7 +286,6 @@ def validate_discord_channel(
         except Exception as e:
             raise serializers.ValidationError({"target_identifier": str(e)})
 
-        data["target_identifier"] = channel_id
         return data
 
     def validate_pagerduty_service(
diff --git a/src/sentry/api/serializers/snuba.py b/src/sentry/api/serializers/snuba.py
index c42d6d76d4baa8..3a5f09c8b24d18 100644
--- a/src/sentry/api/serializers/snuba.py
+++ b/src/sentry/api/serializers/snuba.py
@@ -114,6 +114,23 @@ def serialize(
             )
         }
 
+        confidence_values = []
+        if "confidence" in result.data:
+            for key, group in itertools.groupby(result.data["confidence"], key=lambda r: r["time"]):
+                result_row = []
+                for confidence_row in group:
+                    item = {"count": confidence_row.get(column, None)}
+                    if extra_columns is not None:
+                        for extra_column in extra_columns:
+                            item[extra_column] = confidence_row.get(extra_column, 0)
+                    if self.lookup:
+                        value = value_from_row(confidence_row, self.lookup.columns)
+                        item[self.lookup.name] = (attrs.get(value),)
+                    result_row.append(item)
+                confidence_values.append((key, result_row))
+            # confidence only comes from the RPC which already helps us zerofill by returning all buckets
+            res["confidence"] = confidence_values
+
         if result.data.get("totals"):
             res["totals"] = {"count": result.data["totals"][column]}
         # If order is passed let that overwrite whats in data since its order for multi-axis
diff --git a/src/sentry/api/urls.py b/src/sentry/api/urls.py
index 86a808a5587777..ab5ea0cba6d58a 100644
--- a/src/sentry/api/urls.py
+++ b/src/sentry/api/urls.py
@@ -83,6 +83,10 @@
     OrganizationFlagLogDetailsEndpoint,
     OrganizationFlagLogIndexEndpoint,
 )
+from sentry.flags.endpoints.secrets import (
+    OrganizationFlagsWebHookSigningSecretEndpoint,
+    OrganizationFlagsWebHookSigningSecretsEndpoint,
+)
 from sentry.incidents.endpoints.organization_alert_rule_activations import (
     OrganizationAlertRuleActivationsEndpoint,
 )
@@ -99,23 +103,10 @@
     OrganizationAlertRuleIndexEndpoint,
     OrganizationCombinedRuleIndexEndpoint,
 )
-from sentry.incidents.endpoints.organization_incident_activity_index import (
-    OrganizationIncidentActivityIndexEndpoint,
-)
-from sentry.incidents.endpoints.organization_incident_comment_details import (
-    OrganizationIncidentCommentDetailsEndpoint,
-)
-from sentry.incidents.endpoints.organization_incident_comment_index import (
-    OrganizationIncidentCommentIndexEndpoint,
-)
 from sentry.incidents.endpoints.organization_incident_details import (
     OrganizationIncidentDetailsEndpoint,
 )
 from sentry.incidents.endpoints.organization_incident_index import OrganizationIncidentIndexEndpoint
-from sentry.incidents.endpoints.organization_incident_seen import OrganizationIncidentSeenEndpoint
-from sentry.incidents.endpoints.organization_incident_subscription_index import (
-    OrganizationIncidentSubscriptionIndexEndpoint,
-)
 from sentry.incidents.endpoints.project_alert_rule_details import ProjectAlertRuleDetailsEndpoint
 from sentry.incidents.endpoints.project_alert_rule_index import ProjectAlertRuleIndexEndpoint
 from sentry.incidents.endpoints.project_alert_rule_task_details import (
@@ -349,6 +340,7 @@
 from sentry.users.api.endpoints.user_roles import UserUserRolesEndpoint
 from sentry.users.api.endpoints.userroles_details import UserRoleDetailsEndpoint
 from sentry.users.api.endpoints.userroles_index import UserRolesEndpoint
+from sentry.workflow_engine.endpoints import urls as workflow_urls
 
 from .endpoints.accept_organization_invite import AcceptOrganizationInvite
 from .endpoints.accept_project_transfer import AcceptProjectTransferEndpoint
@@ -384,7 +376,6 @@
     SourceMapsEndpoint,
     UnknownDebugFilesEndpoint,
 )
-from .endpoints.event_ai_suggested_fix import EventAiSuggestedFixEndpoint
 from .endpoints.event_apple_crash_report import EventAppleCrashReportEndpoint
 from .endpoints.event_attachment_details import EventAttachmentDetailsEndpoint
 from .endpoints.event_attachments import EventAttachmentsEndpoint
@@ -442,6 +433,7 @@
 from .endpoints.organization_config_repositories import OrganizationConfigRepositoriesEndpoint
 from .endpoints.organization_dashboard_details import (
     OrganizationDashboardDetailsEndpoint,
+    OrganizationDashboardFavoriteEndpoint,
     OrganizationDashboardVisitEndpoint,
 )
 from .endpoints.organization_dashboard_widget_details import (
@@ -500,9 +492,6 @@
     OrganizationMemberIndexEndpoint,
 )
 from .endpoints.organization_member.team_details import OrganizationMemberTeamDetailsEndpoint
-from .endpoints.organization_member_unreleased_commits import (
-    OrganizationMemberUnreleasedCommitsEndpoint,
-)
 from .endpoints.organization_metrics_code_locations import OrganizationMetricsCodeLocationsEndpoint
 from .endpoints.organization_metrics_details import OrganizationMetricsDetailsEndpoint
 from .endpoints.organization_metrics_meta import (
@@ -510,7 +499,6 @@
     OrganizationMetricsCompatibilitySums,
 )
 from .endpoints.organization_metrics_query import OrganizationMetricsQueryEndpoint
-from .endpoints.organization_metrics_samples import OrganizationMetricsSamplesEndpoint
 from .endpoints.organization_metrics_tag_details import OrganizationMetricsTagDetailsEndpoint
 from .endpoints.organization_metrics_tags import OrganizationMetricsTagsEndpoint
 from .endpoints.organization_on_demand_metrics_estimation_stats import (
@@ -524,7 +512,6 @@
 from .endpoints.organization_profiling_functions import OrganizationProfilingFunctionTrendsEndpoint
 from .endpoints.organization_profiling_profiles import (
     OrganizationProfilingChunksEndpoint,
-    OrganizationProfilingChunksFlamegraphEndpoint,
     OrganizationProfilingFlamegraphEndpoint,
     OrganizationProfilingHasChunksEndpoint,
 )
@@ -573,9 +560,6 @@
     OrganizationTraceSpansEndpoint,
     OrganizationTracesStatsEndpoint,
 )
-from .endpoints.organization_transaction_anomaly_detection import (
-    OrganizationTransactionAnomalyDetectionEndpoint,
-)
 from .endpoints.organization_user_details import OrganizationUserDetailsEndpoint
 from .endpoints.organization_user_reports import OrganizationUserReportsEndpoint
 from .endpoints.organization_user_teams import OrganizationUserTeamsEndpoint
@@ -583,12 +567,6 @@
 from .endpoints.project_agnostic_rule_conditions import ProjectAgnosticRuleConditionsEndpoint
 from .endpoints.project_artifact_bundle_file_details import ProjectArtifactBundleFileDetailsEndpoint
 from .endpoints.project_artifact_bundle_files import ProjectArtifactBundleFilesEndpoint
-from .endpoints.project_autofix_codebase_index_status import (
-    ProjectAutofixCodebaseIndexStatusEndpoint,
-)
-from .endpoints.project_autofix_create_codebase_index import (
-    ProjectAutofixCreateCodebaseIndexEndpoint,
-)
 from .endpoints.project_commits import ProjectCommitsEndpoint
 from .endpoints.project_create_sample import ProjectCreateSampleEndpoint
 from .endpoints.project_create_sample_transaction import ProjectCreateSampleTransactionEndpoint
@@ -1211,21 +1189,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         name="sentry-api-0-data-secrecy",
     ),
     # Incidents
-    re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/incidents/(?P<incident_identifier>[^\/]+)/activity/$",
-        OrganizationIncidentActivityIndexEndpoint.as_view(),
-        name="sentry-api-0-organization-incident-activity",
-    ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/incidents/(?P<incident_identifier>[^\/]+)/comments/$",
-        OrganizationIncidentCommentIndexEndpoint.as_view(),
-        name="sentry-api-0-organization-incident-comments",
-    ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/incidents/(?P<incident_identifier>[^\/]+)/comments/(?P<activity_id>[^\/]+)/$",
-        OrganizationIncidentCommentDetailsEndpoint.as_view(),
-        name="sentry-api-0-organization-incident-comment-details",
-    ),
     re_path(
         r"^(?P<organization_id_or_slug>[^\/]+)/incidents/(?P<incident_identifier>[^\/]+)/$",
         OrganizationIncidentDetailsEndpoint.as_view(),
@@ -1236,16 +1199,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         OrganizationIncidentIndexEndpoint.as_view(),
         name="sentry-api-0-organization-incident-index",
     ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/incidents/(?P<incident_identifier>[^\/]+)/seen/$",
-        OrganizationIncidentSeenEndpoint.as_view(),
-        name="sentry-api-0-organization-incident-seen",
-    ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/incidents/(?P<incident_identifier>[^\/]+)/subscriptions/$",
-        OrganizationIncidentSubscriptionIndexEndpoint.as_view(),
-        name="sentry-api-0-organization-incident-subscription-index",
-    ),
     re_path(
         r"^(?P<organization_id_or_slug>[^\/]+)/chunk-upload/$",
         ChunkUploadEndpoint.as_view(),
@@ -1340,6 +1293,11 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         OrganizationDashboardVisitEndpoint.as_view(),
         name="sentry-api-0-organization-dashboard-visit",
     ),
+    re_path(
+        r"^(?P<organization_id_or_slug>[^\/]+)/dashboards/(?P<dashboard_id>[^\/]+)/favorite/$",
+        OrganizationDashboardFavoriteEndpoint.as_view(),
+        name="sentry-api-0-organization-dashboard-favorite",
+    ),
     re_path(
         r"^(?P<organization_id_or_slug>[^\/]+)/shortids/(?P<short_id>[^\/]+)/$",
         ShortIdLookupEndpoint.as_view(),
@@ -1810,11 +1768,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         OrganizationMemberDetailsEndpoint.as_view(),
         name="sentry-api-0-organization-member-details",
     ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/members/(?P<member_id>[^\/]+)/unreleased-commits/$",
-        OrganizationMemberUnreleasedCommitsEndpoint.as_view(),
-        name="sentry-api-0-organization-member-unreleased-commits",
-    ),
     re_path(
         r"^(?P<organization_id_or_slug>[^\/]+)/members/(?P<member_id>[^\/]+)/teams/(?P<team_id_or_slug>[^\/]+)/$",
         OrganizationMemberTeamDetailsEndpoint.as_view(),
@@ -2041,11 +1994,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         OrganizationJoinRequestEndpoint.as_view(),
         name="sentry-api-0-organization-join-request",
     ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/transaction-anomaly-detection/$",
-        OrganizationTransactionAnomalyDetectionEndpoint.as_view(),
-        name="sentry-api-0-organization-transaction-anomaly-detection",
-    ),
     # relay usage
     re_path(
         r"^(?P<organization_id_or_slug>[^\/]+)/relay_usage/$",
@@ -2064,10 +2012,20 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         name="sentry-api-0-organization-flag-log",
     ),
     re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/flags/hooks/provider/(?P<provider>[\w-]+)/token/(?P<token>.+)/$",
+        r"^(?P<organization_id_or_slug>[^\/]+)/flags/hooks/provider/(?P<provider>[\w-]+)/$",
         OrganizationFlagsHooksEndpoint.as_view(),
         name="sentry-api-0-organization-flag-hooks",
     ),
+    re_path(
+        r"^(?P<organization_id_or_slug>[^\/]+)/flags/signing-secrets/$",
+        OrganizationFlagsWebHookSigningSecretsEndpoint.as_view(),
+        name="sentry-api-0-organization-flag-hooks-signing-secrets",
+    ),
+    re_path(
+        r"^(?P<organization_id_or_slug>[^\/]+)/flags/signing-secrets/(?P<signing_secret_id>\d+)/$",
+        OrganizationFlagsWebHookSigningSecretEndpoint.as_view(),
+        name="sentry-api-0-organization-flag-hooks-signing-secret",
+    ),
     # Replays
     re_path(
         r"^(?P<organization_id_or_slug>[^\/]+)/replays/$",
@@ -2151,11 +2109,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         OrganizationMetricsQueryEndpoint.as_view(),
         name="sentry-api-0-organization-metrics-query",
     ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^/]+)/metrics/samples/$",
-        OrganizationMetricsSamplesEndpoint.as_view(),
-        name="sentry-api-0-organization-metrics-samples",
-    ),
     re_path(
         r"^(?P<organization_id_or_slug>[^/]+)/metrics/tags/$",
         OrganizationMetricsTagsEndpoint.as_view(),
@@ -2175,11 +2128,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
                     OrganizationProfilingFlamegraphEndpoint.as_view(),
                     name="sentry-api-0-organization-profiling-flamegraph",
                 ),
-                re_path(
-                    r"^chunks-flamegraph/$",
-                    OrganizationProfilingChunksFlamegraphEndpoint.as_view(),
-                    name="sentry-api-0-organization-profiling-chunks-flamegraph",
-                ),
                 re_path(
                     r"^function-trends/$",
                     OrganizationProfilingFunctionTrendsEndpoint.as_view(),
@@ -2322,11 +2270,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         EventGroupingInfoEndpoint.as_view(),
         name="sentry-api-0-event-grouping-info",
     ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/(?P<project_id_or_slug>[^\/]+)/events/(?P<event_id>[\w-]+)/ai-fix-suggest/$",
-        EventAiSuggestedFixEndpoint.as_view(),
-        name="sentry-api-0-event-ai-fix-suggest",
-    ),
     re_path(
         r"^(?P<organization_id_or_slug>[^\/]+)/(?P<project_id_or_slug>[^\/]+)/events/(?P<event_id>[\w-]+)/apple-crash-report$",
         EventAppleCrashReportEndpoint.as_view(),
@@ -2833,16 +2776,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         ProjectMonitorStatsEndpoint.as_view(),
         name="sentry-api-0-project-monitor-stats",
     ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/(?P<project_id_or_slug>[^\/]+)/autofix/codebase-index/status/$",
-        ProjectAutofixCodebaseIndexStatusEndpoint.as_view(),
-        name="sentry-api-0-project-autofix-codebase-index-status",
-    ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^\/]+)/(?P<project_id_or_slug>[^\/]+)/autofix/codebase-index/create/$",
-        ProjectAutofixCreateCodebaseIndexEndpoint.as_view(),
-        name="sentry-api-0-project-autofix-codebase-index-create",
-    ),
     # Uptime
     re_path(
         r"^(?P<organization_id_or_slug>[^\/]+)/(?P<project_id_or_slug>[^\/]+)/uptime/(?P<uptime_project_subscription_id>[^\/]+)/$",
@@ -2854,6 +2787,7 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         ProjectUptimeAlertIndexEndpoint.as_view(),
         name="sentry-api-0-project-uptime-alert-index",
     ),
+    *workflow_urls.urlpatterns,
 ]
 
 TEAM_URLS = [
diff --git a/src/sentry/api/utils.py b/src/sentry/api/utils.py
index fb0738df6b3ed3..ebfbf0dfac2cd4 100644
--- a/src/sentry/api/utils.py
+++ b/src/sentry/api/utils.py
@@ -234,6 +234,35 @@ def get_date_range_from_stats_period(
     return start, end
 
 
+def clamp_date_range(
+    range: tuple[datetime.datetime, datetime.datetime], max_timedelta: datetime.timedelta
+) -> tuple[datetime.datetime, datetime.datetime]:
+    """
+    Accepts a date range and a maximum time delta. If the date range is shorter
+    than the max delta, returns the range as-is. If the date range is longer than the max delta, clamps the range range, anchoring to the end.
+
+    If any of the inputs are invalid (e.g., a negative range) returns the range
+    without modifying it.
+
+    :param range: A tuple of two `datetime.datetime` objects
+    :param max_timedelta: Maximum allowed range delta
+    :return: A tuple of two `datetime.datetime` objects
+    """
+
+    [start, end] = range
+    delta = end - start
+
+    # Ignore negative max time deltas
+    if max_timedelta < datetime.timedelta(0):
+        return (start, end)
+
+    # Ignore if delta is within acceptable range
+    if delta < max_timedelta:
+        return (start, end)
+
+    return (end - max_timedelta, end)
+
+
 # The wide typing allows us to move towards RpcUserOrganizationContext in the future to save RPC calls.
 # If you can use the wider more correct type, please do.
 def is_member_disabled_from_limit(
diff --git a/src/sentry/apidocs/api_ownership_allowlist_dont_modify.py b/src/sentry/apidocs/api_ownership_allowlist_dont_modify.py
index 7f5ef84ac62f9d..230d3e1703f016 100644
--- a/src/sentry/apidocs/api_ownership_allowlist_dont_modify.py
+++ b/src/sentry/apidocs/api_ownership_allowlist_dont_modify.py
@@ -42,7 +42,6 @@
     "/api/0/sentry-apps/{sentry_app_id_or_slug}/features/",
     "/api/0/organizations/{organization_id_or_slug}/monitors/",
     "/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/filters/{filter_id}/",
-    "/api/0/organizations/{organization_id_or_slug}/members/{member_id}/unreleased-commits/",
     "/api/0/sentry-apps/{sentry_app_id_or_slug}/api-tokens/",
     "/api/0/internal/quotas/",
     "/api/0/sentry-apps/{sentry_app_id_or_slug}/stats/",
diff --git a/src/sentry/apidocs/api_publish_status_allowlist_dont_modify.py b/src/sentry/apidocs/api_publish_status_allowlist_dont_modify.py
index 6a7117f1c73097..f0ca4e6a4e1c67 100644
--- a/src/sentry/apidocs/api_publish_status_allowlist_dont_modify.py
+++ b/src/sentry/apidocs/api_publish_status_allowlist_dont_modify.py
@@ -406,9 +406,6 @@
     "/api/0/organizations/{organization_id_or_slug}/sessions/": {"GET"},
     "/api/0/organizations/{organization_id_or_slug}/releases/{version}/resolved/": {"GET"},
     "/api/0/organizations/{organization_id_or_slug}/request-project-creation/": {"POST"},
-    "/api/0/organizations/{organization_id_or_slug}/members/{member_id}/unreleased-commits/": {
-        "GET"
-    },
     "/api/0/organizations/{organization_id_or_slug}/members/{member_id}/teams/{team_id_or_slug}/": {
         "GET",
         "PUT",
diff --git a/src/sentry/apidocs/examples/dashboard_examples.py b/src/sentry/apidocs/examples/dashboard_examples.py
index 20fdeaeaf8c920..f844e04b04585c 100644
--- a/src/sentry/apidocs/examples/dashboard_examples.py
+++ b/src/sentry/apidocs/examples/dashboard_examples.py
@@ -72,6 +72,7 @@
         "isEditableByEveryone": True,
         "teamsWithEditAccess": [],
     },
+    "isFavorited": False,
 }
 
 DASHBOARDS_OBJECT = [
@@ -104,6 +105,8 @@
         },
         "widgetDisplay": [],
         "widgetPreview": [],
+        "permissions": {"isEditableByEveryone": True, "teamsWithEditAccess": []},
+        "isFavorited": False,
     },
     {
         "id": "2",
@@ -134,6 +137,8 @@
         },
         "widgetDisplay": [],
         "widgetPreview": [],
+        "permissions": None,
+        "isFavorited": False,
     },
 ]
 
diff --git a/src/sentry/apidocs/examples/event_examples.py b/src/sentry/apidocs/examples/event_examples.py
index 22797eafad0537..0dae9ea877e764 100644
--- a/src/sentry/apidocs/examples/event_examples.py
+++ b/src/sentry/apidocs/examples/event_examples.py
@@ -28,6 +28,7 @@
     "location": "example.py:123",
     "culprit": "/books/new/",
     "projectID": "49271",
+    "metadata": None,
 }
 
 GROUP_EVENT: GroupEventDetailsResponse = {
diff --git a/src/sentry/apidocs/examples/organization_examples.py b/src/sentry/apidocs/examples/organization_examples.py
index 09f90d6ba36b71..676eee217115c6 100644
--- a/src/sentry/apidocs/examples/organization_examples.py
+++ b/src/sentry/apidocs/examples/organization_examples.py
@@ -310,7 +310,6 @@ class OrganizationExamples:
                 "allowJoinRequests": True,
                 "relayPiiConfig": None,
                 "codecovAccess": False,
-                "aiSuggestedSolution": True,
                 "hideAiFeatures": False,
                 "githubPRBot": True,
                 "githubOpenPRBot": True,
diff --git a/src/sentry/apidocs/examples/project_examples.py b/src/sentry/apidocs/examples/project_examples.py
index d46b805b9dc825..cc609bbc07168a 100644
--- a/src/sentry/apidocs/examples/project_examples.py
+++ b/src/sentry/apidocs/examples/project_examples.py
@@ -526,3 +526,30 @@ class ProjectExamples:
             response_only=True,
         ),
     ]
+
+    GET_PROJECT_FILTERS = [
+        OpenApiExample(
+            "List a project's filters",
+            value=[
+                {"id": "browser-extensions", "active": False},
+                {"id": "filtered-transaction", "active": True},
+                {
+                    "id": "legacy-browsers",
+                    "active": [
+                        "opera",
+                        "edge",
+                        "safari",
+                        "chrome",
+                        "ie",
+                        "opera_mini",
+                        "firefox",
+                        "android",
+                    ],
+                },
+                {"id": "localhost", "active": False},
+                {"id": "web-crawlers", "active": True},
+            ],
+            status_codes=["200"],
+            response_only=True,
+        ),
+    ]
diff --git a/src/sentry/auth/services/auth/model.py b/src/sentry/auth/services/auth/model.py
index 86c918af04a68c..d0bbd928b60133 100644
--- a/src/sentry/auth/services/auth/model.py
+++ b/src/sentry/auth/services/auth/model.py
@@ -40,6 +40,7 @@ class RpcApiToken(RpcModel):
     expires_at: datetime.datetime | None = None
     allowed_origins: list[str] = Field(default_factory=list)
     scope_list: list[str] = Field(default_factory=list)
+    scoping_organization_id: int | None = None
 
 
 class RpcMemberSsoState(RpcModel):
diff --git a/src/sentry/auth/services/auth/serial.py b/src/sentry/auth/services/auth/serial.py
index 514b54ff1eb090..722649ed210584 100644
--- a/src/sentry/auth/services/auth/serial.py
+++ b/src/sentry/auth/services/auth/serial.py
@@ -85,6 +85,7 @@ def serialize_api_token(at: ApiToken) -> RpcApiToken:
         user_id=at.user_id,
         application_id=at.application_id,
         organization_id=at.organization_id,
+        scoping_organization_id=at.scoping_organization_id,
         application_is_active=at.application is None or at.application.is_active,
         token=at.token,
         hashed_token=at.hashed_token,
diff --git a/src/sentry/auth/system.py b/src/sentry/auth/system.py
index baa20a77f4bc04..6bc29df82b15e5 100644
--- a/src/sentry/auth/system.py
+++ b/src/sentry/auth/system.py
@@ -46,6 +46,7 @@ class SystemToken:
     token = "<system.secret-key>"
     application = None
     organization_id = None
+    scoping_organization_id = None
 
     @classmethod
     def from_request(cls, request: HttpRequest, token: str) -> SystemToken | None:
diff --git a/src/sentry/autofix/utils.py b/src/sentry/autofix/utils.py
index dc9b5f5fe78f41..4de15e4be3ca06 100644
--- a/src/sentry/autofix/utils.py
+++ b/src/sentry/autofix/utils.py
@@ -26,10 +26,10 @@ class AutofixRequest(TypedDict):
 class AutofixStatus(str, enum.Enum):
     COMPLETED = "COMPLETED"
     ERROR = "ERROR"
-    PENDING = "PENDING"
     PROCESSING = "PROCESSING"
     NEED_MORE_INFORMATION = "NEED_MORE_INFORMATION"
     CANCELLED = "CANCELLED"
+    WAITING_FOR_USER_RESPONSE = "WAITING_FOR_USER_RESPONSE"
 
 
 class AutofixState(BaseModel):
diff --git a/src/sentry/backup/comparators.py b/src/sentry/backup/comparators.py
index cb1b27fa603aa7..a2f5a9e7d1ac7b 100644
--- a/src/sentry/backup/comparators.py
+++ b/src/sentry/backup/comparators.py
@@ -802,6 +802,9 @@ def get_default_comparators() -> dict[str, list[JSONScrubbingComparator]]:
             "sentry.alertrule": [
                 DateUpdatedComparator("date_modified"),
             ],
+            "sentry.dashboardfavoriteuser": [
+                DateUpdatedComparator("date_added", "date_updated"),
+            ],
             "sentry.groupsearchview": [DateUpdatedComparator("date_updated")],
             "sentry.incident": [UUID4Comparator("detection_uuid")],
             "sentry.incidentactivity": [UUID4Comparator("notification_uuid")],
diff --git a/src/sentry/backup/crypto.py b/src/sentry/backup/crypto.py
index 5ea2a64eac2e93..1e842ca6e2ed01 100644
--- a/src/sentry/backup/crypto.py
+++ b/src/sentry/backup/crypto.py
@@ -54,8 +54,6 @@ class Encryptor(ABC):
     A `IO[bytes]`-wrapper that contains relevant information and methods to encrypt some an in-memory JSON-ifiable dict.
     """
 
-    __fp: IO[bytes]
-
     @abstractmethod
     def get_public_key_pem(self) -> bytes:
         pass
@@ -67,10 +65,10 @@ class LocalFileEncryptor(Encryptor):
     """
 
     def __init__(self, fp: IO[bytes]):
-        self.__fp = fp
+        self.__key = fp.read()
 
     def get_public_key_pem(self) -> bytes:
-        return self.__fp.read()
+        return self.__key
 
 
 class GCPKMSEncryptor(Encryptor):
@@ -82,7 +80,7 @@ class GCPKMSEncryptor(Encryptor):
     crypto_key_version: CryptoKeyVersion | None = None
 
     def __init__(self, fp: IO[bytes]):
-        self.__fp = fp
+        self.__key = fp.read()
 
     @classmethod
     def from_crypto_key_version(cls, crypto_key_version: CryptoKeyVersion) -> GCPKMSEncryptor:
@@ -93,7 +91,7 @@ def from_crypto_key_version(cls, crypto_key_version: CryptoKeyVersion) -> GCPKMS
     def get_public_key_pem(self) -> bytes:
         if self.crypto_key_version is None:
             # Read the user supplied configuration into the proper format.
-            gcp_kms_config_json = orjson.loads(self.__fp.read())
+            gcp_kms_config_json = orjson.loads(self.__key)
             try:
                 self.crypto_key_version = CryptoKeyVersion(**gcp_kms_config_json)
             except TypeError:
@@ -217,12 +215,6 @@ class Decryptor(ABC):
     tarball.
     """
 
-    __fp: IO[bytes]
-
-    @abstractmethod
-    def read(self) -> bytes:
-        pass
-
     @abstractmethod
     def decrypt_data_encryption_key(self, unwrapped: UnwrappedEncryptedExportTarball) -> bytes:
         pass
@@ -234,22 +226,19 @@ class LocalFileDecryptor(Decryptor):
     """
 
     def __init__(self, fp: IO[bytes]):
-        self.__fp = fp
+        self.__key = fp.read()
 
     @classmethod
     def from_bytes(cls, b: bytes) -> LocalFileDecryptor:
         return cls(io.BytesIO(b))
 
-    def read(self) -> bytes:
-        return self.__fp.read()
-
     def decrypt_data_encryption_key(self, unwrapped: UnwrappedEncryptedExportTarball) -> bytes:
         """
         Decrypt the encrypted data encryption key used to encrypt the actual export JSON.
         """
 
         # Compare the public and private key, to ensure that they are a match.
-        private_key_pem = self.__fp.read()
+        private_key_pem = self.__key
         private_key = serialization.load_pem_private_key(
             private_key_pem,
             password=None,
@@ -286,17 +275,14 @@ class GCPKMSDecryptor(Decryptor):
     """
 
     def __init__(self, fp: IO[bytes]):
-        self.__fp = fp
+        self.__key = fp.read()
 
     @classmethod
     def from_bytes(cls, b: bytes) -> GCPKMSDecryptor:
         return cls(io.BytesIO(b))
 
-    def read(self) -> bytes:
-        return self.__fp.read()
-
     def decrypt_data_encryption_key(self, unwrapped: UnwrappedEncryptedExportTarball) -> bytes:
-        gcp_kms_config_bytes = self.__fp.read()
+        gcp_kms_config_bytes = self.__key
 
         # Read the user supplied configuration into the proper format.
         gcp_kms_config_json = orjson.loads(gcp_kms_config_bytes)
@@ -345,3 +331,13 @@ def decrypt_encrypted_tarball(tarball: IO[bytes], decryptor: Decryptor) -> bytes
     decrypted_dek = decryptor.decrypt_data_encryption_key(unwrapped)
     fernet = Fernet(decrypted_dek)
     return fernet.decrypt(unwrapped.encrypted_json_blob)
+
+
+class EncryptorDecryptorPair:
+    """
+    An Encryptor and Decryptor that use paired public and private keys, respectively.
+    """
+
+    def __init__(self, encryptor: Encryptor, decryptor: Decryptor):
+        self.encryptor = encryptor
+        self.decryptor = decryptor
diff --git a/src/sentry/backup/exports.py b/src/sentry/backup/exports.py
index 5fefc80354e7cc..8ff011dc4cc6c0 100644
--- a/src/sentry/backup/exports.py
+++ b/src/sentry/backup/exports.py
@@ -5,12 +5,15 @@
 # We have to use the default JSON interface to enable pretty-printing on export. When loading JSON,
 # we still use the one from `sentry.utils`, imported as `sentry_json` below.
 import json as builtin_json  # noqa: S003
+from abc import ABC, abstractmethod
 from typing import IO
 
 import orjson
 
-from sentry.backup.crypto import Encryptor, create_encrypted_export_tarball
+from sentry.backup.crypto import Encryptor, EncryptorDecryptorPair, create_encrypted_export_tarball
 from sentry.backup.dependencies import (
+    ImportKind,
+    NormalizedModelName,
     PrimaryKeyMap,
     dependencies,
     get_model_name,
@@ -20,6 +23,7 @@
 from sentry.backup.scopes import ExportScope
 from sentry.backup.services.import_export.model import (
     RpcExportError,
+    RpcExportOk,
     RpcExportScope,
     RpcFilter,
     RpcPrimaryKeyMap,
@@ -41,6 +45,69 @@ def __init__(self, context: RpcExportError) -> None:
         self.context = context
 
 
+class ExportCheckpointerError(Exception):
+    pass
+
+
+class ExportCheckpointer(ABC):
+    """
+    For very large exports, the exporting environment may fall over half-way through the process:
+    the thread running it may hit some timeout, or it may OOM, or fail for some other ephemeral
+    reason. To help in such situations, we'd like an API for saving "checkpoints" during the export.
+
+    This class provides per-model checkpointing support for exports. Since there is a topologically
+    sorted order of models being exported, as we move through this list, we can save the exported
+    JSON for each kind of model in order to some stable media (disk, GCP, etc). If there is a
+    failure late in the export process, when it is retried, the exporter can check if that
+    particular model already exists in the checkpointer's cache, thereby avoiding redoing the work
+    of pulling the models from the database, processing them, etc. This ensures that in most retry
+    situations, we can quickly "re-ingest" already-exported models in memory and pick up where we
+    left off.
+    """
+
+    def _parse_cached_json(self, json_data: bytes) -> RpcExportOk | None:
+        max_pk = 0
+        pk_map = PrimaryKeyMap()
+        models = orjson.loads(json_data)
+        for model in models:
+            model_name = model.get("model", None)
+            pk = model.get("pk", None)
+            if model_name is None or pk is None:
+                raise ExportCheckpointerError("Improperly formatted entry")
+
+            pk_map.insert(model_name, pk, pk, ImportKind.Inserted)
+            if pk > max_pk:
+                max_pk = pk
+
+        return RpcExportOk(
+            mapped_pks=RpcPrimaryKeyMap.into_rpc(pk_map), max_pk=max_pk, json_data=json_data
+        )
+
+    @abstractmethod
+    def get(self, model_name: NormalizedModelName) -> RpcExportOk | None:
+        pass
+
+    @abstractmethod
+    def add(self, model_name: NormalizedModelName, json_data: str) -> None:
+        pass
+
+
+class NoopExportCheckpointer(ExportCheckpointer):
+    """
+    A noop checkpointer - that is, it doesn't write or read any checkpoints, always returning None.
+    This means that no checkpointing ever occurs.
+    """
+
+    def __init__(self, crypto: EncryptorDecryptorPair | None, printer: Printer):
+        pass
+
+    def get(self, model_name: NormalizedModelName) -> RpcExportOk | None:
+        return None
+
+    def add(self, model_name: NormalizedModelName, json_data: str) -> None:
+        return None
+
+
 def _export(
     dest: IO[bytes],
     scope: ExportScope,
@@ -49,6 +116,7 @@ def _export(
     indent: int = 2,
     filter_by: Filter | None = None,
     printer: Printer,
+    checkpointer: ExportCheckpointer | None = None,
 ):
     """
     Exports core data for the Sentry installation.
@@ -68,6 +136,7 @@ def _export(
         printer.echo(errText, err=True)
         raise RuntimeError(errText)
 
+    cache = checkpointer if checkpointer is not None else NoopExportCheckpointer(None, printer)
     json_export = []
     pk_map = PrimaryKeyMap()
     allowed_relocation_scopes = scope.value
@@ -119,13 +188,18 @@ def _export(
 
         dep_models = {get_model_name(d) for d in model_relations.get_dependencies_for_relocation()}
         export_by_model = ImportExportService.get_exporter_for_model(model)
-        result = export_by_model(
-            export_model_name=str(model_name),
-            scope=RpcExportScope.into_rpc(scope),
-            from_pk=0,
-            filter_by=[RpcFilter.into_rpc(f) for f in filters],
-            pk_map=RpcPrimaryKeyMap.into_rpc(pk_map.partition(dep_models)),
-            indent=indent,
+        cached_result = cache.get(model_name)
+        result = (
+            cached_result
+            if cached_result is not None
+            else export_by_model(
+                export_model_name=str(model_name),
+                scope=RpcExportScope.into_rpc(scope),
+                from_pk=0,
+                filter_by=[RpcFilter.into_rpc(f) for f in filters],
+                pk_map=RpcPrimaryKeyMap.into_rpc(pk_map.partition(dep_models)),
+                indent=indent,
+            )
         )
 
         if isinstance(result, RpcExportError):
@@ -133,11 +207,14 @@ def _export(
             raise ExportingError(result)
 
         pk_map.extend(result.mapped_pks.from_rpc())
+        json_models = orjson.loads(result.json_data)
+        if cached_result is None:
+            cache.add(model_name, json_models)
 
         # TODO(getsentry/team-ospo#190): Since the structure of this data is very predictable (an
         # array of serialized model objects), we could probably avoid re-ingesting the JSON string
         # as a future optimization.
-        for json_model in orjson.loads(result.json_data):
+        for json_model in json_models:
             json_export.append(json_model)
 
     # If no `encryptor` argument was passed in, this is an unencrypted export, so we can just dump
@@ -158,6 +235,7 @@ def export_in_user_scope(
     user_filter: set[str] | None = None,
     indent: int = 2,
     printer: Printer,
+    checkpointer: ExportCheckpointer | None = None,
 ):
     """
     Perform an export in the `User` scope, meaning that only models with `RelocationScope.User` will
@@ -174,6 +252,7 @@ def export_in_user_scope(
         filter_by=Filter(User, "username", user_filter) if user_filter is not None else None,
         indent=indent,
         printer=printer,
+        checkpointer=checkpointer,
     )
 
 
@@ -184,6 +263,7 @@ def export_in_organization_scope(
     org_filter: set[str] | None = None,
     indent: int = 2,
     printer: Printer,
+    checkpointer: ExportCheckpointer | None = None,
 ):
     """
     Perform an export in the `Organization` scope, meaning that only models with
@@ -201,6 +281,7 @@ def export_in_organization_scope(
         filter_by=Filter(Organization, "slug", org_filter) if org_filter is not None else None,
         indent=indent,
         printer=printer,
+        checkpointer=checkpointer,
     )
 
 
@@ -210,6 +291,7 @@ def export_in_config_scope(
     encryptor: Encryptor | None = None,
     indent: int = 2,
     printer: Printer,
+    checkpointer: ExportCheckpointer | None = None,
 ):
     """
     Perform an export in the `Config` scope, meaning that only models directly related to the global
@@ -226,6 +308,7 @@ def export_in_config_scope(
         filter_by=Filter(User, "pk", import_export_service.get_all_globally_privileged_users()),
         indent=indent,
         printer=printer,
+        checkpointer=checkpointer,
     )
 
 
@@ -235,6 +318,7 @@ def export_in_global_scope(
     encryptor: Encryptor | None = None,
     indent: int = 2,
     printer: Printer,
+    checkpointer: ExportCheckpointer | None = None,
 ):
     """
     Perform an export in the `Global` scope, meaning that all models will be exported from the
@@ -246,4 +330,5 @@ def export_in_global_scope(
         encryptor=encryptor,
         indent=indent,
         printer=printer,
+        checkpointer=checkpointer,
     )
diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
index 841b87ba0c8500..a06966905e2e38 100644
--- a/src/sentry/conf/server.py
+++ b/src/sentry/conf/server.py
@@ -26,6 +26,7 @@
 from sentry.conf.types.role_dict import RoleDict
 from sentry.conf.types.sdk_config import ServerSdkConfig
 from sentry.conf.types.sentry_config import SentryMode
+from sentry.conf.types.service_options import ServiceOptions
 from sentry.utils import json  # NOQA (used in getsentry config)
 from sentry.utils.celery import crontab_with_minute_jitter, make_split_task_queues
 from sentry.utils.types import Type, type_from_value
@@ -322,7 +323,6 @@ def env(
 # This is because CommonMiddleware Sets the Content-Length header for non-streaming responses.
 MIDDLEWARE: tuple[str, ...] = (
     "csp.middleware.CSPMiddleware",
-    "sentry.middleware.flag.FlagMiddleware",
     "sentry.middleware.health.HealthCheck",
     "sentry.middleware.security.SecurityHeadersMiddleware",
     "sentry.middleware.env.SentryEnvMiddleware",
@@ -401,6 +401,7 @@ def env(
     "sentry.users",
     "sentry.sentry_apps",
     "sentry.integrations",
+    "sentry.notifications",
     "sentry.flags",
     "sentry.monitors",
     "sentry.uptime",
@@ -2492,7 +2493,7 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 SENTRY_SELF_HOSTED_ERRORS_ONLY = False
 # only referenced in getsentry to provide the stable beacon version
 # updated with scripts/bump-version.sh
-SELF_HOSTED_STABLE_VERSION = "24.10.0"
+SELF_HOSTED_STABLE_VERSION = "24.11.1"
 
 # Whether we should look at X-Forwarded-For header or not
 # when checking REMOTE_ADDR ip addresses
@@ -2881,6 +2882,7 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
     "transactions-subscription-results": "default",
     "generic-metrics-subscription-results": "default",
     "metrics-subscription-results": "default",
+    "eap-spans-subscription-results": "default",
     "ingest-events": "default",
     "ingest-feedback-events": "default",
     "ingest-feedback-events-dlq": "default",
@@ -3066,6 +3068,7 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 ZERO_DOWNTIME_MIGRATIONS_LOCK_TIMEOUT = None
 ZERO_DOWNTIME_MIGRATIONS_STATEMENT_TIMEOUT = None
 ZERO_DOWNTIME_MIGRATIONS_LOCK_TIMEOUT_FORCE = False
+ZERO_DOWNTIME_MIGRATIONS_IDEMPOTENT_SQL = False
 
 if int(PG_VERSION.split(".", maxsplit=1)[0]) < 12:
     # In v0.6 of django-pg-zero-downtime-migrations this settings is deprecated for PostreSQLv12+
@@ -3159,12 +3162,12 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 SENTRY_SNOWFLAKE_EPOCH_START = datetime(2022, 8, 8, 0, 0).timestamp()
 SENTRY_USE_SNOWFLAKE = False
 
-SENTRY_DEFAULT_LOCKS_BACKEND_OPTIONS = {
+SENTRY_DEFAULT_LOCKS_BACKEND_OPTIONS: ServiceOptions = {
     "path": "sentry.utils.locking.backends.redis.RedisLockBackend",
     "options": {"cluster": "default"},
 }
 
-SENTRY_POST_PROCESS_LOCKS_BACKEND_OPTIONS = {
+SENTRY_POST_PROCESS_LOCKS_BACKEND_OPTIONS: ServiceOptions = {
     "path": "sentry.utils.locking.backends.redis.RedisLockBackend",
     "options": {"cluster": "default"},
 }
@@ -3242,7 +3245,7 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 # lost as a result of toggling this setting.
 SENTRY_REPLAYS_ATTEMPT_LEGACY_FILESTORE_LOOKUP = True
 
-SENTRY_FEATURE_ADOPTION_CACHE_OPTIONS = {
+SENTRY_FEATURE_ADOPTION_CACHE_OPTIONS: ServiceOptions = {
     "path": "sentry.models.featureadoption.FeatureAdoptionRedisBackend",
     "options": {"cluster": "default"},
 }
diff --git a/src/sentry/conf/types/kafka_definition.py b/src/sentry/conf/types/kafka_definition.py
index f486e4c3f3469f..59ae1228343494 100644
--- a/src/sentry/conf/types/kafka_definition.py
+++ b/src/sentry/conf/types/kafka_definition.py
@@ -26,6 +26,7 @@ class Topic(Enum):
     TRANSACTIONS_SUBSCRIPTIONS_RESULTS = "transactions-subscription-results"
     GENERIC_METRICS_SUBSCRIPTIONS_RESULTS = "generic-metrics-subscription-results"
     METRICS_SUBSCRIPTIONS_RESULTS = "metrics-subscription-results"
+    EAP_SPANS_SUBSCRIPTIONS_RESULTS = "eap-spans-subscription-results"
     INGEST_EVENTS = "ingest-events"
     INGEST_EVENTS_DLQ = "ingest-events-dlq"
     INGEST_FEEDBACK_EVENTS = "ingest-feedback-events"
@@ -48,7 +49,6 @@ class Topic(Enum):
     MONITORS_CLOCK_TICK = "monitors-clock-tick"
     MONITORS_CLOCK_TASKS = "monitors-clock-tasks"
     MONITORS_INCIDENT_OCCURRENCES = "monitors-incident-occurrences"
-    UPTIME_CONFIG = "uptime-configs"
     UPTIME_RESULTS = "uptime-results"
     UPTIME_CONFIGS = "uptime-configs"
     EVENTSTREAM_GENERIC = "generic-events"
diff --git a/src/sentry/conf/types/service_options.py b/src/sentry/conf/types/service_options.py
new file mode 100644
index 00000000000000..5c1bccb44dbbb6
--- /dev/null
+++ b/src/sentry/conf/types/service_options.py
@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from typing import TypedDict
+
+
+class ServiceOptions(TypedDict, total=False):
+    path: str
+    options: dict[str, object]
+    executor: ServiceOptions
diff --git a/src/sentry/constants.py b/src/sentry/constants.py
index b6d53e557f2f4d..fc526aa8d11cce 100644
--- a/src/sentry/constants.py
+++ b/src/sentry/constants.py
@@ -706,7 +706,6 @@ class InsightModules(Enum):
 SCRAPE_JAVASCRIPT_DEFAULT = True
 TRUSTED_RELAYS_DEFAULT = None
 JOIN_REQUESTS_DEFAULT = True
-AI_SUGGESTED_SOLUTION = True
 HIDE_AI_FEATURES_DEFAULT = False
 GITHUB_COMMENT_BOT_DEFAULT = True
 ISSUE_ALERTS_THREAD_DEFAULT = True
@@ -779,17 +778,17 @@ class InsightModules(Enum):
 HEALTH_CHECK_GLOBS = [
     "*healthcheck*",
     "*heartbeat*",
-    "*/health",
-    "*/healthy",
-    "*/healthz",
-    "*/_health",
-    r"*/\[_health\]",
-    "*/live",
-    "*/livez",
-    "*/ready",
-    "*/readyz",
-    "*/ping",
-    "*/up",
+    "*/health{/,}",
+    "*/healthy{/,}",
+    "*/healthz{/,}",
+    "*/_health{/,}",
+    r"*/\[_health\]{/,}",
+    "*/live{/,}",
+    "*/livez{/,}",
+    "*/ready{/,}",
+    "*/readyz{/,}",
+    "*/ping{/,}",
+    "*/up{/,}",
 ]
 
 
diff --git a/src/sentry/consumers/__init__.py b/src/sentry/consumers/__init__.py
index 02c31010a58a91..bb21f85fadb759 100644
--- a/src/sentry/consumers/__init__.py
+++ b/src/sentry/consumers/__init__.py
@@ -301,6 +301,12 @@ def ingest_transactions_options() -> list[click.Option]:
         "click_options": multiprocessing_options(default_max_batch_size=100),
         "static_args": {"dataset": "metrics"},
     },
+    "eap-spans-subscription-results": {
+        "topic": Topic.EAP_SPANS_SUBSCRIPTIONS_RESULTS,
+        "strategy_factory": "sentry.snuba.query_subscriptions.run.QuerySubscriptionStrategyFactory",
+        "click_options": multiprocessing_options(default_max_batch_size=100),
+        "static_args": {"dataset": "events_analytics_platform"},
+    },
     "ingest-events": {
         "topic": Topic.INGEST_EVENTS,
         "strategy_factory": "sentry.ingest.consumer.factory.IngestStrategyFactory",
diff --git a/src/sentry/consumers/synchronized.py b/src/sentry/consumers/synchronized.py
index 5c72a658f574ed..9b2efe1d128705 100644
--- a/src/sentry/consumers/synchronized.py
+++ b/src/sentry/consumers/synchronized.py
@@ -300,3 +300,7 @@ def close(self, timeout: float | None = None) -> None:
     @property
     def closed(self) -> bool:
         return self.__consumer.closed
+
+    @property
+    def member_id(self) -> str:
+        return self.__consumer.member_id
diff --git a/src/sentry/db/postgres/schema.py b/src/sentry/db/postgres/schema.py
index 65e500578163c8..385feff6591a91 100644
--- a/src/sentry/db/postgres/schema.py
+++ b/src/sentry/db/postgres/schema.py
@@ -17,13 +17,9 @@
 )
 
 unsafe_mapping = {
-    Unsafe.ADD_COLUMN_DEFAULT: (
-        "Adding {}.{} as column with a default is safe, but you need to take additional steps.\n"
-        "Follow this guide: https://develop.sentry.dev/database-migrations/#adding-columns-with-a-default"
-    ),
     Unsafe.ADD_COLUMN_NOT_NULL: (
-        "Adding {}.{} as a not null column is unsafe.\n"
-        "More info: https://develop.sentry.dev/database-migrations/#adding-not-null-to-columns"
+        "Adding {}.{} as a not null column with no default is unsafe. Provide a default using db_default. \n"
+        "More info: https://develop.sentry.dev/api-server/application-domains/database-migrations/#adding-columns-with-a-default"
     ),
     Unsafe.ALTER_COLUMN_TYPE: (
         "Altering the type of column {}.{} in this way is unsafe\n"
@@ -92,23 +88,27 @@ def alter_db_table(self, model, old_db_table, new_db_table):
             "More info here: https://develop.sentry.dev/database-migrations/#renaming-tables"
         )
 
-    def delete_model(self, model):
+    def delete_model(self, model, is_safe=False):
         """
         It's never safe to delete a model using the standard migration process
         """
-        raise UnsafeOperationException(
-            f"Deleting the {model.__name__} model is unsafe.\n"
-            "More info here: https://develop.sentry.dev/database-migrations/#deleting-tables"
-        )
+        if not is_safe:
+            raise UnsafeOperationException(
+                f"Deleting the {model.__name__} model is unsafe.\n"
+                "More info here: https://develop.sentry.dev/database-migrations/#deleting-tables"
+            )
+        super(DatabaseSchemaEditorMixin, self).delete_model(model)
 
-    def remove_field(self, model, field):
+    def remove_field(self, model, field, is_safe=False):
         """
         It's never safe to remove a field using the standard migration process
         """
-        raise UnsafeOperationException(
-            f"Removing the {model.__name__}.{field.name} field is unsafe.\n"
-            "More info here: https://develop.sentry.dev/database-migrations/#deleting-columns"
-        )
+        if not is_safe:
+            raise UnsafeOperationException(
+                f"Removing the {model.__name__}.{field.name} field is unsafe.\n"
+                "More info here: https://develop.sentry.dev/database-migrations/#deleting-columns"
+            )
+        super(DatabaseSchemaEditorMixin, self).remove_field(model, field)
 
     def execute(self, sql, params=()):
         if sql is DUMMY_SQL:
@@ -121,29 +121,34 @@ def execute(self, sql, params=()):
         else:
             statements.append(sql)
         for statement in statements:
+            idempotent_condition = None
             if isinstance(statement, PGLock):
                 use_timeouts = statement.use_timeouts
                 disable_statement_timeout = statement.disable_statement_timeout
+                idempotent_condition = statement.idempotent_condition
                 statement = statement.sql
             elif isinstance(statement, Statement) and isinstance(statement.template, PGLock):
                 use_timeouts = statement.template.use_timeouts
                 disable_statement_timeout = statement.template.disable_statement_timeout
+                if statement.template.idempotent_condition is not None:
+                    idempotent_condition = statement.template.idempotent_condition % statement.parts
                 statement = Statement(statement.template.sql, **statement.parts)
             else:
                 use_timeouts = False
                 disable_statement_timeout = False
 
-            if use_timeouts:
-                with self._set_operation_timeout(self.STATEMENT_TIMEOUT, self.LOCK_TIMEOUT):
-                    PostgresDatabaseSchemaEditor.execute(self, statement, params)
-            elif self.LOCK_TIMEOUT_FORCE:
-                with self._set_operation_timeout(lock_timeout=self.LOCK_TIMEOUT):
+            if not self._skip_applied(idempotent_condition):
+                if use_timeouts:
+                    with self._set_operation_timeout(self.STATEMENT_TIMEOUT, self.LOCK_TIMEOUT):
+                        PostgresDatabaseSchemaEditor.execute(self, statement, params)
+                elif self.LOCK_TIMEOUT_FORCE:
+                    with self._set_operation_timeout(lock_timeout=self.LOCK_TIMEOUT):
+                        PostgresDatabaseSchemaEditor.execute(self, statement, params)
+                elif disable_statement_timeout and self.FLEXIBLE_STATEMENT_TIMEOUT:
+                    with self._set_operation_timeout(self.ZERO_TIMEOUT):
+                        PostgresDatabaseSchemaEditor.execute(self, statement, params)
+                else:
                     PostgresDatabaseSchemaEditor.execute(self, statement, params)
-            elif disable_statement_timeout and self.FLEXIBLE_STATEMENT_TIMEOUT:
-                with self._set_operation_timeout(self.ZERO_TIMEOUT):
-                    PostgresDatabaseSchemaEditor.execute(self, statement, params)
-            else:
-                PostgresDatabaseSchemaEditor.execute(self, statement, params)
 
     @contextmanager
     def _set_operation_timeout(self, statement_timeout=None, lock_timeout=None):
@@ -152,27 +157,27 @@ def _set_operation_timeout(self, statement_timeout=None, lock_timeout=None):
             previous_lock_timeout = self.ZERO_TIMEOUT
         else:
             with self.connection.cursor() as cursor:
-                cursor.execute(self.sql_get_statement_timeout)
+                cursor.execute(self._sql_get_statement_timeout)
                 (previous_statement_timeout,) = cursor.fetchone()
-                cursor.execute(self.sql_get_lock_timeout)
+                cursor.execute(self._sql_get_lock_timeout)
                 (previous_lock_timeout,) = cursor.fetchone()
         if statement_timeout is not None:
             PostgresDatabaseSchemaEditor.execute(
-                self, self.sql_set_statement_timeout % {"statement_timeout": statement_timeout}
+                self, self._sql_set_statement_timeout % {"statement_timeout": statement_timeout}
             )
         if lock_timeout is not None:
             PostgresDatabaseSchemaEditor.execute(
-                self, self.sql_set_lock_timeout % {"lock_timeout": lock_timeout}
+                self, self._sql_set_lock_timeout % {"lock_timeout": lock_timeout}
             )
         yield
         if statement_timeout is not None:
             PostgresDatabaseSchemaEditor.execute(
                 self,
-                self.sql_set_statement_timeout % {"statement_timeout": previous_statement_timeout},
+                self._sql_set_statement_timeout % {"statement_timeout": previous_statement_timeout},
             )
         if lock_timeout is not None:
             PostgresDatabaseSchemaEditor.execute(
-                self, self.sql_set_lock_timeout % {"lock_timeout": previous_lock_timeout}
+                self, self._sql_set_lock_timeout % {"lock_timeout": previous_lock_timeout}
             )
 
 
diff --git a/src/sentry/db/router.py b/src/sentry/db/router.py
index 5668c49b9ac3da..26cbd56d8d1969 100644
--- a/src/sentry/db/router.py
+++ b/src/sentry/db/router.py
@@ -71,6 +71,8 @@ class SiloRouter:
         "sentry_projectavatar": SiloMode.REGION,
         "sentry_pagerdutyservice": SiloMode.REGION,
         "sentry_notificationsetting": SiloMode.CONTROL,
+        "authprovider_duplicate": SiloMode.CONTROL,
+        "authidentity_duplicate": SiloMode.CONTROL,
     }
     """
     When we remove models, we are no longer able to resolve silo assignments
diff --git a/src/sentry/deletions/defaults/alert_rule_trigger_action.py b/src/sentry/deletions/defaults/alert_rule_trigger_action.py
index ed7c6307839d47..dc82647bd210aa 100644
--- a/src/sentry/deletions/defaults/alert_rule_trigger_action.py
+++ b/src/sentry/deletions/defaults/alert_rule_trigger_action.py
@@ -6,7 +6,7 @@ class AlertRuleTriggerActionDeletionTask(ModelDeletionTask[AlertRuleTriggerActio
     manager_name = "objects_for_deletion"
 
     def get_child_relations(self, instance: AlertRuleTriggerAction) -> list[BaseRelation]:
-        from sentry.models.notificationmessage import NotificationMessage
+        from sentry.notifications.models.notificationmessage import NotificationMessage
 
         return [
             ModelRelation(NotificationMessage, {"trigger_action_id": instance.id}),
diff --git a/src/sentry/deletions/defaults/project.py b/src/sentry/deletions/defaults/project.py
index fb06ba353c6fc5..d1d4874652e3df 100644
--- a/src/sentry/deletions/defaults/project.py
+++ b/src/sentry/deletions/defaults/project.py
@@ -93,7 +93,7 @@ def get_child_relations(self, instance: Project) -> list[BaseRelation]:
         relations.append(
             ModelRelation(
                 AlertRule,
-                {"snuba_query__subscriptions__project": instance, "include_all_projects": False},
+                {"snuba_query__subscriptions__project": instance},
             )
         )
 
diff --git a/src/sentry/deletions/defaults/rulefirehistory.py b/src/sentry/deletions/defaults/rulefirehistory.py
index 67e4f54569cae4..f71a8964dedd3b 100644
--- a/src/sentry/deletions/defaults/rulefirehistory.py
+++ b/src/sentry/deletions/defaults/rulefirehistory.py
@@ -4,7 +4,7 @@
 
 class RuleFireHistoryDeletionTask(ModelDeletionTask[RuleFireHistory]):
     def get_child_relations(self, instance: RuleFireHistory) -> list[BaseRelation]:
-        from sentry.models.notificationmessage import NotificationMessage
+        from sentry.notifications.models.notificationmessage import NotificationMessage
 
         return [
             ModelRelation(NotificationMessage, {"rule_fire_history_id": instance.id}),
diff --git a/src/sentry/discover/endpoints/discover_homepage_query.py b/src/sentry/discover/endpoints/discover_homepage_query.py
index 44abebde7c399f..cbd3c68698b06f 100644
--- a/src/sentry/discover/endpoints/discover_homepage_query.py
+++ b/src/sentry/discover/endpoints/discover_homepage_query.py
@@ -71,7 +71,7 @@ def put(self, request: Request, organization) -> Response:
         serializer = DiscoverSavedQuerySerializer(
             # HACK: To ensure serializer data is valid, pass along a name temporarily
             data={**request.data, "name": "New Query"},
-            context={"params": params},
+            context={"params": params, "organization": organization, "user": request.user},
         )
         if not serializer.is_valid():
             raise ParseError(serializer.errors)
diff --git a/src/sentry/discover/endpoints/discover_saved_queries.py b/src/sentry/discover/endpoints/discover_saved_queries.py
index 3f28dea8a7d166..009b919ad43862 100644
--- a/src/sentry/discover/endpoints/discover_saved_queries.py
+++ b/src/sentry/discover/endpoints/discover_saved_queries.py
@@ -175,7 +175,7 @@ def post(self, request: Request, organization) -> Response:
 
         serializer = DiscoverSavedQuerySerializer(
             data=request.data,
-            context={"params": params},
+            context={"params": params, "organization": organization, "user": request.user},
         )
 
         if not serializer.is_valid():
diff --git a/src/sentry/discover/endpoints/discover_saved_query_detail.py b/src/sentry/discover/endpoints/discover_saved_query_detail.py
index d2529fd74a1ce4..f1a40778355175 100644
--- a/src/sentry/discover/endpoints/discover_saved_query_detail.py
+++ b/src/sentry/discover/endpoints/discover_saved_query_detail.py
@@ -114,7 +114,7 @@ def put(self, request: Request, organization, query) -> Response:
 
         serializer = DiscoverSavedQuerySerializer(
             data=request.data,
-            context={"params": params},
+            context={"params": params, "organization": organization, "user": request.user},
         )
         if not serializer.is_valid():
             return Response(serializer.errors, status=400)
diff --git a/src/sentry/discover/endpoints/serializers.py b/src/sentry/discover/endpoints/serializers.py
index 52bb22efdfe6ff..3f1ca91c671b44 100644
--- a/src/sentry/discover/endpoints/serializers.py
+++ b/src/sentry/discover/endpoints/serializers.py
@@ -1,11 +1,13 @@
 import re
 from collections.abc import Sequence
 
+import sentry_sdk
 from django.db.models import Count, Max, QuerySet
 from drf_spectacular.utils import extend_schema_serializer
 from rest_framework import serializers
 from rest_framework.serializers import ListField
 
+from sentry import features
 from sentry.api.fields.empty_integer import EmptyIntegerField
 from sentry.api.utils import get_date_range_from_params
 from sentry.constants import ALL_ACCESS_PROJECTS
@@ -16,9 +18,12 @@
     TeamKeyTransaction,
 )
 from sentry.exceptions import InvalidParams, InvalidSearchQuery
+from sentry.models.organization import Organization
 from sentry.models.team import Team
 from sentry.search.events.builder.discover import DiscoverQueryBuilder
+from sentry.search.events.types import QueryBuilderConfig
 from sentry.snuba.dataset import Dataset
+from sentry.users.models import User
 from sentry.utils.dates import parse_stats_period, validate_interval
 from sentry.utils.snuba import SENTRY_SNUBA_MAP
 
@@ -159,8 +164,11 @@ class DiscoverSavedQuerySerializer(serializers.Serializer):
     )
     queryDataset = serializers.ChoiceField(
         choices=DiscoverSavedQueryTypes.as_text_choices(),
-        default=DiscoverSavedQueryTypes.get_type_name(DiscoverSavedQueryTypes.DISCOVER),
-        help_text="The dataset you would like to query.",
+        default=DiscoverSavedQueryTypes.get_type_name(DiscoverSavedQueryTypes.ERROR_EVENTS),
+        help_text="""The dataset you would like to query. Allowed values are:
+- error-events
+- transaction-like
+""",
     )
     start = serializers.DateTimeField(
         required=False, allow_null=True, help_text="The saved start time for this saved query."
@@ -253,11 +261,58 @@ class DiscoverSavedQuerySerializer(serializers.Serializer):
         2: {"groupby", "rollup", "aggregations", "conditions", "limit"},
     }
 
+    def get_metrics_features(
+        self, organization: Organization | None, user: User | None
+    ) -> dict[str, bool | None]:
+        if organization is None or user is None:
+            return {}
+
+        feature_names = [
+            "organizations:mep-rollout-flag",
+            "organizations:dynamic-sampling",
+            "organizations:performance-use-metrics",
+            "organizations:dashboards-mep",
+        ]
+        batch_features = features.batch_has(
+            feature_names,
+            organization=organization,
+            actor=user,
+        )
+
+        return (
+            batch_features.get(f"organization:{organization.id}", {})
+            if batch_features is not None
+            else {
+                feature_name: features.has(feature_name, organization=organization, actor=user)
+                for feature_name in feature_names
+            }
+        )
+
     def validate_projects(self, projects):
         from sentry.api.validators import validate_project_ids
 
         return validate_project_ids(projects, self.context["params"]["project_id"])
 
+    def validate_queryDataset(self, value):
+        dataset = DiscoverSavedQueryTypes.get_id_for_type_name(value)
+        if dataset == DiscoverSavedQueryTypes.DISCOVER or dataset is None:
+            sentry_sdk.set_context(
+                "discover",
+                {
+                    "org_slug": self.context["organization"].slug,
+                },
+            )
+            sentry_sdk.capture_message("Created or updated saved query with discover dataset.")
+            if features.has(
+                "organizations:deprecate-discover-widget-type",
+                self.context["organization"],
+                actor=self.context["user"],
+            ):
+                raise serializers.ValidationError(
+                    "Attribute value `discover` is deprecated. Please use `error-events` or `transaction-like`"
+                )
+        return dataset
+
     def validate(self, data):
         query = {}
         query_keys = [
@@ -305,6 +360,18 @@ def validate(self, data):
                     0,
                 )
             try:
+                batch_features = self.get_metrics_features(
+                    self.context.get("organization"), self.context.get("user")
+                )
+                use_metrics = bool(
+                    (
+                        batch_features.get("organizations:mep-rollout-flag", False)
+                        and batch_features.get("organizations:dynamic-sampling", False)
+                    )
+                    or batch_features.get("organizations:performance-use-metrics", False)
+                    or batch_features.get("organizations:dashboards-mep", False)
+                )
+
                 equations, columns = categorize_columns(query["fields"])
                 builder = DiscoverQueryBuilder(
                     dataset=Dataset.Discover,
@@ -313,19 +380,18 @@ def validate(self, data):
                     selected_columns=columns,
                     equations=equations,
                     orderby=query.get("orderby"),
+                    config=QueryBuilderConfig(has_metrics=use_metrics),
                 )
                 builder.get_snql_query().validate()
             except (InvalidSearchQuery, ArithmeticError) as err:
                 raise serializers.ValidationError(f"Cannot save invalid query: {err}")
 
-        dataset = DiscoverSavedQueryTypes.get_id_for_type_name(data["queryDataset"])
-
         return {
             "name": data["name"],
             "project_ids": data["projects"],
             "query": query,
             "version": version,
-            "query_dataset": dataset,
+            "query_dataset": data["queryDataset"],
         }
 
     def validate_version_fields(self, version, query):
diff --git a/src/sentry/dynamic_sampling/tasks/boost_low_volume_projects.py b/src/sentry/dynamic_sampling/tasks/boost_low_volume_projects.py
index ab6a4c5c060466..a1f5115f57cc8c 100644
--- a/src/sentry/dynamic_sampling/tasks/boost_low_volume_projects.py
+++ b/src/sentry/dynamic_sampling/tasks/boost_low_volume_projects.py
@@ -401,6 +401,10 @@ def adjust_sample_rates_of_projects(
     projects_with_counts = {
         project_id: count_per_root for project_id, count_per_root, _, _ in projects_with_tx_count
     }
+    # The rebalancing will not work (or would make sense) when we have only projects with zero-counts.
+    if not any(projects_with_counts.values()):
+        return
+
     # Since we don't mind about strong consistency, we query a replica of the main database with the possibility of
     # having out of date information. This is a trade-off we accept, since we work under the assumption that eventually
     # the projects of an org will be replicated consistently across replicas, because no org should continue to create
diff --git a/src/sentry/dynamic_sampling/tasks/helpers/recalibrate_orgs.py b/src/sentry/dynamic_sampling/tasks/helpers/recalibrate_orgs.py
index e1a60995eeaebc..ff4444c013743e 100644
--- a/src/sentry/dynamic_sampling/tasks/helpers/recalibrate_orgs.py
+++ b/src/sentry/dynamic_sampling/tasks/helpers/recalibrate_orgs.py
@@ -93,7 +93,8 @@ def compute_adjusted_factor(
     Calculates an adjustment factor in order to bring the effective sample rate close to the target sample rate.
     """
     # If the factor is outside the range, we can't do much besides bailing.
-    if prev_factor <= 0.0:
+    # We also bail, when we don't have a valid effective sample rate.
+    if prev_factor <= 0.0 or effective_sample_rate == 0.0:
         return None
 
     # This formula aims at scaling the factor proportionally to the ratio of the sample rate we are targeting compared
diff --git a/src/sentry/dynamic_sampling/tasks/sliding_window_org.py b/src/sentry/dynamic_sampling/tasks/sliding_window_org.py
index ca7f5d202f42ec..3e5babb8c398cc 100644
--- a/src/sentry/dynamic_sampling/tasks/sliding_window_org.py
+++ b/src/sentry/dynamic_sampling/tasks/sliding_window_org.py
@@ -29,8 +29,8 @@
     queue="dynamicsampling",
     default_retry_delay=5,
     max_retries=5,
-    soft_time_limit=3 * 60,  # 3 minutes
-    time_limit=3 * 60 + 5,
+    soft_time_limit=15 * 60,  # 15 minutes
+    time_limit=15 * 60 + 5,
     silo_mode=SiloMode.REGION,
 )
 @dynamic_sampling_task_with_context(max_task_execution=MAX_TASK_SECONDS)
diff --git a/src/sentry/event_manager.py b/src/sentry/event_manager.py
index f0cdbda79b8f12..bbb6d1dd9b3a07 100644
--- a/src/sentry/event_manager.py
+++ b/src/sentry/event_manager.py
@@ -47,6 +47,7 @@
 from sentry.eventtypes import EventType
 from sentry.eventtypes.transaction import TransactionEvent
 from sentry.exceptions import HashDiscarded
+from sentry.features.rollout import in_rollout_group
 from sentry.grouping.api import (
     NULL_GROUPHASH_INFO,
     GroupHashInfo,
@@ -70,6 +71,9 @@
 )
 from sentry.grouping.variants import BaseVariant
 from sentry.ingest.inbound_filters import FilterStatKeys
+from sentry.ingest.transaction_clusterer.datasource.redis import (
+    record_transaction_name as record_transaction_name_for_clustering,
+)
 from sentry.integrations.tasks.kick_off_status_syncs import kick_off_status_syncs
 from sentry.issues.grouptype import ErrorGroupType
 from sentry.issues.issue_occurrence import IssueOccurrence
@@ -99,6 +103,8 @@
 from sentry.net.http import connection_from_url
 from sentry.plugins.base import plugins
 from sentry.quotas.base import index_data_category
+from sentry.receivers.features import record_event_processed
+from sentry.receivers.onboarding import record_release_received, record_user_context_received
 from sentry.reprocessing2 import is_reprocessed_event
 from sentry.seer.signed_seer_api import make_signed_seer_api_request
 from sentry.signals import (
@@ -132,6 +138,8 @@
 from sentry.utils.sdk import set_measurement
 from sentry.utils.tag_normalization import normalized_sdk_tag_from_event
 
+from .utils.event_tracker import TransactionStageStatus, track_sampled_event
+
 if TYPE_CHECKING:
     from sentry.eventstore.models import BaseEvent, Event
 
@@ -2111,14 +2119,17 @@ def _get_severity_score(event: Event) -> tuple[float, str]:
             reason = "microservice_max_retry"
             update_severity_error_count()
             metrics.incr("issues.severity.error", tags={"reason": "max_retries"})
+            logger.exception("Seer severity microservice max retries exceeded")
         except TimeoutError:
             reason = "microservice_timeout"
             update_severity_error_count()
             metrics.incr("issues.severity.error", tags={"reason": "timeout"})
+            logger.exception("Seer severity microservice timeout")
         except Exception:
             reason = "microservice_error"
             update_severity_error_count()
             metrics.incr("issues.severity.error", tags={"reason": "unknown"})
+            logger.exception("Seer severity microservice error")
             sentry_sdk.capture_exception()
         else:
             update_severity_error_count(reset=True)
@@ -2512,6 +2523,34 @@ def _detect_performance_problems(
         )
 
 
+@sentry_sdk.tracing.trace
+def _record_transaction_info(jobs: Sequence[Job], projects: ProjectsMapping) -> None:
+    """
+    this function does what we do in post_process for transactions. if this option is
+    turned on, we do the actions here instead of in post_process, with the goal
+    eventually being to not run transactions through post_process
+    """
+    for job in jobs:
+        try:
+            event = job["event"]
+            if not in_rollout_group("transactions.do_post_process_in_save", event.event_id):
+                continue
+
+            project = event.project
+            with sentry_sdk.start_span(op="event_manager.record_transaction_name_for_clustering"):
+                record_transaction_name_for_clustering(project, event.data)
+
+            # these are what the "transaction_processed" signal hooked into
+            # we should not use signals here, so call the recievers directly
+            # instead of sending a signal. we should consider potentially
+            # deleting these
+            record_event_processed(project, event)
+            record_user_context_received(project, event)
+            record_release_received(project, event)
+        except Exception:
+            sentry_sdk.capture_exception()
+
+
 class PerformanceJob(TypedDict, total=False):
     performance_problems: Sequence[PerformanceProblem]
     event: Event
@@ -2577,6 +2616,8 @@ def _send_occurrence_to_platform(jobs: Sequence[Job], projects: ProjectsMapping)
 
 @sentry_sdk.tracing.trace
 def save_transaction_events(jobs: Sequence[Job], projects: ProjectsMapping) -> Sequence[Job]:
+    from .ingest.types import ConsumerType
+
     organization_ids = {project.organization_id for project in projects.values()}
     organizations = {o.id: o for o in Organization.objects.get_many_from_cache(organization_ids)}
 
@@ -2628,6 +2669,13 @@ def save_transaction_events(jobs: Sequence[Job], projects: ProjectsMapping) -> S
     with metrics.timer("save_transaction_events.eventstream_insert_many"):
         _eventstream_insert_many(jobs)
 
+    for job in jobs:
+        track_sampled_event(
+            job["event"].event_id,
+            ConsumerType.Transactions,
+            TransactionStageStatus.SNUBA_TOPIC_PUT,
+        )
+
     with metrics.timer("save_transaction_events.track_outcome_accepted_many"):
         _track_outcome_accepted_many(jobs)
 
@@ -2637,6 +2685,9 @@ def save_transaction_events(jobs: Sequence[Job], projects: ProjectsMapping) -> S
     with metrics.timer("save_transaction_events.send_occurrence_to_platform"):
         _send_occurrence_to_platform(jobs, projects)
 
+    with metrics.timer("save_transaction_events.record_transaction_info"):
+        _record_transaction_info(jobs, projects)
+
     return jobs
 
 
diff --git a/src/sentry/eventstore/models.py b/src/sentry/eventstore/models.py
index bca5783584f736..67a49708ce2a03 100644
--- a/src/sentry/eventstore/models.py
+++ b/src/sentry/eventstore/models.py
@@ -572,6 +572,11 @@ def __getstate__(self) -> Mapping[str, Any]:
         state.pop("_groups_cache", None)
         return state
 
+    def __repr__(self):
+        return "<sentry.eventstore.models.Event at 0x{:x}: event_id={}>".format(
+            id(self), self.event_id
+        )
+
     @property
     def data(self) -> NodeData:
         return self._data
diff --git a/src/sentry/eventstore/processing/__init__.py b/src/sentry/eventstore/processing/__init__.py
index 8666683109849c..04034c01126772 100644
--- a/src/sentry/eventstore/processing/__init__.py
+++ b/src/sentry/eventstore/processing/__init__.py
@@ -1,4 +1,3 @@
-import sentry_sdk
 from django.conf import settings
 
 from sentry.eventstore.processing.base import EventProcessingStore
@@ -15,20 +14,11 @@
     settings.SENTRY_TRANSACTION_PROCESSING_STORE
     and settings.SENTRY_TRANSACTION_PROCESSING_STORE_OPTIONS
 ):
-    try:
-        transaction_processing_store = LazyServiceWrapper(
-            EventProcessingStore,
-            settings.SENTRY_TRANSACTION_PROCESSING_STORE,
-            settings.SENTRY_TRANSACTION_PROCESSING_STORE_OPTIONS,
-        )
-    except BaseException as e:
-        sentry_sdk.capture_exception(e)
-        transaction_processing_store = LazyServiceWrapper(
-            EventProcessingStore,
-            settings.SENTRY_EVENT_PROCESSING_STORE,
-            settings.SENTRY_EVENT_PROCESSING_STORE_OPTIONS,
-        )
-
+    transaction_processing_store = LazyServiceWrapper(
+        EventProcessingStore,
+        settings.SENTRY_TRANSACTION_PROCESSING_STORE,
+        settings.SENTRY_TRANSACTION_PROCESSING_STORE_OPTIONS,
+    )
 else:
     transaction_processing_store = LazyServiceWrapper(
         EventProcessingStore,
@@ -36,5 +26,4 @@
         settings.SENTRY_EVENT_PROCESSING_STORE_OPTIONS,
     )
 
-
 __all__ = ["event_processing_store", "transaction_processing_store"]
diff --git a/src/sentry/features/manager.py b/src/sentry/features/manager.py
index 98c3eb8b72d589..accbc814a146f0 100644
--- a/src/sentry/features/manager.py
+++ b/src/sentry/features/manager.py
@@ -14,8 +14,8 @@
 
 from sentry import options
 from sentry.users.services.user.model import RpcUser
-from sentry.utils import flag as flag_manager
 from sentry.utils import metrics
+from sentry.utils.flag import flag_pole_hook
 from sentry.utils.types import Dict
 
 from .base import Feature, FeatureHandlerStrategy
@@ -285,7 +285,7 @@ def has(self, name: str, *args: Any, skip_entity: bool | None = False, **kwargs:
                         tags={"feature": name, "result": rv},
                         sample_rate=sample_rate,
                     )
-                    flag_manager.process_flag_result(name, rv)
+                    flag_pole_hook(name, rv)
                     return rv
 
                 if self._entity_handler and not skip_entity:
@@ -296,7 +296,7 @@ def has(self, name: str, *args: Any, skip_entity: bool | None = False, **kwargs:
                             tags={"feature": name, "result": rv},
                             sample_rate=sample_rate,
                         )
-                        flag_manager.process_flag_result(name, rv)
+                        flag_pole_hook(name, rv)
                         return rv
 
                 rv = settings.SENTRY_FEATURES.get(feature.name, False)
@@ -306,7 +306,7 @@ def has(self, name: str, *args: Any, skip_entity: bool | None = False, **kwargs:
                         tags={"feature": name, "result": rv},
                         sample_rate=sample_rate,
                     )
-                    flag_manager.process_flag_result(name, rv)
+                    flag_pole_hook(name, rv)
                     return rv
 
                 # Features are by default disabled if no plugin or default enables them
@@ -315,7 +315,7 @@ def has(self, name: str, *args: Any, skip_entity: bool | None = False, **kwargs:
                     tags={"feature": name, "result": False},
                     sample_rate=sample_rate,
                 )
-                flag_manager.process_flag_result(name, False)
+                flag_pole_hook(name, False)
                 return False
         except Exception as e:
             if in_random_rollout("features.error.capture_rate"):
diff --git a/src/sentry/features/temporary.py b/src/sentry/features/temporary.py
index da1fc645becd7e..8f688d52cd6f68 100644
--- a/src/sentry/features/temporary.py
+++ b/src/sentry/features/temporary.py
@@ -80,12 +80,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:continuous-profiling-beta", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable stopping the ingestion of continuous profile for non-beta orgs
     manager.add("organizations:continuous-profiling-beta-ingest", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable continuous profiling ui
-    manager.add("organizations:continuous-profiling-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Display profile durations on the stats page
     manager.add("organizations:continuous-profiling-stats", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=True)
-    # Enable the continuous profiling compatible redesign
-    manager.add("organizations:continuous-profiling-compat", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Delightful Developer Metrics (DDM):
     # Enables experimental WIP custom metrics related features
     manager.add("organizations:custom-metrics-experimental", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
@@ -102,12 +98,16 @@ def register_temporary_features(manager: FeatureManager):
     # Enable metrics enhanced performance for AM2+ customers as they transition from AM2 to AM3
     manager.add("organizations:dashboards-metrics-transition", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:dashboards-span-metrics", OrganizationFeature, FeatureHandlerStrategy.OPTIONS, api_expose=False)
-    # Enable releases overlay on dashboard chart widgets
-    manager.add("organizations:dashboards-releases-on-charts", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable table view on dashboards landing page
+    manager.add("organizations:dashboards-table-view", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable access protected editing of dashboards
     manager.add("organizations:dashboards-edit-access", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable share links for dashboards for sharing outside the org
     manager.add("organizations:dashboards-share", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable favouriting dashboards
+    manager.add("organizations:dashboards-favourite", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable the dashboard widget builder redesign UI
+    manager.add("organizations:dashboards-widget-builder-redesign", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable the dev toolbar PoC code for employees
     # Data Secrecy
     manager.add("organizations:data-secrecy", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
@@ -137,6 +137,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:escalating-metrics-backend", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable logging for failure rate subscription processor
     manager.add("organizations:failure-rate-metric-alert-logging", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enable GenAI features such as Autofix and Issue Summary
+    manager.add("organizations:gen-ai-features", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable disabling gitlab integrations when broken is detected
     manager.add("organizations:gitlab-disable-on-broken", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Allow creating `GroupHashMetadata` records
@@ -152,6 +154,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:integrations-feature-flag-integration", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Allow tenant type installations through issue alert actions
     manager.add("organizations:integrations-msteams-tenant", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enable inviting billing members to organizations at the member limit.
+    manager.add("organizations:invite-billing", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, default=False, api_expose=False)
     # Enable inviting members to organizations.
     manager.add("organizations:invite-members", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=True)
     # Enable new invite members modal.
@@ -168,8 +172,10 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:issue-platform-deletion-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enables a toggle for entering the new issue details UI
     manager.add("organizations:issue-details-new-experience-toggle", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enables access to the streamlined issue details UI
+    # Enables opt-in access to the streamlined issue details UI for all users of an organization
     manager.add("organizations:issue-details-streamline", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enables streamlined issue details UI for all users of an organization without opt-out
+    manager.add("organizations:issue-details-streamline-enforce", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Whether to allow issue only search on the issue list
     manager.add("organizations:issue-search-allow-postgres-only-search", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Whether to make a side/parallel query against events -> group_attributes when searching issues
@@ -197,8 +203,6 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:messaging-integration-onboarding-project-creation", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable threshold period in metric alert rule builder
     manager.add("organizations:metric-alert-threshold-period", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enables the search bar for metrics samples list
-    manager.add("organizations:metrics-samples-list-search", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Migrate Orgs to new Azure DevOps Integration
     manager.add("organizations:migrate-azure-devops-integration", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable Session Stats down to a minute resolution
@@ -238,8 +242,6 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:ownership-size-limit-large", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable xlarge ownership rule file size limit
     manager.add("organizations:ownership-size-limit-xlarge", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
-    # Enable views for anomaly detection
-    manager.add("organizations:performance-anomaly-detection-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable mobile performance score calculation for transactions in relay
     manager.add("organizations:performance-calculate-mobile-perf-score-relay", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable performance change explorer panel on trends page
@@ -255,6 +257,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:performance-db-main-thread-detector", OrganizationFeature, api_expose=False)
     # Enable Discover Saved Query dataset selector
     manager.add("organizations:performance-discover-dataset-selector", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable deprecate discover widget type
+    manager.add("organizations:deprecate-discover-widget-type", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable backend overriding and always making a fresh split decision
     manager.add("organizations:performance-discover-widget-split-override-save", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable UI sending a discover split for widget
@@ -344,6 +348,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:project-templates", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable the new quick start guide
     manager.add("organizations:quick-start-updates", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable new small design changes for the quick start guide GA
+    manager.add("organizations:quick-start-updates-ga", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable the new Related Events feature
     manager.add("organizations:related-events", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable related issues feature
@@ -352,8 +358,6 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:relay-cardinality-limiter", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable the release details performance section
     manager.add("organizations:release-comparison-performance", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Fixes the next release resolution for semver releases
-    manager.add("organizations:releases-resolve-next-release-semver-fix", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # enable new release set_commits functionality
     manager.add("organizations:set-commits-updated", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable new release UI
@@ -366,6 +370,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:reprocessing-v2", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable Sentry's 2024 Rollback feature
     manager.add("organizations:sentry-rollback-2024", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable Sentry's 2024 Rollback toggle within organization settings
+    manager.add("organizations:sentry-rollback-settings", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable resolve in upcoming release
     # TODO(steve): Remove when we remove the feature from the UI
     manager.add("organizations:resolve-in-upcoming-release", OrganizationFeature, FeatureHandlerStrategy.OPTIONS, api_expose=True)
@@ -446,8 +452,6 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:insights-use-eap", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable access to insights metrics alerts
     manager.add("organizations:insights-alerts", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable domain view in Insights modules
-    manager.add("organizations:insights-domain-view", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable Related Issues table in Insights modules
     manager.add("organizations:insights-related-issues-table", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable access to Mobile Screens insights module
@@ -525,6 +529,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:user-feedback-trace-section", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable view hierarchies options
     manager.add("organizations:view-hierarchies-options-dev", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable admin features on the new explore page
+    manager.add("organizations:visibility-explore-admin", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable the new explore page
     manager.add("organizations:visibility-explore-view", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable the dataset toggle on the new explore page
@@ -533,12 +539,22 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:widget-viewer-modal-minimap", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enabled unresolved issue webhook for organization
     manager.add("organizations:webhooks-unresolved", OrganizationFeature, FeatureHandlerStrategy.OPTIONS, api_expose=True)
+    # Enable dual writing for metric alert issues (see: alerts create issues)
+    manager.add("organizations:workflow-engine-m3-dual-write", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enable reading from new ACI tables for metric alert issues (see: alerts create issues)
+    manager.add("organizations:workflow-engine-m3-read", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enable new workflow_engine UI (see: alerts create issues)
+    manager.add("organizations:workflow-engine-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable EventUniqueUserFrequencyConditionWithConditions special alert condition
     manager.add("organizations:event-unique-user-frequency-condition-with-conditions", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Use spans instead of transactions for dynamic sampling calculations. This will become the new default.
     manager.add("organizations:dynamic-sampling-spans", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable tagging span with whether or not we should ingest it in the EAP
     manager.add("organizations:ingest-spans-in-eap", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enables EAP alerts UI use RPC
+    manager.add("organizations:eap-alerts-ui-uses-rpc", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Test flag for flagpole region checking
+    manager.add("organizations:validate-region-test-flag", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
 
     # NOTE: Don't add features down here! Add them to their specific group and sort
     #       them alphabetically! The order features are registered is not important.
@@ -560,6 +576,8 @@ def register_temporary_features(manager: FeatureManager):
     # Enable alternative version of group creation that is supposed to be less racy.
     manager.add("projects:race-free-group-creation", ProjectFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=False)
     # Enable similarity embeddings API call
+    # This feature is only available on the frontend using project details since the handler gets
+    # project options and this is slow in the project index endpoint feature flag serialization
     manager.add("projects:similarity-embeddings", ProjectFeature, FeatureHandlerStrategy.INTERNAL, default=False, api_expose=True)
     manager.add("projects:similarity-embeddings-backfill", ProjectFeature, FeatureHandlerStrategy.OPTIONS, api_expose=False)
     manager.add("projects:similarity-embeddings-delete-by-hash", ProjectFeature, FeatureHandlerStrategy.OPTIONS, api_expose=False)
@@ -572,9 +590,6 @@ def register_temporary_features(manager: FeatureManager):
     # EAP: extremely experimental flag that makes DDM page use EAP tables
     manager.add("projects:use-eap-spans-for-metrics-explorer", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
 
-    # Ecosystem: Enable verbose alert reporting when triggering test alerts
-    manager.add("projects:verbose-test-alert-reporting", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE,
-                api_expose=False)
     # Project plugin features
     manager.add("projects:plugins", ProjectPluginFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=True)
 
@@ -594,6 +609,12 @@ def register_temporary_features(manager: FeatureManager):
         FeatureHandlerStrategy.FLAGPOLE,
         api_expose=True,
     )
+    manager.add(
+        "organizations:feature-flag-cta",
+        OrganizationFeature,
+        FeatureHandlerStrategy.FLAGPOLE,
+        api_expose=True,
+    )
 
     # Partner oauth
     manager.add(
diff --git a/src/sentry/flags/docs/api.md b/src/sentry/flags/docs/api.md
index 2fee96927f558f..5e63588b40142c 100644
--- a/src/sentry/flags/docs/api.md
+++ b/src/sentry/flags/docs/api.md
@@ -8,7 +8,7 @@ Host: https://sentry.io/api/0
 
 **How to read this document.**
 
-This document is structured by resource with each resource having actions that can be performed against it. Every action that either accepts a request or returns a response WILL document the full interchange format. Clients may opt to restrict response data or provide a subset of the request data.
+This document is structured by resource with each resource having actions that can be performed against it. Every action that either accepts a request or returns a response **must** document the full interchange format.
 
 ## Flag Logs [/organizations/<organization_id_or_slug>/flags/logs/]
 
@@ -17,7 +17,7 @@ This document is structured by resource with each resource having actions that c
   - start (optional, string) - ISO 8601 format (`YYYY-MM-DDTHH:mm:ss.sssZ`)
   - end (optional, string) - ISO 8601 format. Required if `start` is set.
   - statsPeriod (optional, string) - A positive integer suffixed with a unit type.
-  - cursor (optional, string)`
+  - cursor (optional, string)
   - per_page (optional, number)
     Default: 10
   - offset (optional, number)
@@ -83,32 +83,78 @@ Retrieve a single flag log instance.
   }
   ```
 
-## Webhooks [/organizations/<organization_id_or_slug>/flags/hooks/provider/<provider>/token/<token>/]
+## Signing Secrets [/organizations/<organization_id_or_slug>/flags/signing-secrets/]
 
-### Create Flag Log [POST]
+- Parameters
+  - cursor (optional, string)
+  - per_page (optional, number)
+    Default: 10
+  - offset (optional, number)
+    Default: 0
 
-The shape of the request object varies by provider. The `<provider>` URI parameter informs the server of the shape of the request and it is on the server to handle the provider. The following providers are supported: Unleash, Split, Statsig, and LaunchDarkly.
+### Browse Signing Secrets [GET]
 
-**Flag Pole Example:**
+Browse a list of signing secrets. Secrets are unique per provider. Secrets only show the first six characters; the remainder are redacted.
 
-Flag pole is Sentry owned. It matches our audit-log resource because it is designed for that purpose.
+**Attributes**
 
-- Request (application/json)
+| Column    | Type   | Description                                                            |
+| --------- | ------ | ---------------------------------------------------------------------- |
+| createdAt | string | ISO-8601 timestamp of when the secret was added.                       |
+| createdBy | string | The user responsible for adding the secret.                            |
+| id        | number | A unique identifier for the secret entry.                              |
+| provider  | string | The provider this secret applies to.                                   |
+| secret    | string | A secret value which allows us to verify the signature of the request. |
+
+- Response 200
 
   ```json
   {
     "data": [
       {
-        "action": "updated",
-        "createdAt": "2024-11-19T19:12:55",
-        "createdBy": "colton.allen@sentry.io",
-        "flag": "flag-name",
-        "tags": {
-          "commit_sha": "1f33a107d7cd060ab9c98e11c9e5a62dc1347861"
-        }
+        "createdAt": "2024-12-12T00:00:00+00:00",
+        "createdBy": 12345,
+        "id": 123,
+        "provider": "launchdarkly",
+        "secret": "abc123**********"
       }
     ]
   }
   ```
 
+### Create Signing Secret [POST]
+
+Requests from web hook providers can be signed. We use the signing secret to verify the webhook's origin is authentic.
+
+- Request (application/json)
+
+  ```json
+  {
+    "provider": "launchdarkly",
+    "secret": "d41d7d1adced450d9e2eb7f76dde6a04"
+  }
+  ```
+
+- Response 201
+
+## Signing Secret [/organizations/<organization_id_or_slug>/flags/signing-secrets/<signing_secret_id>/]
+
+### Delete Signing Secret [DELETE]
+
+Delete a signing secret.
+
+- Response 204
+
+## Webhooks [/organizations/<organization_id_or_slug>/flags/hooks/provider/<provider>/]
+
+### Create Flag Log [POST]
+
+The shape of the request object varies by provider. The `<provider>` URI parameter informs the server of the shape of the request and it is on the server to handle the provider. The following providers are supported: LaunchDarkly.
+
+Webhooks are signed by their provider. The provider handler must use the secret stored in Sentry to verify the signature of the payload. Failure to do so could lead to unauthorized access.
+
+Any request content-type is acceptable (JSON, XML, binary-formats) so long as the server is capable of decoding the request and mapping it to our object model.
+
+- Request
+
 - Response 201
diff --git a/src/sentry/flags/endpoints/__init__.py b/src/sentry/flags/endpoints/__init__.py
index e69de29bb2d1d6..be4cef59b09284 100644
--- a/src/sentry/flags/endpoints/__init__.py
+++ b/src/sentry/flags/endpoints/__init__.py
@@ -0,0 +1,12 @@
+from sentry.api.bases.organization import OrganizationEndpoint
+from sentry.api.exceptions import ResourceDoesNotExist
+
+VALID_PROVIDERS = {"launchdarkly"}
+
+
+class OrganizationFlagsEndpoint(OrganizationEndpoint):
+
+    def convert_args(self, *args, **kwargs):
+        if kwargs.get("provider", "") not in VALID_PROVIDERS:
+            raise ResourceDoesNotExist
+        return super().convert_args(*args, **kwargs)
diff --git a/src/sentry/flags/endpoints/hooks.py b/src/sentry/flags/endpoints/hooks.py
index 6db6bc7d7e9bf4..e223f602df2363 100644
--- a/src/sentry/flags/endpoints/hooks.py
+++ b/src/sentry/flags/endpoints/hooks.py
@@ -1,70 +1,29 @@
-import logging
-from urllib.parse import unquote
-
 import sentry_sdk
-from rest_framework.exceptions import AuthenticationFailed
 from rest_framework.request import Request
 from rest_framework.response import Response
 
 from sentry import features
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import Endpoint, region_silo_endpoint
+from sentry.api.base import region_silo_endpoint
 from sentry.api.exceptions import ResourceDoesNotExist
+from sentry.flags.endpoints import OrganizationFlagsEndpoint
 from sentry.flags.providers import (
     DeserializationError,
     InvalidProvider,
     handle_provider_event,
+    validate_provider_event,
     write,
 )
-from sentry.hybridcloud.models.orgauthtokenreplica import OrgAuthTokenReplica
 from sentry.models.organization import Organization
-from sentry.models.orgauthtoken import OrgAuthToken
-from sentry.silo.base import SiloMode
-from sentry.utils.security.orgauthtoken_token import hash_token
-
-"""HTTP endpoint.
-
-This endpoint accepts only organization authorization tokens. I've made the conscious
-decision to exclude all other forms of authentication. We don't want users accidentally
-writing logs or leaked DSNs generating invalid log entries. An organization token is
-secret and reasonably restricted and so makes sense for this use case where we have
-inter-provider communication.
-"""
-
-logger = logging.getLogger()
 
 
 @region_silo_endpoint
-class OrganizationFlagsHooksEndpoint(Endpoint):
+class OrganizationFlagsHooksEndpoint(OrganizationFlagsEndpoint):
     authentication_classes = ()
     owner = ApiOwner.REPLAY
     permission_classes = ()
-    publish_status = {
-        "POST": ApiPublishStatus.PRIVATE,
-    }
-
-    def convert_args(
-        self,
-        request: Request,
-        organization_id_or_slug: str,
-        token: str,
-        *args,
-        **kwargs,
-    ):
-        try:
-            if str(organization_id_or_slug).isdigit():
-                organization = Organization.objects.get_from_cache(id=organization_id_or_slug)
-            else:
-                organization = Organization.objects.get_from_cache(slug=organization_id_or_slug)
-        except Organization.DoesNotExist:
-            raise ResourceDoesNotExist
-
-        if not is_valid_token(organization.id, token):
-            raise AuthenticationFailed("Invalid token specified.")
-
-        kwargs["organization"] = organization
-        return args, kwargs
+    publish_status = {"POST": ApiPublishStatus.PRIVATE}
 
     def post(self, request: Request, organization: Organization, provider: str) -> Response:
         if not features.has(
@@ -73,6 +32,14 @@ def post(self, request: Request, organization: Organization, provider: str) -> R
             return Response("Not enabled.", status=404)
 
         try:
+            if not validate_provider_event(
+                provider,
+                request.body,
+                request.headers,
+                organization.id,
+            ):
+                return Response("Not authorized.", status=401)
+
             write(handle_provider_event(provider, request.data, organization.id))
             return Response(status=200)
         except InvalidProvider:
@@ -80,28 +47,3 @@ def post(self, request: Request, organization: Organization, provider: str) -> R
         except DeserializationError as exc:
             sentry_sdk.capture_exception()
             return Response(exc.errors, status=200)
-
-
-def is_valid_token(organization_id: int, token: str) -> bool:
-    token_hashed = hash_token(unquote(token))
-
-    if SiloMode.get_current_mode() == SiloMode.REGION:
-        try:
-            OrgAuthTokenReplica.objects.get(
-                token_hashed=token_hashed,
-                date_deactivated__isnull=True,
-                organization_id=organization_id,
-            )
-            return True
-        except OrgAuthTokenReplica.DoesNotExist:
-            return False
-    else:
-        try:
-            OrgAuthToken.objects.get(
-                token_hashed=token_hashed,
-                date_deactivated__isnull=True,
-                organization_id=organization_id,
-            )
-            return True
-        except OrgAuthToken.DoesNotExist:
-            return False
diff --git a/src/sentry/flags/endpoints/logs.py b/src/sentry/flags/endpoints/logs.py
index 8378569e14951c..196227873dbdd0 100644
--- a/src/sentry/flags/endpoints/logs.py
+++ b/src/sentry/flags/endpoints/logs.py
@@ -5,7 +5,6 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-# from sentry import features
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
@@ -48,9 +47,6 @@ class OrganizationFlagLogIndexEndpoint(OrganizationEndpoint):
     publish_status = {"GET": ApiPublishStatus.PRIVATE}
 
     def get(self, request: Request, organization: Organization) -> Response:
-        # if not features.has("organizations:feature-flag-ui", organization, actor=request.user):
-        #     raise ResourceDoesNotExist
-
         start, end = get_date_range_from_params(request.GET)
         if start is None or end is None:
             raise ParseError(detail="Invalid date range")
@@ -81,9 +77,6 @@ class OrganizationFlagLogDetailsEndpoint(OrganizationEndpoint):
     publish_status = {"GET": ApiPublishStatus.PRIVATE}
 
     def get(self, request: Request, organization: Organization, flag_log_id: int) -> Response:
-        # if not features.has("organizations:feature-flag-ui", organization, actor=request.user):
-        #     raise ResourceDoesNotExist
-
         try:
             model = FlagAuditLogModel.objects.filter(
                 id=flag_log_id,
diff --git a/src/sentry/flags/endpoints/secrets.py b/src/sentry/flags/endpoints/secrets.py
new file mode 100644
index 00000000000000..17a03d98b3a045
--- /dev/null
+++ b/src/sentry/flags/endpoints/secrets.py
@@ -0,0 +1,117 @@
+from __future__ import annotations
+
+from datetime import datetime, timezone
+from typing import TypedDict
+
+from rest_framework import serializers
+from rest_framework.request import Request
+from rest_framework.response import Response
+
+from sentry import features
+from sentry.api.api_owners import ApiOwner
+from sentry.api.api_publish_status import ApiPublishStatus
+from sentry.api.base import region_silo_endpoint
+from sentry.api.bases.organization import OrganizationEndpoint, OrgAuthTokenPermission
+from sentry.api.paginator import OffsetPaginator
+from sentry.api.serializers import Serializer, register, serialize
+from sentry.flags.models import FlagWebHookSigningSecretModel
+from sentry.models.organization import Organization
+
+
+class FlagWebhookSigningSecretResponse(TypedDict):
+    createdAt: str
+    createdBy: int
+    id: int
+    provider: str
+    secret: str
+
+
+@register(FlagWebHookSigningSecretModel)
+class FlagWebhookSigningSecretSerializer(Serializer):
+    def serialize(self, obj, attrs, user, **kwargs) -> FlagWebhookSigningSecretResponse:
+        return {
+            "createdAt": obj.date_added.isoformat(),
+            "createdBy": obj.created_by,
+            "id": obj.id,
+            "provider": obj.provider,
+            "secret": obj.secret[0:6] + "*" * (len(obj.secret) - 6),
+        }
+
+
+class FlagWebhookSigningSecretValidator(serializers.Serializer):
+    provider = serializers.ChoiceField(choices=[("launchdarkly", "launchdarkly")], required=True)
+    secret = serializers.CharField(required=True, max_length=32, min_length=32)
+
+
+@region_silo_endpoint
+class OrganizationFlagsWebHookSigningSecretsEndpoint(OrganizationEndpoint):
+    owner = ApiOwner.REPLAY
+    permission_classes = (OrgAuthTokenPermission,)
+    publish_status = {
+        "GET": ApiPublishStatus.PRIVATE,
+        "POST": ApiPublishStatus.PRIVATE,
+    }
+
+    def get(self, request: Request, organization: Organization) -> Response:
+        if not features.has(
+            "organizations:feature-flag-audit-log", organization, actor=request.user
+        ):
+            return Response("Not enabled.", status=404)
+
+        return self.paginate(
+            request=request,
+            queryset=FlagWebHookSigningSecretModel.objects.filter(organization_id=organization.id),
+            order_by="-date_added",
+            on_results=lambda x: {
+                "data": serialize(x, request.user, FlagWebhookSigningSecretSerializer())
+            },
+            paginator_cls=OffsetPaginator,
+        )
+
+    def post(self, request: Request, organization: Organization) -> Response:
+        if not features.has(
+            "organizations:feature-flag-audit-log", organization, actor=request.user
+        ):
+            return Response("Not enabled.", status=404)
+
+        validator = FlagWebhookSigningSecretValidator(data=request.data)
+        if not validator.is_valid():
+            return self.respond(validator.errors, status=400)
+
+        FlagWebHookSigningSecretModel.objects.create_or_update(
+            organization=organization,
+            provider=validator.validated_data["provider"],
+            values={
+                "created_by": request.user.id,
+                "date_added": datetime.now(tz=timezone.utc),
+                "provider": validator.validated_data["provider"],
+                "secret": validator.validated_data["secret"],
+            },
+        )
+
+        return Response(status=201)
+
+
+@region_silo_endpoint
+class OrganizationFlagsWebHookSigningSecretEndpoint(OrganizationEndpoint):
+    owner = ApiOwner.REPLAY
+    permission_classes = (OrgAuthTokenPermission,)
+    publish_status = {"DELETE": ApiPublishStatus.PRIVATE}
+
+    def delete(
+        self, request: Request, organization: Organization, signing_secret_id: str
+    ) -> Response:
+        if not features.has(
+            "organizations:feature-flag-audit-log", organization, actor=request.user
+        ):
+            return Response("Not enabled.", status=404)
+
+        try:
+            model = FlagWebHookSigningSecretModel.objects.filter(
+                organization_id=organization.id
+            ).get(id=int(signing_secret_id))
+            model.delete()
+        except FlagWebHookSigningSecretModel.DoesNotExist:
+            return Response(status=404)
+        else:
+            return Response(status=204)
diff --git a/src/sentry/flags/migrations/0002_add_flags_webhooksigningsecret.py b/src/sentry/flags/migrations/0002_add_flags_webhooksigningsecret.py
new file mode 100644
index 00000000000000..22b42652c5b387
--- /dev/null
+++ b/src/sentry/flags/migrations/0002_add_flags_webhooksigningsecret.py
@@ -0,0 +1,64 @@
+# Generated by Django 5.1.1 on 2024-11-13 15:32
+
+import django.db.models.deletion
+import django.utils.timezone
+from django.db import migrations, models
+
+import sentry.db.models.fields.bounded
+import sentry.db.models.fields.foreignkey
+import sentry.db.models.fields.hybrid_cloud_foreign_key
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("flags", "0001_add_flag_audit_log"),
+        ("sentry", "0787_make_dashboard_perms_col_nullable"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="FlagWebHookSigningSecretModel",
+            fields=[
+                (
+                    "id",
+                    sentry.db.models.fields.bounded.BoundedBigAutoField(
+                        primary_key=True, serialize=False
+                    ),
+                ),
+                (
+                    "created_by",
+                    sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                        "sentry.User", db_index=True, null=True, on_delete="SET_NULL"
+                    ),
+                ),
+                ("date_added", models.DateTimeField(default=django.utils.timezone.now)),
+                ("provider", models.CharField(db_index=True)),
+                ("secret", models.CharField()),
+                (
+                    "organization",
+                    sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="sentry.organization"
+                    ),
+                ),
+            ],
+            options={
+                "db_table": "flags_webhooksigningsecret",
+                "unique_together": {("organization", "provider", "secret")},
+            },
+        ),
+    ]
diff --git a/src/sentry/flags/models.py b/src/sentry/flags/models.py
index 80852d7cc89e5d..5e12788c61696f 100644
--- a/src/sentry/flags/models.py
+++ b/src/sentry/flags/models.py
@@ -1,10 +1,11 @@
 from enum import Enum
 
+from django.conf import settings
 from django.db import models
 from django.utils import timezone
 
 from sentry.backup.scopes import RelocationScope
-from sentry.db.models import Model, region_silo_model, sane_repr
+from sentry.db.models import FlexibleForeignKey, Model, region_silo_model, sane_repr
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
 
 
@@ -83,3 +84,19 @@ class Meta:
         indexes = (models.Index(fields=("flag",)),)
 
     __repr__ = sane_repr("organization_id", "flag")
+
+
+@region_silo_model
+class FlagWebHookSigningSecretModel(Model):
+    __relocation_scope__ = RelocationScope.Excluded
+
+    created_by = HybridCloudForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete="SET_NULL")
+    date_added = models.DateTimeField(default=timezone.now)
+    organization = FlexibleForeignKey("sentry.Organization")
+    provider = models.CharField(db_index=True)
+    secret = models.CharField()
+
+    class Meta:
+        app_label = "flags"
+        db_table = "flags_webhooksigningsecret"
+        unique_together = (("organization", "provider", "secret"),)
diff --git a/src/sentry/flags/providers.py b/src/sentry/flags/providers.py
index eac1c8a5a5e82b..8232a6cf00be58 100644
--- a/src/sentry/flags/providers.py
+++ b/src/sentry/flags/providers.py
@@ -1,9 +1,17 @@
 import datetime
+import hashlib
+import hmac
 from typing import Any, TypedDict
 
+from django.http.request import HttpHeaders
 from rest_framework import serializers
 
-from sentry.flags.models import ACTION_MAP, CREATED_BY_TYPE_MAP, FlagAuditLogModel
+from sentry.flags.models import (
+    ACTION_MAP,
+    CREATED_BY_TYPE_MAP,
+    FlagAuditLogModel,
+    FlagWebHookSigningSecretModel,
+)
 from sentry.silo.base import SiloLimit
 
 
@@ -62,6 +70,19 @@ def handle_provider_event(
             raise InvalidProvider(provider)
 
 
+def validate_provider_event(
+    provider: str,
+    request_data: bytes,
+    request_headers: HttpHeaders,
+    organization_id: int,
+) -> bool:
+    match provider:
+        case "launchdarkly":
+            return validate_launchdarkly_event(request_data, request_headers, organization_id)
+        case _:
+            raise InvalidProvider(provider)
+
+
 """LaunchDarkly provider."""
 
 
@@ -70,7 +91,7 @@ class LaunchDarklyItemSerializer(serializers.Serializer):
     date = serializers.IntegerField(required=True)
     member = serializers.DictField(required=True)
     name = serializers.CharField(max_length=100, required=True)
-    description = serializers.CharField(required=True)
+    description = serializers.CharField(allow_blank=True, required=True)
 
 
 SUPPORTED_LAUNCHDARKLY_ACTIONS = {
@@ -112,6 +133,10 @@ def handle_launchdarkly_event(
 
     result = serializer.validated_data
 
+    access = result["accesses"][0]
+    if access["action"] not in SUPPORTED_LAUNCHDARKLY_ACTIONS:
+        return []
+
     return [
         {
             "action": handle_launchdarkly_actions(access["action"]),
@@ -122,11 +147,33 @@ def handle_launchdarkly_event(
             "organization_id": organization_id,
             "tags": {"description": result["description"]},
         }
-        for access in result["accesses"]
-        if access["action"] in SUPPORTED_LAUNCHDARKLY_ACTIONS
     ]
 
 
+def validate_launchdarkly_event(
+    request_data: bytes,
+    request_headers: HttpHeaders,
+    organization_id: int,
+) -> bool:
+    """Return "true" if the launchdarkly payload is valid."""
+    signature = request_headers.get("X-LD-Signature")
+    if signature is None:
+        return False
+
+    models = FlagWebHookSigningSecretModel.objects.filter(
+        organization_id=organization_id,
+        provider="launchdarkly",
+    ).all()
+    for model in models:
+        if hmac_sha256_hex_digest(model.secret, request_data) == signature:
+            return True
+    return False
+
+
+def hmac_sha256_hex_digest(key: str, message: bytes):
+    return hmac.new(key.encode(), message, hashlib.sha256).hexdigest()
+
+
 """Internal flag-pole provider.
 
 Allows us to skip the HTTP endpoint.
diff --git a/src/sentry/grouping/__init__.py b/src/sentry/grouping/__init__.py
index c9a6eac32bb86b..d7ba3b7c147978 100644
--- a/src/sentry/grouping/__init__.py
+++ b/src/sentry/grouping/__init__.py
@@ -87,7 +87,7 @@
 Here an example of how components can be used::
 
     function_name = 'lambda$1234'
-    threads = GroupingComponent(
+    threads = BaseGroupingComponent(
         id="function",
         values=[function_name],
         contributes=False,
diff --git a/src/sentry/grouping/api.py b/src/sentry/grouping/api.py
index 5c85088cc06fde..1e2ac52f4efe0d 100644
--- a/src/sentry/grouping/api.py
+++ b/src/sentry/grouping/api.py
@@ -1,14 +1,19 @@
 from __future__ import annotations
 
 import re
-from collections.abc import Sequence
+from collections.abc import MutableMapping, Sequence
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, TypedDict
+from typing import TYPE_CHECKING, Any, NotRequired, TypedDict
 
 import sentry_sdk
 
 from sentry import options
-from sentry.grouping.component import GroupingComponent
+from sentry.grouping.component import (
+    AppGroupingComponent,
+    BaseGroupingComponent,
+    DefaultGroupingComponent,
+    SystemGroupingComponent,
+)
 from sentry.grouping.enhancer import LATEST_VERSION, Enhancements
 from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.grouping.strategies.base import DEFAULT_GROUPING_ENHANCEMENTS_BASE, GroupingContext
@@ -33,13 +38,18 @@
 
 if TYPE_CHECKING:
     from sentry.eventstore.models import Event
-    from sentry.grouping.fingerprinting import FingerprintingRules
+    from sentry.grouping.fingerprinting import FingerprintingRules, FingerprintRuleJSON
     from sentry.grouping.strategies.base import StrategyConfiguration
     from sentry.models.project import Project
 
 HASH_RE = re.compile(r"^[0-9a-f]{32}$")
 
 
+class FingerprintInfo(TypedDict):
+    client_fingerprint: NotRequired[list[str]]
+    matched_rule: NotRequired[FingerprintRuleJSON]
+
+
 @dataclass
 class GroupHashInfo:
     config: GroupingConfig
@@ -234,7 +244,9 @@ def get_fingerprinting_config_for_project(
     return rv
 
 
-def apply_server_fingerprinting(event, config, allow_custom_title=True):
+def apply_server_fingerprinting(
+    event: MutableMapping[str, Any], config: FingerprintingRules, allow_custom_title: bool = True
+) -> None:
     fingerprint_info = {}
 
     client_fingerprint = event.get("fingerprint", [])
@@ -264,10 +276,10 @@ def apply_server_fingerprinting(event, config, allow_custom_title=True):
 
 def _get_calculated_grouping_variants_for_event(
     event: Event, context: GroupingContext
-) -> dict[str, GroupingComponent]:
+) -> dict[str, AppGroupingComponent | SystemGroupingComponent | DefaultGroupingComponent]:
     winning_strategy: str | None = None
     precedence_hint: str | None = None
-    per_variant_components: dict[str, list[GroupingComponent]] = {}
+    per_variant_components: dict[str, list[BaseGroupingComponent]] = {}
 
     for strategy in context.config.iter_strategies():
         # Defined in src/sentry/grouping/strategies/base.py
@@ -292,7 +304,12 @@ def _get_calculated_grouping_variants_for_event(
 
     rv = {}
     for variant, components in per_variant_components.items():
-        component = GroupingComponent(id=variant, values=components)
+        component_class_by_variant = {
+            "app": AppGroupingComponent,
+            "default": DefaultGroupingComponent,
+            "system": SystemGroupingComponent,
+        }
+        component = component_class_by_variant[variant](values=components)
         if not component.contributes and precedence_hint:
             component.update(hint=precedence_hint)
         rv[variant] = component
@@ -336,7 +353,7 @@ def get_grouping_variants_for_event(
     # a materialized fingerprint info from server side fingerprinting we forward it to the
     # variants which can export additional information about them.
     fingerprint = event.data.get("fingerprint") or ["{{ default }}"]
-    fingerprint_info = event.data.get("_fingerprint_info")
+    fingerprint_info = event.data.get("_fingerprint_info", {})
     defaults_referenced = sum(1 if is_default_fingerprint_var(d) else 0 for d in fingerprint)
 
     if config is None:
@@ -359,7 +376,7 @@ def get_grouping_variants_for_event(
             rv[key] = ComponentVariant(component, context.config)
 
         fingerprint = resolve_fingerprint_values(fingerprint, event.data)
-        if (fingerprint_info or {}).get("matched_rule", {}).get("is_builtin") is True:
+        if fingerprint_info.get("matched_rule", {}).get("is_builtin") is True:
             rv["built_in_fingerprint"] = BuiltInFingerprintVariant(fingerprint, fingerprint_info)
         else:
             rv["custom_fingerprint"] = CustomFingerprintVariant(fingerprint, fingerprint_info)
diff --git a/src/sentry/grouping/component.py b/src/sentry/grouping/component.py
index be4e1bffdef7b1..cd1a83b820af1b 100644
--- a/src/sentry/grouping/component.py
+++ b/src/sentry/grouping/component.py
@@ -1,12 +1,12 @@
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
+from collections import Counter
 from collections.abc import Generator, Iterator, Sequence
-from typing import Any
+from typing import Any, Self
 
 from sentry.grouping.utils import hash_from_values
 
-DEFAULT_HINTS = {"salt": "a static salt"}
-
 # When a component ID appears here it has a human readable name which also
 # makes it a major component.  A major component is described as such for
 # the UI.
@@ -23,40 +23,41 @@
 }
 
 
-def _calculate_contributes(values: Sequence[str | GroupingComponent]) -> bool:
+def _calculate_contributes[ValuesType](values: Sequence[ValuesType]) -> bool:
     for value in values or ():
-        if not isinstance(value, GroupingComponent) or value.contributes:
+        if not isinstance(value, BaseGroupingComponent) or value.contributes:
             return True
     return False
 
 
-class GroupingComponent:
+class BaseGroupingComponent[ValuesType: str | int | BaseGroupingComponent[Any]](ABC):
     """A grouping component is a recursive structure that is flattened
     into components to make a hash for grouping purposes.
     """
 
+    hint: str | None = None
+    contributes: bool = False
+    values: Sequence[ValuesType]
+
     def __init__(
         self,
-        id: str,
         hint: str | None = None,
         contributes: bool | None = None,
-        values: Sequence[str | GroupingComponent] | None = None,
+        values: Sequence[ValuesType] | None = None,
         variant_provider: bool = False,
     ):
-        self.id = id
-
-        # Default values
-        self.hint = DEFAULT_HINTS.get(id)
-        self.contributes = contributes
         self.variant_provider = variant_provider
-        self.values: Sequence[str | GroupingComponent] = []
 
         self.update(
             hint=hint,
             contributes=contributes,
-            values=values,
+            values=values or [],
         )
 
+    @property
+    @abstractmethod
+    def id(self) -> str: ...
+
     @property
     def name(self) -> str | None:
         return KNOWN_MAJOR_COMPONENT_NAMES.get(self.id)
@@ -72,13 +73,15 @@ def description(self) -> str:
         # Keep track of the paths we walk so later we can pick the longest one
         paths = []
 
-        def _walk_components(component: GroupingComponent, current_path: list[str | None]) -> None:
+        def _walk_components(
+            component: BaseGroupingComponent[Any], current_path: list[str | None]
+        ) -> None:
             # Keep track of the names of the nodes from the root of the component tree to here
             current_path.append(component.name)
 
             # Walk the tree, looking for contributing components.
             for value in component.values:
-                if isinstance(value, GroupingComponent) and value.contributes:
+                if isinstance(value, BaseGroupingComponent) and value.contributes:
                     _walk_components(value, current_path)
 
             # Filter out the `None`s (which come from components not in `KNOWN_MAJOR_COMPONENT_NAMES`)
@@ -99,16 +102,16 @@ def _walk_components(component: GroupingComponent, current_path: list[str | None
 
     def get_subcomponent(
         self, id: str, only_contributing: bool = False
-    ) -> str | GroupingComponent | None:
+    ) -> str | int | BaseGroupingComponent[Any] | None:
         """Looks up a subcomponent by the id and returns the first or `None`."""
         return next(self.iter_subcomponents(id=id, only_contributing=only_contributing), None)
 
     def iter_subcomponents(
         self, id: str, recursive: bool = False, only_contributing: bool = False
-    ) -> Iterator[str | GroupingComponent | None]:
+    ) -> Iterator[str | int | BaseGroupingComponent[Any] | None]:
         """Finds all subcomponents matching an id, optionally recursively."""
         for value in self.values:
-            if isinstance(value, GroupingComponent):
+            if isinstance(value, BaseGroupingComponent):
                 if only_contributing and not value.contributes:
                     continue
                 if value.id == id:
@@ -123,7 +126,7 @@ def update(
         self,
         hint: str | None = None,
         contributes: bool | None = None,
-        values: Sequence[str | GroupingComponent] | None = None,
+        values: Sequence[ValuesType] | None = None,
     ) -> None:
         """Updates an already existing component with new values."""
         if hint is not None:
@@ -135,20 +138,20 @@ def update(
         if contributes is not None:
             self.contributes = contributes
 
-    def shallow_copy(self) -> GroupingComponent:
+    def shallow_copy(self) -> Self:
         """Creates a shallow copy."""
         rv = object.__new__(self.__class__)
         rv.__dict__.update(self.__dict__)
         rv.values = list(self.values)
         return rv
 
-    def iter_values(self) -> Generator[str | GroupingComponent]:
+    def iter_values(self) -> Generator[str | int]:
         """Recursively walks the component and flattens it into a list of
         values.
         """
         if self.contributes:
             for value in self.values:
-                if isinstance(value, GroupingComponent):
+                if isinstance(value, BaseGroupingComponent):
                     yield from value.iter_values()
                 else:
                     yield value
@@ -170,7 +173,7 @@ def as_dict(self) -> dict[str, Any]:
             "values": [],
         }
         for value in self.values:
-            if isinstance(value, GroupingComponent):
+            if isinstance(value, BaseGroupingComponent):
                 rv["values"].append(value.as_dict())
             else:
                 # This basically assumes that a value is only a primitive
@@ -180,4 +183,224 @@ def as_dict(self) -> dict[str, Any]:
         return rv
 
     def __repr__(self) -> str:
-        return f"GroupingComponent({self.id!r}, hint={self.hint!r}, contributes={self.contributes!r}, values={self.values!r})"
+        return f"{self.__class__.__name__}({self.id!r}, hint={self.hint!r}, contributes={self.contributes!r}, values={self.values!r})"
+
+
+# NOTE: In all of the classes below, the type(s) passed to `BaseGroupingComponent` represent
+# the type(s) which can appear in the `values` attribute
+
+
+# Error-related inner components
+
+
+class ContextLineGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "context-line"
+
+
+class ErrorTypeGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "type"
+
+
+class ErrorValueGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "value"
+
+
+class FilenameGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "filename"
+
+
+class FunctionGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "function"
+
+
+class LineNumberGroupingComponent(BaseGroupingComponent[int]):
+    id: str = "lineno"
+
+
+class ModuleGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "module"
+
+
+class NSErrorGroupingComponent(BaseGroupingComponent[str | int]):
+    id: str = "ns-error"
+
+
+class SymbolGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "symbol"
+
+
+FrameGroupingComponentChildren = (
+    ContextLineGroupingComponent
+    | FilenameGroupingComponent
+    | FunctionGroupingComponent
+    | LineNumberGroupingComponent  # only in legacy config
+    | ModuleGroupingComponent
+    | SymbolGroupingComponent  # only in legacy config
+)
+
+
+class FrameGroupingComponent(BaseGroupingComponent[FrameGroupingComponentChildren]):
+    id: str = "frame"
+    in_app: bool
+
+    def __init__(
+        self,
+        values: Sequence[FrameGroupingComponentChildren],
+        in_app: bool,
+        hint: str | None = None,  # only passed in legacy
+        contributes: bool | None = None,  # only passed in legacy
+    ):
+        super().__init__(hint=hint, contributes=contributes, values=values)
+        self.in_app = in_app
+
+
+# Security-related inner components
+
+
+class HostnameGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "hostname"
+
+
+class SaltGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "salt"
+    hint: str = "a static salt"
+
+
+class ViolationGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "violation"
+
+
+class URIGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "uri"
+
+
+# Top-level components
+
+
+class MessageGroupingComponent(BaseGroupingComponent[str]):
+    id: str = "message"
+
+
+class StacktraceGroupingComponent(BaseGroupingComponent[FrameGroupingComponent]):
+    id: str = "stacktrace"
+    frame_counts: Counter[str]
+
+    def __init__(
+        self,
+        values: Sequence[FrameGroupingComponent] | None = None,
+        hint: str | None = None,
+        contributes: bool | None = None,
+        frame_counts: Counter[str] | None = None,
+    ):
+        super().__init__(hint=hint, contributes=contributes, values=values)
+        self.frame_counts = frame_counts or Counter()
+
+
+ExceptionGroupingComponentChildren = (
+    ErrorTypeGroupingComponent
+    | ErrorValueGroupingComponent
+    | NSErrorGroupingComponent
+    | StacktraceGroupingComponent
+)
+
+
+class ExceptionGroupingComponent(BaseGroupingComponent[ExceptionGroupingComponentChildren]):
+    id: str = "exception"
+    frame_counts: Counter[str]
+
+    def __init__(
+        self,
+        values: Sequence[ExceptionGroupingComponentChildren] | None = None,
+        hint: str | None = None,
+        contributes: bool | None = None,
+        frame_counts: Counter[str] | None = None,
+    ):
+        super().__init__(hint=hint, contributes=contributes, values=values)
+        self.frame_counts = frame_counts or Counter()
+
+
+class ChainedExceptionGroupingComponent(BaseGroupingComponent[ExceptionGroupingComponent]):
+    id: str = "chained-exception"
+    frame_counts: Counter[str]
+
+    def __init__(
+        self,
+        values: Sequence[ExceptionGroupingComponent] | None = None,
+        hint: str | None = None,
+        contributes: bool | None = None,
+        frame_counts: Counter[str] | None = None,
+    ):
+        super().__init__(hint=hint, contributes=contributes, values=values)
+        self.frame_counts = frame_counts or Counter()
+
+
+class ThreadsGroupingComponent(BaseGroupingComponent[StacktraceGroupingComponent]):
+    id: str = "threads"
+
+
+class CSPGroupingComponent(
+    BaseGroupingComponent[SaltGroupingComponent | ViolationGroupingComponent | URIGroupingComponent]
+):
+    id: str = "csp"
+
+
+class ExpectCTGroupingComponent(
+    BaseGroupingComponent[HostnameGroupingComponent | SaltGroupingComponent]
+):
+    id: str = "expect-ct"
+
+
+class ExpectStapleGroupingComponent(
+    BaseGroupingComponent[HostnameGroupingComponent | SaltGroupingComponent]
+):
+    id: str = "expect-staple"
+
+
+class HPKPGroupingComponent(
+    BaseGroupingComponent[HostnameGroupingComponent | SaltGroupingComponent]
+):
+    id: str = "hpkp"
+
+
+class TemplateGroupingComponent(
+    BaseGroupingComponent[ContextLineGroupingComponent | FilenameGroupingComponent]
+):
+    id: str = "template"
+
+
+# Wrapper components used to link component trees to variants
+
+
+class DefaultGroupingComponent(
+    BaseGroupingComponent[
+        CSPGroupingComponent
+        | ExpectCTGroupingComponent
+        | ExpectStapleGroupingComponent
+        | HPKPGroupingComponent
+        | MessageGroupingComponent
+        | TemplateGroupingComponent
+    ]
+):
+    id: str = "default"
+
+
+class AppGroupingComponent(
+    BaseGroupingComponent[
+        ChainedExceptionGroupingComponent
+        | ExceptionGroupingComponent
+        | StacktraceGroupingComponent
+        | ThreadsGroupingComponent
+    ]
+):
+    id: str = "app"
+
+
+class SystemGroupingComponent(
+    BaseGroupingComponent[
+        ChainedExceptionGroupingComponent
+        | ExceptionGroupingComponent
+        | StacktraceGroupingComponent
+        | ThreadsGroupingComponent
+    ]
+):
+    id: str = "system"
diff --git a/src/sentry/grouping/enhancer/__init__.py b/src/sentry/grouping/enhancer/__init__.py
index 5b8ac2d2694d42..0499870a57e860 100644
--- a/src/sentry/grouping/enhancer/__init__.py
+++ b/src/sentry/grouping/enhancer/__init__.py
@@ -4,6 +4,7 @@
 import logging
 import os
 import zlib
+from collections import Counter
 from collections.abc import Sequence
 from typing import Any, Literal
 
@@ -15,14 +16,14 @@
 from sentry_ophio.enhancers import Enhancements as RustEnhancements
 
 from sentry import projectoptions
-from sentry.grouping.component import GroupingComponent
+from sentry.grouping.component import FrameGroupingComponent, StacktraceGroupingComponent
 from sentry.stacktraces.functions import set_in_app
 from sentry.utils.safe import get_path, set_path
 
 from .exceptions import InvalidEnhancerConfig
 from .matchers import create_match_frame
 from .parser import parse_enhancements
-from .rules import Rule
+from .rules import EnhancementRule
 
 logger = logging.getLogger(__name__)
 
@@ -35,9 +36,13 @@
 
 VALID_PROFILING_MATCHER_PREFIXES = (
     "stack.abs_path",
+    "path",  # stack.abs_path alias
     "stack.module",
+    "module",  # stack.module alias
     "stack.function",
+    "function",  # stack.function alias
     "stack.package",
+    "package",  # stack.package
 )
 VALID_PROFILING_ACTIONS_SET = frozenset(["+app", "-app"])
 
@@ -81,7 +86,7 @@ def parse_rust_enhancements(
 
 
 def make_rust_exception_data(
-    exception_data: dict[str, Any],
+    exception_data: dict[str, Any] | None,
 ) -> RustExceptionData:
     e = exception_data or {}
     e = {
@@ -162,7 +167,13 @@ def apply_modifications_to_frame(
             if category is not None:
                 set_path(frame, "data", "category", value=category)
 
-    def assemble_stacktrace_component(self, components, frames, platform, exception_data=None):
+    def assemble_stacktrace_component(
+        self,
+        components: list[FrameGroupingComponent],
+        frames: list[dict[str, Any]],
+        platform: str | None,
+        exception_data: dict[str, Any] | None = None,
+    ) -> tuple[StacktraceGroupingComponent, bool]:
         """
         This assembles a `stacktrace` grouping component out of the given
         `frame` components and source frames.
@@ -177,14 +188,21 @@ def assemble_stacktrace_component(self, components, frames, platform, exception_
             match_frames, make_rust_exception_data(exception_data), rust_components
         )
 
+        # Tally the number of each type of frame in the stacktrace. Later on, this will allow us to
+        # both collect metrics and use the information in decisions about whether to send the event
+        # to Seer
+        frame_counts: Counter[str] = Counter()
+
         for py_component, rust_component in zip(components, rust_components):
             py_component.update(contributes=rust_component.contributes, hint=rust_component.hint)
+            key = f"{"in_app" if py_component.in_app else "system"}_{"contributing" if py_component.contributes else "non_contributing"}_frames"
+            frame_counts[key] += 1
 
-        component = GroupingComponent(
-            id="stacktrace",
+        component = StacktraceGroupingComponent(
             values=components,
             hint=rust_results.hint,
             contributes=rust_results.contributes,
+            frame_counts=frame_counts,
         )
 
         return component, rust_results.invert_stacktrace
@@ -220,7 +238,7 @@ def _from_config_structure(cls, data, rust_enhancements: RustEnhancements) -> En
         if version not in VERSIONS:
             raise ValueError("Unknown version")
         return cls(
-            rules=[Rule._from_config_structure(x, version=version) for x in rules],
+            rules=[EnhancementRule._from_config_structure(x, version=version) for x in rules],
             rust_enhancements=rust_enhancements,
             version=version,
             bases=bases,
diff --git a/src/sentry/grouping/enhancer/actions.py b/src/sentry/grouping/enhancer/actions.py
index 9fbba4d59f52e4..10911971a0b23f 100644
--- a/src/sentry/grouping/enhancer/actions.py
+++ b/src/sentry/grouping/enhancer/actions.py
@@ -21,7 +21,7 @@
 REVERSE_ACTION_FLAGS = {v: k for k, v in ACTION_FLAGS.items()}
 
 
-class Action:
+class EnhancementAction:
     _is_modifier: bool
     _is_updater: bool
 
@@ -60,7 +60,7 @@ def _from_config_structure(cls, val, version: int):
         return FlagAction(ACTIONS[val & 0xF], flag, range)
 
 
-class FlagAction(Action):
+class FlagAction(EnhancementAction):
     def __init__(self, key: str, flag: bool, range: str | None) -> None:
         self.key = key
         self._is_updater = key in {"group", "app"}
@@ -135,7 +135,7 @@ def update_frame_components_contributions(
                 )
 
 
-class VarAction(Action):
+class VarAction(EnhancementAction):
     range = None
 
     _VALUE_PARSERS: dict[str, Callable[[Any], Any]] = {
diff --git a/src/sentry/grouping/enhancer/matchers.py b/src/sentry/grouping/enhancer/matchers.py
index 50cd316216f5b3..4b60fadb9d5a79 100644
--- a/src/sentry/grouping/enhancer/matchers.py
+++ b/src/sentry/grouping/enhancer/matchers.py
@@ -104,7 +104,7 @@ def create_match_frame(frame_data: dict, platform: str | None) -> dict:
     return match_frame
 
 
-class Match:
+class EnhancementMatch:
     def matches_frame(self, frames, idx, exception_data, cache):
         raise NotImplementedError()
 
@@ -115,9 +115,9 @@ def _to_config_structure(self, version):
     def _from_config_structure(obj, version):
         val = obj
         if val.startswith("|[") and val.endswith("]"):
-            return CalleeMatch(Match._from_config_structure(val[2:-1], version))
+            return CalleeMatch(EnhancementMatch._from_config_structure(val[2:-1], version))
         if val.startswith("[") and val.endswith("]|"):
-            return CallerMatch(Match._from_config_structure(val[1:-2], version))
+            return CallerMatch(EnhancementMatch._from_config_structure(val[1:-2], version))
 
         if val.startswith("!"):
             negated = True
@@ -136,13 +136,13 @@ def _from_config_structure(obj, version):
 InstanceKey = tuple[str, str, bool]
 
 
-class FrameMatch(Match):
+class FrameMatch(EnhancementMatch):
     # Global registry of matchers
-    instances: dict[InstanceKey, Match] = {}
+    instances: dict[InstanceKey, EnhancementMatch] = {}
     field: Any = None
 
     @classmethod
-    def from_key(cls, key: str, pattern: str, negated: bool) -> Match:
+    def from_key(cls, key: str, pattern: str, negated: bool) -> EnhancementMatch:
         instance_key = (key, pattern, negated)
         if instance_key in cls.instances:
             instance = cls.instances[instance_key]
@@ -153,7 +153,7 @@ def from_key(cls, key: str, pattern: str, negated: bool) -> Match:
         return instance
 
     @classmethod
-    def _from_key(cls, key: str, pattern: str, negated: bool) -> Match:
+    def _from_key(cls, key: str, pattern: str, negated: bool) -> EnhancementMatch:
         subclass = {
             "package": PackageMatch,
             "path": PathMatch,
@@ -315,7 +315,7 @@ class ExceptionMechanismMatch(ExceptionFieldMatch):
     field_path = ["mechanism", "type"]
 
 
-class CallerMatch(Match):
+class CallerMatch(EnhancementMatch):
     def __init__(self, inner: FrameMatch):
         self.inner = inner
 
@@ -330,7 +330,7 @@ def matches_frame(self, frames, idx, exception_data, cache):
         return idx > 0 and self.inner.matches_frame(frames, idx - 1, exception_data, cache)
 
 
-class CalleeMatch(Match):
+class CalleeMatch(EnhancementMatch):
     def __init__(self, inner: FrameMatch):
         self.inner = inner
 
diff --git a/src/sentry/grouping/enhancer/parser.py b/src/sentry/grouping/enhancer/parser.py
index 803d0d1379726f..433e8f9f918834 100644
--- a/src/sentry/grouping/enhancer/parser.py
+++ b/src/sentry/grouping/enhancer/parser.py
@@ -7,7 +7,7 @@
 from .actions import FlagAction, VarAction
 from .exceptions import InvalidEnhancerConfig
 from .matchers import CalleeMatch, CallerMatch, FrameMatch
-from .rules import Rule
+from .rules import EnhancementRule
 
 # Grammar is defined in EBNF syntax.
 enhancements_grammar = Grammar(
@@ -59,7 +59,7 @@ class EnhancementsVisitor(NodeVisitor):
     visit_comment = visit_empty = lambda *a: None
     unwrapped_exceptions = (InvalidEnhancerConfig,)
 
-    def visit_enhancements(self, node, children) -> list[Rule]:
+    def visit_enhancements(self, node, children) -> list[EnhancementRule]:
         rules = []
         for child in children:
             if not isinstance(child, str) and child is not None:
@@ -75,7 +75,7 @@ def visit_line(self, node, children):
 
     def visit_rule(self, node, children):
         _, matcher, actions = children
-        return Rule(matcher, actions)
+        return EnhancementRule(matcher, actions)
 
     def visit_matchers(self, node, children):
         caller_matcher, frame_matchers, callee_matcher = children
@@ -141,7 +141,7 @@ def visit_quoted_ident(self, node, children):
         return node.match.groups()[0].lstrip("!")
 
 
-def parse_enhancements(s: str) -> list[Rule]:
+def parse_enhancements(s: str) -> list[EnhancementRule]:
     try:
         tree = enhancements_grammar.parse(s)
         return EnhancementsVisitor().visit(tree)
diff --git a/src/sentry/grouping/enhancer/rules.py b/src/sentry/grouping/enhancer/rules.py
index 477577bff9fd79..5bfae1d5b2b534 100644
--- a/src/sentry/grouping/enhancer/rules.py
+++ b/src/sentry/grouping/enhancer/rules.py
@@ -2,11 +2,11 @@
 
 from typing import Any
 
-from .actions import Action
-from .matchers import ExceptionFieldMatch, Match
+from .actions import EnhancementAction
+from .matchers import EnhancementMatch, ExceptionFieldMatch
 
 
-class Rule:
+class EnhancementRule:
     def __init__(self, matchers, actions):
         self.matchers = matchers
 
@@ -29,17 +29,17 @@ def matcher_description(self):
             rv = f"{rv} {action}"
         return rv
 
-    def _as_modifier_rule(self) -> Rule | None:
+    def _as_modifier_rule(self) -> EnhancementRule | None:
         actions = [action for action in self.actions if action.is_modifier]
         if actions:
-            return Rule(self.matchers, actions)
+            return EnhancementRule(self.matchers, actions)
         else:
             return None
 
-    def _as_updater_rule(self) -> Rule | None:
+    def _as_updater_rule(self) -> EnhancementRule | None:
         actions = [action for action in self.actions if action.is_updater]
         if actions:
-            return Rule(self.matchers, actions)
+            return EnhancementRule(self.matchers, actions)
         else:
             return None
 
@@ -54,7 +54,7 @@ def get_matching_frame_actions(
         match_frames: list[dict[str, Any]],
         exception_data: dict[str, Any],
         in_memory_cache: dict[str, str],
-    ) -> list[tuple[int, Action]]:
+    ) -> list[tuple[int, EnhancementAction]]:
         """Given a frame returns all the matching actions based on this rule.
         If the rule does not match `None` is returned.
         """
@@ -87,7 +87,7 @@ def _to_config_structure(self, version):
 
     @classmethod
     def _from_config_structure(cls, tuple, version):
-        return Rule(
-            [Match._from_config_structure(x, version) for x in tuple[0]],
-            [Action._from_config_structure(x, version) for x in tuple[1]],
+        return EnhancementRule(
+            [EnhancementMatch._from_config_structure(x, version) for x in tuple[0]],
+            [EnhancementAction._from_config_structure(x, version) for x in tuple[1]],
         )
diff --git a/src/sentry/grouping/fingerprinting/__init__.py b/src/sentry/grouping/fingerprinting/__init__.py
index 2b0490637a5c61..2da4cac8517c13 100644
--- a/src/sentry/grouping/fingerprinting/__init__.py
+++ b/src/sentry/grouping/fingerprinting/__init__.py
@@ -4,7 +4,7 @@
 import logging
 from collections.abc import Generator, Mapping, Sequence
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, NotRequired, Self, TypedDict, TypeVar
+from typing import TYPE_CHECKING, Any, NamedTuple, NotRequired, Self, TypedDict, TypeVar
 
 from django.conf import settings
 from parsimonious.exceptions import ParseError
@@ -108,6 +108,41 @@ class _ReleaseInfo(TypedDict):
     release: str | None
 
 
+class FingerprintRuleAttributes(TypedDict):
+    title: NotRequired[str]
+
+
+class FingerprintWithAttributes(NamedTuple):
+    fingerprint: list[str]
+    attributes: FingerprintRuleAttributes
+
+
+class FingerprintRuleConfig(TypedDict):
+    # Each matcher is a list of [<name of event attribute to match>, <value to match>]
+    matchers: list[list[str]]
+    fingerprint: list[str]
+    attributes: NotRequired[FingerprintRuleAttributes]
+    is_builtin: NotRequired[bool]
+
+
+# This is just `FingerprintRuleConfig` with an extra `text` entry and with `attributes` required
+# rather than optional. (Unfortunately, you can't overwrite lack of required-ness when subclassing a
+# TypedDict, so we have to create the full type independently.)
+class FingerprintRuleJSON(TypedDict):
+    text: str
+    # Each matcher is a list of [<name of event attribute to match>, <value to match>]
+    matchers: list[list[str]]
+    fingerprint: list[str]
+    attributes: FingerprintRuleAttributes
+    is_builtin: NotRequired[bool]
+
+
+class FingerprintRuleMatch(NamedTuple):
+    matched_rule: FingerprintRule
+    fingerprint: list[str]
+    attributes: FingerprintRuleAttributes
+
+
 class EventAccess:
     def __init__(self, event: Mapping[str, Any]) -> None:
         self.event = event
@@ -211,7 +246,7 @@ def get_values(self, match_group: str) -> list[dict[str, Any]]:
 class FingerprintingRules:
     def __init__(
         self,
-        rules: Sequence[Rule],
+        rules: Sequence[FingerprintRule],
         changelog: Sequence[object] | None = None,
         version: int | None = None,
         bases: Sequence[str] | None = None,
@@ -223,7 +258,7 @@ def __init__(
         self.changelog = changelog
         self.bases = bases or []
 
-    def iter_rules(self, include_builtin: bool = True) -> Generator[Rule]:
+    def iter_rules(self, include_builtin: bool = True) -> Generator[FingerprintRule]:
         if self.rules:
             yield from self.rules
         if include_builtin:
@@ -231,14 +266,16 @@ def iter_rules(self, include_builtin: bool = True) -> Generator[Rule]:
                 base_rules = FINGERPRINTING_BASES.get(base, [])
                 yield from base_rules
 
-    def get_fingerprint_values_for_event(self, event: dict[str, object]) -> None | object:
+    def get_fingerprint_values_for_event(
+        self, event: Mapping[str, object]
+    ) -> None | FingerprintRuleMatch:
         if not (self.bases or self.rules):
             return None
         access = EventAccess(event)
         for rule in self.iter_rules():
             new_values = rule.get_fingerprint_values_for_event_access(access)
             if new_values is not None:
-                return (rule,) + new_values
+                return FingerprintRuleMatch(rule, new_values.fingerprint, new_values.attributes)
         return None
 
     @classmethod
@@ -249,7 +286,7 @@ def _from_config_structure(
         if version != VERSION:
             raise ValueError("Unknown version")
         return cls(
-            rules=[Rule._from_config_structure(x) for x in data["rules"]],
+            rules=[FingerprintRule._from_config_structure(x) for x in data["rules"]],
             version=version,
             bases=bases,
         )
@@ -337,7 +374,7 @@ def _from_config_structure(
 }
 
 
-class Match:
+class FingerprintMatch:
     def __init__(self, key: str, pattern: str, negated: bool = False) -> None:
         if key.startswith("tags."):
             self.key = key
@@ -436,7 +473,7 @@ def _to_config_structure(self) -> list[str]:
         return [key, self.pattern]
 
     @classmethod
-    def _from_config_structure(cls, obj: Sequence[str]) -> Self:
+    def _from_config_structure(cls, obj: list[str]) -> Self:
         key = obj[0]
         if key.startswith("!"):
             key = key[1:]
@@ -454,12 +491,12 @@ def text(self) -> str:
         )
 
 
-class Rule:
+class FingerprintRule:
     def __init__(
         self,
-        matchers: Sequence[Match],
+        matchers: Sequence[FingerprintMatch],
         fingerprint: list[str],
-        attributes: dict[str, Any],
+        attributes: FingerprintRuleAttributes,
         is_builtin: bool = False,
     ) -> None:
         self.matchers = matchers
@@ -469,8 +506,8 @@ def __init__(
 
     def get_fingerprint_values_for_event_access(
         self, event_access: EventAccess
-    ) -> None | tuple[list[str], dict[str, Any]]:
-        by_match_group: dict[str, list[Match]] = {}
+    ) -> None | FingerprintWithAttributes:
+        by_match_group: dict[str, list[FingerprintMatch]] = {}
         for matcher in self.matchers:
             by_match_group.setdefault(matcher.match_group, []).append(matcher)
 
@@ -481,10 +518,10 @@ def get_fingerprint_values_for_event_access(
             else:
                 return None
 
-        return self.fingerprint, self.attributes
+        return FingerprintWithAttributes(self.fingerprint, self.attributes)
 
-    def _to_config_structure(self) -> dict[str, Any]:
-        config_structure: dict[str, Any] = {
+    def _to_config_structure(self) -> FingerprintRuleJSON:
+        config_structure: FingerprintRuleJSON = {
             "text": self.text,
             "matchers": [x._to_config_structure() for x in self.matchers],
             "fingerprint": self.fingerprint,
@@ -497,19 +534,19 @@ def _to_config_structure(self) -> dict[str, Any]:
         return config_structure
 
     @classmethod
-    def _from_config_structure(cls, obj: dict[str, Any]) -> Self:
+    def _from_config_structure(cls, obj: FingerprintRuleConfig | FingerprintRuleJSON) -> Self:
         return cls(
-            [Match._from_config_structure(x) for x in obj["matchers"]],
+            [FingerprintMatch._from_config_structure(x) for x in obj["matchers"]],
             obj["fingerprint"],
             obj.get("attributes") or {},
             obj.get("is_builtin") or False,
         )
 
-    def to_json(self) -> dict[str, Any]:
+    def to_json(self) -> FingerprintRuleJSON:
         return self._to_config_structure()
 
     @classmethod
-    def from_json(cls, json: dict[str, object]) -> Self:
+    def from_json(cls, json: FingerprintRuleConfig | FingerprintRuleJSON) -> Self:
         return cls._from_config_structure(json)
 
     @property
@@ -539,7 +576,7 @@ def visit_comment(self, node: Node, _: object) -> str:
         return node.text
 
     def visit_fingerprinting_rules(
-        self, _: object, children: list[str | Rule | None]
+        self, _: object, children: list[str | FingerprintRule | None]
     ) -> FingerprintingRules:
         changelog = []
         rules = []
@@ -560,8 +597,8 @@ def visit_fingerprinting_rules(
         )
 
     def visit_line(
-        self, _: object, children: tuple[object, list[Rule | str | None], object]
-    ) -> Rule | str | None:
+        self, _: object, children: tuple[object, list[FingerprintRule | str | None], object]
+    ) -> FingerprintRule | str | None:
         _, line, _ = children
         comment_or_rule_or_empty = line[0]
         if comment_or_rule_or_empty:
@@ -572,17 +609,17 @@ def visit_rule(
         self,
         _: object,
         children: tuple[
-            object, list[Match], object, object, object, tuple[list[str], dict[str, Any]]
+            object, list[FingerprintMatch], object, object, object, FingerprintWithAttributes
         ],
-    ) -> Rule:
+    ) -> FingerprintRule:
         _, matcher, _, _, _, (fingerprint, attributes) = children
-        return Rule(matcher, fingerprint, attributes)
+        return FingerprintRule(matcher, fingerprint, attributes)
 
     def visit_matcher(
         self, _: object, children: tuple[object, list[str], str, object, str]
-    ) -> Match:
+    ) -> FingerprintMatch:
         _, negation, ty, _, argument = children
-        return Match(ty, argument, bool(negation))
+        return FingerprintMatch(ty, argument, bool(negation))
 
     def visit_matcher_type(self, _: object, children: list[str]) -> str:
         return children[0]
@@ -594,16 +631,18 @@ def visit_argument(self, _: object, children: list[str]) -> str:
 
     def visit_fingerprint(
         self, _: object, children: list[str | tuple[str, str]]
-    ) -> tuple[list[str], dict[str, str]]:
+    ) -> FingerprintWithAttributes:
         fingerprint = []
-        attributes = {}
+        attributes: FingerprintRuleAttributes = {}
         for item in children:
             if isinstance(item, tuple):
-                key, value = item
-                attributes[key] = value
+                # This should always be true, because otherwise an error would have been raised when
+                # we visited the child node in `visit_fp_attribute`
+                if item[0] == "title":
+                    attributes["title"] = item[1]
             else:
                 fingerprint.append(item)
-        return fingerprint, attributes
+        return FingerprintWithAttributes(fingerprint, attributes)
 
     def visit_fp_value(self, _: object, children: tuple[object, str, object, object]) -> str:
         _, argument, _, _ = children
@@ -634,7 +673,7 @@ def visit_quoted_key(self, node: RegexNode, _: object) -> str:
         return node.match.groups()[0].lstrip("!")
 
 
-def _load_configs() -> dict[str, list[Rule]]:
+def _load_configs() -> dict[str, list[FingerprintRule]]:
     if not CONFIGS_DIR.exists():
         logger.error(
             "Failed to load Fingerprinting Configs, invalid _config_dir: %s",
@@ -645,7 +684,7 @@ def _load_configs() -> dict[str, list[Rule]]:
                 f"Failed to load Fingerprinting Configs, invalid _config_dir: '{CONFIGS_DIR}'"
             )
 
-    configs: dict[str, list[Rule]] = {}
+    configs: dict[str, list[FingerprintRule]] = {}
 
     for config_file_path in sorted(CONFIGS_DIR.glob("**/*.txt")):
         config_name = config_file_path.parent.name
diff --git a/src/sentry/grouping/grouping_info.py b/src/sentry/grouping/grouping_info.py
index 92e4d60e6bc8ac..5e7ff6e9f695da 100644
--- a/src/sentry/grouping/grouping_info.py
+++ b/src/sentry/grouping/grouping_info.py
@@ -1,4 +1,5 @@
 import logging
+from collections.abc import Mapping
 from typing import Any
 
 from sentry.api.exceptions import ResourceDoesNotExist
@@ -88,7 +89,7 @@ def _check_for_mismatched_hashes(
 
 
 def get_grouping_info_from_variants(
-    variants: dict[str, BaseVariant],
+    variants: Mapping[str, BaseVariant],
 ) -> dict[str, dict[str, Any]]:
     """
     Given a dictionary of variant objects, create and return a copy of the dictionary in which each
diff --git a/src/sentry/grouping/ingest/config.py b/src/sentry/grouping/ingest/config.py
index c620c8f559e63f..eaaf2d79a9ab0c 100644
--- a/src/sentry/grouping/ingest/config.py
+++ b/src/sentry/grouping/ingest/config.py
@@ -20,7 +20,9 @@
 Job = MutableMapping[str, Any]
 
 # Used to migrate projects that have no activity via getsentry scripts
-CONFIGS_TO_DEPRECATE = ()
+CONFIGS_TO_DEPRECATE = set(CONFIGURATIONS.keys()) - {
+    DEFAULT_GROUPING_CONFIG,
+}
 
 
 def update_grouping_config_if_needed(project: Project, source: str) -> None:
diff --git a/src/sentry/grouping/ingest/grouphash_metadata.py b/src/sentry/grouping/ingest/grouphash_metadata.py
index 13a989a2ff216d..e30006d11a846d 100644
--- a/src/sentry/grouping/ingest/grouphash_metadata.py
+++ b/src/sentry/grouping/ingest/grouphash_metadata.py
@@ -1,15 +1,51 @@
 from __future__ import annotations
 
 import logging
+from typing import Any, cast
+
+from typing_extensions import TypeIs
 
 from sentry.eventstore.models import Event
-from sentry.grouping.variants import BaseVariant
+from sentry.grouping.component import (
+    ChainedExceptionGroupingComponent,
+    CSPGroupingComponent,
+    ExceptionGroupingComponent,
+    ExpectCTGroupingComponent,
+    ExpectStapleGroupingComponent,
+    HPKPGroupingComponent,
+    MessageGroupingComponent,
+    StacktraceGroupingComponent,
+    TemplateGroupingComponent,
+    ThreadsGroupingComponent,
+)
+from sentry.grouping.variants import (
+    BaseVariant,
+    ChecksumVariant,
+    ComponentVariant,
+    CustomFingerprintVariant,
+    HashedChecksumVariant,
+    SaltedComponentVariant,
+    VariantsByDescriptor,
+)
 from sentry.models.grouphash import GroupHash
 from sentry.models.grouphashmetadata import GroupHashMetadata, HashBasis
 from sentry.models.project import Project
+from sentry.types.grouphash_metadata import (
+    ChecksumHashingMetadata,
+    FallbackHashingMetadata,
+    FingerprintHashingMetadata,
+    HashingMetadata,
+    MessageHashingMetadata,
+    SecurityHashingMetadata,
+    StacktraceHashingMetadata,
+    TemplateHashingMetadata,
+)
+from sentry.utils import metrics
+from sentry.utils.metrics import MutableTags
 
 logger = logging.getLogger(__name__)
 
+
 GROUPING_METHODS_BY_DESCRIPTION = {
     # All frames from a stacktrace at the top level of the event, in `exception`, or in
     # `threads` (top-level stacktraces come, for example, from using `attach_stacktrace`
@@ -35,6 +71,8 @@
     # Security reports (CSP, expect-ct, and the like)
     "URL": HashBasis.SECURITY_VIOLATION,
     "hostname": HashBasis.SECURITY_VIOLATION,
+    # CSP reports of `unsafe-inline` and `unsafe-eval` violations
+    "violation": HashBasis.SECURITY_VIOLATION,
     # Django template errors, which don't report a full stacktrace
     "template": HashBasis.TEMPLATE,
     # Hash set directly on the event by the client, under the key `checksum`
@@ -44,8 +82,21 @@
     "fallback": HashBasis.FALLBACK,
 }
 
+# TODO: For now not including `csp_directive` and `csp_script_violation` - let's see if we end up
+# wanting them
+METRICS_TAGS_BY_HASH_BASIS = {
+    HashBasis.STACKTRACE: ["stacktrace_type", "stacktrace_location"],
+    HashBasis.MESSAGE: ["message_source", "message_parameterized"],
+    HashBasis.FINGERPRINT: ["fingerprint_source"],
+    HashBasis.SECURITY_VIOLATION: ["security_report_type"],
+    HashBasis.TEMPLATE: [],
+    HashBasis.CHECKSUM: [],
+    HashBasis.FALLBACK: ["fallback_reason"],
+    HashBasis.UNKNOWN: [],
+}
+
 
-def create_or_update_grouphash_metadata(
+def create_or_update_grouphash_metadata_if_needed(
     event: Event,
     project: Project,
     grouphash: GroupHash,
@@ -57,12 +108,18 @@ def create_or_update_grouphash_metadata(
     # we'll have to override the metadata creation date for them.
 
     if created:
-        hash_basis = _get_hash_basis(event, project, variants)
+        with metrics.timer(
+            "grouping.grouphashmetadata.get_hash_basis_and_metadata"
+        ) as metrics_timer_tags:
+            hash_basis, hashing_metadata = get_hash_basis_and_metadata(
+                event, project, variants, metrics_timer_tags
+            )
 
         GroupHashMetadata.objects.create(
             grouphash=grouphash,
             latest_grouping_config=grouping_config,
             hash_basis=hash_basis,
+            hashing_metadata=hashing_metadata,
         )
     elif grouphash.metadata and grouphash.metadata.latest_grouping_config != grouping_config:
         # Keep track of the most recent config which computed this hash, so that once a
@@ -71,8 +128,19 @@ def create_or_update_grouphash_metadata(
         grouphash.metadata.update(latest_grouping_config=grouping_config)
 
 
-def _get_hash_basis(event: Event, project: Project, variants: dict[str, BaseVariant]) -> HashBasis:
-    main_variant = (
+def get_hash_basis_and_metadata(
+    event: Event,
+    project: Project,
+    variants: dict[str, BaseVariant],
+    metrics_timer_tags: MutableTags,
+) -> tuple[HashBasis, HashingMetadata]:
+    hashing_metadata: HashingMetadata = {}
+
+    # TODO: This (and `contributing_variant` below) are typed as `Any` so that we don't have to cast
+    # them to whatever specific subtypes of `BaseVariant` and `GroupingComponent` (respectively)
+    # each of the helper calls below requires. Casting once, to a type retrieved from a look-up,
+    # doesn't work, but maybe there's a better way?
+    contributing_variant: Any = (
         variants["app"]
         # TODO: We won't need this 'if' once we stop returning both app and system contributing
         # variants
@@ -87,20 +155,293 @@ def _get_hash_basis(event: Event, project: Project, variants: dict[str, BaseVari
             else [variant for variant in variants.values() if variant.contributes][0]
         )
     )
+    contributing_component: Any = (
+        # There should only ever be a single contributing component here at the top level
+        [value for value in contributing_variant.component.values if value.contributes][0]
+        if hasattr(contributing_variant, "component")
+        else None
+    )
+
+    # Hybrid fingerprinting adds 'modified' to the beginning of the description of whatever method
+    # was used before the extra fingerprint was added. We classify events with hybrid fingerprints
+    # by the `{{ default }}` portion of their grouping, so strip the prefix before doing the
+    # look-up.
+    is_hybrid_fingerprint = contributing_variant.description.startswith("modified")
+    method_description = contributing_variant.description.replace("modified ", "")
 
     try:
-        hash_basis = GROUPING_METHODS_BY_DESCRIPTION[
-            # Hybrid fingerprinting adds 'modified' to the beginning of the description of whatever
-            # method was used beore the extra fingerprint was added, so strip that off before
-            # looking it up
-            main_variant.description.replace("modified ", "")
-        ]
+        hash_basis = GROUPING_METHODS_BY_DESCRIPTION[method_description]
     except KeyError:
         logger.exception(
             "Encountered unknown grouping method '%s'.",
-            main_variant.description,
-            extra={"project": project.id, "event": event.event_id},
+            contributing_variant.description,
+            extra={"project": project.id, "event_id": event.event_id},
+        )
+        return (HashBasis.UNKNOWN, {})
+
+    metrics_timer_tags["hash_basis"] = hash_basis
+
+    # Gather different metadata depending on the grouping method
+
+    if hash_basis == HashBasis.STACKTRACE:
+        hashing_metadata = _get_stacktrace_hashing_metadata(
+            contributing_variant, contributing_component
+        )
+
+    elif hash_basis == HashBasis.MESSAGE:
+        hashing_metadata = _get_message_hashing_metadata(contributing_component)
+
+    elif hash_basis == HashBasis.FINGERPRINT:
+        hashing_metadata = _get_fingerprint_hashing_metadata(contributing_variant)
+
+    elif hash_basis == HashBasis.SECURITY_VIOLATION:
+        hashing_metadata = _get_security_hashing_metadata(contributing_component)
+
+    elif hash_basis == HashBasis.TEMPLATE:
+        hashing_metadata = _get_template_hashing_metadata(contributing_component)
+
+    elif hash_basis == HashBasis.CHECKSUM:
+        hashing_metadata = _get_checksum_hashing_metadata(contributing_variant)
+
+    elif hash_basis == HashBasis.FALLBACK:
+        hashing_metadata = _get_fallback_hashing_metadata(
+            # TODO: Once https://peps.python.org/pep-0728 is a thing (still in draft but
+            # theoretically on track for 3.14), we can mark `VariantsByDescriptor` as closed and
+            # annotate `variants` as a `VariantsByDescriptor` instance in the spot where it's created
+            # and in all of the spots where it gets passed function to function. (Without the
+            # closed-ness, the return values of `.items()` and `.values()` don't get typed as
+            # `BaseVariant`, so for now we need to keep `variants` typed as `dict[str, BaseVariant]`
+            # until we get here.)
+            cast(VariantsByDescriptor, variants)
+        )
+
+    if is_hybrid_fingerprint:
+        hashing_metadata.update(
+            _get_fingerprint_hashing_metadata(contributing_variant, is_hybrid=True)
+        )
+
+    return hash_basis, hashing_metadata
+
+
+def record_grouphash_metadata_metrics(grouphash_metadata: GroupHashMetadata) -> None:
+    # TODO: Once https://peps.python.org/pep-0728 is a thing (still in draft but theoretically on
+    # track for 3.14), we can mark the various hashing metadata types as closed and that should
+    # narrow the types for the tag values such that we can stop stringifying everything
+
+    # TODO: For now, until we backfill data for pre-existing hashes, these metrics are going
+    # to be somewhat skewed
+
+    # Define a helper for this check so that it can double as a type guard
+    def is_stacktrace_hashing(
+        _hashing_metadata: HashingMetadata,
+        hash_basis: str,
+    ) -> TypeIs[StacktraceHashingMetadata]:
+        return hash_basis == HashBasis.STACKTRACE
+
+    hash_basis = grouphash_metadata.hash_basis
+    hashing_metadata = grouphash_metadata.hashing_metadata
+
+    if hash_basis:
+        hash_basis_tags: dict[str, str] = {"hash_basis": hash_basis}
+        if hashing_metadata:
+            hash_basis_tags["is_hybrid_fingerprint"] = str(
+                hashing_metadata.get("is_hybrid_fingerprint", False)
+            )
+        metrics.incr(
+            "grouping.grouphashmetadata.event_hash_basis", sample_rate=1.0, tags=hash_basis_tags
         )
-        hash_basis = HashBasis.UNKNOWN
 
-    return hash_basis
+        if hashing_metadata:
+            hashing_metadata_tags: dict[str, str | bool] = {
+                tag: str(hashing_metadata.get(tag))
+                for tag in METRICS_TAGS_BY_HASH_BASIS[hash_basis]
+            }
+            if is_stacktrace_hashing(hashing_metadata, hash_basis):
+                hashing_metadata_tags["chained_exception"] = str(
+                    int(hashing_metadata.get("num_stacktraces", 1)) > 1
+                )
+            if hashing_metadata_tags:
+                metrics.incr(
+                    f"grouping.grouphashmetadata.event_hashing_metadata.{hash_basis}",
+                    sample_rate=1.0,
+                    tags=hashing_metadata_tags,
+                )
+
+
+def _get_stacktrace_hashing_metadata(
+    contributing_variant: ComponentVariant,
+    contributing_component: (
+        StacktraceGroupingComponent
+        | ExceptionGroupingComponent
+        | ChainedExceptionGroupingComponent
+        | ThreadsGroupingComponent
+    ),
+) -> StacktraceHashingMetadata:
+    return {
+        "stacktrace_type": "in_app" if "in-app" in contributing_variant.description else "system",
+        "stacktrace_location": (
+            "exception"
+            if "exception" in contributing_variant.description
+            else "thread" if "thread" in contributing_variant.description else "top-level"
+        ),
+        "num_stacktraces": (
+            len(contributing_component.values)
+            if contributing_component.id == "chained-exception"
+            else 1
+        ),
+    }
+
+
+def _get_message_hashing_metadata(
+    contributing_component: (
+        MessageGroupingComponent | ExceptionGroupingComponent | ChainedExceptionGroupingComponent
+    ),
+) -> MessageHashingMetadata:
+    # In the simplest case, we already have the component we need to check
+    if isinstance(contributing_component, MessageGroupingComponent):
+        return {
+            "message_source": "message",
+            "message_parameterized": (
+                contributing_component.hint == "stripped event-specific values"
+            ),
+        }
+
+    # Otherwise, we have to look in the nested structure to figure out if the message was
+    # parameterized. If it's a single exception, we can just check its subcomponents directly, but
+    # if it's a chained exception we have to dig in an extra level, and look at the subcomponents of
+    # all of its children. (The subcomponents are things like stacktrace, error type, error value,
+    # etc.)
+    exceptions_to_check: list[ExceptionGroupingComponent] = []
+    if isinstance(contributing_component, ChainedExceptionGroupingComponent):
+        exceptions = contributing_component.values
+        exceptions_to_check = [exception for exception in exceptions if exception.contributes]
+    else:
+        exception = contributing_component
+        exceptions_to_check = [exception]
+
+    for exception in exceptions_to_check:
+        for subcomponent in exception.values:
+            if subcomponent.contributes and subcomponent.hint == "stripped event-specific values":
+                return {"message_source": "exception", "message_parameterized": True}
+
+    return {"message_source": "exception", "message_parameterized": False}
+
+
+def _get_fingerprint_hashing_metadata(
+    contributing_variant: CustomFingerprintVariant | SaltedComponentVariant, is_hybrid: bool = False
+) -> FingerprintHashingMetadata:
+    client_fingerprint = contributing_variant.info.get("client_fingerprint")
+    matched_rule = contributing_variant.info.get("matched_rule")
+
+    metadata: FingerprintHashingMetadata = {
+        # For simplicity, we stringify fingerprint values (which are always lists) to keep
+        # `hashing_metadata` a flat structure
+        "fingerprint": str(contributing_variant.values),
+        "fingerprint_source": (
+            "client"
+            if not matched_rule
+            else (
+                "server_builtin_rule"
+                if contributing_variant.type == "built_in_fingerprint"
+                else "server_custom_rule"
+            )
+        ),
+        "is_hybrid_fingerprint": is_hybrid,
+    }
+
+    # Note that these two conditions are not mutually exclusive - you can set a fingerprint in the
+    # SDK and have your event match a server-based rule (in which case the latter will take
+    # precedence)
+    if matched_rule:
+        metadata["matched_fingerprinting_rule"] = matched_rule["text"]
+    if client_fingerprint:
+        metadata["client_fingerprint"] = str(client_fingerprint)
+
+    return metadata
+
+
+def _get_security_hashing_metadata(
+    contributing_component: (
+        CSPGroupingComponent
+        | ExpectCTGroupingComponent
+        | ExpectStapleGroupingComponent
+        | HPKPGroupingComponent
+    ),
+) -> SecurityHashingMetadata:
+    subcomponents_by_id = {
+        subcomponent.id: subcomponent for subcomponent in contributing_component.values
+    }
+    blocked_host_key = "uri" if contributing_component.id == "csp" else "hostname"
+
+    metadata: SecurityHashingMetadata = {
+        "security_report_type": contributing_component.id,
+        # Having a string which includes the "this is a string" quotes is a *real* footgun in terms
+        # of querying, so strip those off before storing the value
+        "blocked_host": subcomponents_by_id[blocked_host_key].values[0].strip("'"),
+    }
+
+    if contributing_component.id == "csp":
+        metadata["csp_directive"] = subcomponents_by_id["salt"].values[0]
+        if subcomponents_by_id["violation"].contributes:
+            metadata["csp_script_violation"] = subcomponents_by_id["violation"].values[0].strip("'")
+
+    return metadata
+
+
+def _get_template_hashing_metadata(
+    contributing_component: TemplateGroupingComponent,
+) -> TemplateHashingMetadata:
+    metadata: TemplateHashingMetadata = {}
+
+    subcomponents_by_id = {
+        subcomponent.id: subcomponent for subcomponent in contributing_component.values
+    }
+
+    if subcomponents_by_id["filename"].values:
+        metadata["template_name"] = subcomponents_by_id["filename"].values[0]
+    if subcomponents_by_id["context-line"].values:
+        metadata["template_context_line"] = subcomponents_by_id["context-line"].values[0]
+
+    return metadata
+
+
+def _get_checksum_hashing_metadata(
+    contributing_variant: ChecksumVariant | HashedChecksumVariant,
+) -> ChecksumHashingMetadata:
+    metadata: ChecksumHashingMetadata = {"checksum": contributing_variant.checksum}
+
+    if isinstance(contributing_variant, HashedChecksumVariant):
+        metadata["raw_checksum"] = contributing_variant.raw_checksum
+
+    return metadata
+
+
+def _get_fallback_hashing_metadata(
+    variants: VariantsByDescriptor,
+) -> FallbackHashingMetadata:
+    # TODO: All of the specific cases handled below relate to stacktrace frames. Let's how often we
+    # land in the `other` category and then we can decide how much further it's worthwhile to break
+    # it down.
+
+    if (
+        "app" in variants
+        and variants["app"].component.values[0].hint == "ignored because it contains no frames"
+    ):
+        reason = "no_frames"
+
+    elif (
+        "system" in variants
+        and variants["system"].component.values[0].hint
+        == "ignored because it contains no contributing frames"
+    ):
+        reason = "no_contributing_frames"
+
+    elif "system" in variants and "min-frames" in (
+        variants["system"].component.values[0].hint or ""
+    ):
+        reason = "insufficient_contributing_frames"
+
+    else:
+        reason = "other"
+
+    return {"fallback_reason": reason}
diff --git a/src/sentry/grouping/ingest/hashing.py b/src/sentry/grouping/ingest/hashing.py
index 73620569b04bb3..93b0c6e4865f61 100644
--- a/src/sentry/grouping/ingest/hashing.py
+++ b/src/sentry/grouping/ingest/hashing.py
@@ -21,7 +21,10 @@
     load_grouping_config,
 )
 from sentry.grouping.ingest.config import is_in_transition
-from sentry.grouping.ingest.grouphash_metadata import create_or_update_grouphash_metadata
+from sentry.grouping.ingest.grouphash_metadata import (
+    create_or_update_grouphash_metadata_if_needed,
+    record_grouphash_metadata_metrics,
+)
 from sentry.grouping.variants import BaseVariant
 from sentry.models.grouphash import GroupHash
 from sentry.models.project import Project
@@ -230,9 +233,23 @@ def get_or_create_grouphashes(
         if options.get("grouping.grouphash_metadata.ingestion_writes_enabled") and features.has(
             "organizations:grouphash-metadata-creation", project.organization
         ):
-            create_or_update_grouphash_metadata(
-                event, project, grouphash, created, grouping_config, variants
-            )
+            try:
+                # We don't expect this to throw any errors, but collecting this metadata
+                # shouldn't ever derail ingestion, so better to be safe
+                create_or_update_grouphash_metadata_if_needed(
+                    event, project, grouphash, created, grouping_config, variants
+                )
+            except Exception as exc:
+                sentry_sdk.capture_exception(exc)
+
+        if grouphash.metadata:
+            record_grouphash_metadata_metrics(grouphash.metadata)
+        else:
+            # Collect a temporary metric to get a sense of how often we would be adding metadata to an
+            # existing hash. (Yes, this is an overestimate, because this will fire every time we see a given
+            # non-backfilled grouphash, not the once per non-backfilled grouphash we'd actually be doing a
+            # backfill, but it will give us a ceiling from which we can work down.)
+            metrics.incr("grouping.grouphashmetadata.backfill_needed")
 
         grouphashes.append(grouphash)
 
diff --git a/src/sentry/grouping/ingest/seer.py b/src/sentry/grouping/ingest/seer.py
index e8b1b15bb7db06..234759e73ddd8a 100644
--- a/src/sentry/grouping/ingest/seer.py
+++ b/src/sentry/grouping/ingest/seer.py
@@ -1,4 +1,5 @@
 import logging
+from collections.abc import Mapping
 from dataclasses import asdict
 from typing import Any
 
@@ -16,9 +17,10 @@
 from sentry.seer.similarity.similar_issues import get_similarity_data_from_seer
 from sentry.seer.similarity.types import SimilarIssuesEmbeddingsRequest
 from sentry.seer.similarity.utils import (
+    ReferrerOptions,
     event_content_is_seer_eligible,
     filter_null_from_string,
-    get_stacktrace_string,
+    get_stacktrace_string_with_metrics,
     killswitch_enabled,
 )
 from sentry.utils import metrics
@@ -28,7 +30,7 @@
 logger = logging.getLogger("sentry.events.grouping")
 
 
-def should_call_seer_for_grouping(event: Event, variants: dict[str, BaseVariant]) -> bool:
+def should_call_seer_for_grouping(event: Event, variants: Mapping[str, BaseVariant]) -> bool:
     """
     Use event content, feature flags, rate limits, killswitches, seer health, etc. to determine
     whether a call to Seer should be made.
@@ -46,6 +48,10 @@ def should_call_seer_for_grouping(event: Event, variants: dict[str, BaseVariant]
         _has_customized_fingerprint(event, variants)
         or killswitch_enabled(project.id, event)
         or _circuit_breaker_broken(event, project)
+        # The rate limit check has to be last (see below) but rate-limiting aside, call this after other checks
+        # because it calculates the stacktrace string, which we only want to spend the time to do if we already
+        # know the other checks have passed.
+        or _has_empty_stacktrace_string(event, variants)
         # **Do not add any new checks after this.** The rate limit check MUST remain the last of all
         # the checks.
         #
@@ -80,7 +86,7 @@ def _project_has_similarity_grouping_enabled(project: Project) -> bool:
 # combined with some other value). To the extent to which we're then using this function to decide
 # whether or not to call Seer, this means that the calculations giving rise to the default part of
 # the value never involve Seer input. In the long run, we probably want to change that.
-def _has_customized_fingerprint(event: Event, variants: dict[str, BaseVariant]) -> bool:
+def _has_customized_fingerprint(event: Event, variants: Mapping[str, BaseVariant]) -> bool:
     fingerprint = event.data.get("fingerprint", [])
 
     if "{{ default }}" in fingerprint:
@@ -176,9 +182,30 @@ def _circuit_breaker_broken(event: Event, project: Project) -> bool:
     return circuit_broken
 
 
+def _has_empty_stacktrace_string(event: Event, variants: Mapping[str, BaseVariant]) -> bool:
+    stacktrace_string = get_stacktrace_string_with_metrics(
+        get_grouping_info_from_variants(variants), event.platform, ReferrerOptions.INGEST
+    )
+    if not stacktrace_string:
+        if stacktrace_string == "":
+            metrics.incr(
+                "grouping.similarity.did_call_seer",
+                sample_rate=options.get("seer.similarity.metrics_sample_rate"),
+                tags={
+                    "call_made": False,
+                    "blocker": "empty-stacktrace-string",
+                },
+            )
+        return True
+    # Store the stacktrace string in the event so we only calculate it once. We need to pop it
+    # later so it isn't stored in the database.
+    event.data["stacktrace_string"] = stacktrace_string
+    return False
+
+
 def get_seer_similar_issues(
     event: Event,
-    variants: dict[str, BaseVariant],
+    variants: Mapping[str, BaseVariant],
     num_neighbors: int = 1,
 ) -> tuple[dict[str, Any], GroupHash | None]:
     """
@@ -187,9 +214,31 @@ def get_seer_similar_issues(
     should go in (if any), or None if no neighbor was near enough.
     """
     event_hash = event.get_primary_hash()
-    stacktrace_string = get_stacktrace_string(get_grouping_info_from_variants(variants))
     exception_type = get_path(event.data, "exception", "values", -1, "type")
 
+    stacktrace_string = event.data.get(
+        "stacktrace_string",
+        get_stacktrace_string_with_metrics(
+            get_grouping_info_from_variants(variants), event.platform, ReferrerOptions.INGEST
+        ),
+    )
+
+    if not stacktrace_string:
+        # TODO: remove this log once we've confirmed it isn't happening
+        logger.info(
+            "get_seer_similar_issues.empty_stacktrace",
+            extra={
+                "event_id": event.event_id,
+                "project_id": event.project.id,
+                "stacktrace_string": stacktrace_string,
+            },
+        )
+        similar_issues_metadata_empty = {
+            "results": [],
+            "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
+        }
+        return (similar_issues_metadata_empty, None)
+
     request_data: SimilarIssuesEmbeddingsRequest = {
         "event_id": event.event_id,
         "hash": event_hash,
@@ -200,6 +249,7 @@ def get_seer_similar_issues(
         "referrer": "ingest",
         "use_reranking": options.get("seer.similarity.ingest.use_reranking"),
     }
+    event.data.pop("stacktrace_string", None)
 
     # Similar issues are returned with the closest match first
     seer_results = get_similarity_data_from_seer(request_data)
@@ -231,7 +281,7 @@ def get_seer_similar_issues(
 
 
 def maybe_check_seer_for_matching_grouphash(
-    event: Event, variants: dict[str, BaseVariant], all_grouphashes: list[GroupHash]
+    event: Event, variants: Mapping[str, BaseVariant], all_grouphashes: list[GroupHash]
 ) -> GroupHash | None:
     seer_matched_grouphash = None
 
@@ -262,6 +312,7 @@ def maybe_check_seer_for_matching_grouphash(
         # Once those two problems are fixed, there will only be one hash passed to this function
         # and we won't have to do this search to find the right one to update.
         primary_hash = event.get_primary_hash()
+
         grouphash_sent = list(
             filter(lambda grouphash: grouphash.hash == primary_hash, all_grouphashes)
         )[0]
diff --git a/src/sentry/grouping/strategies/base.py b/src/sentry/grouping/strategies/base.py
index ab3e99949f8e4e..e7ed88a961ca4f 100644
--- a/src/sentry/grouping/strategies/base.py
+++ b/src/sentry/grouping/strategies/base.py
@@ -1,12 +1,19 @@
 import inspect
 from collections.abc import Callable, Iterator, Sequence
-from typing import Any, Generic, Protocol, TypeVar
+from typing import Any, Generic, Protocol, TypeVar, overload
 
 from sentry import projectoptions
 from sentry.eventstore.models import Event
-from sentry.grouping.component import GroupingComponent
+from sentry.grouping.component import (
+    BaseGroupingComponent,
+    ExceptionGroupingComponent,
+    FrameGroupingComponent,
+    StacktraceGroupingComponent,
+)
 from sentry.grouping.enhancer import Enhancements
 from sentry.interfaces.base import Interface
+from sentry.interfaces.exception import SingleException
+from sentry.interfaces.stacktrace import Frame, Stacktrace
 
 STRATEGIES: dict[str, "Strategy[Any]"] = {}
 
@@ -24,6 +31,9 @@
 DEFAULT_GROUPING_ENHANCEMENTS_BASE = "common:2019-03-23"
 DEFAULT_GROUPING_FINGERPRINTING_BASES: list[str] = []
 
+# TODO: Hack to make `ReturnedVariants` (no pun intended) covariant. At some point we should
+# probably turn `ReturnedVariants` into a Mapping (immutable), since in practice it's read-only.
+GroupingComponent = TypeVar("GroupingComponent", bound=BaseGroupingComponent[Any])
 ReturnedVariants = dict[str, GroupingComponent]
 ConcreteInterface = TypeVar("ConcreteInterface", bound=Interface, contravariant=True)
 
@@ -115,9 +125,24 @@ def get_grouping_component(
         """
         return self._get_strategy_dict(interface, event=event, **kwargs)
 
+    @overload
+    def get_single_grouping_component(
+        self, interface: Frame, *, event: Event, **kwargs: Any
+    ) -> FrameGroupingComponent: ...
+
+    @overload
+    def get_single_grouping_component(
+        self, interface: SingleException, *, event: Event, **kwargs: Any
+    ) -> ExceptionGroupingComponent: ...
+
+    @overload
+    def get_single_grouping_component(
+        self, interface: Stacktrace, *, event: Event, **kwargs: Any
+    ) -> StacktraceGroupingComponent: ...
+
     def get_single_grouping_component(
         self, interface: Interface, *, event: Event, **kwargs: Any
-    ) -> GroupingComponent:
+    ) -> BaseGroupingComponent:
         """Invokes a delegate grouping strategy.  If no such delegate is
         configured a fallback grouping component is returned.
         """
@@ -193,7 +218,7 @@ def variant_processor(self, func: VariantProcessor) -> VariantProcessor:
 
     def get_grouping_component(
         self, event: Event, context: GroupingContext, variant: str | None = None
-    ) -> None | GroupingComponent | ReturnedVariants:
+    ) -> None | BaseGroupingComponent | ReturnedVariants:
         """Given a specific variant this calculates the grouping component."""
         args = []
         iface = event.interfaces.get(self.interface)
diff --git a/src/sentry/grouping/strategies/legacy.py b/src/sentry/grouping/strategies/legacy.py
index 455deea1b95185..4e6dc1581f8323 100644
--- a/src/sentry/grouping/strategies/legacy.py
+++ b/src/sentry/grouping/strategies/legacy.py
@@ -3,7 +3,21 @@
 from typing import Any
 
 from sentry.eventstore.models import Event
-from sentry.grouping.component import GroupingComponent
+from sentry.grouping.component import (
+    ChainedExceptionGroupingComponent,
+    ContextLineGroupingComponent,
+    ErrorTypeGroupingComponent,
+    ErrorValueGroupingComponent,
+    ExceptionGroupingComponent,
+    FilenameGroupingComponent,
+    FrameGroupingComponent,
+    FunctionGroupingComponent,
+    LineNumberGroupingComponent,
+    ModuleGroupingComponent,
+    StacktraceGroupingComponent,
+    SymbolGroupingComponent,
+    ThreadsGroupingComponent,
+)
 from sentry.grouping.strategies.base import (
     GroupingContext,
     ReturnedVariants,
@@ -164,17 +178,15 @@ def single_exception_legacy(
     interface: SingleException, event: Event, context: GroupingContext, **meta: Any
 ) -> ReturnedVariants:
 
-    type_component = GroupingComponent(
-        id="type",
+    type_component = ErrorTypeGroupingComponent(
         values=[interface.type] if interface.type else [],
         contributes=False,
     )
-    value_component = GroupingComponent(
-        id="value",
+    value_component = ErrorValueGroupingComponent(
         values=[interface.value] if interface.value else [],
         contributes=False,
     )
-    stacktrace_component = GroupingComponent(id="stacktrace")
+    stacktrace_component = StacktraceGroupingComponent()
 
     if interface.stacktrace is not None:
         stacktrace_component = context.get_single_grouping_component(
@@ -195,8 +207,8 @@ def single_exception_legacy(
             value_component.update(contributes=True)
 
     return {
-        context["variant"]: GroupingComponent(
-            id="exception", values=[stacktrace_component, type_component, value_component]
+        context["variant"]: ExceptionGroupingComponent(
+            values=[stacktrace_component, type_component, value_component]
         )
     }
 
@@ -231,7 +243,7 @@ def chained_exception_legacy(
             if stacktrace_component is None or not stacktrace_component.contributes:
                 value.update(contributes=False, hint="exception has no stacktrace")
 
-    return {context["variant"]: GroupingComponent(id="chained-exception", values=values)}
+    return {context["variant"]: ChainedExceptionGroupingComponent(values=values)}
 
 
 @chained_exception_legacy.variant_processor
@@ -262,7 +274,7 @@ def frame_legacy(
     # Safari throws [native code] frames in for calls like ``forEach``
     # whereas Chrome ignores these. Let's remove it from the hashing algo
     # so that they're more likely to group together
-    filename_component = GroupingComponent(id="filename")
+    filename_component = FilenameGroupingComponent()
     if interface.filename == "<anonymous>":
         filename_component.update(
             contributes=False, values=[interface.filename], hint="anonymous filename discarded"
@@ -293,17 +305,10 @@ def frame_legacy(
     # if we have a module we use that for grouping.  This will always
     # take precedence over the filename, even if the module is
     # considered unhashable.
-    module_component = GroupingComponent(id="module")
+    module_component = ModuleGroupingComponent()
     if interface.module:
         if is_unhashable_module_legacy(interface, platform):
-            module_component.update(
-                values=[
-                    GroupingComponent(
-                        id="salt", values=["<module>"], hint="normalized generated module name"
-                    )
-                ],
-                hint="ignored module",
-            )
+            module_component.update(values=["<module>"], hint="normalized generated module name")
         else:
             module_name, module_hint = remove_module_outliers_legacy(interface.module, platform)
             module_component.update(values=[module_name], hint=module_hint)
@@ -313,7 +318,7 @@ def frame_legacy(
             )
 
     # Context line when available is the primary contributor
-    context_line_component = GroupingComponent(id="context-line")
+    context_line_component = ContextLineGroupingComponent()
     if interface.context_line is not None:
         if len(interface.context_line) > 120:
             context_line_component.update(hint="discarded because line too long")
@@ -322,9 +327,9 @@ def frame_legacy(
         else:
             context_line_component.update(values=[interface.context_line])
 
-    symbol_component = GroupingComponent(id="symbol")
-    function_component = GroupingComponent(id="function")
-    lineno_component = GroupingComponent(id="lineno")
+    symbol_component = SymbolGroupingComponent()
+    function_component = FunctionGroupingComponent()
+    lineno_component = LineNumberGroupingComponent()
 
     # The context line grouping information is the most reliable one.
     # If we did not manage to find some information there, we want to
@@ -346,11 +351,7 @@ def frame_legacy(
         elif func:
             if is_unhashable_function_legacy(func):
                 function_component.update(
-                    values=[
-                        GroupingComponent(
-                            id="salt", values=["<function>"], hint="normalized lambda function name"
-                        )
-                    ]
+                    values=["<function>"], hint="normalized lambda function name"
                 )
             else:
                 function, function_hint = remove_function_outliers_legacy(func)
@@ -380,8 +381,7 @@ def frame_legacy(
             )
 
     return {
-        context["variant"]: GroupingComponent(
-            id="frame",
+        context["variant"]: FrameGroupingComponent(
             values=[
                 module_component,
                 filename_component,
@@ -392,6 +392,7 @@ def frame_legacy(
             ],
             contributes=contributes,
             hint=hint,
+            in_app=interface.in_app,
         )
     }
 
@@ -461,24 +462,22 @@ def threads_legacy(
     thread_count = len(interface.values)
     if thread_count != 1:
         return {
-            context["variant"]: GroupingComponent(
-                id="threads",
+            context["variant"]: ThreadsGroupingComponent(
                 contributes=False,
                 hint="ignored because contains %d threads" % thread_count,
             )
         }
 
-    stacktrace = interface.values[0].get("stacktrace")
+    stacktrace: Stacktrace = interface.values[0].get("stacktrace")
     if not stacktrace:
         return {
-            context["variant"]: GroupingComponent(
-                id="threads", contributes=False, hint="thread has no stacktrace"
+            context["variant"]: ThreadsGroupingComponent(
+                contributes=False, hint="thread has no stacktrace"
             )
         }
 
     return {
-        context["variant"]: GroupingComponent(
-            id="threads",
+        context["variant"]: ThreadsGroupingComponent(
             values=[context.get_single_grouping_component(stacktrace, event=event, **meta)],
         )
     }
diff --git a/src/sentry/grouping/strategies/message.py b/src/sentry/grouping/strategies/message.py
index 4c71541a6d3122..7615e98c23ca4b 100644
--- a/src/sentry/grouping/strategies/message.py
+++ b/src/sentry/grouping/strategies/message.py
@@ -4,7 +4,7 @@
 from sentry import analytics
 from sentry.eventstore.models import Event
 from sentry.features.rollout import in_rollout_group
-from sentry.grouping.component import GroupingComponent
+from sentry.grouping.component import MessageGroupingComponent
 from sentry.grouping.parameterization import Parameterizer, UniqueIdExperiment
 from sentry.grouping.strategies.base import (
     GroupingContext,
@@ -108,17 +108,10 @@ def message_v1(
         raw = interface.message or interface.formatted or ""
         normalized = normalize_message_for_grouping(raw, event)
         hint = "stripped event-specific values" if raw != normalized else None
-        return {
-            context["variant"]: GroupingComponent(
-                id="message",
-                values=[normalized],
-                hint=hint,
-            )
-        }
+        return {context["variant"]: MessageGroupingComponent(values=[normalized], hint=hint)}
     else:
         return {
-            context["variant"]: GroupingComponent(
-                id="message",
+            context["variant"]: MessageGroupingComponent(
                 values=[interface.message or interface.formatted or ""],
             )
         }
diff --git a/src/sentry/grouping/strategies/newstyle.py b/src/sentry/grouping/strategies/newstyle.py
index e6a6d0e1c92078..15daac601845bc 100644
--- a/src/sentry/grouping/strategies/newstyle.py
+++ b/src/sentry/grouping/strategies/newstyle.py
@@ -3,11 +3,25 @@
 import itertools
 import logging
 import re
+from collections import Counter
 from collections.abc import Generator
 from typing import Any
 
 from sentry.eventstore.models import Event
-from sentry.grouping.component import GroupingComponent
+from sentry.grouping.component import (
+    ChainedExceptionGroupingComponent,
+    ContextLineGroupingComponent,
+    ErrorTypeGroupingComponent,
+    ErrorValueGroupingComponent,
+    ExceptionGroupingComponent,
+    FilenameGroupingComponent,
+    FrameGroupingComponent,
+    FunctionGroupingComponent,
+    ModuleGroupingComponent,
+    NSErrorGroupingComponent,
+    StacktraceGroupingComponent,
+    ThreadsGroupingComponent,
+)
 from sentry.grouping.strategies.base import (
     GroupingContext,
     ReturnedVariants,
@@ -116,20 +130,17 @@ def get_filename_component(
     filename: str | None,
     platform: str | None,
     allow_file_origin: bool = False,
-) -> GroupingComponent:
+) -> FilenameGroupingComponent:
     """Attempt to normalize filenames by detecting special filenames and by
     using the basename only.
     """
     if filename is None:
-        return GroupingComponent(id="filename")
+        return FilenameGroupingComponent()
 
     # Only use the platform independent basename for grouping and
     # lowercase it
     filename = _basename_re.split(filename)[-1].lower()
-    filename_component = GroupingComponent(
-        id="filename",
-        values=[filename],
-    )
+    filename_component = FilenameGroupingComponent(values=[filename])
 
     if has_url_origin(abs_path, allow_file_origin=allow_file_origin):
         filename_component.update(contributes=False, hint="ignored because frame points to a URL")
@@ -151,17 +162,14 @@ def get_module_component(
     module: str | None,
     platform: str | None,
     context: GroupingContext,
-) -> GroupingComponent:
+) -> ModuleGroupingComponent:
     """Given an absolute path, module and platform returns the module component
     with some necessary cleaning performed.
     """
     if module is None:
-        return GroupingComponent(id="module")
+        return ModuleGroupingComponent()
 
-    module_component = GroupingComponent(
-        id="module",
-        values=[module],
-    )
+    module_component = ModuleGroupingComponent(values=[module])
 
     if platform == "javascript" and "/" in module and abs_path and abs_path.endswith(module):
         module_component.update(contributes=False, hint="ignored bad javascript module")
@@ -200,7 +208,7 @@ def get_function_component(
     platform: str | None,
     sourcemap_used: bool = False,
     context_line_available: bool = False,
-) -> GroupingComponent:
+) -> FunctionGroupingComponent:
     """
     Attempt to normalize functions by removing common platform outliers.
 
@@ -230,12 +238,9 @@ def get_function_component(
             func = trim_function_name(func, platform)
 
     if not func:
-        return GroupingComponent(id="function")
+        return FunctionGroupingComponent()
 
-    function_component = GroupingComponent(
-        id="function",
-        values=[func],
-    )
+    function_component = FunctionGroupingComponent(values=[func])
 
     if platform == "ruby":
         if func.startswith("block "):
@@ -328,11 +333,16 @@ def frame(
         context_line_available=context_line_available,
     )
 
-    values = [module_component, filename_component, function_component]
+    values: list[
+        ContextLineGroupingComponent
+        | FilenameGroupingComponent
+        | FunctionGroupingComponent
+        | ModuleGroupingComponent
+    ] = [module_component, filename_component, function_component]
     if context_line_component is not None:
         values.append(context_line_component)
 
-    rv = GroupingComponent(id="frame", values=values)
+    rv = FrameGroupingComponent(values=values, in_app=frame.in_app)
 
     # if we are in javascript fuzzing mode we want to disregard some
     # frames consistently.  These force common bad stacktraces together
@@ -368,7 +378,7 @@ def frame(
 
 def get_contextline_component(
     frame: Frame, platform: str | None, function: str, context: GroupingContext
-) -> GroupingComponent:
+) -> ContextLineGroupingComponent:
     """Returns a contextline component.  The caller's responsibility is to
     make sure context lines are only used for platforms where we trust the
     quality of the sourcecode.  It does however protect against some bad
@@ -376,12 +386,9 @@ def get_contextline_component(
     """
     line = " ".join((frame.context_line or "").expandtabs(2).split())
     if not line:
-        return GroupingComponent(id="context-line")
+        return ContextLineGroupingComponent()
 
-    component = GroupingComponent(
-        id="context-line",
-        values=[line],
-    )
+    component = ContextLineGroupingComponent(values=[line])
     if line:
         if len(frame.context_line) > 120:
             component.update(hint="discarded because line too long", contributes=False)
@@ -498,8 +505,7 @@ def stacktrace_variant_processor(
 def single_exception(
     interface: SingleException, event: Event, context: GroupingContext, **meta: Any
 ) -> ReturnedVariants:
-    type_component = GroupingComponent(
-        id="type",
+    type_component = ErrorTypeGroupingComponent(
         values=[interface.type] if interface.type else [],
     )
     system_type_component = type_component.shallow_copy()
@@ -522,8 +528,7 @@ def single_exception(
                 contributes=False, hint="ignored because exception is synthetic"
             )
         if interface.mechanism.meta and "ns_error" in interface.mechanism.meta:
-            ns_error_component = GroupingComponent(
-                id="ns-error",
+            ns_error_component = NSErrorGroupingComponent(
                 values=[
                     interface.mechanism.meta["ns_error"].get("domain"),
                     interface.mechanism.meta["ns_error"].get("code"),
@@ -533,18 +538,23 @@ def single_exception(
     if interface.stacktrace is not None:
         with context:
             context["exception_data"] = interface.to_json()
-            stacktrace_variants = context.get_grouping_component(
-                interface.stacktrace, event=event, **meta
+            stacktrace_variants: dict[str, StacktraceGroupingComponent] = (
+                context.get_grouping_component(interface.stacktrace, event=event, **meta)
             )
     else:
         stacktrace_variants = {
-            "app": GroupingComponent(id="stacktrace"),
+            "app": StacktraceGroupingComponent(),
         }
 
     rv = {}
 
     for variant, stacktrace_component in stacktrace_variants.items():
-        values = [
+        values: list[
+            ErrorTypeGroupingComponent
+            | ErrorValueGroupingComponent
+            | NSErrorGroupingComponent
+            | StacktraceGroupingComponent
+        ] = [
             stacktrace_component,
             system_type_component if variant == "system" else type_component,
         ]
@@ -553,9 +563,7 @@ def single_exception(
             values.append(ns_error_component)
 
         if context["with_exception_value_fallback"]:
-            value_component = GroupingComponent(
-                id="value",
-            )
+            value_component = ErrorValueGroupingComponent()
 
             raw = interface.value
             if raw is not None:
@@ -587,7 +595,9 @@ def single_exception(
 
             values.append(value_component)
 
-        rv[variant] = GroupingComponent(id="exception", values=values)
+        rv[variant] = ExceptionGroupingComponent(
+            values=values, frame_counts=stacktrace_component.frame_counts
+        )
 
     return rv
 
@@ -628,7 +638,7 @@ def chained_exception(
         return exception_components[id(exceptions[0])]
 
     # Case 2: produce a component for each chained exception
-    by_name: dict[str, list[GroupingComponent]] = {}
+    by_name: dict[str, list[ExceptionGroupingComponent]] = {}
 
     for exception in exceptions:
         for name, component in exception_components[id(exception)].items():
@@ -637,9 +647,15 @@ def chained_exception(
     rv = {}
 
     for name, component_list in by_name.items():
-        rv[name] = GroupingComponent(
-            id="chained-exception",
+        # Calculate an aggregate tally of the different types of frames (in-app vs system,
+        # contributing or not) across all of the exceptions in the chain
+        total_frame_counts: Counter[str] = Counter()
+        for exception_component in component_list:
+            total_frame_counts += exception_component.frame_counts
+
+        rv[name] = ChainedExceptionGroupingComponent(
             values=component_list,
+            frame_counts=total_frame_counts,
         )
 
     return rv
@@ -777,8 +793,7 @@ def threads(
         return thread_variants
 
     return {
-        "app": GroupingComponent(
-            id="threads",
+        "app": ThreadsGroupingComponent(
             contributes=False,
             hint=(
                 "ignored because does not contain exactly one crashing, "
@@ -797,18 +812,14 @@ def _filtered_threads(
 
     stacktrace = threads[0].get("stacktrace")
     if not stacktrace:
-        return {
-            "app": GroupingComponent(
-                id="threads", contributes=False, hint="thread has no stacktrace"
-            )
-        }
+        return {"app": ThreadsGroupingComponent(contributes=False, hint="thread has no stacktrace")}
 
     rv = {}
 
     for name, stacktrace_component in context.get_grouping_component(
         stacktrace, event=event, **meta
     ).items():
-        rv[name] = GroupingComponent(id="threads", values=[stacktrace_component])
+        rv[name] = ThreadsGroupingComponent(values=[stacktrace_component])
 
     return rv
 
diff --git a/src/sentry/grouping/strategies/security.py b/src/sentry/grouping/strategies/security.py
index b1fe7aaceb2bc2..6e992081d646b3 100644
--- a/src/sentry/grouping/strategies/security.py
+++ b/src/sentry/grouping/strategies/security.py
@@ -1,44 +1,53 @@
 from typing import Any
 
 from sentry.eventstore.models import Event
-from sentry.grouping.component import GroupingComponent
+from sentry.grouping.component import (
+    CSPGroupingComponent,
+    ExpectCTGroupingComponent,
+    ExpectStapleGroupingComponent,
+    HostnameGroupingComponent,
+    HPKPGroupingComponent,
+    SaltGroupingComponent,
+    URIGroupingComponent,
+    ViolationGroupingComponent,
+)
 from sentry.grouping.strategies.base import (
     GroupingContext,
     ReturnedVariants,
     produces_variants,
     strategy,
 )
-from sentry.interfaces.security import Csp, ExpectCT, ExpectStaple, Hpkp, SecurityReport
+from sentry.interfaces.security import Csp, ExpectCT, ExpectStaple, Hpkp
 
 
-def _security_v1(
-    reported_id: str, obj: SecurityReport, context: GroupingContext, **meta: Any
+@strategy(ids=["expect-ct:v1"], interface=ExpectCT, score=1000)
+@produces_variants(["default"])
+def expect_ct_v1(
+    interface: ExpectCT, event: Event, context: GroupingContext, **meta: Any
 ) -> ReturnedVariants:
     return {
-        context["variant"]: GroupingComponent(
-            id=reported_id,
+        context["variant"]: ExpectCTGroupingComponent(
             values=[
-                GroupingComponent(id="salt", values=[reported_id]),
-                GroupingComponent(id="hostname", values=[obj.hostname]),
+                SaltGroupingComponent(values=["expect-ct"]),
+                HostnameGroupingComponent(values=[interface.hostname]),
             ],
         )
     }
 
 
-@strategy(ids=["expect-ct:v1"], interface=ExpectCT, score=1000)
-@produces_variants(["default"])
-def expect_ct_v1(
-    interface: ExpectCT, event: Event, context: GroupingContext, **meta: Any
-) -> ReturnedVariants:
-    return _security_v1("expect-ct", interface, context=context, **meta)
-
-
 @strategy(ids=["expect-staple:v1"], interface=ExpectStaple, score=1001)
 @produces_variants(["default"])
 def expect_staple_v1(
     interface: ExpectStaple, event: Event, context: GroupingContext, **meta: Any
 ) -> ReturnedVariants:
-    return _security_v1("expect-staple", interface, context=context, **meta)
+    return {
+        context["variant"]: ExpectStapleGroupingComponent(
+            values=[
+                SaltGroupingComponent(values=["expect-staple"]),
+                HostnameGroupingComponent(values=[interface.hostname]),
+            ],
+        )
+    }
 
 
 @strategy(ids=["hpkp:v1"], interface=Hpkp, score=1002)
@@ -46,14 +55,21 @@ def expect_staple_v1(
 def hpkp_v1(
     interface: Hpkp, event: Event, context: GroupingContext, **meta: Any
 ) -> ReturnedVariants:
-    return _security_v1("hpkp", interface, context=context, **meta)
+    return {
+        context["variant"]: HPKPGroupingComponent(
+            values=[
+                SaltGroupingComponent(values=["hpkp"]),
+                HostnameGroupingComponent(values=[interface.hostname]),
+            ],
+        )
+    }
 
 
 @strategy(ids=["csp:v1"], interface=Csp, score=1003)
 @produces_variants(["default"])
 def csp_v1(interface: Csp, event: Event, context: GroupingContext, **meta: Any) -> ReturnedVariants:
-    violation_component = GroupingComponent(id="violation")
-    uri_component = GroupingComponent(id="uri")
+    violation_component = ViolationGroupingComponent()
+    uri_component = URIGroupingComponent()
 
     if interface.local_script_violation_type:
         violation_component.update(values=["'%s'" % interface.local_script_violation_type])
@@ -67,10 +83,9 @@ def csp_v1(interface: Csp, event: Event, context: GroupingContext, **meta: Any)
         uri_component.update(values=[interface.normalized_blocked_uri])
 
     return {
-        context["variant"]: GroupingComponent(
-            id="csp",
+        context["variant"]: CSPGroupingComponent(
             values=[
-                GroupingComponent(id="salt", values=[interface.effective_directive]),
+                SaltGroupingComponent(values=[interface.effective_directive]),
                 violation_component,
                 uri_component,
             ],
diff --git a/src/sentry/grouping/strategies/template.py b/src/sentry/grouping/strategies/template.py
index 3c4e9584cd5c82..d116d7d2cd4b66 100644
--- a/src/sentry/grouping/strategies/template.py
+++ b/src/sentry/grouping/strategies/template.py
@@ -1,7 +1,11 @@
 from typing import Any
 
 from sentry.eventstore.models import Event
-from sentry.grouping.component import GroupingComponent
+from sentry.grouping.component import (
+    ContextLineGroupingComponent,
+    FilenameGroupingComponent,
+    TemplateGroupingComponent,
+)
 from sentry.grouping.strategies.base import (
     GroupingContext,
     ReturnedVariants,
@@ -16,16 +20,16 @@
 def template_v1(
     interface: Template, event: Event, context: GroupingContext, **meta: Any
 ) -> ReturnedVariants:
-    filename_component = GroupingComponent(id="filename")
+    filename_component = FilenameGroupingComponent()
     if interface.filename is not None:
         filename_component.update(values=[interface.filename])
 
-    context_line_component = GroupingComponent(id="context-line")
+    context_line_component = ContextLineGroupingComponent()
     if interface.context_line is not None:
         context_line_component.update(values=[interface.context_line])
 
     return {
-        context["variant"]: GroupingComponent(
-            id="template", values=[filename_component, context_line_component]
+        context["variant"]: TemplateGroupingComponent(
+            values=[filename_component, context_line_component]
         )
     }
diff --git a/src/sentry/grouping/variants.py b/src/sentry/grouping/variants.py
index 4264d71f52ad2e..eafac8c45fc03e 100644
--- a/src/sentry/grouping/variants.py
+++ b/src/sentry/grouping/variants.py
@@ -1,16 +1,36 @@
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING, NotRequired, TypedDict
+
+from sentry.grouping.component import (
+    AppGroupingComponent,
+    DefaultGroupingComponent,
+    SystemGroupingComponent,
+)
+from sentry.grouping.fingerprinting import FingerprintRule
 from sentry.grouping.utils import hash_from_values, is_default_fingerprint_var
 from sentry.types.misc import KeyedList
 
+if TYPE_CHECKING:
+    from sentry.grouping.api import FingerprintInfo
+    from sentry.grouping.strategies.base import StrategyConfiguration
 
-class BaseVariant:
-    # The type of the variant that is reported to the UI.
-    type: str | None = None
 
+class FingerprintVariantMetadata(TypedDict):
+    values: list[str]
+    client_values: NotRequired[list[str]]
+    matched_rule: NotRequired[str]
+
+
+class BaseVariant(ABC):
     # This is true if `get_hash` does not return `None`.
     contributes = True
 
+    @property
+    @abstractmethod
+    def type(self) -> str: ...
+
     def get_hash(self) -> str | None:
         return None
 
@@ -105,12 +125,16 @@ def _get_metadata_as_dict(self):
 
 class ComponentVariant(BaseVariant):
     """A component variant is a variant that produces a hash from the
-    `GroupingComponent` it encloses.
+    `BaseGroupingComponent` it encloses.
     """
 
     type = "component"
 
-    def __init__(self, component, config):
+    def __init__(
+        self,
+        component: AppGroupingComponent | SystemGroupingComponent | DefaultGroupingComponent,
+        config: StrategyConfiguration,
+    ):
         self.component = component
         self.config = config
 
@@ -132,24 +156,24 @@ def __repr__(self):
         return super().__repr__() + f" contributes={self.contributes} ({self.description})"
 
 
-def expose_fingerprint_dict(values, info=None):
-    rv = {
+def expose_fingerprint_dict(values: list[str], info: FingerprintInfo) -> FingerprintVariantMetadata:
+    rv: FingerprintVariantMetadata = {
         "values": values,
     }
-    if not info:
-        return rv
-
-    from sentry.grouping.fingerprinting import Rule
 
     client_values = info.get("client_fingerprint")
     if client_values and (
         len(client_values) != 1 or not is_default_fingerprint_var(client_values[0])
     ):
         rv["client_values"] = client_values
+
     matched_rule = info.get("matched_rule")
     if matched_rule:
-        rule = Rule.from_json(matched_rule)
-        rv["matched_rule"] = rule.text
+        # TODO: Before late October 2024, we didn't store the rule text along with the matched rule,
+        # meaning there are still events out there whose `_fingerprint_info` entry doesn't have it.
+        # Once those events have aged out (in February or so), we can remove the default value here
+        # and the `test_old_event_with_no_fingerprint_rule_text` test in `test_variants.py`.
+        rv["matched_rule"] = matched_rule.get("text", FingerprintRule.from_json(matched_rule).text)
 
     return rv
 
@@ -159,7 +183,7 @@ class CustomFingerprintVariant(BaseVariant):
 
     type = "custom_fingerprint"
 
-    def __init__(self, values, fingerprint_info=None):
+    def __init__(self, values: list[str], fingerprint_info: FingerprintInfo):
         self.values = values
         self.info = fingerprint_info
 
@@ -170,7 +194,7 @@ def description(self):
     def get_hash(self) -> str | None:
         return hash_from_values(self.values)
 
-    def _get_metadata_as_dict(self):
+    def _get_metadata_as_dict(self) -> FingerprintVariantMetadata:
         return expose_fingerprint_dict(self.values, self.info)
 
 
@@ -189,7 +213,13 @@ class SaltedComponentVariant(ComponentVariant):
 
     type = "salted_component"
 
-    def __init__(self, values, component, config, fingerprint_info=None):
+    def __init__(
+        self,
+        values: list[str],
+        component: AppGroupingComponent | SystemGroupingComponent | DefaultGroupingComponent,
+        config: StrategyConfiguration,
+        fingerprint_info: FingerprintInfo,
+    ):
         ComponentVariant.__init__(self, component, config)
         self.values = values
         self.info = fingerprint_info
@@ -201,7 +231,7 @@ def description(self):
     def get_hash(self) -> str | None:
         if not self.component.contributes:
             return None
-        final_values = []
+        final_values: list[str | int] = []
         for value in self.values:
             if is_default_fingerprint_var(value):
                 final_values.extend(self.component.iter_values())
@@ -213,3 +243,14 @@ def _get_metadata_as_dict(self):
         rv = ComponentVariant._get_metadata_as_dict(self)
         rv.update(expose_fingerprint_dict(self.values, self.info))
         return rv
+
+
+class VariantsByDescriptor(TypedDict, total=False):
+    system: ComponentVariant
+    app: ComponentVariant
+    custom_fingerprint: CustomFingerprintVariant
+    built_in_fingerprint: BuiltInFingerprintVariant
+    checksum: ChecksumVariant
+    hashed_checksum: HashedChecksumVariant
+    default: ComponentVariant
+    fallback: FallbackVariant
diff --git a/src/sentry/hybridcloud/migrations/0003_add_scopes_to_api_key_replica.py b/src/sentry/hybridcloud/migrations/0003_add_scopes_to_api_key_replica.py
index 320d680a87853f..092ed71bbc5cc9 100644
--- a/src/sentry/hybridcloud/migrations/0003_add_scopes_to_api_key_replica.py
+++ b/src/sentry/hybridcloud/migrations/0003_add_scopes_to_api_key_replica.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("hybridcloud", "0002_add_slug_reservation_replica_model"),
     ]
diff --git a/src/sentry/hybridcloud/migrations/0017_add_scoping_organization_apitokenreplica.py b/src/sentry/hybridcloud/migrations/0017_add_scoping_organization_apitokenreplica.py
new file mode 100644
index 00000000000000..e70659d4095006
--- /dev/null
+++ b/src/sentry/hybridcloud/migrations/0017_add_scoping_organization_apitokenreplica.py
@@ -0,0 +1,36 @@
+# Generated by Django 5.1.1 on 2024-11-22 22:03
+
+from django.db import migrations
+
+import sentry.db.models.fields.hybrid_cloud_foreign_key
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("hybridcloud", "0016_add_control_cacheversion"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="apitokenreplica",
+            name="scoping_organization_id",
+            field=sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                "sentry.Organization", db_index=True, null=True, on_delete="CASCADE"
+            ),
+        ),
+    ]
diff --git a/src/sentry/hybridcloud/models/apitokenreplica.py b/src/sentry/hybridcloud/models/apitokenreplica.py
index 21e3982dc808c5..d9ee2be13040dc 100644
--- a/src/sentry/hybridcloud/models/apitokenreplica.py
+++ b/src/sentry/hybridcloud/models/apitokenreplica.py
@@ -24,6 +24,9 @@ class ApiTokenReplica(Model, HasApiScopes):
     expires_at = models.DateTimeField(null=True)
     allowed_origins = models.TextField(blank=True, null=True)
     date_added = models.DateTimeField(default=timezone.now)
+    scoping_organization_id = HybridCloudForeignKey(
+        "sentry.Organization", null=True, on_delete="CASCADE"
+    )
 
     class Meta:
         app_label = "hybridcloud"
diff --git a/src/sentry/hybridcloud/rpc/caching/__init__.py b/src/sentry/hybridcloud/rpc/caching/__init__.py
index 11122ac4f444fa..9774c31c977145 100644
--- a/src/sentry/hybridcloud/rpc/caching/__init__.py
+++ b/src/sentry/hybridcloud/rpc/caching/__init__.py
@@ -1,13 +1,15 @@
 from .service import (
     back_with_silo_cache,
+    back_with_silo_cache_list,
     back_with_silo_cache_many,
     control_caching_service,
     region_caching_service,
 )
 
 __all__ = (
-    "back_with_silo_cache_many",
     "back_with_silo_cache",
+    "back_with_silo_cache_list",
+    "back_with_silo_cache_many",
     "region_caching_service",
     "control_caching_service",
 )
diff --git a/src/sentry/hybridcloud/rpc/caching/service.py b/src/sentry/hybridcloud/rpc/caching/service.py
index acf347c848856d..1638cc1f381953 100644
--- a/src/sentry/hybridcloud/rpc/caching/service.py
+++ b/src/sentry/hybridcloud/rpc/caching/service.py
@@ -43,6 +43,8 @@ class SiloCacheBackedCallable(Generic[_R]):
 
     When cache read returns no data, the wrapped function will be
     invoked. The result of the wrapped function is then stored in cache.
+
+    Ideal for 'get by id' style methods
     """
 
     silo_mode: SiloMode
@@ -107,12 +109,87 @@ def get_one(self, object_id: int) -> _R | None:
         return _consume_generator(self.resolve_from(object_id, values))
 
 
+class SiloCacheBackedListCallable(Generic[_R]):
+    """
+    Get a list of results from cache or wrapped function.
+
+    When cache read returns no data, the wrapped function will be
+    invoked. The result of the wrapped function is then stored in cache.
+
+    Ideal for 'get many X for organization' style methods
+    """
+
+    silo_mode: SiloMode
+    base_key: str
+    cb: Callable[[int], list[_R]]
+    type_: type[_R]
+    timeout: int | None
+
+    def __init__(
+        self,
+        base_key: str,
+        silo_mode: SiloMode,
+        cb: Callable[[int], list[_R]],
+        t: type[_R],
+        timeout: int | None = None,
+    ):
+        self.base_key = base_key
+        self.silo_mode = silo_mode
+        self.cb = cb
+        self.type_ = t
+        self.timeout = timeout
+
+    def __call__(self, object_id: int) -> list[_R]:
+        if (
+            SiloMode.get_current_mode() != self.silo_mode
+            and SiloMode.get_current_mode() != SiloMode.MONOLITH
+        ):
+            return self.cb(object_id)
+        return self.get_results(object_id)
+
+    def key_from(self, object_id: int) -> str:
+        return f"{self.base_key}:{object_id}"
+
+    def resolve_from(
+        self, object_id: int, values: Mapping[str, int | str]
+    ) -> Generator[None, None, list[_R]]:
+        from .impl import _consume_generator, _delete_cache, _set_cache
+
+        key = self.key_from(object_id)
+        value = values[key]
+        version: int
+        if isinstance(value, str):
+            try:
+                metrics.incr("hybridcloud.caching.list.cached", tags={"base_key": self.base_key})
+                return [self.type_(**item) for item in json.loads(value)]
+            except (pydantic.ValidationError, JSONDecodeError, TypeError):
+                version = yield from _delete_cache(key, self.silo_mode)
+        else:
+            version = value
+
+        metrics.incr("hybridcloud.caching.list.rpc", tags={"base_key": self.base_key})
+        result = self.cb(object_id)
+        if result is not None:
+            cache_value = json.dumps([item.json() for item in result])
+            _consume_generator(_set_cache(key, cache_value, version, self.timeout))
+        return result
+
+    def get_results(self, object_id: int) -> list[_R]:
+        from .impl import _consume_generator, _get_cache
+
+        key = self.key_from(object_id)
+        values = _consume_generator(_get_cache([key], self.silo_mode))
+        return _consume_generator(self.resolve_from(object_id, values))
+
+
 class SiloCacheManyBackedCallable(Generic[_R]):
     """
     Get a multiple records from cache or wrapped function.
 
     When cache read returns no or partial data, the wrapped function will be invoked
     with keys missing data. The result of the wrapped function will then be stored in cache.
+
+    Ideal for 'get many by id' style methods.
     """
 
     silo_mode: SiloMode
@@ -238,6 +315,30 @@ def wrapper(cb: Callable[[list[int]], list[_R]]) -> "SiloCacheManyBackedCallable
     return wrapper
 
 
+def back_with_silo_cache_list(
+    base_key: str, silo_mode: SiloMode, t: type[_R], timeout: int | None = None
+) -> Callable[[Callable[[int], list[_R]]], "SiloCacheBackedListCallable[_R]"]:
+    """
+    Decorator for adding local caching to RPC operations for list results
+
+    This decorator can be applied to RPC methods that fetch a list of results
+    based on a single input id. This works well with methods that get a list
+    of results based on an organization or user id.
+
+    If the cache read for the id value fails, the decorated function will be called and
+    its result will be stored in cache. The decorator also adds method on the wrapped
+    function for generating keys to clear cache entires with
+    with region_caching_service and control_caching_service.
+
+    See app_service.installations_for_organization() for an example usage.
+    """
+
+    def wrapper(cb: Callable[[int], list[_R]]) -> "SiloCacheBackedListCallable[_R]":
+        return SiloCacheBackedListCallable(base_key, silo_mode, cb, t, timeout)
+
+    return wrapper
+
+
 region_caching_service = RegionCachingService.create_delegation()
 
 
diff --git a/src/sentry/hybridcloud/services/replica/impl.py b/src/sentry/hybridcloud/services/replica/impl.py
index ea45a5d32fd3cf..25d5936ebc740f 100644
--- a/src/sentry/hybridcloud/services/replica/impl.py
+++ b/src/sentry/hybridcloud/services/replica/impl.py
@@ -163,6 +163,7 @@ def upsert_replicated_api_token(self, *, api_token: RpcApiToken, region_name: st
                 "\n".join(api_token.allowed_origins) if api_token.allowed_origins else None
             ),
             user_id=api_token.user_id,
+            scoping_organization_id=api_token.scoping_organization_id,
         )
         handle_replication(ApiToken, destination)
 
diff --git a/src/sentry/identity/github_enterprise/provider.py b/src/sentry/identity/github_enterprise/provider.py
index c23da6e32b3114..1f4abb0b42aca4 100644
--- a/src/sentry/identity/github_enterprise/provider.py
+++ b/src/sentry/identity/github_enterprise/provider.py
@@ -1,42 +1,13 @@
-from django.core.exceptions import PermissionDenied
+from typing import NoReturn
 
-from sentry import http
 from sentry.identity.oauth2 import OAuth2Provider
 
 
-def get_user_info(url, access_token):
-    with http.build_session() as session:
-        resp = session.get(
-            f"https://{url}/api/v3/user",
-            headers={
-                "Accept": "application/vnd.github.machine-man-preview+json",
-                "Authorization": f"token {access_token}",
-            },
-            verify=False,
-        )
-        resp.raise_for_status()
-    return resp.json()
-
-
 class GitHubEnterpriseIdentityProvider(OAuth2Provider):
     key = "github_enterprise"
     name = "GitHub Enterprise"
 
     oauth_scopes = ()
 
-    def build_identity(self, data):
-        data = data["data"]
-        access_token = data.get("access_token")
-        if not access_token:
-            raise PermissionDenied()
-
-        # todo(meredith): this doesn't work yet, need to pass in the base url
-        user = get_user_info(access_token)
-
-        return {
-            "type": "github_enterprise",
-            "id": user["id"],
-            "email": user["email"],
-            "scopes": [],  # GitHub apps do not have user scopes
-            "data": self.get_oauth_data(data),
-        }
+    def build_identity(self, data: object) -> NoReturn:
+        raise NotImplementedError
diff --git a/src/sentry/identity/oauth2.py b/src/sentry/identity/oauth2.py
index 5eaad9e3a39b13..f7e7b521956c0b 100644
--- a/src/sentry/identity/oauth2.py
+++ b/src/sentry/identity/oauth2.py
@@ -322,7 +322,7 @@ def exchange_token(self, request: Request, pipeline, code):
                     "identity.oauth2.ssl-error",
                     extra={"url": self.access_token_url, "verify_ssl": verify_ssl},
                 )
-                lifecycle.record_failure({"failure_reason": "ssl_error"})
+                lifecycle.record_failure("ssl_error")
                 url = self.access_token_url
                 return {
                     "error": "Could not verify SSL certificate",
@@ -331,14 +331,14 @@ def exchange_token(self, request: Request, pipeline, code):
             except ConnectionError:
                 url = self.access_token_url
                 logger.info("identity.oauth2.connection-error", extra={"url": url})
-                lifecycle.record_failure({"failure_reason": "connection_error"})
+                lifecycle.record_failure("connection_error")
                 return {
                     "error": "Could not connect to host or service",
                     "error_description": f"Ensure that {url} is open to connections",
                 }
             except orjson.JSONDecodeError:
                 logger.info("identity.oauth2.json-error", extra={"url": self.access_token_url})
-                lifecycle.record_failure({"failure_reason": "json_error"})
+                lifecycle.record_failure("json_error")
                 return {
                     "error": "Could not decode a JSON Response",
                     "error_description": "We were not able to parse a JSON response, please try again.",
@@ -355,9 +355,9 @@ def dispatch(self, request: Request, pipeline) -> HttpResponse:
             if error:
                 pipeline.logger.info("identity.token-exchange-error", extra={"error": error})
                 lifecycle.record_failure(
-                    {"failure_reason": "token_exchange_error", "msg": ERR_INVALID_STATE}
+                    "token_exchange_error", extra={"failure_info": ERR_INVALID_STATE}
                 )
-                return pipeline.error(ERR_INVALID_STATE)
+                return pipeline.error(f"{ERR_INVALID_STATE}\nError: {error}")
 
             if state != pipeline.fetch_state("state"):
                 pipeline.logger.info(
@@ -370,7 +370,7 @@ def dispatch(self, request: Request, pipeline) -> HttpResponse:
                     },
                 )
                 lifecycle.record_failure(
-                    {"failure_reason": "token_exchange_error", "msg": ERR_INVALID_STATE}
+                    "token_exchange_error", extra={"failure_info": ERR_INVALID_STATE}
                 )
                 return pipeline.error(ERR_INVALID_STATE)
 
@@ -384,7 +384,7 @@ def dispatch(self, request: Request, pipeline) -> HttpResponse:
 
         if "error" in data:
             pipeline.logger.info("identity.token-exchange-error", extra={"error": data["error"]})
-            return pipeline.error(ERR_TOKEN_RETRIEVAL)
+            return pipeline.error(f"{ERR_TOKEN_RETRIEVAL}\nError: {data['error']}")
 
         # we can either expect the API to be implicit and say "im looking for
         # blah within state data" or we need to pass implementation + call a
diff --git a/src/sentry/identity/slack/provider.py b/src/sentry/identity/slack/provider.py
index 35420b37a4b887..faf99532e86335 100644
--- a/src/sentry/identity/slack/provider.py
+++ b/src/sentry/identity/slack/provider.py
@@ -78,12 +78,8 @@ class SlackOAuth2LoginView(OAuth2LoginView):
 
     user_scope = ""
 
-    def __init__(
-        self, authorize_url=None, client_id=None, scope=None, user_scope=None, *args, **kwargs
-    ):
-        super().__init__(
-            authorize_url=authorize_url, client_id=client_id, scope=scope, *args, **kwargs
-        )
+    def __init__(self, authorize_url=None, client_id=None, scope=None, user_scope=None):
+        super().__init__(authorize_url=authorize_url, client_id=client_id, scope=scope)
         if user_scope is not None:
             self.user_scope = user_scope
 
diff --git a/src/sentry/identity/vsts/provider.py b/src/sentry/identity/vsts/provider.py
index bc17268b06d4a1..6cd3cfe481ed70 100644
--- a/src/sentry/identity/vsts/provider.py
+++ b/src/sentry/identity/vsts/provider.py
@@ -3,7 +3,8 @@
 from rest_framework.request import Request
 
 from sentry import http, options
-from sentry.identity.oauth2 import OAuth2CallbackView, OAuth2LoginView, OAuth2Provider
+from sentry.identity.oauth2 import OAuth2CallbackView, OAuth2LoginView, OAuth2Provider, record_event
+from sentry.integrations.utils.metrics import IntegrationPipelineViewType
 from sentry.utils.http import absolute_uri
 
 
@@ -120,21 +121,27 @@ def exchange_token(self, request: Request, pipeline, code):
         from sentry.http import safe_urlopen, safe_urlread
         from sentry.utils.http import absolute_uri
 
-        req = safe_urlopen(
-            url=self.access_token_url,
-            headers={"Content-Type": "application/x-www-form-urlencoded", "Content-Length": "1322"},
-            data={
-                "client_assertion_type": "urn:ietf:params:oauth:client-assertion-type:jwt-bearer",
-                "client_assertion": self.client_secret,
-                "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
-                "assertion": code,
-                "redirect_uri": absolute_uri(pipeline.redirect_url()),
-            },
-        )
-        body = safe_urlread(req)
-        if req.headers["Content-Type"].startswith("application/x-www-form-urlencoded"):
-            return dict(parse_qsl(body))
-        return orjson.loads(body)
+        with record_event(
+            IntegrationPipelineViewType.TOKEN_EXCHANGE, pipeline.provider.key
+        ).capture():
+            req = safe_urlopen(
+                url=self.access_token_url,
+                headers={
+                    "Content-Type": "application/x-www-form-urlencoded",
+                    "Content-Length": "1322",
+                },
+                data={
+                    "client_assertion_type": "urn:ietf:params:oauth:client-assertion-type:jwt-bearer",
+                    "client_assertion": self.client_secret,
+                    "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
+                    "assertion": code,
+                    "redirect_uri": absolute_uri(pipeline.redirect_url()),
+                },
+            )
+            body = safe_urlread(req)
+            if req.headers["Content-Type"].startswith("application/x-www-form-urlencoded"):
+                return dict(parse_qsl(body))
+            return orjson.loads(body)
 
 
 # TODO(iamrajjoshi): Make this the default provider
@@ -232,18 +239,24 @@ def exchange_token(self, request: Request, pipeline, code):
         from sentry.http import safe_urlopen, safe_urlread
         from sentry.utils.http import absolute_uri
 
-        req = safe_urlopen(
-            url=self.access_token_url,
-            headers={"Content-Type": "application/x-www-form-urlencoded", "Content-Length": "1322"},
-            data={
-                "grant_type": "authorization_code",
-                "client_id": self.client_id,
-                "client_secret": self.client_secret,
-                "code": code,
-                "redirect_uri": absolute_uri(pipeline.redirect_url()),
-            },
-        )
-        body = safe_urlread(req)
-        if req.headers["Content-Type"].startswith("application/x-www-form-urlencoded"):
-            return dict(parse_qsl(body))
-        return orjson.loads(body)
+        with record_event(
+            IntegrationPipelineViewType.TOKEN_EXCHANGE, pipeline.provider.key
+        ).capture():
+            req = safe_urlopen(
+                url=self.access_token_url,
+                headers={
+                    "Content-Type": "application/x-www-form-urlencoded",
+                    "Content-Length": "1322",
+                },
+                data={
+                    "grant_type": "authorization_code",
+                    "client_id": self.client_id,
+                    "client_secret": self.client_secret,
+                    "code": code,
+                    "redirect_uri": absolute_uri(pipeline.redirect_url()),
+                },
+            )
+            body = safe_urlread(req)
+            if req.headers["Content-Type"].startswith("application/x-www-form-urlencoded"):
+                return dict(parse_qsl(body))
+            return orjson.loads(body)
diff --git a/src/sentry/incidents/charts.py b/src/sentry/incidents/charts.py
index b9797c5cce07c6..4d352763137508 100644
--- a/src/sentry/incidents/charts.py
+++ b/src/sentry/incidents/charts.py
@@ -266,7 +266,7 @@ def build_metric_alert_chart(
     query_str = build_query_strings(subscription=subscription, snuba_query=snuba_query).query_string
     query = (
         query_str
-        if is_crash_free_alert
+        if is_crash_free_alert or dataset == Dataset.EventsAnalyticsPlatform
         else apply_dataset_query_conditions(
             SnubaQuery.Type(snuba_query.type),
             query_str,
@@ -292,6 +292,11 @@ def build_metric_alert_chart(
     else:
         if query_type == SnubaQuery.Type.PERFORMANCE and dataset == Dataset.PerformanceMetrics:
             query_params["dataset"] = "metrics"
+        elif (
+            query_type == SnubaQuery.Type.PERFORMANCE and dataset == Dataset.EventsAnalyticsPlatform
+        ):
+            query_params["dataset"] = "spans"
+            query_params["useRpc"] = "1"
         elif query_type == SnubaQuery.Type.ERROR:
             query_params["dataset"] = "errors"
         else:
diff --git a/src/sentry/incidents/endpoints/organization_alert_rule_available_action_index.py b/src/sentry/incidents/endpoints/organization_alert_rule_available_action_index.py
index dc4d4e3e607684..2d1d228e9fcd72 100644
--- a/src/sentry/incidents/endpoints/organization_alert_rule_available_action_index.py
+++ b/src/sentry/incidents/endpoints/organization_alert_rule_available_action_index.py
@@ -119,7 +119,7 @@ def get(self, request: Request, organization) -> Response:
 
             # Add all alertable SentryApps to the list.
             elif registered_type.service_type == AlertRuleTriggerAction.Type.SENTRY_APP:
-                installs = app_service.get_installed_for_organization(
+                installs = app_service.installations_for_organization(
                     organization_id=organization.id
                 )
                 actions += [
diff --git a/src/sentry/incidents/endpoints/organization_alert_rule_details.py b/src/sentry/incidents/endpoints/organization_alert_rule_details.py
index aecdf6f86137c6..0aeea3a1fb0df0 100644
--- a/src/sentry/incidents/endpoints/organization_alert_rule_details.py
+++ b/src/sentry/incidents/endpoints/organization_alert_rule_details.py
@@ -73,7 +73,7 @@ def update_alert_rule(request: Request, organization, alert_rule):
             "access": request.access,
             "user": request.user,
             "ip_address": request.META.get("REMOTE_ADDR"),
-            "installations": app_service.get_installed_for_organization(
+            "installations": app_service.installations_for_organization(
                 organization_id=organization.id
             ),
         },
@@ -148,7 +148,7 @@ class OrganizationAlertRuleDetailsPutSerializer(serializers.Serializer):
 - `label`: One of `critical` or `warning`. A `critical` trigger is always required.
 - `alertThreshold`: The value that the subscription needs to reach to trigger the
 alert rule.
-- `actions`: A list of actions that take place when the threshold is met. Set as an empty list if no actions are to take place.
+- `actions`: A list of actions that take place when the threshold is met.
 ```json
 triggers: [
     {
@@ -212,9 +212,6 @@ class OrganizationAlertRuleDetailsPutSerializer(serializers.Serializer):
     owner = ActorField(
         required=False, allow_null=True, help_text="The ID of the team or user that owns the rule."
     )
-    excludedProjects = serializers.ListField(
-        child=ProjectField(scope="project:read"), required=False
-    )
     thresholdPeriod = serializers.IntegerField(required=False, default=1, min_value=1, max_value=20)
     monitorType = serializers.IntegerField(
         required=False,
diff --git a/src/sentry/incidents/endpoints/organization_alert_rule_index.py b/src/sentry/incidents/endpoints/organization_alert_rule_index.py
index 0c6e64b83e5786..db45347717d093 100644
--- a/src/sentry/incidents/endpoints/organization_alert_rule_index.py
+++ b/src/sentry/incidents/endpoints/organization_alert_rule_index.py
@@ -111,7 +111,7 @@ def create_metric_alert(
                 "access": request.access,
                 "user": request.user,
                 "ip_address": request.META.get("REMOTE_ADDR"),
-                "installations": app_service.get_installed_for_organization(
+                "installations": app_service.installations_for_organization(
                     organization_id=organization.id
                 ),
             },
@@ -346,7 +346,7 @@ class OrganizationAlertRuleIndexPostSerializer(serializers.Serializer):
 - `label`: One of `critical` or `warning`. A `critical` trigger is always required.
 - `alertThreshold`: The value that the subscription needs to reach to trigger the
 alert rule.
-- `actions`: A list of actions that take place when the threshold is met. Set as an empty list if no actions are to take place.
+- `actions`: A list of actions that take place when the threshold is met.
 ```json
 triggers: [
     {
@@ -409,9 +409,6 @@ class OrganizationAlertRuleIndexPostSerializer(serializers.Serializer):
     owner = ActorField(
         required=False, allow_null=True, help_text="The ID of the team or user that owns the rule."
     )
-    excludedProjects = serializers.ListField(
-        child=ProjectField(scope="project:read"), required=False
-    )
     thresholdPeriod = serializers.IntegerField(required=False, default=1, min_value=1, max_value=20)
     monitorType = serializers.IntegerField(
         required=False,
@@ -442,10 +439,14 @@ def check_can_create_alert(self, request: Request, organization: Organization) -
         permission, then we must verify that the user is a team admin with "alerts:write" access to the project(s)
         in their request.
         """
-        #
-        if request.access.has_scope("alerts:write"):
+        # if the requesting user has any of these org-level permissions, then they can create an alert
+        if (
+            request.access.has_scope("alerts:write")
+            or request.access.has_scope("org:admin")
+            or request.access.has_scope("org:write")
+        ):
             return
-        # team admins should be able to crete alerts for the projects they have access to
+        # team admins should be able to create alerts for the projects they have access to
         projects = self.get_projects(request, organization)
         # team admins will have alerts:write scoped to their projects, members will not
         team_admin_has_access = all(
diff --git a/src/sentry/incidents/endpoints/organization_incident_activity_index.py b/src/sentry/incidents/endpoints/organization_incident_activity_index.py
deleted file mode 100644
index 0437f5fa249a03..00000000000000
--- a/src/sentry/incidents/endpoints/organization_incident_activity_index.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from rest_framework.request import Request
-from rest_framework.response import Response
-
-from sentry.api.api_owners import ApiOwner
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.incident import IncidentEndpoint, IncidentPermission
-from sentry.api.paginator import OffsetPaginator
-from sentry.api.serializers import serialize
-from sentry.incidents.logic import get_incident_activity
-
-
-@region_silo_endpoint
-class OrganizationIncidentActivityIndexEndpoint(IncidentEndpoint):
-    owner = ApiOwner.ISSUES
-    publish_status = {
-        "GET": ApiPublishStatus.UNKNOWN,
-    }
-    permission_classes = (IncidentPermission,)
-
-    def get(self, request: Request, organization, incident) -> Response:
-        if request.GET.get("desc", "1") == "1":
-            order_by = "-date_added"
-        else:
-            order_by = "date_added"
-
-        return self.paginate(
-            request=request,
-            queryset=get_incident_activity(incident),
-            order_by=order_by,
-            paginator_cls=OffsetPaginator,
-            on_results=lambda x: serialize(x, request.user),
-        )
diff --git a/src/sentry/incidents/endpoints/organization_incident_comment_details.py b/src/sentry/incidents/endpoints/organization_incident_comment_details.py
deleted file mode 100644
index fdfc47e8a31cfb..00000000000000
--- a/src/sentry/incidents/endpoints/organization_incident_comment_details.py
+++ /dev/null
@@ -1,88 +0,0 @@
-from rest_framework import serializers
-from rest_framework.exceptions import PermissionDenied
-from rest_framework.request import Request
-from rest_framework.response import Response
-
-from sentry.api.api_owners import ApiOwner
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.incident import IncidentEndpoint, IncidentPermission
-from sentry.api.exceptions import ResourceDoesNotExist
-from sentry.api.serializers import serialize
-from sentry.incidents.models.incident import IncidentActivity, IncidentActivityType
-
-
-class CommentSerializer(serializers.Serializer):
-    comment = serializers.CharField(required=True)
-
-
-class CommentDetailsEndpoint(IncidentEndpoint):
-    def convert_args(self, request: Request, activity_id, *args, **kwargs):
-        # See GroupNotesDetailsEndpoint:
-        #   We explicitly don't allow a request with an ApiKey
-        #   since an ApiKey is bound to the Organization, not
-        #   an individual. Not sure if we'd want to allow an ApiKey
-        #   to delete/update other users' comments
-        if not request.user.is_authenticated:
-            raise PermissionDenied(detail="Key doesn't have permission to delete Note")
-
-        args, kwargs = super().convert_args(request, *args, **kwargs)
-
-        try:
-            # Superusers may mutate any comment
-            user_filter = {} if request.user.is_superuser else {"user_id": request.user.id}
-
-            kwargs["activity"] = IncidentActivity.objects.get(
-                id=activity_id,
-                incident=kwargs["incident"],
-                # Only allow modifying comments
-                type=IncidentActivityType.COMMENT.value,
-                **user_filter,
-            )
-        except IncidentActivity.DoesNotExist:
-            raise ResourceDoesNotExist
-
-        return args, kwargs
-
-
-@region_silo_endpoint
-class OrganizationIncidentCommentDetailsEndpoint(CommentDetailsEndpoint):
-    owner = ApiOwner.ISSUES
-    publish_status = {
-        "DELETE": ApiPublishStatus.UNKNOWN,
-        "PUT": ApiPublishStatus.UNKNOWN,
-    }
-    permission_classes = (IncidentPermission,)
-
-    def delete(self, request: Request, organization, incident, activity) -> Response:
-        """
-        Delete a comment
-        ````````````````
-        :auth: required
-        """
-
-        try:
-            activity.delete()
-        except IncidentActivity.DoesNotExist:
-            raise ResourceDoesNotExist
-
-        return Response(status=204)
-
-    def put(self, request: Request, organization, incident, activity) -> Response:
-        """
-        Update an existing comment
-        ``````````````````````````
-        :auth: required
-        """
-
-        serializer = CommentSerializer(data=request.data)
-        if serializer.is_valid():
-            result = serializer.validated_data
-
-            try:
-                comment = activity.update(comment=result.get("comment"))
-            except IncidentActivity.DoesNotExist:
-                raise ResourceDoesNotExist
-
-            return Response(serialize(comment, request.user), status=200)
-        return Response(serializer.errors, status=400)
diff --git a/src/sentry/incidents/endpoints/organization_incident_comment_index.py b/src/sentry/incidents/endpoints/organization_incident_comment_index.py
deleted file mode 100644
index b2a534ed598b23..00000000000000
--- a/src/sentry/incidents/endpoints/organization_incident_comment_index.py
+++ /dev/null
@@ -1,56 +0,0 @@
-from rest_framework import serializers
-from rest_framework.request import Request
-from rest_framework.response import Response
-
-from sentry.api.api_owners import ApiOwner
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.incident import IncidentEndpoint, IncidentPermission
-from sentry.api.fields.actor import ActorField
-from sentry.api.serializers import serialize
-from sentry.api.serializers.rest_framework.mentions import (
-    MentionsMixin,
-    extract_user_ids_from_mentions,
-)
-from sentry.incidents.logic import create_incident_activity
-from sentry.incidents.models.incident import IncidentActivityType
-from sentry.users.services.user.serial import serialize_generic_user
-
-
-class CommentSerializer(serializers.Serializer, MentionsMixin):
-    comment = serializers.CharField(required=True)
-    mentions = serializers.ListField(child=ActorField(), required=False)
-    external_id = serializers.CharField(allow_null=True, required=False)
-
-
-@region_silo_endpoint
-class OrganizationIncidentCommentIndexEndpoint(IncidentEndpoint):
-    owner = ApiOwner.ISSUES
-    publish_status = {
-        "POST": ApiPublishStatus.UNKNOWN,
-    }
-    permission_classes = (IncidentPermission,)
-
-    def post(self, request: Request, organization, incident) -> Response:
-        serializer = CommentSerializer(
-            data=request.data,
-            context={
-                "projects": incident.projects.all(),
-                "organization": organization,
-                "organization_id": organization.id,
-            },
-        )
-        if serializer.is_valid():
-            mentions = extract_user_ids_from_mentions(
-                organization.id, serializer.validated_data.get("mentions", [])
-            )
-            mentioned_user_ids = mentions["users"] | mentions["team_users"]
-            activity = create_incident_activity(
-                incident,
-                IncidentActivityType.COMMENT,
-                user=serialize_generic_user(request.user),
-                comment=serializer.validated_data["comment"],
-                mentioned_user_ids=mentioned_user_ids,
-            )
-            return Response(serialize(activity, request.user), status=201)
-        return Response(serializer.errors, status=400)
diff --git a/src/sentry/incidents/endpoints/organization_incident_details.py b/src/sentry/incidents/endpoints/organization_incident_details.py
index 7edc9a96a8bd5c..20f217883b7d50 100644
--- a/src/sentry/incidents/endpoints/organization_incident_details.py
+++ b/src/sentry/incidents/endpoints/organization_incident_details.py
@@ -10,7 +10,6 @@
 from sentry.incidents.endpoints.serializers.incident import DetailedIncidentSerializer
 from sentry.incidents.logic import update_incident_status
 from sentry.incidents.models.incident import IncidentStatus, IncidentStatusMethod
-from sentry.users.services.user.serial import serialize_generic_user
 
 
 class IncidentSerializer(serializers.Serializer):
@@ -56,8 +55,6 @@ def put(self, request: Request, organization, incident) -> Response:
                 incident = update_incident_status(
                     incident=incident,
                     status=result["status"],
-                    user=serialize_generic_user(request.user),
-                    comment=result.get("comment"),
                     status_method=IncidentStatusMethod.MANUAL,
                 )
                 return Response(
diff --git a/src/sentry/incidents/endpoints/organization_incident_seen.py b/src/sentry/incidents/endpoints/organization_incident_seen.py
deleted file mode 100644
index 869596a422b021..00000000000000
--- a/src/sentry/incidents/endpoints/organization_incident_seen.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from django.utils import timezone as django_timezone
-from rest_framework.request import Request
-from rest_framework.response import Response
-
-from sentry.api.api_owners import ApiOwner
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.incident import IncidentEndpoint, IncidentPermission
-from sentry.incidents.models.incident import Incident, IncidentProject, IncidentSeen
-from sentry.models.organization import Organization
-from sentry.users.services.user import RpcUser
-from sentry.users.services.user.serial import serialize_generic_user
-
-
-@region_silo_endpoint
-class OrganizationIncidentSeenEndpoint(IncidentEndpoint):
-    owner = ApiOwner.ISSUES
-    publish_status = {
-        "POST": ApiPublishStatus.UNKNOWN,
-    }
-    permission_classes = (IncidentPermission,)
-
-    def post(self, request: Request, organization: Organization, incident: Incident) -> Response:
-        """
-        Mark an incident as seen by the user
-        ````````````````````````````````````
-
-        :auth: required
-        """
-
-        user = serialize_generic_user(request.user)
-        if user is not None:
-            _set_incident_seen(incident, user)
-        return Response({}, status=201)
-
-
-def _set_incident_seen(incident: Incident, user: RpcUser) -> None:
-    """
-    Updates the incident to be seen
-    """
-
-    def is_project_member() -> bool:
-        incident_projects = IncidentProject.objects.filter(incident=incident)
-        for incident_project in incident_projects.select_related("project"):
-            if incident_project.project.member_set.filter(user_id=user.id).exists():
-                return True
-        return False
-
-    is_org_member = incident.organization.has_access(user)
-    if is_org_member and is_project_member():
-        IncidentSeen.objects.create_or_update(
-            incident=incident, user_id=user.id, values={"last_seen": django_timezone.now()}
-        )
diff --git a/src/sentry/incidents/endpoints/organization_incident_subscription_index.py b/src/sentry/incidents/endpoints/organization_incident_subscription_index.py
deleted file mode 100644
index dd22eea9d5a32e..00000000000000
--- a/src/sentry/incidents/endpoints/organization_incident_subscription_index.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from rest_framework.request import Request
-from rest_framework.response import Response
-
-from sentry.api.api_owners import ApiOwner
-from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.incident import IncidentEndpoint, IncidentPermission
-from sentry.incidents.logic import subscribe_to_incident, unsubscribe_from_incident
-
-
-class IncidentSubscriptionPermission(IncidentPermission):
-    scope_map = IncidentPermission.scope_map.copy()
-    scope_map["DELETE"] = [
-        "org:write",
-        "org:admin",
-        "project:read",
-        "project:write",
-        "project:admin",
-    ]
-
-
-@region_silo_endpoint
-class OrganizationIncidentSubscriptionIndexEndpoint(IncidentEndpoint):
-    owner = ApiOwner.ISSUES
-    publish_status = {
-        "DELETE": ApiPublishStatus.UNKNOWN,
-        "POST": ApiPublishStatus.UNKNOWN,
-    }
-    permission_classes = (IncidentSubscriptionPermission,)
-
-    def post(self, request: Request, organization, incident) -> Response:
-        """
-        Subscribes the authenticated user to the incident.
-        ``````````````````````````````````````````````````
-        Subscribes the user to the incident. If they are already subscribed
-        then no-op.
-        :auth: required
-        """
-
-        subscribe_to_incident(incident, request.user.id)
-        return Response({}, status=201)
-
-    def delete(self, request: Request, organization, incident) -> Response:
-        """
-        Unsubscribes the authenticated user from the incident.
-        ``````````````````````````````````````````````````````
-        Unsubscribes the user from the incident. If they are not subscribed then
-        no-op.
-        :auth: required
-        """
-        unsubscribe_from_incident(incident, request.user.id)
-        return Response({}, status=200)
diff --git a/src/sentry/incidents/endpoints/serializers/alert_rule.py b/src/sentry/incidents/endpoints/serializers/alert_rule.py
index 0ec511f596727c..9d6e31d3c65935 100644
--- a/src/sentry/incidents/endpoints/serializers/alert_rule.py
+++ b/src/sentry/incidents/endpoints/serializers/alert_rule.py
@@ -17,7 +17,6 @@
     AlertRule,
     AlertRuleActivity,
     AlertRuleActivityType,
-    AlertRuleExcludedProjects,
     AlertRuleTrigger,
     AlertRuleTriggerAction,
 )
@@ -40,7 +39,6 @@
 class AlertRuleSerializerResponseOptional(TypedDict, total=False):
     environment: str | None
     projects: list[str] | None
-    excludedProjects: list[dict] | None
     queryType: int | None
     resolveThreshold: float | None
     dataset: str | None
@@ -63,8 +61,6 @@ class AlertRuleSerializerResponseOptional(TypedDict, total=False):
         "status",
         "resolution",
         "thresholdPeriod",
-        "includeAllProjects",
-        "excludedProjects",
         "weeklyAvg",
         "totalThisWeek",
         "latestIncident",
@@ -89,7 +85,6 @@ class AlertRuleSerializerResponse(AlertRuleSerializerResponseOptional):
     resolution: float
     thresholdPeriod: int
     triggers: list[dict]
-    includeAllProjects: bool
     dateModified: datetime
     dateCreated: datetime
     createdBy: dict
@@ -309,7 +304,6 @@ def serialize(
             "thresholdPeriod": obj.threshold_period,
             "triggers": attrs.get("triggers", []),
             "projects": sorted(attrs.get("projects", [])),
-            "includeAllProjects": obj.include_all_projects,
             "owner": attrs.get("owner", None),
             "originalAlertRuleId": attrs.get("originalAlertRuleId", None),
             "comparisonDelta": obj.comparison_delta / 60 if obj.comparison_delta else None,
@@ -343,13 +337,6 @@ def get_attrs(
         self, item_list: Sequence[Any], user: User | RpcUser, **kwargs: Any
     ) -> defaultdict[AlertRule, Any]:
         result = super().get_attrs(item_list, user, **kwargs)
-        alert_rules = {item.id: item for item in item_list}
-        for alert_rule_id, project_slug in AlertRuleExcludedProjects.objects.filter(
-            alert_rule__in=item_list
-        ).values_list("alert_rule_id", "project__slug"):
-            exclusions = result[alert_rules[alert_rule_id]].setdefault("excluded_projects", [])
-            exclusions.append(project_slug)
-
         query_to_alert_rule = {ar.snuba_query_id: ar for ar in item_list}
 
         for event_type in SnubaQueryEventType.objects.filter(
@@ -366,7 +353,6 @@ def serialize(
         self, obj: AlertRule, attrs: Mapping[Any, Any], user: User | RpcUser, **kwargs
     ) -> AlertRuleSerializerResponse:
         data = super().serialize(obj, attrs, user)
-        data["excludedProjects"] = sorted(attrs.get("excluded_projects", []))
         data["eventTypes"] = sorted(attrs.get("event_types", []))
         data["snooze"] = False
         return data
diff --git a/src/sentry/incidents/endpoints/serializers/alert_rule_trigger.py b/src/sentry/incidents/endpoints/serializers/alert_rule_trigger.py
index c188c507c94349..66aca9a48658ae 100644
--- a/src/sentry/incidents/endpoints/serializers/alert_rule_trigger.py
+++ b/src/sentry/incidents/endpoints/serializers/alert_rule_trigger.py
@@ -5,11 +5,7 @@
 
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.incidents.endpoints.utils import translate_threshold
-from sentry.incidents.models.alert_rule import (
-    AlertRuleTrigger,
-    AlertRuleTriggerAction,
-    AlertRuleTriggerExclusion,
-)
+from sentry.incidents.models.alert_rule import AlertRuleTrigger, AlertRuleTriggerAction
 
 
 @register(AlertRuleTrigger)
@@ -45,20 +41,3 @@ def serialize(self, obj, attrs, user, **kwargs):
             "dateCreated": obj.date_added,
             "actions": attrs.get("actions", []),
         }
-
-
-class DetailedAlertRuleTriggerSerializer(AlertRuleTriggerSerializer):
-    def get_attrs(self, item_list, user, **kwargs):
-        triggers = {item.id: item for item in item_list}
-        result: dict[str, dict[str, list[str]]] = defaultdict(lambda: defaultdict(list))
-        for trigger_id, project_slug in AlertRuleTriggerExclusion.objects.filter(
-            alert_rule_trigger__in=item_list
-        ).values_list("alert_rule_trigger_id", "query_subscription__project__slug"):
-            if project_slug is not None:
-                result[triggers[trigger_id]]["excludedProjects"].append(project_slug)
-        return result
-
-    def serialize(self, obj, attrs, user, **kwargs):
-        data = super().serialize(obj, attrs, user, **kwargs)
-        data["excludedProjects"] = sorted(attrs.get("excludedProjects", []))
-        return data
diff --git a/src/sentry/incidents/endpoints/serializers/incident.py b/src/sentry/incidents/endpoints/serializers/incident.py
index c2ad42429c2936..4df9bc2015ab85 100644
--- a/src/sentry/incidents/endpoints/serializers/incident.py
+++ b/src/sentry/incidents/endpoints/serializers/incident.py
@@ -4,13 +4,7 @@
 
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.incidents.endpoints.serializers.alert_rule import AlertRuleSerializer
-from sentry.incidents.models.incident import (
-    Incident,
-    IncidentActivity,
-    IncidentProject,
-    IncidentSeen,
-    IncidentSubscription,
-)
+from sentry.incidents.models.incident import Incident, IncidentActivity, IncidentProject
 from sentry.snuba.entity_subscription import apply_dataset_query_conditions
 from sentry.snuba.models import SnubaQuery
 
@@ -45,21 +39,6 @@ def get_attrs(self, item_list, user, **kwargs):
                 serialize(incident.activation) if incident.activation else []
             )
 
-        if "seen_by" in self.expand:
-            incident_seen_list = list(
-                IncidentSeen.objects.filter(incident__in=item_list).order_by("-last_seen")
-            )
-            incident_seen_dict = defaultdict(list)
-            for incident_seen, serialized_seen_by in zip(
-                incident_seen_list, serialize(incident_seen_list)
-            ):
-                incident_seen_dict[incident_seen.incident_id].append(serialized_seen_by)
-            for incident in item_list:
-                seen_by = incident_seen_dict[incident.id]
-                has_seen = any(seen for seen in seen_by if seen["id"] == str(user.id))
-                results[incident]["seen_by"] = seen_by
-                results[incident]["has_seen"] = has_seen  # type: ignore[assignment]
-
         if "activities" in self.expand:
             # There could be many activities. An incident could seesaw between error/warning for a long period.
             # e.g - every 1 minute for 10 months
@@ -81,8 +60,6 @@ def serialize(self, obj, attrs, user, **kwargs):
             "projects": attrs["projects"],
             "alertRule": attrs["alert_rule"],
             "activities": attrs["activities"] if "activities" in self.expand else None,
-            "seenBy": attrs["seen_by"] if "seen_by" in self.expand else None,
-            "hasSeen": attrs["has_seen"] if "seen_by" in self.expand else None,
             "status": obj.status,
             "statusMethod": obj.status_method,
             "type": obj.type,
@@ -99,29 +76,12 @@ class DetailedIncidentSerializer(IncidentSerializer):
     def __init__(self, expand=None):
         if expand is None:
             expand = []
-        if "seen_by" not in expand:
-            expand.append("seen_by")
         if "original_alert_rule" not in expand:
             expand.append("original_alert_rule")
         super().__init__(expand=expand)
 
-    def get_attrs(self, item_list, user, **kwargs):
-        results = super().get_attrs(item_list, user=user, **kwargs)
-        subscribed_incidents = set()
-        if user.is_authenticated:
-            subscribed_incidents = set(
-                IncidentSubscription.objects.filter(
-                    incident__in=item_list, user_id=user.id
-                ).values_list("incident_id", flat=True)
-            )
-
-        for item in item_list:
-            results[item]["is_subscribed"] = item.id in subscribed_incidents
-        return results
-
     def serialize(self, obj, attrs, user, **kwargs):
         context = super().serialize(obj, attrs, user)
-        context["isSubscribed"] = attrs["is_subscribed"]
         # The query we should use to get accurate results in Discover.
         context["discoverQuery"] = self._build_discover_query(obj)
 
diff --git a/src/sentry/incidents/events.py b/src/sentry/incidents/events.py
index 0c12286a8a7375..03a00e89049097 100644
--- a/src/sentry/incidents/events.py
+++ b/src/sentry/incidents/events.py
@@ -21,14 +21,5 @@ class IncidentStatusUpdatedEvent(BaseIncidentEvent):
     )
 
 
-class IncidentCommentCreatedEvent(BaseIncidentEvent):
-    type = "incident.comment"
-    attributes = BaseIncidentEvent.attributes + (
-        analytics.Attribute("user_id", required=False),
-        analytics.Attribute("activity_id", required=False),
-    )
-
-
 analytics.register(IncidentCreatedEvent)
 analytics.register(IncidentStatusUpdatedEvent)
-analytics.register(IncidentCommentCreatedEvent)
diff --git a/src/sentry/incidents/grouptype.py b/src/sentry/incidents/grouptype.py
index 6973a4b8ed5c82..b7078c7c2f7a40 100644
--- a/src/sentry/incidents/grouptype.py
+++ b/src/sentry/incidents/grouptype.py
@@ -5,7 +5,7 @@
 from sentry.issues.grouptype import GroupCategory, GroupType
 from sentry.ratelimits.sliding_windows import Quota
 from sentry.types.group import PriorityLevel
-from sentry.workflow_engine.processors.detector import StatefulDetectorHandler
+from sentry.workflow_engine.handlers.detector import StatefulDetectorHandler
 
 
 class MetricAlertDetectorHandler(StatefulDetectorHandler[QuerySubscriptionUpdate]):
diff --git a/src/sentry/incidents/logic.py b/src/sentry/incidents/logic.py
index b5984b75504ce6..a59fc409354300 100644
--- a/src/sentry/incidents/logic.py
+++ b/src/sentry/incidents/logic.py
@@ -49,23 +49,24 @@
     IncidentProject,
     IncidentStatus,
     IncidentStatusMethod,
-    IncidentSubscription,
     IncidentTrigger,
     IncidentType,
     TriggerStatus,
 )
 from sentry.integrations.services.integration import RpcIntegration, integration_service
 from sentry.models.environment import Environment
-from sentry.models.notificationaction import ActionService, ActionTarget
 from sentry.models.organization import Organization
 from sentry.models.project import Project
+from sentry.notifications.models.notificationaction import ActionService, ActionTarget
 from sentry.relay.config.metric_extraction import on_demand_metrics_feature_flags
+from sentry.search.eap.types import SearchResolverConfig
 from sentry.search.events.builder.base import BaseQueryBuilder
 from sentry.search.events.constants import (
     METRICS_LAYER_UNSUPPORTED_TRANSACTION_METRICS_FUNCTIONS,
     SPANS_METRICS_FUNCTIONS,
 )
 from sentry.search.events.fields import is_function, resolve_field
+from sentry.search.events.types import SnubaParams
 from sentry.seer.anomaly_detection.delete_rule import delete_rule_in_seer
 from sentry.seer.anomaly_detection.store_data import send_new_rule_data, update_rule_data
 from sentry.sentry_apps.services.app import RpcSentryAppInstallation, app_service
@@ -74,7 +75,8 @@
     DuplicateDisplayNameError,
     IntegrationError,
 )
-from sentry.snuba.dataset import Dataset
+from sentry.snuba import spans_rpc
+from sentry.snuba.dataset import Dataset, EntityKey
 from sentry.snuba.entity_subscription import (
     ENTITY_TIME_COLUMNS,
     EntitySubscription,
@@ -85,6 +87,7 @@
 from sentry.snuba.metrics.extraction import should_use_on_demand_metrics
 from sentry.snuba.metrics.naming_layer.mri import get_available_operations, is_mri, parse_mri
 from sentry.snuba.models import QuerySubscription, SnubaQuery, SnubaQueryEventType
+from sentry.snuba.referrer import Referrer
 from sentry.snuba.subscriptions import (
     bulk_delete_snuba_subscriptions,
     bulk_disable_snuba_subscriptions,
@@ -94,6 +97,7 @@
 )
 from sentry.tasks.relay import schedule_invalidate_project_config
 from sentry.types.actor import Actor
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.utils import metrics
 from sentry.utils.audit import create_audit_entry_from_user
@@ -194,8 +198,6 @@ def create_incident(
 def update_incident_status(
     incident: Incident,
     status: IncidentStatus,
-    user: RpcUser | None = None,
-    comment: str | None = None,
     status_method: IncidentStatusMethod = IncidentStatusMethod.RULE_TRIGGERED,
     date_closed: datetime | None = None,
 ) -> Incident:
@@ -211,13 +213,9 @@ def update_incident_status(
         create_incident_activity(
             incident,
             IncidentActivityType.STATUS_CHANGE,
-            user=user,
             value=status.value,
             previous_value=incident.status,
-            comment=comment,
         )
-        if user:
-            subscribe_to_incident(incident, user.id)
 
         prev_status = incident.status
         kwargs: dict[str, Any] = {"status": status.value, "status_method": status_method.value}
@@ -252,15 +250,11 @@ def update_incident_status(
 def create_incident_activity(
     incident: Incident,
     activity_type: IncidentActivityType,
-    user: RpcUser | None = None,
+    user: RpcUser | User | None = None,
     value: str | int | None = None,
     previous_value: str | int | None = None,
-    comment: str | None = None,
-    mentioned_user_ids: Collection[int] = (),
     date_added: datetime | None = None,
 ) -> IncidentActivity:
-    if activity_type == IncidentActivityType.COMMENT and user:
-        subscribe_to_incident(incident, user.id)
     value = str(value) if value is not None else None
     previous_value = str(previous_value) if previous_value is not None else None
     kwargs = {}
@@ -272,40 +266,9 @@ def create_incident_activity(
         user_id=user.id if user else None,
         value=value,
         previous_value=previous_value,
-        comment=comment,
         notification_uuid=uuid4(),
         **kwargs,
     )
-
-    if mentioned_user_ids:
-        user_ids_to_subscribe = set(mentioned_user_ids) - set(
-            IncidentSubscription.objects.filter(
-                incident=incident, user_id__in=mentioned_user_ids
-            ).values_list("user_id", flat=True)
-        )
-        if user_ids_to_subscribe:
-            IncidentSubscription.objects.bulk_create(
-                [
-                    IncidentSubscription(incident=incident, user_id=mentioned_user_id)
-                    for mentioned_user_id in user_ids_to_subscribe
-                ]
-            )
-    transaction.on_commit(
-        lambda: tasks.send_subscriber_notifications.apply_async(
-            kwargs={"activity_id": activity.id}, countdown=10
-        ),
-        router.db_for_write(IncidentSubscription),
-    )
-    if activity_type == IncidentActivityType.COMMENT:
-        analytics.record(
-            "incident.comment",
-            incident_id=incident.id,
-            organization_id=incident.organization_id,
-            incident_type=incident.type,
-            user_id=user.id if user else None,
-            activity_id=activity.id,
-        )
-
     return activity
 
 
@@ -416,36 +379,64 @@ def get_incident_aggregates(
         snuba_query,
         incident.organization_id,
     )
-    query_builder = _build_incident_query_builder(
-        incident, entity_subscription, start, end, windowed_stats
-    )
-    try:
-        results = query_builder.run_query(referrer="incidents.get_incident_aggregates")
-    except Exception:
-        metrics.incr(
-            "incidents.get_incident_aggregates.snql.query.error",
-            tags={
-                "dataset": snuba_query.dataset,
-                "entity": get_entity_key_from_query_builder(query_builder).value,
-            },
+    if entity_subscription.dataset == Dataset.EventsAnalyticsPlatform:
+        start, end = _calculate_incident_time_range(
+            incident, start, end, windowed_stats=windowed_stats
         )
-        raise
-
-    aggregated_result = entity_subscription.aggregate_query_results(results["data"], alias="count")
-    return aggregated_result[0]
 
+        project_ids = list(
+            IncidentProject.objects.filter(incident=incident).values_list("project_id", flat=True)
+        )
 
-def subscribe_to_incident(incident: Incident, user_id: int) -> IncidentSubscription:
-    subscription, _ = IncidentSubscription.objects.get_or_create(incident=incident, user_id=user_id)
-    return subscription
-
+        params = SnubaParams(
+            environments=[snuba_query.environment],
+            projects=[Project.objects.get_from_cache(id=project_id) for project_id in project_ids],
+            organization=Organization.objects.get_from_cache(id=incident.organization_id),
+            start=start,
+            end=end,
+        )
 
-def unsubscribe_from_incident(incident: Incident, user_id: int) -> None:
-    IncidentSubscription.objects.filter(incident=incident, user_id=user_id).delete()
+        try:
+            results = spans_rpc.run_table_query(
+                params,
+                query_string=snuba_query.query,
+                selected_columns=[entity_subscription.aggregate],
+                orderby=None,
+                offset=0,
+                limit=1,
+                referrer=Referrer.API_ALERTS_ALERT_RULE_CHART.value,
+                config=SearchResolverConfig(
+                    auto_fields=True,
+                ),
+            )
 
+        except Exception:
+            metrics.incr(
+                "incidents.get_incident_aggregates.snql.query.error",
+                tags={
+                    "dataset": snuba_query.dataset,
+                    "entity": EntityKey.EAPSpans.value,
+                },
+            )
+            raise
+    else:
+        query_builder = _build_incident_query_builder(
+            incident, entity_subscription, start, end, windowed_stats
+        )
+        try:
+            results = query_builder.run_query(referrer="incidents.get_incident_aggregates")
+        except Exception:
+            metrics.incr(
+                "incidents.get_incident_aggregates.snql.query.error",
+                tags={
+                    "dataset": snuba_query.dataset,
+                    "entity": get_entity_key_from_query_builder(query_builder).value,
+                },
+            )
+            raise
 
-def get_incident_subscribers(incident: Incident) -> Iterable[IncidentSubscription]:
-    return IncidentSubscription.objects.filter(incident=incident)
+    aggregated_result = entity_subscription.aggregate_query_results(results["data"], alias="count")
+    return aggregated_result[0]
 
 
 def get_incident_activity(incident: Incident) -> Iterable[IncidentActivity]:
@@ -671,7 +662,7 @@ def create_alert_rule(
     return alert_rule
 
 
-def snapshot_alert_rule(alert_rule: AlertRule, user: RpcUser | None = None) -> None:
+def snapshot_alert_rule(alert_rule: AlertRule, user: RpcUser | User | None = None) -> None:
     def nullify_id(model: Model) -> None:
         """Set the id field to null.
 
@@ -1638,7 +1629,7 @@ def _get_alert_rule_trigger_action_sentry_app(
     from sentry.sentry_apps.services.app import app_service
 
     if installations is None:
-        installations = app_service.get_installed_for_organization(organization_id=organization.id)
+        installations = app_service.installations_for_organization(organization_id=organization.id)
 
     for installation in installations:
         if installation.sentry_app.id == sentry_app_id:
@@ -1850,7 +1841,7 @@ def get_slack_actions_with_async_lookups(
                         "access": SystemAccess(),
                         "user": user,
                         "input_channel_id": action.get("inputChannelId"),
-                        "installations": app_service.get_installed_for_organization(
+                        "installations": app_service.installations_for_organization(
                             organization_id=organization.id
                         ),
                     },
diff --git a/src/sentry/incidents/models/alert_rule.py b/src/sentry/incidents/models/alert_rule.py
index 1493ff50c56bc6..75eb7696b6c8f6 100644
--- a/src/sentry/incidents/models/alert_rule.py
+++ b/src/sentry/incidents/models/alert_rule.py
@@ -32,10 +32,14 @@
 from sentry.incidents.models.incident import Incident, IncidentStatus, IncidentTrigger
 from sentry.incidents.utils.constants import INCIDENTS_SNUBA_SUBSCRIPTION_TYPE
 from sentry.incidents.utils.types import AlertRuleActivationConditionType
-from sentry.models.notificationaction import AbstractNotificationAction, ActionService, ActionTarget
 from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.models.team import Team
+from sentry.notifications.models.notificationaction import (
+    AbstractNotificationAction,
+    ActionService,
+    ActionTarget,
+)
 from sentry.seer.anomaly_detection.delete_rule import delete_rule_in_seer
 from sentry.snuba.models import QuerySubscription
 from sentry.snuba.subscriptions import bulk_create_snuba_subscriptions, delete_snuba_subscription
@@ -237,26 +241,6 @@ def conditionally_subscribe_project_to_alert_rules(
         return []
 
 
-@region_silo_model
-class AlertRuleExcludedProjects(Model):
-    """
-    Excludes a specific project from an AlertRule
-
-    NOTE: This feature is not currently utilized.
-    """
-
-    __relocation_scope__ = RelocationScope.Organization
-
-    alert_rule = FlexibleForeignKey("sentry.AlertRule", db_index=False)
-    project = FlexibleForeignKey("sentry.Project", db_constraint=False)
-    date_added = models.DateTimeField(default=timezone.now)
-
-    class Meta:
-        app_label = "sentry"
-        db_table = "sentry_alertruleexcludedprojects"
-        unique_together = (("alert_rule", "project"),)
-
-
 @region_silo_model
 class AlertRuleProjects(Model):
     """
@@ -297,15 +281,6 @@ class AlertRule(Model):
 
     user_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete="SET_NULL")
     team = FlexibleForeignKey("sentry.Team", null=True, on_delete=models.SET_NULL)
-
-    excluded_projects = models.ManyToManyField(
-        "sentry.Project", related_name="alert_rule_exclusions", through=AlertRuleExcludedProjects
-    )  # NOTE: This feature is not currently utilized.
-    # Determines whether we include all current and future projects from this
-    # organization in this rule.
-    include_all_projects = models.BooleanField(
-        default=False
-    )  # NOTE: This feature is not currently utilized.
     name = models.TextField()
     status = models.SmallIntegerField(default=AlertRuleStatus.PENDING.value)
     threshold_type = models.SmallIntegerField(null=True)
@@ -478,24 +453,6 @@ class Meta:
         unique_together = (("alert_rule", "label"),)
 
 
-@region_silo_model
-class AlertRuleTriggerExclusion(Model):
-    """
-    Allows us to define a specific trigger to be excluded from a query subscription
-    """
-
-    __relocation_scope__ = RelocationScope.Organization
-
-    alert_rule_trigger = FlexibleForeignKey("sentry.AlertRuleTrigger", related_name="exclusions")
-    query_subscription = FlexibleForeignKey("sentry.QuerySubscription")
-    date_added = models.DateTimeField(default=timezone.now)
-
-    class Meta:
-        app_label = "sentry"
-        db_table = "sentry_alertruletriggerexclusion"
-        unique_together = (("alert_rule_trigger", "query_subscription"),)
-
-
 class AlertRuleTriggerActionMethod(StrEnum):
     FIRE = "fire"
     RESOLVE = "resolve"
diff --git a/src/sentry/incidents/models/incident.py b/src/sentry/incidents/models/incident.py
index 5339fc055652a8..1d64379b142813 100644
--- a/src/sentry/incidents/models/incident.py
+++ b/src/sentry/incidents/models/incident.py
@@ -22,7 +22,6 @@
     OneToOneCascadeDeletes,
     UUIDField,
     region_silo_model,
-    sane_repr,
 )
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
 from sentry.db.models.manager.base import BaseManager
@@ -45,20 +44,6 @@ class Meta:
         unique_together = (("project", "incident"),)
 
 
-@region_silo_model
-class IncidentSeen(Model):
-    __relocation_scope__ = RelocationScope.Excluded
-
-    incident = FlexibleForeignKey("sentry.Incident")
-    user_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, on_delete="CASCADE", db_index=False)
-    last_seen = models.DateTimeField(default=timezone.now)
-
-    class Meta:
-        app_label = "sentry"
-        db_table = "sentry_incidentseen"
-        unique_together = (("user_id", "incident"),)
-
-
 class IncidentManager(BaseManager["Incident"]):
     CACHE_KEY = "incidents:active:%s:%s:%s"
 
@@ -185,7 +170,7 @@ class Incident(Model):
     - UI should be able to handle multiple active incidents
     """
 
-    __relocation_scope__ = RelocationScope.Organization
+    __relocation_scope__ = RelocationScope.Global
 
     objects: ClassVar[IncidentManager] = IncidentManager()
 
@@ -250,7 +235,7 @@ def normalize_before_relocation_import(
 
 @region_silo_model
 class PendingIncidentSnapshot(Model):
-    __relocation_scope__ = RelocationScope.Organization
+    __relocation_scope__ = RelocationScope.Global
 
     incident = OneToOneCascadeDeletes("sentry.Incident", db_constraint=False)
     target_run_date = models.DateTimeField(db_index=True, default=timezone.now)
@@ -263,7 +248,7 @@ class Meta:
 
 @region_silo_model
 class IncidentSnapshot(Model):
-    __relocation_scope__ = RelocationScope.Organization
+    __relocation_scope__ = RelocationScope.Global
 
     incident = OneToOneCascadeDeletes("sentry.Incident", db_constraint=False)
     event_stats_snapshot = FlexibleForeignKey("sentry.TimeSeriesSnapshot", db_constraint=False)
@@ -278,7 +263,7 @@ class Meta:
 
 @region_silo_model
 class TimeSeriesSnapshot(Model):
-    __relocation_scope__ = RelocationScope.Organization
+    __relocation_scope__ = RelocationScope.Global
     __relocation_dependencies__ = {"sentry.Incident"}
 
     start = models.DateTimeField()
@@ -303,7 +288,6 @@ def query_for_relocation_export(cls, q: models.Q, pk_map: PrimaryKeyMap) -> mode
 class IncidentActivityType(Enum):
     CREATED = 1
     STATUS_CHANGE = 2
-    COMMENT = 3
     DETECTED = 4
 
 
@@ -313,7 +297,7 @@ class IncidentActivity(Model):
     An IncidentActivity is a record of a change that occurred in an Incident. This could be a status change,
     """
 
-    __relocation_scope__ = RelocationScope.Organization
+    __relocation_scope__ = RelocationScope.Global
 
     incident = FlexibleForeignKey("sentry.Incident")
     user_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, on_delete="CASCADE", null=True)
@@ -341,27 +325,6 @@ def normalize_before_relocation_import(
         return old_pk
 
 
-@region_silo_model
-class IncidentSubscription(Model):
-    """
-    IncidentSubscription is a record of a user being subscribed to an incident.
-    Not to be confused with a snuba QuerySubscription
-    """
-
-    __relocation_scope__ = RelocationScope.Organization
-
-    incident = FlexibleForeignKey("sentry.Incident", db_index=False)
-    user_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, on_delete="CASCADE")
-    date_added = models.DateTimeField(default=timezone.now)
-
-    class Meta:
-        app_label = "sentry"
-        db_table = "sentry_incidentsubscription"
-        unique_together = (("incident", "user_id"),)
-
-    __repr__ = sane_repr("incident_id", "user_id")
-
-
 class TriggerStatus(Enum):
     ACTIVE = 0
     RESOLVED = 1
@@ -405,7 +368,7 @@ class IncidentTrigger(Model):
     NOTE: dissimilar to an AlertRuleTrigger which represents the trigger threshold required to initialize an Incident
     """
 
-    __relocation_scope__ = RelocationScope.Organization
+    __relocation_scope__ = RelocationScope.Global
 
     objects: ClassVar[IncidentTriggerManager] = IncidentTriggerManager()
 
diff --git a/src/sentry/incidents/serializers/alert_rule.py b/src/sentry/incidents/serializers/alert_rule.py
index 74d631d95d8ae5..4c0c6ddac49405 100644
--- a/src/sentry/incidents/serializers/alert_rule.py
+++ b/src/sentry/incidents/serializers/alert_rule.py
@@ -76,9 +76,6 @@ class AlertRuleSerializer(CamelSnakeModelSerializer[AlertRule]):
         required=False,
         max_length=1,
     )
-    excluded_projects = serializers.ListField(
-        child=ProjectField(scope="project:read"), required=False
-    )
     triggers = serializers.ListField(required=True)
     query_type = serializers.IntegerField(required=False)
     dataset = serializers.CharField(required=False)
@@ -123,8 +120,6 @@ class Meta:
             "comparison_delta",
             "aggregate",
             "projects",
-            "include_all_projects",
-            "excluded_projects",
             "triggers",
             "event_types",
             "monitor_type",
@@ -136,7 +131,6 @@ class Meta:
         ]
         extra_kwargs = {
             "name": {"min_length": 1, "max_length": 256},
-            "include_all_projects": {"default": False},
             "threshold_type": {"required": True},
             "resolve_threshold": {"required": False},
         }
diff --git a/src/sentry/incidents/serializers/alert_rule_trigger_action.py b/src/sentry/incidents/serializers/alert_rule_trigger_action.py
index b2a34227bb6d11..53266d2472f0e9 100644
--- a/src/sentry/incidents/serializers/alert_rule_trigger_action.py
+++ b/src/sentry/incidents/serializers/alert_rule_trigger_action.py
@@ -14,9 +14,9 @@
 from sentry.integrations.opsgenie.utils import OPSGENIE_CUSTOM_PRIORITIES
 from sentry.integrations.pagerduty.utils import PAGERDUTY_CUSTOM_PRIORITIES
 from sentry.integrations.slack.utils.channel import validate_channel_id
-from sentry.models.notificationaction import ActionService
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.team import Team
+from sentry.notifications.models.notificationaction import ActionService
 from sentry.shared_integrations.exceptions import ApiRateLimitedError
 
 
diff --git a/src/sentry/incidents/subscription_processor.py b/src/sentry/incidents/subscription_processor.py
index 865c0160bf3722..4654948204437a 100644
--- a/src/sentry/incidents/subscription_processor.py
+++ b/src/sentry/incidents/subscription_processor.py
@@ -399,12 +399,15 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
             has_anomaly_detection
             and self.alert_rule.detection_type == AlertRuleDetectionType.DYNAMIC
         ):
-            potential_anomalies = get_anomaly_data_from_seer(
-                alert_rule=self.alert_rule,
-                subscription=self.subscription,
-                last_update=self.last_update.timestamp(),
-                aggregation_value=aggregation_value,
-            )
+            with metrics.timer(
+                "incidents.subscription_processor.process_update.get_anomaly_data_from_seer"
+            ):
+                potential_anomalies = get_anomaly_data_from_seer(
+                    alert_rule=self.alert_rule,
+                    subscription=self.subscription,
+                    last_update=self.last_update.timestamp(),
+                    aggregation_value=aggregation_value,
+                )
             if potential_anomalies is None:
                 logger.info(
                     "No potential anomalies found",
diff --git a/src/sentry/incidents/tasks.py b/src/sentry/incidents/tasks.py
index 5fe389e68082b5..a8ca7387a08491 100644
--- a/src/sentry/incidents/tasks.py
+++ b/src/sentry/incidents/tasks.py
@@ -2,21 +2,15 @@
 
 import logging
 from typing import Any
-from urllib.parse import urlencode
 
-from django.urls import reverse
-
-from sentry.auth.access import from_user
 from sentry.incidents.models.alert_rule import (
     AlertRuleStatus,
     AlertRuleTriggerAction,
     AlertRuleTriggerActionMethod,
 )
 from sentry.incidents.models.incident import (
-    INCIDENT_STATUS,
     Incident,
     IncidentActivity,
-    IncidentActivityType,
     IncidentStatus,
     IncidentStatusMethod,
 )
@@ -31,107 +25,11 @@
 from sentry.snuba.models import QuerySubscription
 from sentry.snuba.query_subscriptions.consumer import register_subscriber
 from sentry.tasks.base import instrumented_task
-from sentry.users.models.user import User
-from sentry.users.services.user import RpcUser
-from sentry.users.services.user.service import user_service
 from sentry.utils import metrics
-from sentry.utils.email import MessageBuilder
-from sentry.utils.http import absolute_uri
 
 logger = logging.getLogger(__name__)
 
 
-@instrumented_task(
-    name="sentry.incidents.tasks.send_subscriber_notifications",
-    queue="incidents",
-    silo_mode=SiloMode.REGION,
-)
-def send_subscriber_notifications(activity_id: int) -> None:
-    from sentry.incidents.logic import get_incident_subscribers, unsubscribe_from_incident
-
-    try:
-        activity = IncidentActivity.objects.select_related(
-            "incident", "incident__organization"
-        ).get(id=activity_id)
-    except IncidentActivity.DoesNotExist:
-        return
-
-    if activity.user_id is None:
-        return
-
-    activity_user = user_service.get_user(user_id=activity.user_id)
-
-    # Only send notifications for specific activity types.
-    if activity.type not in (
-        IncidentActivityType.COMMENT.value,
-        IncidentActivityType.STATUS_CHANGE.value,
-    ):
-        return
-
-    # Check that the user still has access to at least one of the projects
-    # related to the incident. If not then unsubscribe them.
-    projects = list(activity.incident.projects.all())
-    for subscriber in get_incident_subscribers(activity.incident):
-        subscriber_user = user_service.get_user(user_id=subscriber.user_id)
-        if subscriber_user is None:
-            continue
-
-        access = from_user(subscriber_user, activity.incident.organization)
-        if not any(project for project in projects if access.has_project_access(project)):
-            unsubscribe_from_incident(activity.incident, subscriber_user.id)
-        elif subscriber_user.id != activity.user_id:
-            msg = generate_incident_activity_email(activity, subscriber_user, activity_user)
-            msg.send_async([subscriber_user.email])
-
-
-def generate_incident_activity_email(
-    activity: IncidentActivity, user: RpcUser | User, activity_user: RpcUser | User | None = None
-) -> MessageBuilder:
-    incident = activity.incident
-    return MessageBuilder(
-        subject=f"Activity on Alert {incident.title} (#{incident.identifier})",
-        template="sentry/emails/incidents/activity.txt",
-        html_template="sentry/emails/incidents/activity.html",
-        type="incident.activity",
-        context=build_activity_context(activity, user, activity_user),
-    )
-
-
-def build_activity_context(
-    activity: IncidentActivity, user: RpcUser, activity_user: RpcUser | None = None
-) -> dict[str, Any]:
-    if activity_user is None:
-        activity_user = user_service.get_user(user_id=activity.user_id)
-
-    if activity.type == IncidentActivityType.COMMENT.value:
-        action = "left a comment"
-    else:
-        action = "changed status from {} to {}".format(
-            INCIDENT_STATUS[IncidentStatus(int(activity.previous_value))],
-            INCIDENT_STATUS[IncidentStatus(int(activity.value))],
-        )
-    incident = activity.incident
-
-    action = f"{action} on alert {incident.title} (#{incident.identifier})"
-
-    return {
-        "user_name": activity_user.name if activity_user else "Sentry",
-        "action": action,
-        "link": absolute_uri(
-            reverse(
-                "sentry-metric-alert",
-                kwargs={
-                    "organization_slug": incident.organization.slug,
-                    "incident_id": incident.identifier,
-                },
-            )
-        )
-        + "?"
-        + urlencode({"referrer": "incident_activity_email"}),
-        "comment": activity.comment,
-    }
-
-
 @register_subscriber(SUBSCRIPTION_METRICS_LOGGER)
 def handle_subscription_metrics_logger(
     subscription_update: QuerySubscriptionUpdate, subscription: QuerySubscription
@@ -265,7 +163,6 @@ def auto_resolve_snapshot_incidents(alert_rule_id: int, **kwargs: Any) -> None:
             update_incident_status(
                 incident,
                 IncidentStatus.CLOSED,
-                comment="This alert has been auto-resolved because the rule that triggered it has been modified or deleted.",
                 status_method=IncidentStatusMethod.RULE_UPDATED,
             )
 
diff --git a/src/sentry/ingest/billing_metrics_consumer.py b/src/sentry/ingest/billing_metrics_consumer.py
index 688d1e71a7e70f..471855aa356f6d 100644
--- a/src/sentry/ingest/billing_metrics_consumer.py
+++ b/src/sentry/ingest/billing_metrics_consumer.py
@@ -14,7 +14,6 @@
 from django.core.cache import cache
 from sentry_kafka_schemas.schema_types.snuba_generic_metrics_v1 import GenericMetric
 
-from sentry import options
 from sentry.constants import DataCategory
 from sentry.models.project import Project
 from sentry.sentry_metrics.indexer.strings import (
@@ -105,13 +104,6 @@ def _count_processed_items(self, generic_metric: GenericMetric) -> Mapping[DataC
 
         items = {data_category: quantity}
 
-        if not options.get("profiling.emit_outcomes_in_profiling_consumer.enabled"):
-            if self._has_profile(generic_metric):
-                # The bucket is tagged with the "has_profile" tag,
-                # so we also count the quantity of this bucket towards profiles.
-                # This assumes a "1 to 0..1" relationship between transactions / spans and profiles.
-                items[DataCategory.PROFILE] = quantity
-
         return items
 
     def _has_profile(self, generic_metric: GenericMetric) -> bool:
diff --git a/src/sentry/ingest/consumer/processors.py b/src/sentry/ingest/consumer/processors.py
index b4dc48ae05f5ce..c03b71d96e4d6a 100644
--- a/src/sentry/ingest/consumer/processors.py
+++ b/src/sentry/ingest/consumer/processors.py
@@ -25,6 +25,7 @@
 from sentry.utils import metrics
 from sentry.utils.cache import cache_key_for_event
 from sentry.utils.dates import to_datetime
+from sentry.utils.event_tracker import TransactionStageStatus, track_sampled_event
 from sentry.utils.sdk import set_current_event_project
 from sentry.utils.snuba import RateLimitExceeded
 
@@ -107,11 +108,6 @@ def process_event(
     remote_addr = message.get("remote_addr")
     attachments = message.get("attachments") or ()
 
-    if consumer_type == ConsumerType.Transactions:
-        processing_store = transaction_processing_store
-    else:
-        processing_store = event_processing_store
-
     sentry_sdk.set_extra("event_id", event_id)
     sentry_sdk.set_extra("len_attachments", len(attachments))
 
@@ -166,6 +162,13 @@ def process_event(
     with sentry_sdk.start_span(op="orjson.loads"):
         data = orjson.loads(payload)
 
+    # We also need to check "type" as transactions are also sent to ingest-attachments
+    # along with other event types if they have attachments.
+    if consumer_type == ConsumerType.Transactions or data.get("type") == "transaction":
+        processing_store = transaction_processing_store
+    else:
+        processing_store = event_processing_store
+
     sentry_sdk.set_extra("event_type", data.get("type"))
 
     with sentry_sdk.start_span(
@@ -202,6 +205,11 @@ def process_event(
         else:
             with metrics.timer("ingest_consumer._store_event"):
                 cache_key = processing_store.store(data)
+            if consumer_type == ConsumerType.Transactions:
+                track_sampled_event(
+                    data["event_id"], ConsumerType.Transactions, TransactionStageStatus.REDIS_PUT
+                )
+
             save_attachments(attachments, cache_key)
 
         try:
diff --git a/src/sentry/ingest/types.py b/src/sentry/ingest/types.py
index d9ca4198dbc01b..4b0c4596d72796 100644
--- a/src/sentry/ingest/types.py
+++ b/src/sentry/ingest/types.py
@@ -1,4 +1,7 @@
-class ConsumerType:
+from enum import StrEnum
+
+
+class ConsumerType(StrEnum):
     """
     Defines the types of ingestion consumers
     """
diff --git a/src/sentry/integrations/api/bases/integration.py b/src/sentry/integrations/api/bases/integration.py
index 2273d83622fd15..db35ffec89d120 100644
--- a/src/sentry/integrations/api/bases/integration.py
+++ b/src/sentry/integrations/api/bases/integration.py
@@ -42,14 +42,16 @@ class IntegrationEndpoint(ControlSiloOrganizationEndpoint):
     Baseclass for integration endpoints in control silo that need integration exception handling
     """
 
-    def handle_exception(
+    def handle_exception_with_details(
         self,
         request: Request,
         exc: Exception,
         *args: Any,
         **kwds: Any,
     ) -> Response:
-        return _handle_exception(exc) or super().handle_exception(request, exc, *args, **kwds)
+        return _handle_exception(exc) or super().handle_exception_with_details(
+            request, exc, *args, **kwds
+        )
 
 
 class RegionIntegrationEndpoint(OrganizationEndpoint):
@@ -57,11 +59,13 @@ class RegionIntegrationEndpoint(OrganizationEndpoint):
     Baseclass for integration endpoints in region silo that need integration exception handling
     """
 
-    def handle_exception(
+    def handle_exception_with_details(
         self,
         request: Request,
         exc: Exception,
         *args: Any,
         **kwds: Any,
     ) -> Response:
-        return _handle_exception(exc) or super().handle_exception(request, exc, *args, **kwds)
+        return _handle_exception(exc) or super().handle_exception_with_details(
+            request, exc, *args, **kwds
+        )
diff --git a/src/sentry/integrations/api/endpoints/doc_integration_details.py b/src/sentry/integrations/api/endpoints/doc_integration_details.py
index a06c47481bd5ee..e6974c13876c38 100644
--- a/src/sentry/integrations/api/endpoints/doc_integration_details.py
+++ b/src/sentry/integrations/api/endpoints/doc_integration_details.py
@@ -22,9 +22,9 @@
 class DocIntegrationDetailsEndpoint(DocIntegrationBaseEndpoint):
     owner = ApiOwner.INTEGRATIONS
     publish_status = {
-        "DELETE": ApiPublishStatus.UNKNOWN,
-        "GET": ApiPublishStatus.UNKNOWN,
-        "PUT": ApiPublishStatus.UNKNOWN,
+        "DELETE": ApiPublishStatus.PRIVATE,
+        "GET": ApiPublishStatus.PRIVATE,
+        "PUT": ApiPublishStatus.PRIVATE,
     }
 
     def get(self, request: Request, doc_integration: DocIntegration) -> Response:
diff --git a/src/sentry/integrations/api/endpoints/doc_integrations_index.py b/src/sentry/integrations/api/endpoints/doc_integrations_index.py
index 9358d0bc0d2b66..869079209a13c1 100644
--- a/src/sentry/integrations/api/endpoints/doc_integrations_index.py
+++ b/src/sentry/integrations/api/endpoints/doc_integrations_index.py
@@ -23,8 +23,8 @@
 class DocIntegrationsEndpoint(DocIntegrationsBaseEndpoint):
     owner = ApiOwner.INTEGRATIONS
     publish_status = {
-        "GET": ApiPublishStatus.UNKNOWN,
-        "POST": ApiPublishStatus.UNKNOWN,
+        "GET": ApiPublishStatus.PRIVATE,
+        "POST": ApiPublishStatus.PRIVATE,
     }
 
     def get(self, request: Request):
diff --git a/src/sentry/integrations/api/endpoints/integration_proxy.py b/src/sentry/integrations/api/endpoints/integration_proxy.py
index 5db2f5848659fe..f0e86cf77b02d4 100644
--- a/src/sentry/integrations/api/endpoints/integration_proxy.py
+++ b/src/sentry/integrations/api/endpoints/integration_proxy.py
@@ -221,7 +221,7 @@ def http_method_not_allowed(self, request):
         )
         return response
 
-    def handle_exception(  # type: ignore[override]
+    def handle_exception_with_details(
         self,
         request: DRFRequest,
         exc: Exception,
@@ -240,4 +240,4 @@ def handle_exception(  # type: ignore[override]
             logger.info("hybrid_cloud.integration_proxy.host_timeout_error", extra=self.log_extra)
             return self.respond(status=exc.code)
 
-        return super().handle_exception(request, exc, handler_context, scope)
+        return super().handle_exception_with_details(request, exc, handler_context, scope)
diff --git a/src/sentry/integrations/base.py b/src/sentry/integrations/base.py
index 3858ffa0b0140f..6e3f51ddbd11c8 100644
--- a/src/sentry/integrations/base.py
+++ b/src/sentry/integrations/base.py
@@ -138,7 +138,7 @@ class IntegrationDomain(StrEnum):
 class IntegrationProviderSlug(StrEnum):
     SLACK = "slack"
     DISCORD = "discord"
-    MSTeams = "msteams"
+    MSTEAMS = "msteams"
     JIRA = "jira"
     JIRA_SERVER = "jira_server"
     AZURE_DEVOPS = "vsts"
@@ -155,7 +155,7 @@ class IntegrationProviderSlug(StrEnum):
     IntegrationDomain.MESSAGING: [
         IntegrationProviderSlug.SLACK,
         IntegrationProviderSlug.DISCORD,
-        IntegrationProviderSlug.MSTeams,
+        IntegrationProviderSlug.MSTEAMS,
     ],
     IntegrationDomain.PROJECT_MANAGEMENT: [
         IntegrationProviderSlug.JIRA,
diff --git a/src/sentry/integrations/bitbucket/integration.py b/src/sentry/integrations/bitbucket/integration.py
index f3d05641111f0f..de83ca35c06414 100644
--- a/src/sentry/integrations/bitbucket/integration.py
+++ b/src/sentry/integrations/bitbucket/integration.py
@@ -269,7 +269,7 @@ def dispatch(self, request: Request, pipeline) -> Response:
                     request, BitbucketIntegrationProvider.key
                 )
             except AtlassianConnectValidationError as e:
-                lifecycle.record_failure({"failure_reason": str(e)})
+                lifecycle.record_failure(str(e))
                 return pipeline.error("Unable to verify installation.")
 
             pipeline.bind_state("external_id", integration.external_id)
diff --git a/src/sentry/integrations/bitbucket/issues.py b/src/sentry/integrations/bitbucket/issues.py
index f4844827da3952..50880706e9e6c3 100644
--- a/src/sentry/integrations/bitbucket/issues.py
+++ b/src/sentry/integrations/bitbucket/issues.py
@@ -6,9 +6,6 @@
 from django.urls import reverse
 
 from sentry.integrations.source_code_management.issues import SourceCodeIssueIntegration
-from sentry.integrations.source_code_management.metrics import (
-    SourceCodeIssueIntegrationInteractionType,
-)
 from sentry.models.group import Group
 from sentry.shared_integrations.exceptions import ApiError, IntegrationFormError
 from sentry.silo.base import all_silo_function
@@ -122,25 +119,24 @@ def get_link_issue_config(self, group: Group, **kwargs) -> list[dict[str, Any]]:
         ]
 
     def create_issue(self, data, **kwargs):
-        with self.record_event(SourceCodeIssueIntegrationInteractionType.CREATE_ISSUE).capture():
-            client = self.get_client()
-            if not data.get("repo"):
-                raise IntegrationFormError({"repo": ["Repository is required"]})
+        client = self.get_client()
+        if not data.get("repo"):
+            raise IntegrationFormError({"repo": ["Repository is required"]})
 
-            data["content"] = {"raw": data["description"]}
-            del data["description"]
+        data["content"] = {"raw": data["description"]}
+        del data["description"]
 
-            try:
-                issue = client.create_issue(data.get("repo"), data)
-            except ApiError as e:
-                self.raise_error(e)
+        try:
+            issue = client.create_issue(data.get("repo"), data)
+        except ApiError as e:
+            self.raise_error(e)
 
-            return {
-                "key": issue["id"],
-                "title": issue["title"],
-                "description": issue["content"]["html"],  # users content rendered as html
-                "repo": data.get("repo"),
-            }
+        return {
+            "key": issue["id"],
+            "title": issue["title"],
+            "description": issue["content"]["html"],  # users content rendered as html
+            "repo": data.get("repo"),
+        }
 
     def get_issue(self, issue_id, **kwargs):
         client = self.get_client()
diff --git a/src/sentry/integrations/bitbucket/search.py b/src/sentry/integrations/bitbucket/search.py
index 708341f88b8585..234229e3919646 100644
--- a/src/sentry/integrations/bitbucket/search.py
+++ b/src/sentry/integrations/bitbucket/search.py
@@ -9,6 +9,10 @@
 from sentry.integrations.bitbucket.integration import BitbucketIntegration
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.source_code_management.issues import SourceCodeIssueIntegration
+from sentry.integrations.source_code_management.metrics import (
+    SCMIntegrationInteractionType,
+    SourceCodeSearchEndpointHaltReason,
+)
 from sentry.integrations.source_code_management.search import SourceCodeSearchEndpoint
 from sentry.shared_integrations.exceptions import ApiError
 
@@ -37,32 +41,37 @@ def installation_class(self):
         return BitbucketIntegration
 
     def handle_search_issues(self, installation: T, query: str, repo: str | None) -> Response:
-        assert repo
+        with self.record_event(
+            SCMIntegrationInteractionType.HANDLE_SEARCH_ISSUES
+        ).capture() as lifecycle:
+            assert repo
 
-        full_query = f'title~"{query}"'
-        try:
-            response = installation.search_issues(query=full_query, repo=repo)
-        except ApiError as e:
-            if "no issue tracker" in str(e):
-                logger.info(
-                    "bitbucket.issue-search-no-issue-tracker",
-                    extra={"installation_id": installation.model.id, "repo": repo},
-                )
-                return Response(
-                    {"detail": "Bitbucket Repository has no issue tracker."}, status=400
-                )
-            raise
+            full_query = f'title~"{query}"'
+            try:
+                response = installation.search_issues(query=full_query, repo=repo)
+            except ApiError as e:
+                if "no issue tracker" in str(e):
+                    lifecycle.record_halt(str(SourceCodeSearchEndpointHaltReason.NO_ISSUE_TRACKER))
+                    logger.info(
+                        "bitbucket.issue-search-no-issue-tracker",
+                        extra={"installation_id": installation.model.id, "repo": repo},
+                    )
+                    return Response(
+                        {"detail": "Bitbucket Repository has no issue tracker."}, status=400
+                    )
+                raise
 
-        assert isinstance(response, dict)
-        return Response(
-            [
-                {"label": "#{} {}".format(i["id"], i["title"]), "value": i["id"]}
-                for i in response.get("values", [])
-            ]
-        )
+            assert isinstance(response, dict)
+            return Response(
+                [
+                    {"label": "#{} {}".format(i["id"], i["title"]), "value": i["id"]}
+                    for i in response.get("values", [])
+                ]
+            )
 
     def handle_search_repositories(
         self, integration: Integration, installation: T, query: str
     ) -> Response:
-        result = installation.get_repositories(query)
-        return Response([{"label": i["name"], "value": i["name"]} for i in result])
+        with self.record_event(SCMIntegrationInteractionType.HANDLE_SEARCH_REPOSITORIES).capture():
+            result = installation.get_repositories(query)
+            return Response([{"label": i["name"], "value": i["name"]} for i in result])
diff --git a/src/sentry/integrations/bitbucket/webhook.py b/src/sentry/integrations/bitbucket/webhook.py
index d3c6a7264bc2d7..2460e7aca6c8c5 100644
--- a/src/sentry/integrations/bitbucket/webhook.py
+++ b/src/sentry/integrations/bitbucket/webhook.py
@@ -1,5 +1,6 @@
 import ipaddress
 import logging
+from abc import ABC, abstractmethod
 from collections.abc import Mapping
 from datetime import timezone
 from typing import Any
@@ -14,7 +15,9 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, region_silo_endpoint
+from sentry.integrations.base import IntegrationDomain
 from sentry.integrations.bitbucket.constants import BITBUCKET_IP_RANGES, BITBUCKET_IPS
+from sentry.integrations.utils.metrics import IntegrationWebhookEvent, IntegrationWebhookEventType
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
 from sentry.models.organization import Organization
@@ -27,7 +30,13 @@
 PROVIDER_NAME = "integrations:bitbucket"
 
 
-class Webhook:
+class Webhook(ABC):
+    @property
+    @abstractmethod
+    def event_type(self) -> IntegrationWebhookEventType:
+        raise NotImplementedError
+
+    @abstractmethod
     def __call__(self, organization: Organization, event: Mapping[str, Any]):
         raise NotImplementedError
 
@@ -61,6 +70,11 @@ def update_repo_data(self, repo, event):
 
 class PushEventWebhook(Webhook):
     # https://confluence.atlassian.com/bitbucket/event-payloads-740262817.html#EventPayloads-Push
+
+    @property
+    def event_type(self) -> IntegrationWebhookEventType:
+        return IntegrationWebhookEventType.PUSH
+
     def __call__(self, organization: Organization, event: Mapping[str, Any]):
         authors = {}
 
@@ -186,5 +200,13 @@ def post(self, request: HttpRequest, organization_id: int) -> HttpResponse:
             )
             return HttpResponse(status=400)
 
-        handler()(organization, event)
+        event_handler = handler()
+
+        with IntegrationWebhookEvent(
+            interaction_type=event_handler.event_type,
+            domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
+            provider_key="bitbucket",
+        ).capture():
+            event_handler(organization, event)
+
         return HttpResponse(status=204)
diff --git a/src/sentry/integrations/bitbucket_server/integration.py b/src/sentry/integrations/bitbucket_server/integration.py
index 04d5b7e5ea06b7..8ccdf435b30a2a 100644
--- a/src/sentry/integrations/bitbucket_server/integration.py
+++ b/src/sentry/integrations/bitbucket_server/integration.py
@@ -185,14 +185,12 @@ def dispatch(self, request: Request, pipeline) -> HttpResponse:
             try:
                 request_token = client.get_request_token()
             except ApiError as error:
-                lifecycle.record_failure({"failure_reason": str(error), "url": config.get("url")})
+                lifecycle.record_failure(str(error), extra={"url": config.get("url")})
                 return pipeline.error(f"Could not fetch a request token from Bitbucket. {error}")
 
             pipeline.bind_state("request_token", request_token)
             if not request_token.get("oauth_token"):
-                lifecycle.record_failure(
-                    {"failure_reason": "missing oauth_token", "url": config.get("url")}
-                )
+                lifecycle.record_failure("missing oauth_token", extra={"url": config.get("url")})
                 return pipeline.error("Missing oauth_token")
 
             authorize_url = client.get_authorize_url(request_token)
@@ -230,7 +228,7 @@ def dispatch(self, request: Request, pipeline) -> HttpResponse:
 
                 return pipeline.next_step()
             except ApiError as error:
-                lifecycle.record_failure({"failure_reason": str(error)})
+                lifecycle.record_failure(str(error))
                 return pipeline.error(
                     f"Could not fetch an access token from Bitbucket. {str(error)}"
                 )
diff --git a/src/sentry/integrations/bitbucket_server/webhook.py b/src/sentry/integrations/bitbucket_server/webhook.py
index 0bf345d42a35e5..f18c226c43a36d 100644
--- a/src/sentry/integrations/bitbucket_server/webhook.py
+++ b/src/sentry/integrations/bitbucket_server/webhook.py
@@ -1,4 +1,5 @@
 import logging
+from abc import ABC, abstractmethod
 from collections.abc import Mapping
 from datetime import datetime, timezone
 from typing import Any
@@ -12,7 +13,9 @@
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 
+from sentry.integrations.base import IntegrationDomain
 from sentry.integrations.models.integration import Integration
+from sentry.integrations.utils.metrics import IntegrationWebhookEvent, IntegrationWebhookEventType
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
 from sentry.models.organization import Organization
@@ -26,7 +29,13 @@
 PROVIDER_NAME = "integrations:bitbucket_server"
 
 
-class Webhook:
+class Webhook(ABC):
+    @property
+    @abstractmethod
+    def event_type(self) -> IntegrationWebhookEventType:
+        raise NotImplementedError
+
+    @abstractmethod
     def __call__(self, organization: Organization, integration_id: int, event: Mapping[str, Any]):
         raise NotImplementedError
 
@@ -41,6 +50,10 @@ def update_repo_data(self, repo, event):
 
 
 class PushEventWebhook(Webhook):
+    @property
+    def event_type(self) -> IntegrationWebhookEventType:
+        return IntegrationWebhookEventType.PUSH
+
     def __call__(
         self, organization: Organization, integration_id: int, event: Mapping[str, Any]
     ) -> HttpResponse:
@@ -176,4 +189,11 @@ def post(self, request: HttpRequest, organization_id, integration_id) -> HttpRes
             )
             return HttpResponse(status=400)
 
-        return handler()(organization, integration_id, event)
+        event_handler = handler()
+
+        with IntegrationWebhookEvent(
+            interaction_type=event_handler.event_type,
+            domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
+            provider_key="bitbucket-server",
+        ).capture():
+            return event_handler(organization, integration_id, event)
diff --git a/src/sentry/integrations/discord/actions/metric_alert.py b/src/sentry/integrations/discord/actions/metric_alert.py
index c21997f4f2d0fc..beff2896743e6f 100644
--- a/src/sentry/integrations/discord/actions/metric_alert.py
+++ b/src/sentry/integrations/discord/actions/metric_alert.py
@@ -38,7 +38,7 @@ def send_incident_alert_notification(
         # We can't send a message if we don't know the channel
         logger.warning(
             "discord.metric_alert.no_channel",
-            extra={"guild_id": incident.identifier},
+            extra={"incident_id": incident.id},
         )
         return False
 
@@ -56,7 +56,7 @@ def send_incident_alert_notification(
     except Exception as error:
         logger.warning(
             "discord.metric_alert.message_send_failure",
-            extra={"error": error, "guild_id": incident.identifier, "channel_id": channel},
+            extra={"error": error, "incident_id": incident.id, "channel_id": channel},
         )
         return False
     else:
diff --git a/src/sentry/integrations/discord/spec.py b/src/sentry/integrations/discord/spec.py
index 4899f7ec1ee1de..da96fd9d6fad02 100644
--- a/src/sentry/integrations/discord/spec.py
+++ b/src/sentry/integrations/discord/spec.py
@@ -6,7 +6,7 @@
     MessagingIdentityLinkViewSet,
     MessagingIntegrationSpec,
 )
-from sentry.models.notificationaction import ActionService
+from sentry.notifications.models.notificationaction import ActionService
 from sentry.rules.actions import IntegrationEventAction
 
 
diff --git a/src/sentry/integrations/discord/webhooks/command.py b/src/sentry/integrations/discord/webhooks/command.py
index 471b7bdcbead1d..3736d7ff9e55e9 100644
--- a/src/sentry/integrations/discord/webhooks/command.py
+++ b/src/sentry/integrations/discord/webhooks/command.py
@@ -1,4 +1,4 @@
-from collections.abc import Callable, Iterable
+from collections.abc import Iterable
 from dataclasses import dataclass
 
 from rest_framework.response import Response
@@ -11,12 +11,18 @@
 from sentry.integrations.discord.webhooks.handler import DiscordInteractionHandler
 from sentry.integrations.messaging import commands
 from sentry.integrations.messaging.commands import (
+    CommandHandler,
     CommandInput,
     CommandNotMatchedError,
     MessagingIntegrationCommand,
     MessagingIntegrationCommandDispatcher,
 )
+from sentry.integrations.messaging.metrics import (
+    MessageCommandFailureReason,
+    MessageCommandHaltReason,
+)
 from sentry.integrations.messaging.spec import MessagingIntegrationSpec
+from sentry.integrations.types import EventLifecycleOutcome, IntegrationResponse
 
 LINK_USER_MESSAGE = "[Click here]({url}) to link your Discord account to your Sentry account."
 ALREADY_LINKED_MESSAGE = "You are already linked to the Sentry account with email: `{email}`."
@@ -52,7 +58,7 @@ def handle(self) -> Response:
                 "discord.interaction.command.unknown",
                 extra={"command": command_name, **self.request.logging_data},
             )
-            message = dispatcher.help(cmd_input)
+            message = dispatcher.dispatch(CommandInput("help"))
 
         return self.send_message(message)
 
@@ -65,19 +71,25 @@ class DiscordCommandDispatcher(MessagingIntegrationCommandDispatcher[str]):
     def integration_spec(self) -> MessagingIntegrationSpec:
         return DiscordMessagingSpec()
 
-    @property
-    def command_handlers(
-        self,
-    ) -> Iterable[tuple[MessagingIntegrationCommand, Callable[[CommandInput], str]]]:
-        yield commands.HELP, self.help
-        yield commands.LINK_IDENTITY, self.link_user
-        yield commands.UNLINK_IDENTITY, self.unlink_user
+    def help_handler(self, input: CommandInput) -> IntegrationResponse[str]:
+        return IntegrationResponse(
+            interaction_result=EventLifecycleOutcome.SUCCESS,
+            response=HELP_MESSAGE,
+        )
 
-    def link_user(self, _: CommandInput) -> str:
+    def link_user_handler(self, _: CommandInput) -> IntegrationResponse[str]:
         if self.request.has_identity():
-            return ALREADY_LINKED_MESSAGE.format(email=self.request.get_identity_str())
+            return IntegrationResponse(
+                interaction_result=EventLifecycleOutcome.SUCCESS,
+                response=ALREADY_LINKED_MESSAGE.format(email=self.request.get_identity_str()),
+                outcome_reason=str(MessageCommandHaltReason.ALREADY_LINKED),
+                context_data={
+                    "email": self.request.get_identity_str(),
+                },
+            )
 
         if not self.request.integration or not self.request.user_id:
+            # TODO: remove this logger
             logger.warning(
                 "discord.interaction.command.missing.integration",
                 extra={
@@ -85,18 +97,33 @@ def link_user(self, _: CommandInput) -> str:
                     "hasUserId": self.request.user_id,
                 },
             )
-            return MISSING_DATA_MESSAGE
+            return IntegrationResponse(
+                interaction_result=EventLifecycleOutcome.FAILURE,
+                response=MISSING_DATA_MESSAGE,
+                outcome_reason=str(MessageCommandFailureReason.MISSING_DATA),
+                context_data={
+                    "has_integration": bool(self.request.integration),
+                    "has_user_id": bool(self.request.user_id),
+                },
+            )
 
         link_url = build_linking_url(
             integration=self.request.integration,
             discord_id=self.request.user_id,
         )
 
-        return LINK_USER_MESSAGE.format(url=link_url)
+        return IntegrationResponse(
+            interaction_result=EventLifecycleOutcome.SUCCESS,
+            response=LINK_USER_MESSAGE.format(url=link_url),
+        )
 
-    def unlink_user(self, _: CommandInput) -> str:
+    def unlink_user_handler(self, input: CommandInput) -> IntegrationResponse[str]:
         if not self.request.has_identity():
-            return NOT_LINKED_MESSAGE
+            return IntegrationResponse(
+                interaction_result=EventLifecycleOutcome.SUCCESS,
+                response=NOT_LINKED_MESSAGE,
+                outcome_reason=str(MessageCommandHaltReason.NOT_LINKED),
+            )
 
         # if self.request.has_identity() then these must not be None
         assert self.request.integration is not None
@@ -107,7 +134,16 @@ def unlink_user(self, _: CommandInput) -> str:
             discord_id=self.request.user_id,
         )
 
-        return UNLINK_USER_MESSAGE.format(url=unlink_url)
+        return IntegrationResponse(
+            interaction_result=EventLifecycleOutcome.SUCCESS,
+            response=UNLINK_USER_MESSAGE.format(url=unlink_url),
+        )
+
+    @property
+    def command_handlers(
+        self,
+    ) -> Iterable[tuple[MessagingIntegrationCommand, CommandHandler[str]]]:
 
-    def help(self, _: CommandInput) -> str:
-        return HELP_MESSAGE
+        yield commands.HELP, self.help_handler
+        yield commands.LINK_IDENTITY, self.link_user_handler
+        yield commands.UNLINK_IDENTITY, self.unlink_user_handler
diff --git a/src/sentry/integrations/github/integration.py b/src/sentry/integrations/github/integration.py
index 8da637d0cde63d..9e6a4c7db04596 100644
--- a/src/sentry/integrations/github/integration.py
+++ b/src/sentry/integrations/github/integration.py
@@ -450,7 +450,7 @@ def dispatch(self, request: Request, pipeline) -> HttpResponseBase:
 
             # At this point, we are past the GitHub "authorize" step
             if request.GET.get("state") != pipeline.signature:
-                lifecycle.record_failure({"failure_reason": GitHubInstallationError.INVALID_STATE})
+                lifecycle.record_failure(GitHubInstallationError.INVALID_STATE)
                 return error(
                     request,
                     self.active_organization,
@@ -474,7 +474,7 @@ def dispatch(self, request: Request, pipeline) -> HttpResponseBase:
                 payload = {}
 
             if "access_token" not in payload:
-                lifecycle.record_failure({"failure_reason": GitHubInstallationError.MISSING_TOKEN})
+                lifecycle.record_failure(GitHubInstallationError.MISSING_TOKEN)
                 return error(
                     request,
                     self.active_organization,
@@ -483,7 +483,7 @@ def dispatch(self, request: Request, pipeline) -> HttpResponseBase:
 
             authenticated_user_info = get_user_info(payload["access_token"])
             if "login" not in authenticated_user_info:
-                lifecycle.record_failure({"failure_reason": GitHubInstallationError.MISSING_LOGIN})
+                lifecycle.record_failure(GitHubInstallationError.MISSING_LOGIN)
                 return error(
                     request,
                     self.active_organization,
@@ -525,9 +525,7 @@ def dispatch(self, request: Request, pipeline: Pipeline) -> HttpResponseBase:
                 ).exists()
 
             if integration_pending_deletion_exists:
-                lifecycle.record_failure(
-                    {"failure_reason": GitHubInstallationError.PENDING_DELETION}
-                )
+                lifecycle.record_failure(GitHubInstallationError.PENDING_DELETION)
                 return error(
                     request,
                     self.active_organization,
@@ -545,9 +543,7 @@ def dispatch(self, request: Request, pipeline: Pipeline) -> HttpResponseBase:
                 return pipeline.next_step()
 
             if installations_exist:
-                lifecycle.record_failure(
-                    {"failure_reason": GitHubInstallationError.INSTALLATION_EXISTS}
-                )
+                lifecycle.record_failure(GitHubInstallationError.INSTALLATION_EXISTS)
                 return error(
                     request,
                     self.active_organization,
@@ -561,9 +557,7 @@ def dispatch(self, request: Request, pipeline: Pipeline) -> HttpResponseBase:
                     external_id=installation_id, status=ObjectStatus.ACTIVE
                 )
             except Integration.DoesNotExist:
-                lifecycle.record_failure(
-                    {"failure_reason": GitHubInstallationError.MISSING_INTEGRATION}
-                )
+                lifecycle.record_failure(GitHubInstallationError.MISSING_INTEGRATION)
                 return error(request, self.active_organization)
 
             # Check that the authenticated GitHub user is the same as who installed the app.
@@ -571,7 +565,7 @@ def dispatch(self, request: Request, pipeline: Pipeline) -> HttpResponseBase:
                 pipeline.fetch_state("github_authenticated_user")
                 != integration.metadata["sender"]["login"]
             ):
-                lifecycle.record_failure({"failure_reason": GitHubInstallationError.USER_MISMATCH})
+                lifecycle.record_failure(GitHubInstallationError.USER_MISMATCH)
                 return error(
                     request,
                     self.active_organization,
diff --git a/src/sentry/integrations/github/issues.py b/src/sentry/integrations/github/issues.py
index 0599396e229a0b..cdd510da75cdaf 100644
--- a/src/sentry/integrations/github/issues.py
+++ b/src/sentry/integrations/github/issues.py
@@ -11,9 +11,6 @@
 from sentry.integrations.mixins.issues import MAX_CHAR
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.source_code_management.issues import SourceCodeIssueIntegration
-from sentry.integrations.source_code_management.metrics import (
-    SourceCodeIssueIntegrationInteractionType,
-)
 from sentry.issues.grouptype import GroupCategory
 from sentry.models.group import Group
 from sentry.organizations.services.organization.service import organization_service
@@ -173,34 +170,33 @@ def get_create_issue_config(
         ]
 
     def create_issue(self, data: Mapping[str, Any], **kwargs: Any) -> Mapping[str, Any]:
-        with self.record_event(SourceCodeIssueIntegrationInteractionType.CREATE_ISSUE).capture():
-            client = self.get_client()
+        client = self.get_client()
 
-            repo = data.get("repo")
+        repo = data.get("repo")
 
-            if not repo:
-                raise IntegrationError("repo kwarg must be provided")
+        if not repo:
+            raise IntegrationError("repo kwarg must be provided")
 
-            try:
-                issue = client.create_issue(
-                    repo=repo,
-                    data={
-                        "title": data["title"],
-                        "body": data["description"],
-                        "assignee": data.get("assignee"),
-                        "labels": data.get("labels"),
-                    },
-                )
-            except ApiError as e:
-                raise IntegrationError(self.message_from_error(e))
+        try:
+            issue = client.create_issue(
+                repo=repo,
+                data={
+                    "title": data["title"],
+                    "body": data["description"],
+                    "assignee": data.get("assignee"),
+                    "labels": data.get("labels"),
+                },
+            )
+        except ApiError as e:
+            raise IntegrationError(self.message_from_error(e))
 
-            return {
-                "key": issue["number"],
-                "title": issue["title"],
-                "description": issue["body"],
-                "url": issue["html_url"],
-                "repo": repo,
-            }
+        return {
+            "key": issue["number"],
+            "title": issue["title"],
+            "description": issue["body"],
+            "url": issue["html_url"],
+            "repo": repo,
+        }
 
     def get_link_issue_config(self, group: Group, **kwargs: Any) -> list[dict[str, Any]]:
         params = kwargs.pop("params", {})
diff --git a/src/sentry/integrations/github/search.py b/src/sentry/integrations/github/search.py
index 523b9d61e4a5db..19d013fac4befd 100644
--- a/src/sentry/integrations/github/search.py
+++ b/src/sentry/integrations/github/search.py
@@ -7,6 +7,10 @@
 from sentry.integrations.github_enterprise.integration import GitHubEnterpriseIntegration
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.source_code_management.issues import SourceCodeIssueIntegration
+from sentry.integrations.source_code_management.metrics import (
+    SCMIntegrationInteractionType,
+    SourceCodeSearchEndpointHaltReason,
+)
 from sentry.integrations.source_code_management.search import SourceCodeSearchEndpoint
 from sentry.shared_integrations.exceptions import ApiError
 
@@ -30,42 +34,53 @@ def installation_class(self):
         return (GitHubIntegration, GitHubEnterpriseIntegration)
 
     def handle_search_issues(self, installation: T, query: str, repo: str | None) -> Response:
-        assert repo
+        with self.record_event(
+            SCMIntegrationInteractionType.HANDLE_SEARCH_ISSUES
+        ).capture() as lifecycle:
+            assert repo
 
-        try:
-            response = installation.search_issues(query=f"repo:{repo} {query}")
-        except ApiError as err:
-            if err.code == 403:
-                return Response({"detail": "Rate limit exceeded"}, status=429)
-            raise
+            try:
+                response = installation.search_issues(query=f"repo:{repo} {query}")
+            except ApiError as err:
+                if err.code == 403:
+                    lifecycle.record_halt(str(SourceCodeSearchEndpointHaltReason.RATE_LIMITED))
+                    return Response({"detail": "Rate limit exceeded"}, status=429)
+                raise
 
-        assert isinstance(response, dict)
-        return Response(
-            [
-                {"label": "#{} {}".format(i["number"], i["title"]), "value": i["number"]}
-                for i in response.get("items", [])
-            ]
-        )
+            assert isinstance(response, dict)
+            return Response(
+                [
+                    {"label": "#{} {}".format(i["number"], i["title"]), "value": i["number"]}
+                    for i in response.get("items", [])
+                ]
+            )
 
     def handle_search_repositories(
         self, integration: Integration, installation: T, query: str
     ) -> Response:
-        assert isinstance(installation, self.installation_class)
+        with self.record_event(
+            SCMIntegrationInteractionType.HANDLE_SEARCH_REPOSITORIES
+        ).capture() as lifecyle:
+            assert isinstance(installation, self.installation_class)
 
-        full_query = build_repository_query(integration.metadata, integration.name, query)
-        try:
-            response = installation.get_client().search_repositories(full_query)
-        except ApiError as err:
-            if err.code == 403:
-                return Response({"detail": "Rate limit exceeded"}, status=429)
-            if err.code == 422:
-                return Response(
-                    {
-                        "detail": "Repositories could not be searched because they do not exist, or you do not have access to them."
-                    },
-                    status=404,
-                )
-            raise
-        return Response(
-            [{"label": i["name"], "value": i["full_name"]} for i in response.get("items", [])]
-        )
+            full_query = build_repository_query(integration.metadata, integration.name, query)
+            try:
+                response = installation.get_client().search_repositories(full_query)
+            except ApiError as err:
+                if err.code == 403:
+                    lifecyle.record_halt(str(SourceCodeSearchEndpointHaltReason.RATE_LIMITED))
+                    return Response({"detail": "Rate limit exceeded"}, status=429)
+                if err.code == 422:
+                    lifecyle.record_halt(
+                        str(SourceCodeSearchEndpointHaltReason.MISSING_REPOSITORY_OR_NO_ACCESS)
+                    )
+                    return Response(
+                        {
+                            "detail": "Repositories could not be searched because they do not exist, or you do not have access to them."
+                        },
+                        status=404,
+                    )
+                raise
+            return Response(
+                [{"label": i["name"], "value": i["full_name"]} for i in response.get("items", [])]
+            )
diff --git a/src/sentry/integrations/github/tasks/link_all_repos.py b/src/sentry/integrations/github/tasks/link_all_repos.py
index 860ca2b883cb88..168b296b59c4df 100644
--- a/src/sentry/integrations/github/tasks/link_all_repos.py
+++ b/src/sentry/integrations/github/tasks/link_all_repos.py
@@ -2,6 +2,11 @@
 
 from sentry.constants import ObjectStatus
 from sentry.integrations.services.integration import integration_service
+from sentry.integrations.source_code_management.metrics import (
+    LinkAllReposHaltReason,
+    SCMIntegrationInteractionEvent,
+    SCMIntegrationInteractionType,
+)
 from sentry.organizations.services.organization import organization_service
 from sentry.plugins.providers.integration_repository import (
     RepoExistsError,
@@ -35,52 +40,71 @@ def link_all_repos(
     integration_id: int,
     organization_id: int,
 ):
-    integration = integration_service.get_integration(
-        integration_id=integration_id, status=ObjectStatus.ACTIVE
-    )
-    if not integration:
-        logger.error(
-            "%s.link_all_repos.integration_missing",
-            integration_key,
-            extra={"organization_id": organization_id},
-        )
-        metrics.incr("github.link_all_repos.error", tags={"type": "missing_integration"})
-        return
-
-    rpc_org = organization_service.get(id=organization_id)
-    if rpc_org is None:
-        logger.error(
-            "%s.link_all_repos.organization_missing",
-            integration_key,
-            extra={"organization_id": organization_id},
-        )
-        metrics.incr(
-            f"{integration_key}.link_all_repos.error",
-            tags={"type": "missing_organization"},
-        )
-        return
-
-    installation = integration.get_installation(organization_id=organization_id)
 
-    client = installation.get_client()
+    with SCMIntegrationInteractionEvent(
+        interaction_type=SCMIntegrationInteractionType.LINK_ALL_REPOS,
+        provider_key=integration_key,
+    ).capture() as lifecycle:
+        lifecycle.add_extra("organization_id", organization_id)
+        integration = integration_service.get_integration(
+            integration_id=integration_id, status=ObjectStatus.ACTIVE
+        )
+        if not integration:
+            # TODO: Remove this logger in favor of context manager
+            logger.error(
+                "%s.link_all_repos.integration_missing",
+                integration_key,
+                extra={"organization_id": organization_id},
+            )
+            metrics.incr("github.link_all_repos.error", tags={"type": "missing_integration"})
+            lifecycle.record_failure(str(LinkAllReposHaltReason.MISSING_INTEGRATION))
+            return
 
-    try:
-        repositories = client.get_repositories(fetch_max_pages=True)
-    except ApiError as e:
-        if installation.is_rate_limited_error(e):
+        rpc_org = organization_service.get(id=organization_id)
+        if rpc_org is None:
+            logger.error(
+                "%s.link_all_repos.organization_missing",
+                integration_key,
+                extra={"organization_id": organization_id},
+            )
+            metrics.incr(
+                f"{integration_key}.link_all_repos.error",
+                tags={"type": "missing_organization"},
+            )
+            lifecycle.record_failure(str(LinkAllReposHaltReason.MISSING_ORGANIZATION))
             return
 
-        metrics.incr(f"{integration_key}.link_all_repos.api_error")
-        raise
+        installation = integration.get_installation(organization_id=organization_id)
 
-    integration_repo_provider = get_integration_repository_provider(integration)
+        client = installation.get_client()
 
-    for repo in repositories:
         try:
-            config = get_repo_config(repo, integration_id)
-            integration_repo_provider.create_repository(repo_config=config, organization=rpc_org)
-        except KeyError:
-            continue
-        except RepoExistsError:
-            metrics.incr("sentry.integration_repo_provider.repo_exists")
-            continue
+            repositories = client.get_repositories(fetch_max_pages=True)
+        except ApiError as e:
+            if installation.is_rate_limited_error(e):
+                lifecycle.record_halt(str(LinkAllReposHaltReason.RATE_LIMITED))
+                return
+
+            metrics.incr(f"{integration_key}.link_all_repos.api_error")
+            raise
+
+        integration_repo_provider = get_integration_repository_provider(integration)
+
+        # If we successfully create any repositories, we'll set this to True
+        success = False
+
+        for repo in repositories:
+            try:
+                config = get_repo_config(repo, integration_id)
+                integration_repo_provider.create_repository(
+                    repo_config=config, organization=rpc_org
+                )
+                success = True
+            except KeyError:
+                continue
+            except RepoExistsError:
+                metrics.incr("sentry.integration_repo_provider.repo_exists")
+                continue
+
+        if not success:
+            lifecycle.record_halt(str(LinkAllReposHaltReason.REPOSITORY_NOT_CREATED))
diff --git a/src/sentry/integrations/github/tasks/pr_comment.py b/src/sentry/integrations/github/tasks/pr_comment.py
index 93536c32b9e96b..e40805f0a843ca 100644
--- a/src/sentry/integrations/github/tasks/pr_comment.py
+++ b/src/sentry/integrations/github/tasks/pr_comment.py
@@ -216,9 +216,7 @@ def github_comment_workflow(pullrequest_id: int, project_id: int):
 
     top_24_issues = issue_list[:24]  # 24 is the P99 for issues-per-PR
 
-    enabled_copilot = features.has("projects:ai-autofix", project) or features.has(
-        "organizations:autofix", organization
-    )
+    enabled_copilot = features.has("organizations:gen-ai-features", organization)
     github_copilot_actions = (
         [
             {
diff --git a/src/sentry/integrations/github/webhook.py b/src/sentry/integrations/github/webhook.py
index 679a70880de7f5..d5066d0e908673 100644
--- a/src/sentry/integrations/github/webhook.py
+++ b/src/sentry/integrations/github/webhook.py
@@ -3,7 +3,8 @@
 import hashlib
 import hmac
 import logging
-from collections.abc import Callable, Mapping, MutableMapping
+from abc import ABC, abstractmethod
+from collections.abc import Mapping, MutableMapping
 from datetime import timezone
 from typing import Any
 
@@ -22,6 +23,7 @@
 from sentry.autofix.webhooks import handle_github_pr_webhook_for_autofix
 from sentry.constants import EXTENSION_LANGUAGE_MAP, ObjectStatus
 from sentry.identity.services.identity.service import identity_service
+from sentry.integrations.base import IntegrationDomain
 from sentry.integrations.github.tasks.open_pr_comment import open_pr_comment_workflow
 from sentry.integrations.pipeline import ensure_integration
 from sentry.integrations.services.integration.model import (
@@ -30,6 +32,7 @@
 )
 from sentry.integrations.services.integration.service import integration_service
 from sentry.integrations.services.repository.service import repository_service
+from sentry.integrations.utils.metrics import IntegrationWebhookEvent, IntegrationWebhookEventType
 from sentry.integrations.utils.scope import clear_tags_and_context
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
@@ -70,13 +73,19 @@ def get_file_language(filename: str) -> str | None:
     return language
 
 
-class Webhook:
+class Webhook(ABC):
     """
     Base class for GitHub webhooks handled in region silos.
     """
 
     provider = "github"
 
+    @property
+    @abstractmethod
+    def event_type(self) -> IntegrationWebhookEventType:
+        raise NotImplementedError
+
+    @abstractmethod
     def _handle(
         self,
         integration: RpcIntegration,
@@ -209,6 +218,10 @@ class InstallationEventWebhook:
 
     provider = "github"
 
+    @property
+    def event_type(self) -> IntegrationWebhookEventType:
+        return IntegrationWebhookEventType.INSTALLATION
+
     def __call__(self, event: Mapping[str, Any], host: str | None = None) -> None:
         installation = event["installation"]
 
@@ -284,6 +297,10 @@ def _handle_delete(
 class PushEventWebhook(Webhook):
     """https://developer.github.com/v3/activity/events/types/#pushevent"""
 
+    @property
+    def event_type(self) -> IntegrationWebhookEventType:
+        return IntegrationWebhookEventType.PUSH
+
     def is_anonymous_email(self, email: str) -> bool:
         return email[-25:] == "@users.noreply.github.com"
 
@@ -460,6 +477,10 @@ def _handle(
 class PullRequestEventWebhook(Webhook):
     """https://developer.github.com/v3/activity/events/types/#pullrequestevent"""
 
+    @property
+    def event_type(self) -> IntegrationWebhookEventType:
+        return IntegrationWebhookEventType.PULL_REQUEST
+
     def is_anonymous_email(self, email: str) -> bool:
         return email[-25:] == "@users.noreply.github.com"
 
@@ -591,13 +612,13 @@ class GitHubIntegrationsWebhookEndpoint(Endpoint):
         "POST": ApiPublishStatus.PRIVATE,
     }
 
-    _handlers: dict[str, Callable[[], Callable[[Any], Any]]] = {
+    _handlers: dict[str, type[Webhook] | type[InstallationEventWebhook]] = {
         "push": PushEventWebhook,
         "pull_request": PullRequestEventWebhook,
         "installation": InstallationEventWebhook,
     }
 
-    def get_handler(self, event_type: str) -> Callable[[], Callable[[Any], Any]] | None:
+    def get_handler(self, event_type: str) -> type[Webhook] | type[InstallationEventWebhook] | None:
         return self._handlers.get(event_type)
 
     def is_valid_signature(self, method: str, body: bytes, secret: str, signature: str) -> bool:
@@ -673,5 +694,12 @@ def handle(self, request: HttpRequest) -> HttpResponse:
             logger.exception("Invalid JSON.")
             return HttpResponse(status=400)
 
-        handler()(event)
+        event_handler = handler()
+
+        with IntegrationWebhookEvent(
+            interaction_type=event_handler.event_type,
+            domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
+            provider_key="github",
+        ).capture():
+            event_handler(event)
         return HttpResponse(status=204)
diff --git a/src/sentry/integrations/github_enterprise/integration.py b/src/sentry/integrations/github_enterprise/integration.py
index 31bac578fb1da8..09d28c4ac88c48 100644
--- a/src/sentry/integrations/github_enterprise/integration.py
+++ b/src/sentry/integrations/github_enterprise/integration.py
@@ -9,7 +9,6 @@
 from rest_framework.request import Request
 
 from sentry import http
-from sentry.identity.github_enterprise import get_user_info
 from sentry.identity.pipeline import IdentityProviderPipeline
 from sentry.integrations.base import (
     FeatureDescription,
@@ -36,6 +35,21 @@
 from .client import GitHubEnterpriseApiClient
 from .repository import GitHubEnterpriseRepositoryProvider
 
+
+def get_user_info(url, access_token):
+    with http.build_session() as session:
+        resp = session.get(
+            f"https://{url}/api/v3/user",
+            headers={
+                "Accept": "application/vnd.github.machine-man-preview+json",
+                "Authorization": f"token {access_token}",
+            },
+            verify=False,
+        )
+        resp.raise_for_status()
+    return resp.json()
+
+
 DESCRIPTION = """
 Connect your Sentry organization into your on-premises GitHub Enterprise
 instances. Take a step towards augmenting your sentry issues with commits from
diff --git a/src/sentry/integrations/github_enterprise/webhook.py b/src/sentry/integrations/github_enterprise/webhook.py
index 706544f1d9272a..230ab9e069434f 100644
--- a/src/sentry/integrations/github_enterprise/webhook.py
+++ b/src/sentry/integrations/github_enterprise/webhook.py
@@ -4,8 +4,6 @@
 import hmac
 import logging
 import re
-from collections.abc import Callable
-from typing import Any
 
 import orjson
 import sentry_sdk
@@ -18,12 +16,15 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.constants import ObjectStatus
+from sentry.integrations.base import IntegrationDomain
 from sentry.integrations.github.webhook import (
     InstallationEventWebhook,
     PullRequestEventWebhook,
     PushEventWebhook,
+    Webhook,
     get_github_external_id,
 )
+from sentry.integrations.utils.metrics import IntegrationWebhookEvent
 from sentry.integrations.utils.scope import clear_tags_and_context
 from sentry.utils import metrics
 from sentry.utils.sdk import Scope
@@ -127,7 +128,7 @@ class GitHubEnterpriseWebhookBase(Endpoint):
     authentication_classes = ()
     permission_classes = ()
 
-    _handlers: dict[str, Callable[[], Callable[[Any], Any]]] = {}
+    _handlers: dict[str, type[InstallationEventWebhook] | type[Webhook]] = {}
 
     # https://developer.github.com/webhooks/
     def get_handler(self, event_type):
@@ -296,7 +297,14 @@ def handle(self, request: HttpRequest) -> HttpResponse:
             sentry_sdk.capture_exception(e)
             return HttpResponse(MALFORMED_SIGNATURE_ERROR, status=400)
 
-        handler()(event, host)
+        event_handler = handler()
+        with IntegrationWebhookEvent(
+            interaction_type=event_handler.event_type,
+            domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
+            provider_key="github-enterprise",
+        ).capture():
+            event_handler(event, host)
+
         return HttpResponse(status=204)
 
 
diff --git a/src/sentry/integrations/gitlab/issues.py b/src/sentry/integrations/gitlab/issues.py
index ac2c8dc48a14b6..4a9e2ce16d7bcd 100644
--- a/src/sentry/integrations/gitlab/issues.py
+++ b/src/sentry/integrations/gitlab/issues.py
@@ -7,9 +7,6 @@
 from django.urls import reverse
 
 from sentry.integrations.source_code_management.issues import SourceCodeIssueIntegration
-from sentry.integrations.source_code_management.metrics import (
-    SourceCodeIssueIntegrationInteractionType,
-)
 from sentry.models.group import Group
 from sentry.shared_integrations.exceptions import ApiError, ApiUnauthorized, IntegrationError
 from sentry.silo.base import all_silo_function
@@ -80,32 +77,31 @@ def get_create_issue_config(
         ]
 
     def create_issue(self, data, **kwargs):
-        with self.record_event(SourceCodeIssueIntegrationInteractionType.CREATE_ISSUE).capture():
-            client = self.get_client()
-
-            project_id = data.get("project")
-
-            if not project_id:
-                raise IntegrationError("project kwarg must be provided")
-
-            try:
-                issue = client.create_issue(
-                    project=project_id,
-                    data={"title": data["title"], "description": data["description"]},
-                )
-                project = client.get_project(project_id)
-            except ApiError as e:
-                raise IntegrationError(self.message_from_error(e))
-
-            project_and_issue_iid = "{}#{}".format(project["path_with_namespace"], issue["iid"])
-            return {
-                "key": project_and_issue_iid,
-                "title": issue["title"],
-                "description": issue["description"],
-                "url": issue["web_url"],
-                "project": project_id,
-                "metadata": {"display_name": project_and_issue_iid},
-            }
+        client = self.get_client()
+
+        project_id = data.get("project")
+
+        if not project_id:
+            raise IntegrationError("project kwarg must be provided")
+
+        try:
+            issue = client.create_issue(
+                project=project_id,
+                data={"title": data["title"], "description": data["description"]},
+            )
+            project = client.get_project(project_id)
+        except ApiError as e:
+            raise IntegrationError(self.message_from_error(e))
+
+        project_and_issue_iid = "{}#{}".format(project["path_with_namespace"], issue["iid"])
+        return {
+            "key": project_and_issue_iid,
+            "title": issue["title"],
+            "description": issue["description"],
+            "url": issue["web_url"],
+            "project": project_id,
+            "metadata": {"display_name": project_and_issue_iid},
+        }
 
     def after_link_issue(self, external_issue, **kwargs):
         data = kwargs["data"]
diff --git a/src/sentry/integrations/gitlab/search.py b/src/sentry/integrations/gitlab/search.py
index 45ef39b78a1496..5423110e0eef40 100644
--- a/src/sentry/integrations/gitlab/search.py
+++ b/src/sentry/integrations/gitlab/search.py
@@ -6,6 +6,7 @@
 from sentry.integrations.gitlab.integration import GitlabIntegration
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.source_code_management.issues import SourceCodeIssueIntegration
+from sentry.integrations.source_code_management.metrics import SCMIntegrationInteractionType
 from sentry.integrations.source_code_management.search import SourceCodeSearchEndpoint
 from sentry.shared_integrations.exceptions import ApiError
 
@@ -27,43 +28,51 @@ def installation_class(self):
         return GitlabIntegration
 
     def handle_search_issues(self, installation: T, query: str, repo: str | None) -> Response:
-        assert repo
+        with self.record_event(
+            SCMIntegrationInteractionType.HANDLE_SEARCH_ISSUES
+        ).capture() as lifecycle:
+            assert repo
 
-        full_query: str | None = query
+            full_query: str | None = query
 
-        try:
-            iids = [int(query)]
-            full_query = None
-        except ValueError:
-            iids = None
+            try:
+                iids = [int(query)]
+                full_query = None
+            except ValueError:
+                iids = None
 
-        try:
-            response = installation.search_issues(query=full_query, project_id=repo, iids=iids)
-        except ApiError as e:
-            return Response({"detail": str(e)}, status=400)
+            try:
+                response = installation.search_issues(query=full_query, project_id=repo, iids=iids)
+            except ApiError as e:
+                lifecycle.record_failure(e)
+                return Response({"detail": str(e)}, status=400)
 
-        assert isinstance(response, list)
-        return Response(
-            [
-                {
-                    "label": "(#{}) {}".format(i["iid"], i["title"]),
-                    "value": "{}#{}".format(i["project_id"], i["iid"]),
-                }
-                for i in response
-            ]
-        )
+            assert isinstance(response, list)
+            return Response(
+                [
+                    {
+                        "label": "(#{}) {}".format(i["iid"], i["title"]),
+                        "value": "{}#{}".format(i["project_id"], i["iid"]),
+                    }
+                    for i in response
+                ]
+            )
 
     def handle_search_repositories(
         self, integration: Integration, installation: T, query: str
     ) -> Response:
-        assert isinstance(installation, self.installation_class)
-        try:
-            response = installation.search_projects(query)
-        except ApiError as e:
-            return Response({"detail": str(e)}, status=400)
-        return Response(
-            [
-                {"label": project["name_with_namespace"], "value": project["id"]}
-                for project in response
-            ]
-        )
+        with self.record_event(
+            SCMIntegrationInteractionType.HANDLE_SEARCH_REPOSITORIES
+        ).capture() as lifecyle:
+            assert isinstance(installation, self.installation_class)
+            try:
+                response = installation.search_projects(query)
+            except ApiError as e:
+                lifecyle.record_failure(e)
+                return Response({"detail": str(e)}, status=400)
+            return Response(
+                [
+                    {"label": project["name_with_namespace"], "value": project["id"]}
+                    for project in response
+                ]
+            )
diff --git a/src/sentry/integrations/gitlab/webhooks.py b/src/sentry/integrations/gitlab/webhooks.py
index 9d24ce00dc3dc1..6d2f3cfd0f5c5f 100644
--- a/src/sentry/integrations/gitlab/webhooks.py
+++ b/src/sentry/integrations/gitlab/webhooks.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+from abc import ABC, abstractmethod
 from collections.abc import Mapping
 from datetime import timezone
 from typing import Any
@@ -16,8 +17,10 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, region_silo_endpoint
+from sentry.integrations.base import IntegrationDomain
 from sentry.integrations.services.integration import integration_service
 from sentry.integrations.services.integration.model import RpcIntegration
+from sentry.integrations.utils.metrics import IntegrationWebhookEvent, IntegrationWebhookEventType
 from sentry.integrations.utils.scope import clear_tags_and_context
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
@@ -33,7 +36,13 @@
 GITHUB_WEBHOOK_SECRET_INVALID_ERROR = """Gitlab's webhook secret does not match. Refresh token (or re-install the integration) by following this https://docs.sentry.io/organization/integrations/integration-platform/public-integration/#refreshing-tokens."""
 
 
-class Webhook:
+class Webhook(ABC):
+    @property
+    @abstractmethod
+    def event_type(self) -> IntegrationWebhookEventType:
+        raise NotImplementedError
+
+    @abstractmethod
     def __call__(
         self, integration: RpcIntegration, organization: RpcOrganization, event: Mapping[str, Any]
     ):
@@ -92,6 +101,10 @@ class MergeEventWebhook(Webhook):
     See https://docs.gitlab.com/ee/user/project/integrations/webhooks.html#merge-request-events
     """
 
+    @property
+    def event_type(self) -> IntegrationWebhookEventType:
+        return IntegrationWebhookEventType.PULL_REQUEST
+
     def __call__(
         self, integration: RpcIntegration, organization: RpcOrganization, event: Mapping[str, Any]
     ):
@@ -156,6 +169,10 @@ class PushEventWebhook(Webhook):
     See https://docs.gitlab.com/ee/user/project/integrations/webhooks.html#push-events
     """
 
+    @property
+    def event_type(self) -> IntegrationWebhookEventType:
+        return IntegrationWebhookEventType.PUSH
+
     def __call__(
         self, integration: RpcIntegration, organization: RpcOrganization, event: Mapping[str, Any]
     ):
@@ -244,7 +261,10 @@ class GitlabWebhookEndpoint(Endpoint, GitlabWebhookMixin):
     permission_classes = ()
     provider = "gitlab"
 
-    _handlers = {"Push Hook": PushEventWebhook, "Merge Request Hook": MergeEventWebhook}
+    _handlers: dict[str, type[Webhook]] = {
+        "Push Hook": PushEventWebhook,
+        "Merge Request Hook": MergeEventWebhook,
+    }
 
     @method_decorator(csrf_exempt)
     def dispatch(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
@@ -326,5 +346,13 @@ def post(self, request: HttpRequest) -> HttpResponse:
             )
             if org_context:
                 organization = org_context.organization
-                handler()(integration, organization, event)
+                event_handler = handler()
+
+                with IntegrationWebhookEvent(
+                    interaction_type=event_handler.event_type,
+                    domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
+                    provider_key="gitlab",
+                ).capture():
+                    event_handler(integration, organization, event)
+
         return HttpResponse(status=204)
diff --git a/src/sentry/integrations/jira/utils/api.py b/src/sentry/integrations/jira/utils/api.py
index cdc0f2b37e6a51..a3701ad2d7c5a9 100644
--- a/src/sentry/integrations/jira/utils/api.py
+++ b/src/sentry/integrations/jira/utils/api.py
@@ -13,6 +13,11 @@
 from sentry.shared_integrations.exceptions import ApiError
 
 from ...mixins.issues import IssueSyncIntegration
+from ...project_management.metrics import (
+    ProjectManagementActionType,
+    ProjectManagementEvent,
+    ProjectManagementHaltReason,
+)
 from ..client import JiraCloudClient
 
 logger = logging.getLogger(__name__)
@@ -75,26 +80,45 @@ def handle_assignee_change(
     sync_group_assignee_inbound(integration, email, issue_key, assign=True)
 
 
-def handle_status_change(integration, data):
-    issue_key = data["issue"]["key"]
-    status_changed = any(item for item in data["changelog"]["items"] if item["field"] == "status")
-    log_context = {"issue_key": issue_key, "integration_id": integration.id}
-
-    if not status_changed:
-        logger.info("jira.handle_status_change.unchanged", extra=log_context)
-        return
-
-    try:
-        changelog = next(item for item in data["changelog"]["items"] if item["field"] == "status")
-    except StopIteration:
-        logger.info("jira.missing-changelog-status", extra=log_context)
-        return
-
-    result = integration_service.organization_contexts(integration_id=integration.id)
-    for oi in result.organization_integrations:
-        install = integration.get_installation(organization_id=oi.organization_id)
-        if isinstance(install, IssueSyncIntegration):
-            install.sync_status_inbound(issue_key, {"changelog": changelog, "issue": data["issue"]})
+# TODO(Gabe): Consolidate this with VSTS's implementation, create DTO for status
+# changes.
+def handle_status_change(integration: RpcIntegration, data: Mapping[str, Any]) -> None:
+    with ProjectManagementEvent(
+        action_type=ProjectManagementActionType.INBOUND_STATUS_SYNC, integration=integration
+    ).capture() as lifecycle:
+        issue_key = data["issue"]["key"]
+        status_changed = any(
+            item for item in data["changelog"]["items"] if item["field"] == "status"
+        )
+        log_context = {"issue_key": issue_key, "integration_id": integration.id}
+
+        if not status_changed:
+            logger.info("jira.handle_status_change.unchanged", extra=log_context)
+            return
+
+        try:
+            changelog = next(
+                item for item in data["changelog"]["items"] if item["field"] == "status"
+            )
+        except StopIteration:
+            lifecycle.record_halt(
+                ProjectManagementHaltReason.SYNC_INBOUND_MISSING_CHANGELOG_STATUS, extra=log_context
+            )
+            logger.info("jira.missing-changelog-status", extra=log_context)
+            return
+
+        result = integration_service.organization_contexts(integration_id=integration.id)
+        for oi in result.organization_integrations:
+            install = integration.get_installation(organization_id=oi.organization_id)
+            if isinstance(install, IssueSyncIntegration):
+                install.sync_status_inbound(
+                    issue_key, {"changelog": changelog, "issue": data["issue"]}
+                )
+            else:
+                lifecycle.record_halt(
+                    ProjectManagementHaltReason.SYNC_NON_SYNC_INTEGRATION_PROVIDED,
+                    extra=log_context,
+                )
 
 
 def handle_jira_api_error(error: ApiError, message: str = "") -> Mapping[str, str] | None:
diff --git a/src/sentry/integrations/jira/webhooks/base.py b/src/sentry/integrations/jira/webhooks/base.py
index 7676c2aa86ae1d..2df7f73b877169 100644
--- a/src/sentry/integrations/jira/webhooks/base.py
+++ b/src/sentry/integrations/jira/webhooks/base.py
@@ -37,7 +37,7 @@ class JiraWebhookBase(Endpoint, abc.ABC):
     def dispatch(self, request: Request, *args, **kwargs) -> Response:
         return super().dispatch(request, *args, **kwargs)
 
-    def handle_exception(
+    def handle_exception_with_details(
         self,
         request: Request,
         exc: Exception,
@@ -108,7 +108,7 @@ def handle_exception(
 
         # This will log the error locally, capture the exception and send it to Sentry, and create a
         # generic 500/Internal Error response
-        return super().handle_exception(request, exc, handler_context, scope)
+        return super().handle_exception_with_details(request, exc, handler_context, scope)
 
     def get_token(self, request: Request) -> str:
         try:
diff --git a/src/sentry/integrations/jira/webhooks/installed.py b/src/sentry/integrations/jira/webhooks/installed.py
index 421ed574fd93c4..7b6b33f13089c6 100644
--- a/src/sentry/integrations/jira/webhooks/installed.py
+++ b/src/sentry/integrations/jira/webhooks/installed.py
@@ -11,6 +11,9 @@
 from sentry.integrations.utils.atlassian_connect import authenticate_asymmetric_jwt, verify_claims
 from sentry.utils import jwt
 
+from ...base import IntegrationDomain
+from ...project_management.metrics import ProjectManagementFailuresReason
+from ...utils.metrics import IntegrationPipelineViewEvent, IntegrationPipelineViewType
 from ..integration import JiraIntegrationProvider
 from .base import JiraWebhookBase
 
@@ -26,28 +29,34 @@ class JiraSentryInstalledWebhook(JiraWebhookBase):
     """
 
     def post(self, request: Request, *args, **kwargs) -> Response:
-        token = self.get_token(request)
-
-        state = request.data
-        if not state:
-            return self.respond(status=status.HTTP_400_BAD_REQUEST)
-
-        key_id = jwt.peek_header(token).get("kid")
-        if key_id:
-            decoded_claims = authenticate_asymmetric_jwt(token, key_id)
-            verify_claims(decoded_claims, request.path, request.GET, method="POST")
-
-        data = JiraIntegrationProvider().build_integration(state)
-        integration = ensure_integration(self.provider, data)
-
-        # Note: Unlike in all other Jira webhooks, we don't call `bind_org_context_from_integration`
-        # here, because at this point the integration hasn't yet been bound to an organization. The
-        # best we can do at this point is to record the integration's id.
-        sentry_sdk.set_tag("integration_id", integration.id)
-
-        # Sync integration metadata from Jira. This must be executed *after*
-        # the integration has been installed on Jira as the access tokens will
-        # not work until then.
-        sync_metadata.apply_async(kwargs={"integration_id": integration.id}, countdown=10)
-
-        return self.respond()
+        with IntegrationPipelineViewEvent(
+            interaction_type=IntegrationPipelineViewType.VERIFY_INSTALLATION,
+            domain=IntegrationDomain.PROJECT_MANAGEMENT,
+            provider_key=self.provider,
+        ).capture() as lifecycle:
+            token = self.get_token(request)
+
+            state = request.data
+            if not state:
+                lifecycle.record_failure(ProjectManagementFailuresReason.INSTALLATION_STATE_MISSING)
+                return self.respond(status=status.HTTP_400_BAD_REQUEST)
+
+            key_id = jwt.peek_header(token).get("kid")
+            if key_id:
+                decoded_claims = authenticate_asymmetric_jwt(token, key_id)
+                verify_claims(decoded_claims, request.path, request.GET, method="POST")
+
+            data = JiraIntegrationProvider().build_integration(state)
+            integration = ensure_integration(self.provider, data)
+
+            # Note: Unlike in all other Jira webhooks, we don't call `bind_org_context_from_integration`
+            # here, because at this point the integration hasn't yet been bound to an organization. The
+            # best we can do at this point is to record the integration's id.
+            sentry_sdk.set_tag("integration_id", integration.id)
+
+            # Sync integration metadata from Jira. This must be executed *after*
+            # the integration has been installed on Jira as the access tokens will
+            # not work until then.
+            sync_metadata.apply_async(kwargs={"integration_id": integration.id}, countdown=10)
+
+            return self.respond()
diff --git a/src/sentry/integrations/jira/webhooks/issue_updated.py b/src/sentry/integrations/jira/webhooks/issue_updated.py
index 01b3202da3a789..c78025859d79bd 100644
--- a/src/sentry/integrations/jira/webhooks/issue_updated.py
+++ b/src/sentry/integrations/jira/webhooks/issue_updated.py
@@ -33,7 +33,7 @@ class JiraIssueUpdatedWebhook(JiraWebhookBase):
     Webhook hit by Jira whenever an issue is updated in Jira's database.
     """
 
-    def handle_exception(
+    def handle_exception_with_details(
         self,
         request: Request,
         exc: Exception,
@@ -45,7 +45,7 @@ def handle_exception(
             if response_option:
                 return self.respond(response_option)
 
-        return super().handle_exception(request, exc, handler_context, scope)
+        return super().handle_exception_with_details(request, exc, handler_context, scope)
 
     def post(self, request: Request, *args, **kwargs) -> Response:
         token = self.get_token(request)
diff --git a/src/sentry/integrations/jira_server/integration.py b/src/sentry/integrations/jira_server/integration.py
index 66f3ee72e7f5c8..64cf65ab77d0d8 100644
--- a/src/sentry/integrations/jira_server/integration.py
+++ b/src/sentry/integrations/jira_server/integration.py
@@ -43,6 +43,7 @@
 )
 from sentry.silo.base import all_silo_function
 from sentry.users.models.identity import Identity
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
 from sentry.utils.hashlib import sha1_text
@@ -714,7 +715,7 @@ def get_projects(self, cached=True):
         return jira_projects
 
     @all_silo_function
-    def get_create_issue_config(self, group: Group | None, user: RpcUser, **kwargs):
+    def get_create_issue_config(self, group: Group | None, user: RpcUser | User, **kwargs):
         """
         We use the `group` to get three things: organization_slug, project
         defaults, and default title and description. In the case where we're
diff --git a/src/sentry/integrations/messaging/commands.py b/src/sentry/integrations/messaging/commands.py
index 32968a56e8ef24..c88cba8cef384c 100644
--- a/src/sentry/integrations/messaging/commands.py
+++ b/src/sentry/integrations/messaging/commands.py
@@ -9,6 +9,7 @@
     MessagingInteractionType,
 )
 from sentry.integrations.messaging.spec import MessagingIntegrationSpec
+from sentry.integrations.types import EventLifecycleOutcome, IntegrationResponse
 
 
 @dataclass(frozen=True, eq=True)
@@ -101,6 +102,9 @@ def get_all_command_slugs(self) -> Iterable[CommandSlug]:
 
 R = TypeVar("R")  # response
 
+# Command handler type that receives lifecycle object
+CommandHandler = Callable[[CommandInput], IntegrationResponse[R]]
+
 
 class MessagingIntegrationCommandDispatcher(Generic[R], ABC):
     """The set of commands handled by one messaging integration."""
@@ -114,9 +118,17 @@ def integration_spec(self) -> MessagingIntegrationSpec:
     @abstractmethod
     def command_handlers(
         self,
-    ) -> Iterable[tuple[MessagingIntegrationCommand, Callable[[CommandInput], R]]]:
+    ) -> Iterable[tuple[MessagingIntegrationCommand, CommandHandler[R]]]:
+        """Return list of (command, handler) tuples.
+
+        Each handler receives (command_input) and returns IntegrationResponse[R].
+        """
         raise NotImplementedError
 
+    """
+    Handlers for bot commands which should wrap the EventLifecycle context.
+    """
+
     def get_event(self, command: MessagingIntegrationCommand) -> MessagingInteractionEvent:
         return MessagingInteractionEvent(
             interaction_type=command.interaction_type, spec=self.integration_spec
@@ -127,7 +139,7 @@ def dispatch(self, cmd_input: CommandInput) -> R:
         class CandidateHandler:
             command: MessagingIntegrationCommand
             slug: CommandSlug
-            callback: Callable[[CommandInput], R]
+            callback: CommandHandler[R]
 
             def parsing_order(self) -> int:
                 # Sort by descending length of arg tokens. If one slug is a prefix of
@@ -145,7 +157,16 @@ def parsing_order(self) -> int:
         for handler in candidate_handlers:
             if handler.slug.does_match(cmd_input):
                 arg_input = cmd_input.adjust(handler.slug)
-                with self.get_event(handler.command).capture(assume_success=False):
-                    return handler.callback(arg_input)
+                event = self.get_event(handler.command)
+                with event.capture(assume_success=False) as lifecycle:
+                    response = handler.callback(arg_input)
+                    # Record the appropriate lifecycle event based on the response
+                    if response.interaction_result == EventLifecycleOutcome.HALTED:
+                        lifecycle.record_halt(response.outcome_reason, response.context_data)
+                    elif response.interaction_result == EventLifecycleOutcome.FAILURE:
+                        lifecycle.record_failure(response.outcome_reason, response.context_data)
+                    else:
+                        lifecycle.record_success()
+                    return response.response
 
         raise CommandNotMatchedError(f"{cmd_input=!r}", cmd_input)
diff --git a/src/sentry/integrations/messaging/metrics.py b/src/sentry/integrations/messaging/metrics.py
index 76978dfd12decf..4056ae665641e7 100644
--- a/src/sentry/integrations/messaging/metrics.py
+++ b/src/sentry/integrations/messaging/metrics.py
@@ -1,6 +1,6 @@
 from collections.abc import Mapping
 from dataclasses import dataclass
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from sentry.integrations.base import IntegrationDomain
@@ -12,7 +12,7 @@
 from sentry.users.services.user import RpcUser
 
 
-class MessagingInteractionType(Enum):
+class MessagingInteractionType(StrEnum):
     """A way in which a user can interact with Sentry through a messaging app."""
 
     # Direct interactions with the user
@@ -34,6 +34,7 @@ class MessagingInteractionType(Enum):
     UNRESOLVE = "UNRESOLVE"
     IGNORE = "IGNORE"
     MARK_ONGOING = "MARK_ONGOING"
+    VIEW_SUBMISSION = "VIEW_SUBMISSION"
 
     # Automatic behaviors
     UNFURL_ISSUES = "UNFURL_ISSUES"
@@ -42,9 +43,6 @@ class MessagingInteractionType(Enum):
 
     GET_PARENT_NOTIFICATION = "GET_PARENT_NOTIFICATION"
 
-    def __str__(self) -> str:
-        return self.value.lower()
-
 
 @dataclass
 class MessagingInteractionEvent(IntegrationEventLifecycleMetric):
@@ -71,3 +69,31 @@ def get_extras(self) -> Mapping[str, Any]:
             "user_id": (self.user.id if self.user else None),
             "organization_id": (self.organization.id if self.organization else None),
         }
+
+
+class MessageCommandHaltReason(StrEnum):
+    """Common reasons why a messaging command may halt without success/failure."""
+
+    # Identity Linking
+    ALREADY_LINKED = "already_linked"
+    NOT_LINKED = "not_linked"
+
+    # Team Linking
+    LINK_FROM_CHANNEL = "link_from_channel"
+    LINK_USER_FIRST = "link_user_first"
+    CHANNEL_ALREADY_LINKED = "channel_already_linked"
+    TEAM_NOT_LINKED = "team_not_linked"
+    INSUFFICIENT_ROLE = "insufficient_role"
+
+
+class MessageCommandFailureReason(StrEnum):
+    """Common reasons why a messaging command may fail."""
+
+    MISSING_DATA = "missing_data"
+    INVALID_STATE = "invalid_state"
+
+
+class MessageInteractionFailureReason(StrEnum):
+    """Common reasons why a messaging interaction may fail."""
+
+    MISSING_ACTION = "missing_action"
diff --git a/src/sentry/integrations/messaging/spec.py b/src/sentry/integrations/messaging/spec.py
index 8dfd20a14422a1..b4939159012295 100644
--- a/src/sentry/integrations/messaging/spec.py
+++ b/src/sentry/integrations/messaging/spec.py
@@ -11,8 +11,8 @@
 from sentry.incidents.models.alert_rule import ActionHandlerFactory, AlertRuleTriggerAction
 from sentry.incidents.models.incident import Incident, IncidentStatus
 from sentry.integrations.base import IntegrationProvider
-from sentry.models.notificationaction import ActionService, ActionTarget
 from sentry.models.project import Project
+from sentry.notifications.models.notificationaction import ActionService, ActionTarget
 from sentry.rules import rules
 from sentry.rules.actions import IntegrationEventAction
 
diff --git a/src/sentry/integrations/mixins/issues.py b/src/sentry/integrations/mixins/issues.py
index b59ffcf8bf9171..93d9579dea603b 100644
--- a/src/sentry/integrations/mixins/issues.py
+++ b/src/sentry/integrations/mixins/issues.py
@@ -200,7 +200,7 @@ def get_persisted_user_default_config_fields(self):
         """
         return []
 
-    def store_issue_last_defaults(self, project: Project, user: RpcUser, data):
+    def store_issue_last_defaults(self, project: Project, user: RpcUser | User, data):
         """
         Stores the last used field defaults on a per-project basis. This
         accepts a dict of values that will be filtered to keys returned by
diff --git a/src/sentry/integrations/msteams/spec.py b/src/sentry/integrations/msteams/spec.py
index b617599c853100..07d7d75b527fd7 100644
--- a/src/sentry/integrations/msteams/spec.py
+++ b/src/sentry/integrations/msteams/spec.py
@@ -6,7 +6,7 @@
     MessagingIdentityLinkViewSet,
     MessagingIntegrationSpec,
 )
-from sentry.models.notificationaction import ActionService
+from sentry.notifications.models.notificationaction import ActionService
 from sentry.rules.actions import IntegrationEventAction
 
 PROVIDER = "msteams"
diff --git a/src/sentry/integrations/msteams/webhook.py b/src/sentry/integrations/msteams/webhook.py
index b5b95e42cdb6b6..c47087573fe4dc 100644
--- a/src/sentry/integrations/msteams/webhook.py
+++ b/src/sentry/integrations/msteams/webhook.py
@@ -24,12 +24,14 @@
 from sentry.identity.services.identity.model import RpcIdentity
 from sentry.integrations.messaging import commands
 from sentry.integrations.messaging.commands import (
+    CommandHandler,
     CommandInput,
     CommandNotMatchedError,
     MessagingIntegrationCommand,
     MessagingIntegrationCommandDispatcher,
 )
 from sentry.integrations.messaging.metrics import (
+    MessageCommandHaltReason,
     MessagingInteractionEvent,
     MessagingInteractionType,
 )
@@ -37,6 +39,7 @@
 from sentry.integrations.msteams import parsing
 from sentry.integrations.msteams.spec import PROVIDER, MsTeamsMessagingSpec
 from sentry.integrations.services.integration import integration_service
+from sentry.integrations.types import EventLifecycleOutcome, IntegrationResponse
 from sentry.models.activity import ActivityIntegration
 from sentry.models.apikey import ApiKey
 from sentry.models.group import Group
@@ -652,26 +655,49 @@ def conversation_id(self) -> str:
     def teams_user_id(self) -> str:
         return self.data["from"]["id"]
 
-    @property
-    def command_handlers(
-        self,
-    ) -> Iterable[tuple[MessagingIntegrationCommand, Callable[[CommandInput], AdaptiveCard]]]:
-        yield commands.HELP, (lambda _: build_help_command_card())
-        yield commands.LINK_IDENTITY, self.link_identity
-        yield commands.UNLINK_IDENTITY, self.unlink_identity
+    def help_handler(self, input: CommandInput) -> IntegrationResponse[AdaptiveCard]:
+        return IntegrationResponse(
+            interaction_result=EventLifecycleOutcome.SUCCESS,
+            response=build_help_command_card(),
+        )
 
-    def link_identity(self, _: CommandInput) -> AdaptiveCard:
+    def link_user_handler(self, input: CommandInput) -> IntegrationResponse[AdaptiveCard]:
         linked_identity = identity_service.get_identity(
             filter={"identity_ext_id": self.teams_user_id}
         )
         has_linked_identity = linked_identity is not None
+
         if has_linked_identity:
-            return build_already_linked_identity_command_card()
+            return IntegrationResponse(
+                interaction_result=EventLifecycleOutcome.SUCCESS,
+                response=build_already_linked_identity_command_card(),
+                outcome_reason=str(MessageCommandHaltReason.ALREADY_LINKED),
+                context_data={
+                    "user_id": self.teams_user_id,
+                    "identity_id": linked_identity.id if linked_identity else None,
+                },
+            )
         else:
-            return build_link_identity_command_card()
+            return IntegrationResponse(
+                interaction_result=EventLifecycleOutcome.SUCCESS,
+                response=build_link_identity_command_card(),
+            )
 
-    def unlink_identity(self, _: CommandInput) -> AdaptiveCard:
+    def unlink_user_handler(self, input: CommandInput) -> IntegrationResponse[AdaptiveCard]:
         unlink_url = build_unlinking_url(
             self.conversation_id, self.data["serviceUrl"], self.teams_user_id
         )
-        return build_unlink_identity_card(unlink_url)
+        # TODO: check if the user is already unlinked
+        return IntegrationResponse(
+            response=build_unlink_identity_card(unlink_url),
+            interaction_result=EventLifecycleOutcome.SUCCESS,
+        )
+
+    @property
+    def command_handlers(
+        self,
+    ) -> Iterable[tuple[MessagingIntegrationCommand, CommandHandler[AdaptiveCard]]]:
+
+        yield commands.HELP, self.help_handler
+        yield commands.LINK_IDENTITY, self.link_user_handler
+        yield commands.UNLINK_IDENTITY, self.unlink_user_handler
diff --git a/src/sentry/integrations/on_call/metrics.py b/src/sentry/integrations/on_call/metrics.py
index 76f1b203c203b8..11f61a2ae666a4 100644
--- a/src/sentry/integrations/on_call/metrics.py
+++ b/src/sentry/integrations/on_call/metrics.py
@@ -1,4 +1,4 @@
-from enum import Enum
+from enum import Enum, StrEnum
 
 from attr import dataclass
 
@@ -56,3 +56,13 @@ def get_integration_name(self) -> str:
 
     def get_interaction_type(self) -> str:
         return str(self.interaction_type)
+
+
+class OnCallIntegrationsHaltReason(StrEnum):
+    """
+    Reasons why on on call integration method may halt without success/failure.
+    """
+
+    INVALID_TEAM = "invalid_team"
+    INVALID_SERVICE = "invalid_service"
+    INVALID_KEY = "invalid_key"
diff --git a/src/sentry/integrations/on_call/spec.py b/src/sentry/integrations/on_call/spec.py
index 130c537976e8d5..fd5cdef97deab0 100644
--- a/src/sentry/integrations/on_call/spec.py
+++ b/src/sentry/integrations/on_call/spec.py
@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from sentry.models.notificationaction import ActionService
+from sentry.notifications.models.notificationaction import ActionService
 
 
 class OnCallSpec(ABC):
diff --git a/src/sentry/integrations/opsgenie/actions/form.py b/src/sentry/integrations/opsgenie/actions/form.py
index a6a29d9d208145..05bbb4bf6797e4 100644
--- a/src/sentry/integrations/opsgenie/actions/form.py
+++ b/src/sentry/integrations/opsgenie/actions/form.py
@@ -6,7 +6,7 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
-from sentry.integrations.on_call.metrics import OnCallInteractionType
+from sentry.integrations.on_call.metrics import OnCallIntegrationsHaltReason, OnCallInteractionType
 from sentry.integrations.opsgenie.metrics import record_event
 from sentry.integrations.opsgenie.utils import get_team
 from sentry.integrations.services.integration import integration_service
@@ -65,7 +65,7 @@ def _get_team_status(
         return VALID_TEAM
 
     def _validate_team(self, team_id: str | None, integration_id: int | None) -> None:
-        with record_event(OnCallInteractionType.VERIFY_TEAM).capture():
+        with record_event(OnCallInteractionType.VERIFY_TEAM).capture() as lifecyle:
             params = {
                 "account": dict(self.fields["account"].choices).get(integration_id),
                 "team": dict(self.fields["team"].choices).get(team_id),
@@ -78,6 +78,7 @@ def _validate_team(self, team_id: str | None, integration_id: int | None) -> Non
                 organization_id=self.org_id,
             )
             if integration is None or org_integration is None:
+                lifecyle.record_halt(OnCallIntegrationsHaltReason.INVALID_TEAM)
                 raise forms.ValidationError(
                     _("The Opsgenie integration does not exist."),
                     code="invalid_integration",
@@ -86,6 +87,7 @@ def _validate_team(self, team_id: str | None, integration_id: int | None) -> Non
 
             team_status = self._get_team_status(team_id=team_id, org_integration=org_integration)
             if team_status == INVALID_TEAM:
+                lifecyle.record_halt(OnCallIntegrationsHaltReason.INVALID_TEAM)
                 raise forms.ValidationError(
                     _('The team "%(team)s" does not belong to the %(account)s Opsgenie account.'),
                     code="invalid_team",
diff --git a/src/sentry/integrations/opsgenie/client.py b/src/sentry/integrations/opsgenie/client.py
index a7bd3755418b10..b86df081bb51e4 100644
--- a/src/sentry/integrations/opsgenie/client.py
+++ b/src/sentry/integrations/opsgenie/client.py
@@ -107,12 +107,12 @@ def send_notification(
                 notification_uuid=notification_uuid,
             )
         else:
-            # if we're acknowledging the alert—meaning that the Sentry alert was resolved
+            # if we're closing the alert—meaning that the Sentry alert was resolved
             if data.get("identifier"):
                 interaction_type = OnCallInteractionType.RESOLVE
                 alias = data["identifier"]
                 resp = self.post(
-                    f"/alerts/{alias}/acknowledge",
+                    f"/alerts/{alias}/close",
                     data={},
                     params={"identifierType": "alias"},
                     headers=headers,
diff --git a/src/sentry/integrations/opsgenie/integration.py b/src/sentry/integrations/opsgenie/integration.py
index 8842f608956130..77e968740449cc 100644
--- a/src/sentry/integrations/opsgenie/integration.py
+++ b/src/sentry/integrations/opsgenie/integration.py
@@ -20,7 +20,7 @@
 )
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
-from sentry.integrations.on_call.metrics import OnCallInteractionType
+from sentry.integrations.on_call.metrics import OnCallIntegrationsHaltReason, OnCallInteractionType
 from sentry.integrations.opsgenie.metrics import record_event
 from sentry.integrations.opsgenie.tasks import migrate_opsgenie_plugin
 from sentry.organizations.services.organization import RpcOrganizationSummary
@@ -183,7 +183,7 @@ def update_organization_config(self, data: MutableMapping[str, Any]) -> None:
             team["id"] = str(self.org_integration.id) + "-" + team["team"]
 
         invalid_keys = []
-        with record_event(OnCallInteractionType.VERIFY_KEYS).capture():
+        with record_event(OnCallInteractionType.VERIFY_KEYS).capture() as lifecycle:
             for team in teams:
                 # skip if team, key pair already exist in config
                 if (team["team"], team["integration_key"]) in existing_team_key_pairs:
@@ -213,6 +213,10 @@ def update_organization_config(self, data: MutableMapping[str, Any]) -> None:
                         raise
 
             if invalid_keys:
+                lifecycle.record_halt(
+                    OnCallIntegrationsHaltReason.INVALID_KEY,
+                    extra={"invalid_keys": invalid_keys, "integration_id": integration.id},
+                )
                 raise ApiUnauthorized(f"Invalid integration key: {str(invalid_keys)}")
 
         return super().update_organization_config(data)
diff --git a/src/sentry/integrations/pagerduty/actions/form.py b/src/sentry/integrations/pagerduty/actions/form.py
index 3ac96179b54794..a6f468f7539d40 100644
--- a/src/sentry/integrations/pagerduty/actions/form.py
+++ b/src/sentry/integrations/pagerduty/actions/form.py
@@ -6,7 +6,7 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
-from sentry.integrations.on_call.metrics import OnCallInteractionType
+from sentry.integrations.on_call.metrics import OnCallIntegrationsHaltReason, OnCallInteractionType
 from sentry.integrations.pagerduty.metrics import record_event
 from sentry.integrations.services.integration import integration_service
 from sentry.integrations.types import ExternalProviders
@@ -47,7 +47,7 @@ def __init__(self, *args, **kwargs):
         self.fields["service"].widget.choices = self.fields["service"].choices
 
     def _validate_service(self, service_id: int, integration_id: int) -> None:
-        with record_event(OnCallInteractionType.VALIDATE_SERVICE).capture():
+        with record_event(OnCallInteractionType.VALIDATE_SERVICE).capture() as lifecycle:
             params = {
                 "account": dict(self.fields["account"].choices).get(integration_id),
                 "service": dict(self.fields["service"].choices).get(service_id),
@@ -66,6 +66,7 @@ def _validate_service(self, service_id: int, integration_id: int) -> None:
             ):
                 # We need to make sure that the service actually belongs to that integration,
                 # meaning that it belongs under the appropriate account in PagerDuty.
+                lifecycle.record_halt(OnCallIntegrationsHaltReason.INVALID_SERVICE)
                 raise forms.ValidationError(
                     _(
                         'The service "%(service)s" has not been granted access in the %(account)s Pagerduty account.'
diff --git a/src/sentry/integrations/project_management/__init__.py b/src/sentry/integrations/project_management/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/src/sentry/integrations/project_management/metrics.py b/src/sentry/integrations/project_management/metrics.py
new file mode 100644
index 00000000000000..782bb9c2f4021d
--- /dev/null
+++ b/src/sentry/integrations/project_management/metrics.py
@@ -0,0 +1,45 @@
+from dataclasses import dataclass
+from enum import StrEnum
+
+from sentry.integrations.base import IntegrationDomain
+from sentry.integrations.models import Integration
+from sentry.integrations.services.integration import RpcIntegration
+from sentry.integrations.utils.metrics import IntegrationEventLifecycleMetric
+
+
+class ProjectManagementActionType(StrEnum):
+    CREATE_EXTERNAL_ISSUE = "create_external_issue"
+    OUTBOUND_ASSIGNMENT_SYNC = "outbound_assignment_sync"
+    INBOUND_ASSIGNMENT_SYNC = "inbound_assignment_sync"
+    COMMENT_SYNC = "comment_sync"
+    OUTBOUND_STATUS_SYNC = "outbound_status_sync"
+    INBOUND_STATUS_SYNC = "inbound_status_sync"
+    LINK_EXTERNAL_ISSUE = "link_external_issue"
+
+    def __str__(self):
+        return self.value.lower()
+
+
+class ProjectManagementHaltReason(StrEnum):
+    SYNC_INBOUND_ASSIGNEE_NOT_FOUND = "inbound-assignee-not-found"
+    SYNC_NON_SYNC_INTEGRATION_PROVIDED = "sync-non-sync-integration-provided"
+    SYNC_INBOUND_MISSING_CHANGELOG_STATUS = "missing-changelog-status"
+
+
+class ProjectManagementFailuresReason(StrEnum):
+    INSTALLATION_STATE_MISSING = "installation-state-missing"
+
+
+@dataclass
+class ProjectManagementEvent(IntegrationEventLifecycleMetric):
+    action_type: ProjectManagementActionType
+    integration: Integration | RpcIntegration
+
+    def get_integration_name(self) -> str:
+        return self.integration.provider
+
+    def get_integration_domain(self) -> IntegrationDomain:
+        return IntegrationDomain.PROJECT_MANAGEMENT
+
+    def get_interaction_type(self) -> str:
+        return str(self.action_type)
diff --git a/src/sentry/integrations/repository/issue_alert.py b/src/sentry/integrations/repository/issue_alert.py
index 0160bbf7328e95..bc0d00b212b4f1 100644
--- a/src/sentry/integrations/repository/issue_alert.py
+++ b/src/sentry/integrations/repository/issue_alert.py
@@ -11,8 +11,8 @@
     BaseNotificationMessage,
     NotificationMessageValidationError,
 )
-from sentry.models.notificationmessage import NotificationMessage
 from sentry.models.rulefirehistory import RuleFireHistory
+from sentry.notifications.models.notificationmessage import NotificationMessage
 
 _default_logger: Logger = getLogger(__name__)
 
diff --git a/src/sentry/integrations/repository/metric_alert.py b/src/sentry/integrations/repository/metric_alert.py
index 70b3c1dfe5f8de..2213b3d07755b9 100644
--- a/src/sentry/integrations/repository/metric_alert.py
+++ b/src/sentry/integrations/repository/metric_alert.py
@@ -10,7 +10,7 @@
     BaseNotificationMessage,
     NotificationMessageValidationError,
 )
-from sentry.models.notificationmessage import NotificationMessage
+from sentry.notifications.models.notificationmessage import NotificationMessage
 
 _default_logger: Logger = getLogger(__name__)
 
diff --git a/src/sentry/integrations/slack/notifications.py b/src/sentry/integrations/slack/notifications.py
index 50cfb9e9d62b6e..16859e66ed41a7 100644
--- a/src/sentry/integrations/slack/notifications.py
+++ b/src/sentry/integrations/slack/notifications.py
@@ -19,6 +19,7 @@
 from sentry.notifications.notifications.base import BaseNotification
 from sentry.notifications.notify import register_notification_provider
 from sentry.types.actor import Actor
+from sentry.users.models.user import User
 from sentry.utils import metrics
 
 logger = logging.getLogger("sentry.notifications")
@@ -46,7 +47,7 @@ def send_message(self, channel_id: str, message: str) -> None:
 @register_notification_provider(ExternalProviders.SLACK)
 def send_notification_as_slack(
     notification: BaseNotification,
-    recipients: Iterable[Actor],
+    recipients: Iterable[Actor | User],
     shared_context: Mapping[str, Any],
     extra_context_by_actor: Mapping[Actor, Mapping[str, Any]] | None,
 ) -> None:
diff --git a/src/sentry/integrations/slack/spec.py b/src/sentry/integrations/slack/spec.py
index 0b41fbf48c5f4f..59441767cd258a 100644
--- a/src/sentry/integrations/slack/spec.py
+++ b/src/sentry/integrations/slack/spec.py
@@ -6,7 +6,7 @@
     MessagingIdentityLinkViewSet,
     MessagingIntegrationSpec,
 )
-from sentry.models.notificationaction import ActionService
+from sentry.notifications.models.notificationaction import ActionService
 from sentry.rules.actions import IntegrationEventAction
 
 
diff --git a/src/sentry/integrations/slack/utils/notifications.py b/src/sentry/integrations/slack/utils/notifications.py
index 5535275a3a4a09..2fce90fc3443db 100644
--- a/src/sentry/integrations/slack/utils/notifications.py
+++ b/src/sentry/integrations/slack/utils/notifications.py
@@ -140,6 +140,8 @@ def send_incident_alert_notification(
             "incident_id": incident.id,
             "incident_status": new_status,
             "attachments": attachments,
+            "channel_id": channel,
+            "channel_name": action.target_display,
         }
         _logger.info("slack.metric_alert.error", exc_info=True, extra=log_params)
         metrics.incr(
diff --git a/src/sentry/integrations/slack/webhooks/action.py b/src/sentry/integrations/slack/webhooks/action.py
index f97a632a8b69b0..a4f74148431940 100644
--- a/src/sentry/integrations/slack/webhooks/action.py
+++ b/src/sentry/integrations/slack/webhooks/action.py
@@ -26,6 +26,7 @@
 from sentry.auth.access import from_member
 from sentry.exceptions import UnableToAcceptMemberInvitationException
 from sentry.integrations.messaging.metrics import (
+    MessageInteractionFailureReason,
     MessagingInteractionEvent,
     MessagingInteractionType,
 )
@@ -247,6 +248,17 @@ def _unpack_error_text(validation_error: serializers.ValidationError) -> str:
                 return element
             detail = element
 
+    def record_event(
+        self, interaction_type: MessagingInteractionType, group: Group, request: Request
+    ) -> MessagingInteractionEvent:
+        user = request.user
+        return MessagingInteractionEvent(
+            interaction_type,
+            SlackMessagingSpec(),
+            user=(user if isinstance(user, User) else None),
+            organization=(group.project.organization if group else None),
+        )
+
     def validation_error(
         self,
         slack_request: SlackActionRequest,
@@ -364,72 +376,85 @@ def _handle_group_actions(
 
         if slack_request.type == "view_submission":
             # TODO: if we use modals for something other than resolve and archive, this will need to be more specific
-
-            # Masquerade a status action
-            selection = None
-            view = slack_request.data.get("view")
-            if view:
-                state = view.get("state")
-            if state:
-                values = state.get("values")
-            if values:
-                for value in values:
-                    for val in values[value]:
-                        selection = values[value][val]["selected_option"]["value"]
-                        if selection:
-                            break
-
-            if not selection:
-                return self.respond()
-
-            status_action = MessageAction(name="status", value=selection)
-
-            try:
-                self.on_status(request, identity_user, group, status_action)
-            except client.ApiError as error:
-                return self.api_error(slack_request, group, identity_user, error, "status_dialog")
-
-            view = View(**slack_request.data["view"])
-            private_metadata = orjson.loads(view.private_metadata)
-            original_tags_from_request = set(private_metadata.get("tags", {}))
-
-            blocks = SlackIssuesMessageBuilder(
-                group,
-                identity=identity,
-                actions=[status_action],
-                tags=original_tags_from_request,
-                rules=[rule] if rule else None,
-                issue_details=True,
-                skip_fallback=True,
-            ).build()
-
-            # use the original response_url to update the link attachment
-            try:
-                webhook_client = WebhookClient(private_metadata["orig_response_url"])
-                webhook_client.send(
-                    blocks=blocks.get("blocks"), delete_original=False, replace_original=True
-                )
-                metrics.incr(
-                    SLACK_WEBHOOK_GROUP_ACTIONS_SUCCESS_DATADOG_METRIC,
-                    sample_rate=1.0,
-                    tags={"type": "submit_modal"},
-                )
-            except SlackApiError as e:
-                metrics.incr(
-                    SLACK_WEBHOOK_GROUP_ACTIONS_FAILURE_DATADOG_METRIC,
-                    sample_rate=1.0,
-                    tags={"type": "submit_modal"},
-                )
-                _logger.exception(
-                    "slack.webhook.view_submission.response-error",
-                    extra={
-                        "error": str(e),
-                        "integration_id": slack_request.integration.id,
-                        "organization_id": group.project.organization_id,
-                    },
+            with self.record_event(
+                MessagingInteractionType.VIEW_SUBMISSION, group, request
+            ).capture() as lifecycle:
+
+                # Masquerade a status action
+                selection = None
+                view = slack_request.data.get("view")
+                if view:
+                    state = view.get("state")
+                if state:
+                    values = state.get("values")
+                if values:
+                    for value in values:
+                        for val in values[value]:
+                            selection = values[value][val]["selected_option"]["value"]
+                            if selection:
+                                break
+
+                if not selection:
+                    lifecycle.record_failure(MessageInteractionFailureReason.MISSING_ACTION)
+                    return self.respond()
+
+                lifecycle.add_extra(
+                    "selection",
+                    selection,
                 )
 
-            return self.respond()
+                status_action = MessageAction(name="status", value=selection)
+
+                try:
+                    self.on_status(request, identity_user, group, status_action)
+                except client.ApiError as error:
+                    lifecycle.record_failure(error)
+                    return self.api_error(
+                        slack_request, group, identity_user, error, "status_dialog"
+                    )
+
+                view = View(**slack_request.data["view"])
+                private_metadata = orjson.loads(view.private_metadata)
+                original_tags_from_request = set(private_metadata.get("tags", {}))
+
+                blocks = SlackIssuesMessageBuilder(
+                    group,
+                    identity=identity,
+                    actions=[status_action],
+                    tags=original_tags_from_request,
+                    rules=[rule] if rule else None,
+                    issue_details=True,
+                    skip_fallback=True,
+                ).build()
+
+                # use the original response_url to update the link attachment
+                try:
+                    webhook_client = WebhookClient(private_metadata["orig_response_url"])
+                    webhook_client.send(
+                        blocks=blocks.get("blocks"), delete_original=False, replace_original=True
+                    )
+                    metrics.incr(
+                        SLACK_WEBHOOK_GROUP_ACTIONS_SUCCESS_DATADOG_METRIC,
+                        sample_rate=1.0,
+                        tags={"type": "submit_modal"},
+                    )
+                except SlackApiError as e:
+                    lifecycle.record_failure(e)
+                    metrics.incr(
+                        SLACK_WEBHOOK_GROUP_ACTIONS_FAILURE_DATADOG_METRIC,
+                        sample_rate=1.0,
+                        tags={"type": "submit_modal"},
+                    )
+                    _logger.exception(
+                        "slack.webhook.view_submission.response-error",
+                        extra={
+                            "error": str(e),
+                            "integration_id": slack_request.integration.id,
+                            "organization_id": group.project.organization_id,
+                        },
+                    )
+
+                return self.respond()
 
         # Usually we'll want to respond with the updated attachment including
         # the list of actions taken. However, when opening a dialog we do not
@@ -437,32 +462,31 @@ def _handle_group_actions(
         # response_url later to update it.
         defer_attachment_update = False
 
-        def record_event(interaction_type: MessagingInteractionType) -> MessagingInteractionEvent:
-            user = request.user
-            return MessagingInteractionEvent(
-                interaction_type,
-                SlackMessagingSpec(),
-                user=(user if isinstance(user, User) else None),
-                organization=(group.project.organization if group else None),
-            )
-
         # Handle interaction actions
         for action in action_list:
             try:
                 if action.name in ("status", "unresolved:ongoing"):
-                    with record_event(MessagingInteractionType.STATUS).capture():
+                    with self.record_event(
+                        MessagingInteractionType.STATUS, group, request
+                    ).capture():
                         self.on_status(request, identity_user, group, action)
                 elif (
                     action.name == "assign"
                 ):  # TODO: remove this as it is replaced by the options-load endpoint
-                    with record_event(MessagingInteractionType.ASSIGN).capture():
+                    with self.record_event(
+                        MessagingInteractionType.ASSIGN, group, request
+                    ).capture():
                         self.on_assign(request, identity_user, group, action)
                 elif action.name == "resolve_dialog":
-                    with record_event(MessagingInteractionType.RESOLVE_DIALOG).capture():
+                    with self.record_event(
+                        MessagingInteractionType.RESOLVE_DIALOG, group, request
+                    ).capture():
                         _ResolveDialog().open_dialog(slack_request, group)
                     defer_attachment_update = True
                 elif action.name == "archive_dialog":
-                    with record_event(MessagingInteractionType.ARCHIVE_DIALOG).capture():
+                    with self.record_event(
+                        MessagingInteractionType.ARCHIVE_DIALOG, group, request
+                    ).capture():
                         _ArchiveDialog().open_dialog(slack_request, group)
                     defer_attachment_update = True
             except client.ApiError as error:
diff --git a/src/sentry/integrations/slack/webhooks/base.py b/src/sentry/integrations/slack/webhooks/base.py
index b0663cccebb8d6..fba29ed49d3b62 100644
--- a/src/sentry/integrations/slack/webhooks/base.py
+++ b/src/sentry/integrations/slack/webhooks/base.py
@@ -2,7 +2,7 @@
 
 import abc
 import logging
-from collections.abc import Callable, Iterable
+from collections.abc import Iterable
 from dataclasses import dataclass
 
 from rest_framework import status
@@ -11,11 +11,13 @@
 from sentry.api.base import Endpoint
 from sentry.integrations.messaging import commands
 from sentry.integrations.messaging.commands import (
+    CommandHandler,
     CommandInput,
     CommandNotMatchedError,
     MessagingIntegrationCommand,
     MessagingIntegrationCommandDispatcher,
 )
+from sentry.integrations.messaging.metrics import MessageCommandHaltReason
 from sentry.integrations.messaging.spec import MessagingIntegrationSpec
 from sentry.integrations.slack.message_builder.help import SlackHelpMessageBuilder
 from sentry.integrations.slack.metrics import (
@@ -24,6 +26,7 @@
 )
 from sentry.integrations.slack.requests.base import SlackDMRequest, SlackRequestError
 from sentry.integrations.slack.spec import SlackMessagingSpec
+from sentry.integrations.types import EventLifecycleOutcome, IntegrationResponse
 from sentry.utils import metrics
 
 LINK_USER_MESSAGE = (
@@ -129,16 +132,106 @@ class SlackCommandDispatcher(MessagingIntegrationCommandDispatcher[Response]):
     endpoint: SlackDMEndpoint
     request: SlackDMRequest
 
+    # Define mapping of messages to halt reasons
+    @property
+    def TEAM_HALT_MAPPINGS(self) -> dict[str, MessageCommandHaltReason]:
+        from sentry.integrations.slack.webhooks.command import (
+            CHANNEL_ALREADY_LINKED_MESSAGE,
+            INSUFFICIENT_ROLE_MESSAGE,
+            LINK_FROM_CHANNEL_MESSAGE,
+            LINK_USER_FIRST_MESSAGE,
+            TEAM_NOT_LINKED_MESSAGE,
+        )
+
+        return {
+            LINK_FROM_CHANNEL_MESSAGE: MessageCommandHaltReason.LINK_FROM_CHANNEL,
+            LINK_USER_FIRST_MESSAGE: MessageCommandHaltReason.LINK_USER_FIRST,
+            INSUFFICIENT_ROLE_MESSAGE: MessageCommandHaltReason.INSUFFICIENT_ROLE,
+            CHANNEL_ALREADY_LINKED_MESSAGE: MessageCommandHaltReason.CHANNEL_ALREADY_LINKED,
+            TEAM_NOT_LINKED_MESSAGE: MessageCommandHaltReason.TEAM_NOT_LINKED,
+        }
+
     @property
     def integration_spec(self) -> MessagingIntegrationSpec:
         return SlackMessagingSpec()
 
+    def help_handler(self, input: CommandInput) -> IntegrationResponse[Response]:
+        response = self.endpoint.help(input.cmd_value)
+        return IntegrationResponse(
+            interaction_result=EventLifecycleOutcome.SUCCESS,
+            response=response,
+        )
+
+    def link_user_handler(self, input: CommandInput) -> IntegrationResponse[Response]:
+        response = self.endpoint.link_user(self.request)
+        if ALREADY_LINKED_MESSAGE.format(username=self.request.identity_str) in str(response.data):
+            return IntegrationResponse(
+                interaction_result=EventLifecycleOutcome.SUCCESS,
+                response=response,
+                outcome_reason=str(MessageCommandHaltReason.ALREADY_LINKED),
+                context_data={
+                    "email": self.request.identity_str,
+                },
+            )
+        return IntegrationResponse(
+            interaction_result=EventLifecycleOutcome.SUCCESS,
+            response=response,
+        )
+
+    def unlink_user_handler(self, input: CommandInput) -> IntegrationResponse[Response]:
+        response = self.endpoint.unlink_user(self.request)
+        if NOT_LINKED_MESSAGE in str(response.data):
+            return IntegrationResponse(
+                interaction_result=EventLifecycleOutcome.SUCCESS,
+                response=response,
+                outcome_reason=str(MessageCommandHaltReason.NOT_LINKED),
+                context_data={
+                    "email": self.request.identity_str,
+                },
+            )
+        return IntegrationResponse(
+            interaction_result=EventLifecycleOutcome.SUCCESS,
+            response=response,
+        )
+
+    def link_team_handler(self, input: CommandInput) -> IntegrationResponse[Response]:
+        response = self.endpoint.link_team(self.request)
+
+        for message, reason in self.TEAM_HALT_MAPPINGS.items():
+            if message in str(response.data):
+                return IntegrationResponse(
+                    interaction_result=EventLifecycleOutcome.SUCCESS,
+                    response=response,
+                    outcome_reason=str(reason),
+                )
+
+        return IntegrationResponse(
+            interaction_result=EventLifecycleOutcome.SUCCESS,
+            response=response,
+        )
+
+    def unlink_team_handler(self, input: CommandInput) -> IntegrationResponse[Response]:
+        response = self.endpoint.unlink_team(self.request)
+        for message, reason in self.TEAM_HALT_MAPPINGS.items():
+            if message in str(response.data):
+                return IntegrationResponse(
+                    interaction_result=EventLifecycleOutcome.SUCCESS,
+                    response=response,
+                    outcome_reason=str(reason),
+                )
+
+        return IntegrationResponse(
+            interaction_result=EventLifecycleOutcome.SUCCESS,
+            response=response,
+        )
+
     @property
     def command_handlers(
         self,
-    ) -> Iterable[tuple[MessagingIntegrationCommand, Callable[[CommandInput], Response]]]:
-        yield commands.HELP, (lambda i: self.endpoint.help(i.cmd_value))
-        yield commands.LINK_IDENTITY, (lambda i: self.endpoint.link_user(self.request))
-        yield commands.UNLINK_IDENTITY, (lambda i: self.endpoint.unlink_user(self.request))
-        yield commands.LINK_TEAM, (lambda i: self.endpoint.link_team(self.request))
-        yield commands.UNLINK_TEAM, (lambda i: self.endpoint.unlink_team(self.request))
+    ) -> Iterable[tuple[MessagingIntegrationCommand, CommandHandler[Response]]]:
+
+        yield commands.HELP, self.help_handler
+        yield commands.LINK_IDENTITY, self.link_user_handler
+        yield commands.UNLINK_IDENTITY, self.unlink_user_handler
+        yield commands.LINK_TEAM, self.link_team_handler
+        yield commands.UNLINK_TEAM, self.unlink_team_handler
diff --git a/src/sentry/integrations/source_code_management/commit_context.py b/src/sentry/integrations/source_code_management/commit_context.py
index 590431ef4d4c70..564a7c5eeb9c35 100644
--- a/src/sentry/integrations/source_code_management/commit_context.py
+++ b/src/sentry/integrations/source_code_management/commit_context.py
@@ -13,6 +13,11 @@
 from sentry import analytics
 from sentry.auth.exceptions import IdentityNotValid
 from sentry.integrations.models.repository_project_path_config import RepositoryProjectPathConfig
+from sentry.integrations.source_code_management.metrics import (
+    CommitContextHaltReason,
+    CommitContextIntegrationInteractionEvent,
+    SCMIntegrationInteractionType,
+)
 from sentry.locks import locks
 from sentry.models.commit import Commit
 from sentry.models.group import Group
@@ -26,6 +31,7 @@
     PullRequestCommit,
 )
 from sentry.models.repository import Repository
+from sentry.shared_integrations.exceptions import ApiRateLimitedError
 from sentry.users.models.identity import Identity
 from sentry.utils import metrics
 from sentry.utils.cache import cache
@@ -94,16 +100,28 @@ def get_blame_for_files(
 
         files: list of FileBlameInfo objects
         """
-        try:
-            client = self.get_client()
-        except Identity.DoesNotExist:
-            return []
-        try:
-            response = client.get_blame_for_files(files, extra)
-        except IdentityNotValid:
-            return []
-
-        return response
+        with CommitContextIntegrationInteractionEvent(
+            interaction_type=SCMIntegrationInteractionType.GET_BLAME_FOR_FILES,
+            provider_key=self.integration_name,
+        ).capture() as lifecycle:
+            try:
+                client = self.get_client()
+            except Identity.DoesNotExist as e:
+                lifecycle.record_failure(e)
+                sentry_sdk.capture_exception(e)
+                return []
+            try:
+                response = client.get_blame_for_files(files, extra)
+            except IdentityNotValid as e:
+                lifecycle.record_failure(e)
+                sentry_sdk.capture_exception(e)
+                return []
+            # Swallow rate limited errors so we don't log them as exceptions
+            except ApiRateLimitedError as e:
+                sentry_sdk.capture_exception(e)
+                lifecycle.record_halt(e)
+                return []
+            return response
 
     def get_commit_context_all_frames(
         self, files: Sequence[SourceLineInfo], extra: Mapping[str, Any]
@@ -120,114 +138,137 @@ def queue_comment_task_if_needed(
         group_owner: GroupOwner,
         group_id: int,
     ) -> None:
-        if not OrganizationOption.objects.get_value(
+        with CommitContextIntegrationInteractionEvent(
+            interaction_type=SCMIntegrationInteractionType.QUEUE_COMMENT_TASK,
+            provider_key=self.integration_name,
             organization=project.organization,
-            key="sentry:github_pr_bot",
-            default=True,
-        ):
-            logger.info(
-                _pr_comment_log(integration_name=self.integration_name, suffix="disabled"),
-                extra={"organization_id": project.organization_id},
-            )
-            return
-
-        repo_query = Repository.objects.filter(id=commit.repository_id).order_by("-date_added")
-        group = Group.objects.get_from_cache(id=group_id)
-        if not (
-            group.level is not logging.INFO and repo_query.exists()
-        ):  # Don't comment on info level issues
-            logger.info(
-                _pr_comment_log(
-                    integration_name=self.integration_name, suffix="incorrect_repo_config"
-                ),
-                extra={"organization_id": project.organization_id},
-            )
-            return
-
-        repo: Repository = repo_query.get()
-
-        logger.info(
-            _pr_comment_log(integration_name=self.integration_name, suffix="queue_comment_check"),
-            extra={"organization_id": commit.organization_id, "merge_commit_sha": commit.key},
-        )
-        from sentry.integrations.github.tasks.pr_comment import github_comment_workflow
+            project=project,
+            commit=commit,
+        ).capture() as lifecycle:
+            if not OrganizationOption.objects.get_value(
+                organization=project.organization,
+                key="sentry:github_pr_bot",
+                default=True,
+            ):
+                # TODO: remove logger in favor of the log recorded in  lifecycle.record_halt
+                logger.info(
+                    _pr_comment_log(integration_name=self.integration_name, suffix="disabled"),
+                    extra={"organization_id": project.organization_id},
+                )
+                lifecycle.record_halt(CommitContextHaltReason.PR_BOT_DISABLED)
+                return
+
+            repo_query = Repository.objects.filter(id=commit.repository_id).order_by("-date_added")
+            group = Group.objects.get_from_cache(id=group_id)
+            if not (
+                group.level is not logging.INFO and repo_query.exists()
+            ):  # Don't comment on info level issues
+                logger.info(
+                    _pr_comment_log(
+                        integration_name=self.integration_name, suffix="incorrect_repo_config"
+                    ),
+                    extra={"organization_id": project.organization_id},
+                )
+                lifecycle.record_halt(CommitContextHaltReason.INCORRECT_REPO_CONFIG)
+                return
 
-        # client will raise an Exception if the request is not successful
-        try:
-            client = self.get_client()
-            merge_commit_sha = client.get_merge_commit_sha_from_commit(
-                repo=repo.name, sha=commit.key
-            )
-        except Exception as e:
-            sentry_sdk.capture_exception(e)
-            return
+            repo: Repository = repo_query.get()
+            lifecycle.add_extra("repository_id", repo.id)
 
-        if merge_commit_sha is None:
             logger.info(
                 _pr_comment_log(
-                    integration_name=self.integration_name,
-                    suffix="queue_comment_workflow.commit_not_in_default_branch",
+                    integration_name=self.integration_name, suffix="queue_comment_check"
                 ),
-                extra={
-                    "organization_id": commit.organization_id,
-                    "repository_id": repo.id,
-                    "commit_sha": commit.key,
-                },
+                extra={"organization_id": commit.organization_id, "merge_commit_sha": commit.key},
             )
-            return
+            scope = sentry_sdk.Scope.get_isolation_scope()
+            scope.set_tag("queue_comment_check.merge_commit_sha", commit.key)
+            scope.set_tag("queue_comment_check.organization_id", commit.organization_id)
+            from sentry.integrations.github.tasks.pr_comment import github_comment_workflow
+
+            # client will raise an Exception if the request is not successful
+            try:
+                client = self.get_client()
+                merge_commit_sha = client.get_merge_commit_sha_from_commit(
+                    repo=repo.name, sha=commit.key
+                )
+            except Exception as e:
+                sentry_sdk.capture_exception(e)
+                lifecycle.record_halt(e)
+                return
 
-        pr_query = PullRequest.objects.filter(
-            organization_id=commit.organization_id,
-            repository_id=commit.repository_id,
-            merge_commit_sha=merge_commit_sha,
-        )
-        if not pr_query.exists():
-            logger.info(
-                _pr_comment_log(
-                    integration_name=self.integration_name,
-                    suffix="queue_comment_workflow.missing_pr",
-                ),
-                extra={
-                    "organization_id": commit.organization_id,
-                    "repository_id": repo.id,
-                    "commit_sha": commit.key,
-                },
-            )
-            return
+            if merge_commit_sha is None:
+                logger.info(
+                    _pr_comment_log(
+                        integration_name=self.integration_name,
+                        suffix="queue_comment_workflow.commit_not_in_default_branch",
+                    ),
+                    extra={
+                        "organization_id": commit.organization_id,
+                        "repository_id": repo.id,
+                        "commit_sha": commit.key,
+                    },
+                )
+                lifecycle.record_halt(CommitContextHaltReason.COMMIT_NOT_IN_DEFAULT_BRANCH)
+                return
 
-        pr = pr_query.first()
-        assert pr is not None
-        # need to query explicitly for merged PR comments since we can have multiple comments per PR
-        merged_pr_comment_query = PullRequestComment.objects.filter(
-            pull_request_id=pr.id, comment_type=CommentType.MERGED_PR
-        )
-        if pr.date_added >= datetime.now(tz=timezone.utc) - timedelta(days=PR_COMMENT_WINDOW) and (
-            not merged_pr_comment_query.exists()
-            or group_owner.group_id not in merged_pr_comment_query[0].group_ids
-        ):
-            lock = locks.get(
-                _debounce_pr_comment_lock_key(pr.id), duration=10, name="queue_comment_task"
+            pr_query = PullRequest.objects.filter(
+                organization_id=commit.organization_id,
+                repository_id=commit.repository_id,
+                merge_commit_sha=merge_commit_sha,
             )
-            with lock.acquire():
-                cache_key = _debounce_pr_comment_cache_key(pullrequest_id=pr.id)
-                if cache.get(cache_key) is not None:
-                    return
-
-                # create PR commit row for suspect commit and PR
-                PullRequestCommit.objects.get_or_create(commit=commit, pull_request=pr)
-
+            if not pr_query.exists():
                 logger.info(
                     _pr_comment_log(
-                        integration_name=self.integration_name, suffix="queue_comment_workflow"
+                        integration_name=self.integration_name,
+                        suffix="queue_comment_workflow.missing_pr",
                     ),
-                    extra={"pullrequest_id": pr.id, "project_id": group_owner.project_id},
+                    extra={
+                        "organization_id": commit.organization_id,
+                        "repository_id": repo.id,
+                        "commit_sha": commit.key,
+                    },
                 )
+                lifecycle.record_halt(CommitContextHaltReason.MISSING_PR)
+                return
+
+            pr = pr_query.first()
+            lifecycle.add_extra("pull_request_id", pr.id if pr else None)
+            assert pr is not None
+            # need to query explicitly for merged PR comments since we can have multiple comments per PR
+            merged_pr_comment_query = PullRequestComment.objects.filter(
+                pull_request_id=pr.id, comment_type=CommentType.MERGED_PR
+            )
+            if pr.date_added >= datetime.now(tz=timezone.utc) - timedelta(
+                days=PR_COMMENT_WINDOW
+            ) and (
+                not merged_pr_comment_query.exists()
+                or group_owner.group_id not in merged_pr_comment_query[0].group_ids
+            ):
+                lock = locks.get(
+                    _debounce_pr_comment_lock_key(pr.id), duration=10, name="queue_comment_task"
+                )
+                with lock.acquire():
+                    cache_key = _debounce_pr_comment_cache_key(pullrequest_id=pr.id)
+                    if cache.get(cache_key) is not None:
+                        lifecycle.record_halt(CommitContextHaltReason.ALREADY_QUEUED)
+                        return
 
-                cache.set(cache_key, True, PR_COMMENT_TASK_TTL)
+                    # create PR commit row for suspect commit and PR
+                    PullRequestCommit.objects.get_or_create(commit=commit, pull_request=pr)
 
-                github_comment_workflow.delay(
-                    pullrequest_id=pr.id, project_id=group_owner.project_id
-                )
+                    logger.info(
+                        _pr_comment_log(
+                            integration_name=self.integration_name, suffix="queue_comment_workflow"
+                        ),
+                        extra={"pullrequest_id": pr.id, "project_id": group_owner.project_id},
+                    )
+
+                    cache.set(cache_key, True, PR_COMMENT_TASK_TTL)
+
+                    github_comment_workflow.delay(
+                        pullrequest_id=pr.id, project_id=group_owner.project_id
+                    )
 
     def create_or_update_comment(
         self,
@@ -248,70 +289,81 @@ def create_or_update_comment(
         )
         pr_comment = pr_comment_query[0] if pr_comment_query.exists() else None
 
-        # client will raise ApiError if the request is not successful
-        if pr_comment is None:
-            resp = client.create_comment(
-                repo=repo.name,
-                issue_id=str(pr_key),
-                data=(
-                    {
-                        "body": comment_body,
-                        "actions": github_copilot_actions,
-                    }
-                    if github_copilot_actions
-                    else {"body": comment_body}
-                ),
-            )
+        interaction_type = (
+            SCMIntegrationInteractionType.CREATE_COMMENT
+            if not pr_comment
+            else SCMIntegrationInteractionType.UPDATE_COMMENT
+        )
 
-            current_time = django_timezone.now()
-            comment = PullRequestComment.objects.create(
-                external_id=resp.body["id"],
-                pull_request_id=pullrequest_id,
-                created_at=current_time,
-                updated_at=current_time,
-                group_ids=issue_list,
-                comment_type=comment_type,
-            )
-            metrics.incr(
-                metrics_base.format(integration=self.integration_name, key="comment_created")
-            )
+        with CommitContextIntegrationInteractionEvent(
+            interaction_type=interaction_type,
+            provider_key=self.integration_name,
+            repository=repo,
+            pull_request_id=pullrequest_id,
+        ).capture():
+            if pr_comment is None:
+                resp = client.create_comment(
+                    repo=repo.name,
+                    issue_id=str(pr_key),
+                    data=(
+                        {
+                            "body": comment_body,
+                            "actions": github_copilot_actions,
+                        }
+                        if github_copilot_actions
+                        else {"body": comment_body}
+                    ),
+                )
 
-            if comment_type == CommentType.OPEN_PR:
-                analytics.record(
-                    "open_pr_comment.created",
-                    comment_id=comment.id,
-                    org_id=repo.organization_id,
-                    pr_id=pullrequest_id,
-                    language=(language or "not found"),
+                current_time = django_timezone.now()
+                comment = PullRequestComment.objects.create(
+                    external_id=resp.body["id"],
+                    pull_request_id=pullrequest_id,
+                    created_at=current_time,
+                    updated_at=current_time,
+                    group_ids=issue_list,
+                    comment_type=comment_type,
                 )
-        else:
-            resp = client.update_comment(
-                repo=repo.name,
-                issue_id=str(pr_key),
-                comment_id=pr_comment.external_id,
-                data=(
-                    {
-                        "body": comment_body,
-                        "actions": github_copilot_actions,
-                    }
-                    if github_copilot_actions
-                    else {"body": comment_body}
-                ),
+                metrics.incr(
+                    metrics_base.format(integration=self.integration_name, key="comment_created")
+                )
+
+                if comment_type == CommentType.OPEN_PR:
+                    analytics.record(
+                        "open_pr_comment.created",
+                        comment_id=comment.id,
+                        org_id=repo.organization_id,
+                        pr_id=pullrequest_id,
+                        language=(language or "not found"),
+                    )
+            else:
+                resp = client.update_comment(
+                    repo=repo.name,
+                    issue_id=str(pr_key),
+                    comment_id=pr_comment.external_id,
+                    data=(
+                        {
+                            "body": comment_body,
+                            "actions": github_copilot_actions,
+                        }
+                        if github_copilot_actions
+                        else {"body": comment_body}
+                    ),
+                )
+                metrics.incr(
+                    metrics_base.format(integration=self.integration_name, key="comment_updated")
+                )
+                pr_comment.updated_at = django_timezone.now()
+                pr_comment.group_ids = issue_list
+                pr_comment.save()
+
+            logger_event = metrics_base.format(
+                integration=self.integration_name, key="create_or_update_comment"
             )
-            metrics.incr(
-                metrics_base.format(integration=self.integration_name, key="comment_updated")
+            logger.info(
+                logger_event,
+                extra={"new_comment": pr_comment is None, "pr_key": pr_key, "repo": repo.name},
             )
-            pr_comment.updated_at = django_timezone.now()
-            pr_comment.group_ids = issue_list
-            pr_comment.save()
-
-        logger_event = metrics_base.format(
-            integration=self.integration_name, key="create_or_update_comment"
-        )
-        logger.info(
-            logger_event,
-            extra={"new_comment": pr_comment is None, "pr_key": pr_key, "repo": repo.name},
-        )
 
 
 class CommitContextClient(ABC):
diff --git a/src/sentry/integrations/source_code_management/issues.py b/src/sentry/integrations/source_code_management/issues.py
index a1de561da34e40..04d7487f1e9090 100644
--- a/src/sentry/integrations/source_code_management/issues.py
+++ b/src/sentry/integrations/source_code_management/issues.py
@@ -6,8 +6,8 @@
 
 from sentry.integrations.mixins.issues import IssueBasicIntegration
 from sentry.integrations.source_code_management.metrics import (
-    SourceCodeIssueIntegrationInteractionEvent,
-    SourceCodeIssueIntegrationInteractionType,
+    SCMIntegrationInteractionEvent,
+    SCMIntegrationInteractionType,
 )
 from sentry.integrations.source_code_management.repository import BaseRepositoryIntegration
 from sentry.models.group import Group
@@ -15,8 +15,8 @@
 
 
 class SourceCodeIssueIntegration(IssueBasicIntegration, BaseRepositoryIntegration, ABC):
-    def record_event(self, event: SourceCodeIssueIntegrationInteractionType):
-        return SourceCodeIssueIntegrationInteractionEvent(
+    def record_event(self, event: SCMIntegrationInteractionType):
+        return SCMIntegrationInteractionEvent(
             interaction_type=event,
             provider_key=self.model.provider,
             organization=self.organization,
@@ -27,9 +27,7 @@ def get_repository_choices(self, group: Group | None, params: Mapping[str, Any],
         """
         Returns the default repository and a set/subset of repositories of associated with the installation
         """
-        with self.record_event(
-            SourceCodeIssueIntegrationInteractionType.GET_REPOSITORY_CHOICES
-        ).capture():
+        with self.record_event(SCMIntegrationInteractionType.GET_REPOSITORY_CHOICES).capture():
             try:
                 repos = self.get_repositories()
             except ApiError:
diff --git a/src/sentry/integrations/source_code_management/metrics.py b/src/sentry/integrations/source_code_management/metrics.py
index cf359c4f934319..77e1c6bc0b5834 100644
--- a/src/sentry/integrations/source_code_management/metrics.py
+++ b/src/sentry/integrations/source_code_management/metrics.py
@@ -1,5 +1,5 @@
 from collections.abc import Mapping
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from attr import dataclass
@@ -8,41 +8,52 @@
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.services.integration import RpcOrganizationIntegration
 from sentry.integrations.utils.metrics import IntegrationEventLifecycleMetric
+from sentry.models.commit import Commit
 from sentry.models.organization import Organization
+from sentry.models.project import Project
+from sentry.models.repository import Repository
 from sentry.organizations.services.organization import RpcOrganization
 
 
-class RepositoryIntegrationInteractionType(Enum):
+class SCMIntegrationInteractionType(StrEnum):
     """
-    A RepositoryIntegration feature.
+    SCM integration features
     """
 
-    GET_STACKTRACE_LINK = "GET_STACKTRACE_LINK"
-    GET_CODEOWNER_FILE = "GET_CODEOWNER_FILE"
-    CHECK_FILE = "CHECK_FILE"
+    # RepositoryIntegration
+    GET_STACKTRACE_LINK = "get_stacktrace_link"
+    GET_CODEOWNER_FILE = "get_codeowner_file"
+    CHECK_FILE = "check_file"
 
-    def __str__(self) -> str:
-        return self.value.lower()
+    # SourceCodeIssueIntegration (SCM only)
+    GET_REPOSITORY_CHOICES = "get_repository_choices"
 
+    # SourceCodeSearchEndpoint
+    HANDLE_SEARCH_ISSUES = "handle_search_issues"
+    HANDLE_SEARCH_REPOSITORIES = "handle_search_repositories"
+    GET = "get"
 
-class SourceCodeIssueIntegrationInteractionType(Enum):
-    """
-    A SourceCodeIssueIntegration feature.
-    """
+    # CommitContextIntegration
+    GET_BLAME_FOR_FILES = "get_blame_for_files"
+    CREATE_COMMENT = "create_comment"
+    UPDATE_COMMENT = "update_comment"
+    QUEUE_COMMENT_TASK = "queue_comment_task"
 
-    GET_REPOSITORY_CHOICES = "GET_REPOSITORY_CHOICES"
-    CREATE_ISSUE = "CREATE_ISSUE"
-    SYNC_STATUS_OUTBOUND = "SYNC_STATUS_OUTBOUND"
-    SYNC_ASSIGNEE_OUTBOUND = "SYNC_ASSIGNEE_OUTBOUND"
+    # Tasks
+    LINK_ALL_REPOS = "link_all_repos"
+
+    # GitHub only
+    DERIVE_CODEMAPPINGS = "derive_codemappings"
+    STUDENT_PACK = "student_pack"
 
 
 @dataclass
-class RepositoryIntegrationInteractionEvent(IntegrationEventLifecycleMetric):
+class SCMIntegrationInteractionEvent(IntegrationEventLifecycleMetric):
     """
-    An instance to be recorded of a RepositoryIntegration feature call.
+    An instance to be recorded of an SCM integration feature call.
     """
 
-    interaction_type: RepositoryIntegrationInteractionType
+    interaction_type: SCMIntegrationInteractionType
     provider_key: str
 
     # Optional attributes to populate extras
@@ -66,29 +77,57 @@ def get_extras(self) -> Mapping[str, Any]:
 
 
 @dataclass
-class SourceCodeIssueIntegrationInteractionEvent(IntegrationEventLifecycleMetric):
+class CommitContextIntegrationInteractionEvent(SCMIntegrationInteractionEvent):
     """
-    An instance to be recorded of a SourceCodeIssueIntegration feature call.
+    An instance to be recorded of a CommitContextIntegration feature call.
     """
 
-    interaction_type: SourceCodeIssueIntegrationInteractionType
-    provider_key: str
+    project: Project | None = None
+    commit: Commit | None = None
+    repository: Repository | None = None
+    pull_request_id: int | None = None
 
-    # Optional attributes to populate extras
-    organization: Organization | RpcOrganization | None = None
-    org_integration: OrganizationIntegration | RpcOrganizationIntegration | None = None
+    def get_extras(self) -> Mapping[str, Any]:
+        parent_extras = super().get_extras()
+        return {
+            **parent_extras,
+            "project_id": (self.project.id if self.project else None),
+            "commit_id": (self.commit.id if self.commit else None),
+            "repository_id": (self.repository.id if self.repository else None),
+            "pull_request_id": self.pull_request_id,
+        }
 
-    def get_integration_domain(self) -> IntegrationDomain:
-        return IntegrationDomain.SOURCE_CODE_MANAGEMENT
 
-    def get_integration_name(self) -> str:
-        return self.provider_key
+class CommitContextHaltReason(StrEnum):
+    """Common reasons why a commit context integration may halt without success/failure."""
 
-    def get_interaction_type(self) -> str:
-        return str(self.interaction_type)
+    PR_BOT_DISABLED = "pr_bot_disabled"
+    INCORRECT_REPO_CONFIG = "incorrect_repo_config"
+    COMMIT_NOT_IN_DEFAULT_BRANCH = "commit_not_in_default_branch"
+    MISSING_PR = "missing_pr"
+    ALREADY_QUEUED = "already_queued"
 
-    def get_extras(self) -> Mapping[str, Any]:
-        return {
-            "organization_id": (self.organization.id if self.organization else None),
-            "org_integration_id": (self.org_integration.id if self.org_integration else None),
-        }
+
+class LinkAllReposHaltReason(StrEnum):
+    """
+    Common reasons why a link all repos task may halt without success/failure.
+    """
+
+    MISSING_INTEGRATION = "missing_integration"
+    MISSING_ORGANIZATION = "missing_organization"
+    RATE_LIMITED = "rate_limited"
+    REPOSITORY_NOT_CREATED = "repository_not_created"
+
+
+class SourceCodeSearchEndpointHaltReason(StrEnum):
+    """
+    Reasons why a SourceCodeSearchEndpoint method (handle_search_issues,
+    handle_search_repositories, or get) may halt without success/failure.
+    """
+
+    NO_ISSUE_TRACKER = "no_issue_tracker"
+    RATE_LIMITED = "rate_limited"
+    MISSING_REPOSITORY_OR_NO_ACCESS = "missing_repository_or_no_access"
+    MISSING_INTEGRATION = "missing_integration"
+    SERIALIZER_ERRORS = "serializer_errors"
+    MISSING_REPOSITORY_FIELD = "missing_repository_field"
diff --git a/src/sentry/integrations/source_code_management/repository.py b/src/sentry/integrations/source_code_management/repository.py
index ed1d097a5fbf84..bf737cdfda0062 100644
--- a/src/sentry/integrations/source_code_management/repository.py
+++ b/src/sentry/integrations/source_code_management/repository.py
@@ -10,8 +10,8 @@
 from sentry.integrations.base import IntegrationInstallation
 from sentry.integrations.services.repository import RpcRepository
 from sentry.integrations.source_code_management.metrics import (
-    RepositoryIntegrationInteractionEvent,
-    RepositoryIntegrationInteractionType,
+    SCMIntegrationInteractionEvent,
+    SCMIntegrationInteractionType,
 )
 from sentry.models.repository import Repository
 from sentry.shared_integrations.client.base import BaseApiResponseX
@@ -97,8 +97,8 @@ def get_unmigratable_repositories(self) -> list[RpcRepository]:
         """
         return []
 
-    def record_event(self, event: RepositoryIntegrationInteractionType):
-        return RepositoryIntegrationInteractionEvent(
+    def record_event(self, event: SCMIntegrationInteractionType):
+        return SCMIntegrationInteractionEvent(
             interaction_type=event,
             provider_key=self.integration_name,
             organization=self.organization,
@@ -118,7 +118,7 @@ def check_file(self, repo: Repository, filepath: str, branch: str | None = None)
         filepath: file from the stacktrace (string)
         branch: commitsha or default_branch (string)
         """
-        with self.record_event(RepositoryIntegrationInteractionType.CHECK_FILE).capture():
+        with self.record_event(SCMIntegrationInteractionType.CHECK_FILE).capture():
             filepath = filepath.lstrip("/")
             try:
                 client = self.get_client()
@@ -153,7 +153,7 @@ def get_stacktrace_link(
         If no file was found return `None`, and re-raise for non-"Not Found"
         errors, like 403 "Account Suspended".
         """
-        with self.record_event(RepositoryIntegrationInteractionType.GET_STACKTRACE_LINK).capture():
+        with self.record_event(SCMIntegrationInteractionType.GET_STACKTRACE_LINK).capture():
             scope = sentry_sdk.Scope.get_isolation_scope()
             scope.set_tag("stacktrace_link.tried_version", False)
             if version:
@@ -182,7 +182,7 @@ def get_codeowner_file(
          * filepath - full path of the file i.e. CODEOWNERS, .github/CODEOWNERS, docs/CODEOWNERS
          * raw - the decoded raw contents of the codeowner file
         """
-        with self.record_event(RepositoryIntegrationInteractionType.GET_CODEOWNER_FILE).capture():
+        with self.record_event(SCMIntegrationInteractionType.GET_CODEOWNER_FILE).capture():
             if self.codeowners_locations is None:
                 raise NotImplementedError("Implement self.codeowners_locations to use this method.")
 
diff --git a/src/sentry/integrations/source_code_management/search.py b/src/sentry/integrations/source_code_management/search.py
index d6619aaa287291..c3d90350538c95 100644
--- a/src/sentry/integrations/source_code_management/search.py
+++ b/src/sentry/integrations/source_code_management/search.py
@@ -13,6 +13,11 @@
 from sentry.integrations.api.bases.integration import IntegrationEndpoint
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.source_code_management.issues import SourceCodeIssueIntegration
+from sentry.integrations.source_code_management.metrics import (
+    SCMIntegrationInteractionEvent,
+    SCMIntegrationInteractionType,
+    SourceCodeSearchEndpointHaltReason,
+)
 from sentry.organizations.services.organization import RpcOrganization
 
 T = TypeVar("T", bound=SourceCodeIssueIntegration)
@@ -55,6 +60,15 @@ def installation_class(
     def handle_search_issues(self, installation: T, query: str, repo: str | None) -> Response:
         raise NotImplementedError
 
+    def record_event(self, event: SCMIntegrationInteractionType):
+        # XXX (mifu67): self.integration_provider is None for the GithubSharedSearchEndpoint,
+        # which is used by both GitHub and GitHub Enterprise.
+        provider_name = "github" if self.integration_provider is None else self.integration_provider
+        return SCMIntegrationInteractionEvent(
+            interaction_type=event,
+            provider_key=provider_name,
+        )
+
     # not used in VSTS
     def handle_search_repositories(
         self, integration: Integration, installation: T, query: str
@@ -64,41 +78,50 @@ def handle_search_repositories(
     def get(
         self, request: Request, organization: RpcOrganization, integration_id: int, **kwds: Any
     ) -> Response:
-        integration_query = Q(
-            organizationintegration__organization_id=organization.id, id=integration_id
-        )
-
-        if self.integration_provider:
-            integration_query &= Q(provider=self.integration_provider)
-        try:
-            integration: Integration = Integration.objects.get(integration_query)
-        except Integration.DoesNotExist:
-            return Response(status=404)
-
-        serializer = SourceCodeSearchSerializer(data=request.query_params)
-        if not serializer.is_valid():
-            return self.respond(serializer.errors, status=400)
-
-        field = serializer.validated_data["field"]
-        query = serializer.validated_data["query"]
-
-        installation = integration.get_installation(organization.id)
-        if not isinstance(installation, self.installation_class):
-            raise NotFound(f"Integration by that id is not of type {self.integration_provider}.")
-
-        if field == self.issue_field:
-            repo = None
-
-            if self.repository_field:  # only fetch repository
-                repo = request.GET.get(self.repository_field)
-                if repo is None:
-                    return Response(
-                        {"detail": f"{self.repository_field} is a required parameter"}, status=400
-                    )
-
-            return self.handle_search_issues(installation, query, repo)
-
-        if self.repository_field and field == self.repository_field:
-            return self.handle_search_repositories(integration, installation, query)
-
-        return Response({"detail": "Invalid field"}, status=400)
+        with self.record_event(SCMIntegrationInteractionType.GET).capture() as lifecycle:
+            integration_query = Q(
+                organizationintegration__organization_id=organization.id, id=integration_id
+            )
+
+            if self.integration_provider:
+                integration_query &= Q(provider=self.integration_provider)
+            try:
+                integration: Integration = Integration.objects.get(integration_query)
+            except Integration.DoesNotExist:
+                lifecycle.record_halt(str(SourceCodeSearchEndpointHaltReason.MISSING_INTEGRATION))
+                return Response(status=404)
+
+            serializer = SourceCodeSearchSerializer(data=request.query_params)
+            if not serializer.is_valid():
+                lifecycle.record_halt(str(SourceCodeSearchEndpointHaltReason.SERIALIZER_ERRORS))
+                return self.respond(serializer.errors, status=400)
+
+            field = serializer.validated_data["field"]
+            query = serializer.validated_data["query"]
+
+            installation = integration.get_installation(organization.id)
+            if not isinstance(installation, self.installation_class):
+                raise NotFound(
+                    f"Integration by that id is not of type {self.integration_provider}."
+                )
+
+            if field == self.issue_field:
+                repo = None
+
+                if self.repository_field:  # only fetch repository
+                    repo = request.GET.get(self.repository_field)
+                    if repo is None:
+                        lifecycle.record_halt(
+                            str(SourceCodeSearchEndpointHaltReason.MISSING_REPOSITORY_FIELD)
+                        )
+                        return Response(
+                            {"detail": f"{self.repository_field} is a required parameter"},
+                            status=400,
+                        )
+
+                return self.handle_search_issues(installation, query, repo)
+
+            if self.repository_field and field == self.repository_field:
+                return self.handle_search_repositories(integration, installation, query)
+
+            return Response({"detail": "Invalid field"}, status=400)
diff --git a/src/sentry/integrations/tasks/sync_assignee_outbound.py b/src/sentry/integrations/tasks/sync_assignee_outbound.py
index 78b24fe9273a28..749113771cbd15 100644
--- a/src/sentry/integrations/tasks/sync_assignee_outbound.py
+++ b/src/sentry/integrations/tasks/sync_assignee_outbound.py
@@ -4,6 +4,10 @@
 from sentry.constants import ObjectStatus
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.models.integration import Integration
+from sentry.integrations.project_management.metrics import (
+    ProjectManagementActionType,
+    ProjectManagementEvent,
+)
 from sentry.integrations.services.assignment_source import AssignmentSource
 from sentry.integrations.services.integration import integration_service
 from sentry.models.organization import Organization
@@ -48,23 +52,28 @@ def sync_assignee_outbound(
         return
 
     installation = integration.get_installation(organization_id=external_issue.organization_id)
-    if not (
-        hasattr(installation, "should_sync") and hasattr(installation, "sync_assignee_outbound")
-    ):
-        return
 
-    parsed_assignment_source = (
-        AssignmentSource.from_dict(assignment_source_dict) if assignment_source_dict else None
-    )
-    if installation.should_sync("outbound_assignee", parsed_assignment_source):
-        # Assume unassign if None.
-        user = user_service.get_user(user_id) if user_id else None
-        installation.sync_assignee_outbound(
-            external_issue, user, assign=assign, assignment_source=parsed_assignment_source
-        )
-        analytics.record(
-            "integration.issue.assignee.synced",
-            provider=integration.provider,
-            id=integration.id,
-            organization_id=external_issue.organization_id,
+    with ProjectManagementEvent(
+        action_type=ProjectManagementActionType.OUTBOUND_ASSIGNMENT_SYNC, integration=integration
+    ).capture() as lifecycle:
+        lifecycle.add_extra("sync_task", "sync_assignee_outbound")
+        if not (
+            hasattr(installation, "should_sync") and hasattr(installation, "sync_assignee_outbound")
+        ):
+            return
+
+        parsed_assignment_source = (
+            AssignmentSource.from_dict(assignment_source_dict) if assignment_source_dict else None
         )
+        if installation.should_sync("outbound_assignee", parsed_assignment_source):
+            # Assume unassign if None.
+            user = user_service.get_user(user_id) if user_id else None
+            installation.sync_assignee_outbound(
+                external_issue, user, assign=assign, assignment_source=parsed_assignment_source
+            )
+            analytics.record(
+                "integration.issue.assignee.synced",
+                provider=integration.provider,
+                id=integration.id,
+                organization_id=external_issue.organization_id,
+            )
diff --git a/src/sentry/integrations/tasks/sync_status_inbound.py b/src/sentry/integrations/tasks/sync_status_inbound.py
index 729428d5118219..7337a657ced6b1 100644
--- a/src/sentry/integrations/tasks/sync_status_inbound.py
+++ b/src/sentry/integrations/tasks/sync_status_inbound.py
@@ -243,6 +243,7 @@ def sync_status_inbound(
                 organization_id=organization_id,
                 group_id=group.id,
                 resolution_type="with_third_party_app",
+                provider=provider.key,
                 issue_type=group.issue_type.slug,
                 issue_category=group.issue_category.name.lower(),
             )
diff --git a/src/sentry/integrations/tasks/sync_status_outbound.py b/src/sentry/integrations/tasks/sync_status_outbound.py
index 7aa1fb3afcc9d9..cf6dfe157a1ad3 100644
--- a/src/sentry/integrations/tasks/sync_status_outbound.py
+++ b/src/sentry/integrations/tasks/sync_status_outbound.py
@@ -2,6 +2,10 @@
 from sentry.constants import ObjectStatus
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.models.integration import Integration
+from sentry.integrations.project_management.metrics import (
+    ProjectManagementActionType,
+    ProjectManagementEvent,
+)
 from sentry.integrations.services.integration import integration_service
 from sentry.models.group import Group, GroupStatus
 from sentry.silo.base import SiloMode
@@ -43,14 +47,19 @@ def sync_status_outbound(group_id: int, external_issue_id: int) -> bool | None:
     installation = integration.get_installation(organization_id=external_issue.organization_id)
     if not (hasattr(installation, "should_sync") and hasattr(installation, "sync_status_outbound")):
         return None
-    if installation.should_sync("outbound_status"):
-        installation.sync_status_outbound(
-            external_issue, group.status == GroupStatus.RESOLVED, group.project_id
-        )
-        analytics.record(
-            "integration.issue.status.synced",
-            provider=integration.provider,
-            id=integration.id,
-            organization_id=external_issue.organization_id,
-        )
+
+    with ProjectManagementEvent(
+        action_type=ProjectManagementActionType.OUTBOUND_STATUS_SYNC, integration=integration
+    ).capture() as lifecycle:
+        lifecycle.add_extra("sync_task", "sync_status_outbound")
+        if installation.should_sync("outbound_status"):
+            installation.sync_status_outbound(
+                external_issue, group.status == GroupStatus.RESOLVED, group.project_id
+            )
+            analytics.record(
+                "integration.issue.status.synced",
+                provider=integration.provider,
+                id=integration.id,
+                organization_id=external_issue.organization_id,
+            )
     return None
diff --git a/src/sentry/integrations/types.py b/src/sentry/integrations/types.py
index 6c71f7b516a721..cc3bb0b3324fd2 100644
--- a/src/sentry/integrations/types.py
+++ b/src/sentry/integrations/types.py
@@ -92,4 +92,5 @@ def __str__(self) -> str:
 class IntegrationResponse(Generic[T]):
     interaction_result: EventLifecycleOutcome
     response: T
+    outcome_reason: str | Exception | None = None
     context_data: dict | None = None
diff --git a/src/sentry/integrations/utils/metrics.py b/src/sentry/integrations/utils/metrics.py
index 1da2b33917ffbb..f28252d9c1db0d 100644
--- a/src/sentry/integrations/utils/metrics.py
+++ b/src/sentry/integrations/utils/metrics.py
@@ -2,7 +2,7 @@
 from abc import ABC, abstractmethod
 from collections.abc import Mapping
 from dataclasses import dataclass
-from enum import Enum
+from enum import StrEnum
 from types import TracebackType
 from typing import Any, Self
 
@@ -113,8 +113,12 @@ def add_extra(self, name: str, value: Any) -> None:
         """
         self._extra[name] = value
 
+    def add_extras(self, extras: Mapping[str, int | str]) -> None:
+        """Add multiple values to logged "extra" data."""
+        self._extra.update(extras)
+
     def record_event(
-        self, outcome: EventLifecycleOutcome, exc: BaseException | None = None
+        self, outcome: EventLifecycleOutcome, outcome_reason: BaseException | str | None = None
     ) -> None:
         """Record a starting or halting event.
 
@@ -128,28 +132,35 @@ def record_event(
         sample_rate = 1.0
         metrics.incr(key, tags=tags, sample_rate=sample_rate)
 
+        extra = dict(self._extra)
+        extra.update(tags)
+        log_params: dict[str, Any] = {
+            "extra": extra,
+        }
+
+        if isinstance(outcome_reason, BaseException):
+            log_params["exc_info"] = outcome_reason
+        elif isinstance(outcome_reason, str):
+            extra["outcome_reason"] = outcome_reason
+
         if outcome == EventLifecycleOutcome.FAILURE:
-            extra = dict(self._extra)
-            extra.update(tags)
-            logger.error(key, extra=self._extra, exc_info=exc)
+            logger.error(key, **log_params)
         elif outcome == EventLifecycleOutcome.HALTED:
-            extra = dict(self._extra)
-            extra.update(tags)
-            logger.warning(key, extra=self._extra, exc_info=exc)
+            logger.warning(key, **log_params)
 
     @staticmethod
     def _report_flow_error(message) -> None:
         logger.error("EventLifecycle flow error: %s", message)
 
     def _terminate(
-        self, new_state: EventLifecycleOutcome, exc: BaseException | None = None
+        self, new_state: EventLifecycleOutcome, outcome_reason: BaseException | str | None = None
     ) -> None:
         if self._state is None:
             self._report_flow_error("The lifecycle has not yet been entered")
         if self._state != EventLifecycleOutcome.STARTED:
             self._report_flow_error("The lifecycle has already been exited")
         self._state = new_state
-        self.record_event(new_state, exc)
+        self.record_event(new_state, outcome_reason)
 
     def record_success(self) -> None:
         """Record that the event halted successfully.
@@ -162,7 +173,7 @@ def record_success(self) -> None:
         self._terminate(EventLifecycleOutcome.SUCCESS)
 
     def record_failure(
-        self, exc: BaseException | None = None, extra: dict[str, Any] | None = None
+        self, failure_reason: BaseException | str | None = None, extra: dict[str, Any] | None = None
     ) -> None:
         """Record that the event halted in failure. Additional data may be passed
         to be logged.
@@ -179,10 +190,10 @@ def record_failure(
 
         if extra:
             self._extra.update(extra)
-        self._terminate(EventLifecycleOutcome.FAILURE, exc)
+        self._terminate(EventLifecycleOutcome.FAILURE, failure_reason)
 
     def record_halt(
-        self, exc: BaseException | None = None, extra: dict[str, Any] | None = None
+        self, halt_reason: BaseException | str | None = None, extra: dict[str, Any] | None = None
     ) -> None:
         """Record that the event halted in an ambiguous state.
 
@@ -200,7 +211,7 @@ def record_halt(
 
         if extra:
             self._extra.update(extra)
-        self._terminate(EventLifecycleOutcome.HALTED, exc)
+        self._terminate(EventLifecycleOutcome.HALTED, halt_reason)
 
     def __enter__(self) -> Self:
         if self._state is not None:
@@ -234,30 +245,27 @@ def __exit__(
             )
 
 
-class IntegrationPipelineViewType(Enum):
+class IntegrationPipelineViewType(StrEnum):
     """A specific step in an integration's pipeline that is not a static page."""
 
     # IdentityProviderPipeline
-    IDENTITY_LOGIN = "IDENTITY_LOGIN"
-    IDENTITY_LINK = "IDENTITY_LINK"
-    TOKEN_EXCHANGE = "TOKEN_EXCHANGE"
+    IDENTITY_LOGIN = "identity_login"
+    IDENTITY_LINK = "identity_link"
+    TOKEN_EXCHANGE = "token_exchange"
 
     # GitHub
-    OAUTH_LOGIN = "OAUTH_LOGIN"
-    GITHUB_INSTALLATION = "GITHUB_INSTALLATION"
+    OAUTH_LOGIN = "oauth_loging"
+    GITHUB_INSTALLATION = "github_installation"
 
     # Bitbucket
-    VERIFY_INSTALLATION = "VERIFY_INSTALLATION"
+    VERIFY_INSTALLATION = "verify_installation"
 
     # Bitbucket Server
     # OAUTH_LOGIN = "OAUTH_LOGIN"
-    OAUTH_CALLBACK = "OAUTH_CALLBACK"
+    OAUTH_CALLBACK = "oauth_callback"
 
     # Azure DevOps
-    ACCOUNT_CONFIG = "ACCOUNT_CONFIG"
-
-    def __str__(self) -> str:
-        return self.value.lower()
+    ACCOUNT_CONFIG = "account_config"
 
 
 @dataclass
@@ -279,3 +287,31 @@ def get_integration_name(self) -> str:
 
     def get_interaction_type(self) -> str:
         return str(self.interaction_type)
+
+
+class IntegrationWebhookEventType(StrEnum):
+    INSTALLATION = "installation"
+    PUSH = "push"
+    PULL_REQUEST = "pull_request"
+    INBOUND_SYNC = "inbound_sync"
+
+
+@dataclass
+class IntegrationWebhookEvent(IntegrationEventLifecycleMetric):
+    """An instance to be recorded of a webhook event."""
+
+    interaction_type: IntegrationWebhookEventType
+    domain: IntegrationDomain
+    provider_key: str
+
+    def get_metrics_domain(self) -> str:
+        return "webhook"
+
+    def get_integration_domain(self) -> IntegrationDomain:
+        return self.domain
+
+    def get_integration_name(self) -> str:
+        return self.provider_key
+
+    def get_interaction_type(self) -> str:
+        return str(self.interaction_type)
diff --git a/src/sentry/integrations/utils/sync.py b/src/sentry/integrations/utils/sync.py
index a672dc4daee464..86bb58330748ae 100644
--- a/src/sentry/integrations/utils/sync.py
+++ b/src/sentry/integrations/utils/sync.py
@@ -6,6 +6,11 @@
 
 from sentry import features
 from sentry.integrations.models.integration import Integration
+from sentry.integrations.project_management.metrics import (
+    ProjectManagementActionType,
+    ProjectManagementEvent,
+    ProjectManagementHaltReason,
+)
 from sentry.integrations.services.assignment_source import AssignmentSource
 from sentry.integrations.services.integration import integration_service
 from sentry.integrations.tasks.sync_assignee_outbound import sync_assignee_outbound
@@ -77,48 +82,54 @@ def sync_group_assignee_inbound(
 
     logger = logging.getLogger(f"sentry.integrations.{integration.provider}")
 
-    orgs_with_sync_enabled = where_should_sync(integration, "inbound_assignee")
-    affected_groups = Group.objects.get_groups_by_external_issue(
-        integration,
-        orgs_with_sync_enabled,
-        external_issue_key,
-    )
-    log_context = {
-        "integration_id": integration.id,
-        "email": email,
-        "issue_key": external_issue_key,
-    }
-    if not affected_groups:
-        logger.info("no-affected-groups", extra=log_context)
-        return []
-
-    if not assign:
+    with ProjectManagementEvent(
+        action_type=ProjectManagementActionType.INBOUND_ASSIGNMENT_SYNC, integration=integration
+    ).capture() as lifecycle:
+        orgs_with_sync_enabled = where_should_sync(integration, "inbound_assignee")
+        affected_groups = Group.objects.get_groups_by_external_issue(
+            integration,
+            orgs_with_sync_enabled,
+            external_issue_key,
+        )
+        log_context = {
+            "integration_id": integration.id,
+            "email": email,
+            "issue_key": external_issue_key,
+        }
+        if not affected_groups:
+            logger.info("no-affected-groups", extra=log_context)
+            return []
+
+        if not assign:
+            for group in affected_groups:
+                GroupAssignee.objects.deassign(
+                    group,
+                    assignment_source=AssignmentSource.from_integration(integration),
+                )
+
+            return affected_groups
+
+        users = user_service.get_many_by_email(emails=[email], is_verified=True)
+        users_by_id = {user.id: user for user in users}
+        projects_by_user = Project.objects.get_by_users(users)
+
+        groups_assigned = []
         for group in affected_groups:
-            GroupAssignee.objects.deassign(
-                group,
-                assignment_source=AssignmentSource.from_integration(integration),
-            )
-
-        return affected_groups
-
-    users = user_service.get_many_by_email(emails=[email], is_verified=True)
-    users_by_id = {user.id: user for user in users}
-    projects_by_user = Project.objects.get_by_users(users)
-
-    groups_assigned = []
-    for group in affected_groups:
-        user_id = get_user_id(projects_by_user, group)
-        user = users_by_id.get(user_id)
-        if user:
-            GroupAssignee.objects.assign(
-                group,
-                user,
-                assignment_source=AssignmentSource.from_integration(integration),
-            )
-            groups_assigned.append(group)
-        else:
-            logger.info("assignee-not-found-inbound", extra=log_context)
-    return groups_assigned
+            user_id = get_user_id(projects_by_user, group)
+            user = users_by_id.get(user_id)
+            if user:
+                GroupAssignee.objects.assign(
+                    group,
+                    user,
+                    assignment_source=AssignmentSource.from_integration(integration),
+                )
+                groups_assigned.append(group)
+            else:
+                lifecycle.record_halt(
+                    ProjectManagementHaltReason.SYNC_INBOUND_ASSIGNEE_NOT_FOUND, extra=log_context
+                )
+                logger.info("inbound-assignee-not-found", extra=log_context)
+        return groups_assigned
 
 
 def sync_group_assignee_outbound(
diff --git a/src/sentry/integrations/vsts/integration.py b/src/sentry/integrations/vsts/integration.py
index b6b84563f5921b..8db5fe37936af1 100644
--- a/src/sentry/integrations/vsts/integration.py
+++ b/src/sentry/integrations/vsts/integration.py
@@ -20,6 +20,7 @@
 from sentry.identity.vsts.provider import get_user_info
 from sentry.integrations.base import (
     FeatureDescription,
+    IntegrationDomain,
     IntegrationFeatures,
     IntegrationMetadata,
     IntegrationProvider,
@@ -31,6 +32,10 @@
 from sentry.integrations.services.repository import RpcRepository, repository_service
 from sentry.integrations.source_code_management.repository import RepositoryIntegration
 from sentry.integrations.tasks.migrate_repo import migrate_repo
+from sentry.integrations.utils.metrics import (
+    IntegrationPipelineViewEvent,
+    IntegrationPipelineViewType,
+)
 from sentry.integrations.vsts.issues import VstsIssuesSpec
 from sentry.models.apitoken import generate_token
 from sentry.models.repository import Repository
@@ -631,43 +636,46 @@ def setup(self) -> None:
 
 class AccountConfigView(PipelineView):
     def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
-        account_id = request.POST.get("account")
-        if account_id is not None:
-            state_accounts: Sequence[Mapping[str, Any]] | None = pipeline.fetch_state(
-                key="accounts"
-            )
-            account = self.get_account_from_id(account_id, state_accounts or [])
-            if account is not None:
-                pipeline.bind_state("account", account)
-                return pipeline.next_step()
-
-        state: Mapping[str, Any] | None = pipeline.fetch_state(key="identity")
-        access_token = (state or {}).get("data", {}).get("access_token")
-        user = get_user_info(access_token)
-
-        accounts = self.get_accounts(access_token, user["uuid"])
-        logger.info(
-            "vsts.get_accounts",
-            extra={
+        with IntegrationPipelineViewEvent(
+            IntegrationPipelineViewType.ACCOUNT_CONFIG,
+            IntegrationDomain.SOURCE_CODE_MANAGEMENT,
+            VstsIntegrationProvider.key,
+        ).capture() as lifecycle:
+            account_id = request.POST.get("account")
+            if account_id is not None:
+                state_accounts: Sequence[Mapping[str, Any]] | None = pipeline.fetch_state(
+                    key="accounts"
+                )
+                account = self.get_account_from_id(account_id, state_accounts or [])
+                if account is not None:
+                    pipeline.bind_state("account", account)
+                    return pipeline.next_step()
+
+            state: Mapping[str, Any] | None = pipeline.fetch_state(key="identity")
+            access_token = (state or {}).get("data", {}).get("access_token")
+            user = get_user_info(access_token)
+
+            accounts = self.get_accounts(access_token, user["uuid"])
+            extra = {
                 "organization_id": pipeline.organization.id if pipeline.organization else None,
                 "user_id": request.user.id,
                 "accounts": accounts,
-            },
-        )
-        if not accounts or not accounts.get("value"):
+            }
+            if not accounts or not accounts.get("value"):
+                lifecycle.record_failure("no_accounts", extra=extra)
+                return render_to_response(
+                    template="sentry/integrations/vsts-config.html",
+                    context={"no_accounts": True},
+                    request=request,
+                )
+            accounts = accounts["value"]
+            pipeline.bind_state("accounts", accounts)
+            account_form = AccountForm(accounts)
             return render_to_response(
                 template="sentry/integrations/vsts-config.html",
-                context={"no_accounts": True},
+                context={"form": account_form, "no_accounts": False},
                 request=request,
             )
-        accounts = accounts["value"]
-        pipeline.bind_state("accounts", accounts)
-        account_form = AccountForm(accounts)
-        return render_to_response(
-            template="sentry/integrations/vsts-config.html",
-            context={"form": account_form, "no_accounts": False},
-            request=request,
-        )
 
     def get_account_from_id(
         self, account_id: int, accounts: Sequence[Mapping[str, Any]]
diff --git a/src/sentry/integrations/vsts/issues.py b/src/sentry/integrations/vsts/issues.py
index 61062507fbdfcf..df19746f290fd0 100644
--- a/src/sentry/integrations/vsts/issues.py
+++ b/src/sentry/integrations/vsts/issues.py
@@ -11,9 +11,6 @@
 from sentry.integrations.mixins.issues import IssueSyncIntegration
 from sentry.integrations.services.integration import integration_service
 from sentry.integrations.source_code_management.issues import SourceCodeIssueIntegration
-from sentry.integrations.source_code_management.metrics import (
-    SourceCodeIssueIntegrationInteractionType,
-)
 from sentry.models.activity import Activity
 from sentry.shared_integrations.exceptions import ApiError, ApiUnauthorized, IntegrationError
 from sentry.silo.base import all_silo_function
@@ -171,36 +168,35 @@ def create_issue(self, data: Mapping[str, str], **kwargs: Any) -> Mapping[str, A
         """
         Creates the issue on the remote service and returns an issue ID.
         """
-        with self.record_event(SourceCodeIssueIntegrationInteractionType.CREATE_ISSUE).capture():
-            project_id = data.get("project")
-            if project_id is None:
-                raise ValueError("Azure DevOps expects project")
+        project_id = data.get("project")
+        if project_id is None:
+            raise ValueError("Azure DevOps expects project")
 
-            client = self.get_client()
+        client = self.get_client()
 
-            title = data["title"]
-            description = data["description"]
-            item_type = data["work_item_type"]
+        title = data["title"]
+        description = data["description"]
+        item_type = data["work_item_type"]
 
-            try:
-                created_item = client.create_work_item(
-                    project=project_id,
-                    item_type=item_type,
-                    title=title,
-                    # Descriptions cannot easily be seen. So, a comment will be added as well.
-                    description=markdown(description),
-                    comment=markdown(description),
-                )
-            except Exception as e:
-                self.raise_error(e)
+        try:
+            created_item = client.create_work_item(
+                project=project_id,
+                item_type=item_type,
+                title=title,
+                # Descriptions cannot easily be seen. So, a comment will be added as well.
+                description=markdown(description),
+                comment=markdown(description),
+            )
+        except Exception as e:
+            self.raise_error(e)
 
-            project_name = created_item["fields"]["System.AreaPath"]
-            return {
-                "key": str(created_item["id"]),
-                "title": title,
-                "description": description,
-                "metadata": {"display_name": "{}#{}".format(project_name, created_item["id"])},
-            }
+        project_name = created_item["fields"]["System.AreaPath"]
+        return {
+            "key": str(created_item["id"]),
+            "title": title,
+            "description": description,
+            "metadata": {"display_name": "{}#{}".format(project_name, created_item["id"])},
+        }
 
     def get_issue(self, issue_id: int, **kwargs: Any) -> Mapping[str, Any]:
         client = self.get_client()
@@ -223,110 +219,100 @@ def sync_assignee_outbound(
         assign: bool = True,
         **kwargs: Any,
     ) -> None:
-        with self.record_event(
-            SourceCodeIssueIntegrationInteractionType.SYNC_ASSIGNEE_OUTBOUND
-        ).capture() as lifecycle:
-            client = self.get_client()
-            assignee = None
-
-            if user and assign is True:
-                sentry_emails = [email.lower() for email in user.emails]
-                continuation_token = None
-                while True:
-                    vsts_users = client.get_users(self.model.name, continuation_token)
-                    continuation_token = vsts_users.headers.get("X-MS-ContinuationToken")
-                    for vsts_user in vsts_users["value"]:
-                        vsts_email = vsts_user.get("mailAddress")
-                        if vsts_email and vsts_email.lower() in sentry_emails:
-                            assignee = vsts_user["mailAddress"]
-                            break
-
-                    if not continuation_token:
+        client = self.get_client()
+        assignee = None
+
+        if user and assign is True:
+            sentry_emails = [email.lower() for email in user.emails]
+            continuation_token = None
+            while True:
+                vsts_users = client.get_users(self.model.name, continuation_token)
+                continuation_token = vsts_users.headers.get("X-MS-ContinuationToken")
+                for vsts_user in vsts_users["value"]:
+                    vsts_email = vsts_user.get("mailAddress")
+                    if vsts_email and vsts_email.lower() in sentry_emails:
+                        assignee = vsts_user["mailAddress"]
                         break
 
-                if assignee is None:
-                    # TODO(lb): Email people when this happens
-                    self.logger.info(
-                        "vsts.assignee-not-found",
-                        extra={
-                            "integration_id": external_issue.integration_id,
-                            "user_id": user.id,
-                            "issue_key": external_issue.key,
-                        },
-                    )
-                    lifecycle.record_halt()
-                    return
+                if not continuation_token:
+                    break
 
-            try:
-                client.update_work_item(external_issue.key, assigned_to=assignee)
-            except (ApiUnauthorized, ApiError):
+            if assignee is None:
+                # TODO(lb): Email people when this happens
                 self.logger.info(
-                    "vsts.failed-to-assign",
+                    "vsts.assignee-not-found",
                     extra={
                         "integration_id": external_issue.integration_id,
-                        "user_id": user.id if user else None,
+                        "user_id": user.id,
                         "issue_key": external_issue.key,
                     },
                 )
-                lifecycle.record_halt()
+                return
+
+        try:
+            client.update_work_item(external_issue.key, assigned_to=assignee)
+        except (ApiUnauthorized, ApiError):
+            self.logger.info(
+                "vsts.failed-to-assign",
+                extra={
+                    "integration_id": external_issue.integration_id,
+                    "user_id": user.id if user else None,
+                    "issue_key": external_issue.key,
+                },
+            )
 
     def sync_status_outbound(
         self, external_issue: "ExternalIssue", is_resolved: bool, project_id: int, **kwargs: Any
     ) -> None:
-        with self.record_event(
-            SourceCodeIssueIntegrationInteractionType.SYNC_STATUS_OUTBOUND
-        ).capture() as lifecycle:
-            client = self.get_client()
-            work_item = client.get_work_item(external_issue.key)
-            # For some reason, vsts doesn't include the project id
-            # in the work item response.
-            # TODO(jess): figure out if there's a better way to do this
-            vsts_project_name = work_item["fields"]["System.TeamProject"]
-
-            vsts_projects = client.get_projects()
-
-            vsts_project_id = None
-            for p in vsts_projects:
-                if p["name"] == vsts_project_name:
-                    vsts_project_id = p["id"]
-                    break
-
-            integration_external_project = integration_service.get_integration_external_project(
-                organization_id=external_issue.organization_id,
-                integration_id=external_issue.integration_id,
-                external_id=vsts_project_id,
+        client = self.get_client()
+        work_item = client.get_work_item(external_issue.key)
+        # For some reason, vsts doesn't include the project id
+        # in the work item response.
+        # TODO(jess): figure out if there's a better way to do this
+        vsts_project_name = work_item["fields"]["System.TeamProject"]
+
+        vsts_projects = client.get_projects()
+
+        vsts_project_id = None
+        for p in vsts_projects:
+            if p["name"] == vsts_project_name:
+                vsts_project_id = p["id"]
+                break
+
+        integration_external_project = integration_service.get_integration_external_project(
+            organization_id=external_issue.organization_id,
+            integration_id=external_issue.integration_id,
+            external_id=vsts_project_id,
+        )
+        if integration_external_project is None:
+            self.logger.info(
+                "vsts.external-project-not-found",
+                extra={
+                    "integration_id": external_issue.integration_id,
+                    "is_resolved": is_resolved,
+                    "issue_key": external_issue.key,
+                },
             )
-            if integration_external_project is None:
-                self.logger.info(
-                    "vsts.external-project-not-found",
-                    extra={
-                        "integration_id": external_issue.integration_id,
-                        "is_resolved": is_resolved,
-                        "issue_key": external_issue.key,
-                    },
-                )
-                lifecycle.record_halt()
-                return
+            return
 
-            status = (
-                integration_external_project.resolved_status
-                if is_resolved
-                else integration_external_project.unresolved_status
-            )
+        status = (
+            integration_external_project.resolved_status
+            if is_resolved
+            else integration_external_project.unresolved_status
+        )
 
-            try:
-                client.update_work_item(external_issue.key, state=status)
-            except (ApiUnauthorized, ApiError) as error:
-                self.logger.info(
-                    "vsts.failed-to-change-status",
-                    extra={
-                        "integration_id": external_issue.integration_id,
-                        "is_resolved": is_resolved,
-                        "issue_key": external_issue.key,
-                        "exception": error,
-                    },
-                )
-                lifecycle.record_halt()
+        try:
+            client.update_work_item(external_issue.key, state=status)
+        except (ApiUnauthorized, ApiError) as error:
+            self.logger.info(
+                "vsts.failed-to-change-status",
+                extra={
+                    "integration_id": external_issue.integration_id,
+                    "is_resolved": is_resolved,
+                    "issue_key": external_issue.key,
+                    "exception": error,
+                },
+            )
 
     def get_resolve_sync_action(self, data: Mapping[str, Any]) -> ResolveSyncAction:
         done_states = self._get_done_statuses(data["project"])
diff --git a/src/sentry/integrations/vsts/search.py b/src/sentry/integrations/vsts/search.py
index dfad6424b2ad7b..05b56eff862294 100644
--- a/src/sentry/integrations/vsts/search.py
+++ b/src/sentry/integrations/vsts/search.py
@@ -4,6 +4,7 @@
 
 from sentry.api.base import control_silo_endpoint
 from sentry.integrations.source_code_management.issues import SourceCodeIssueIntegration
+from sentry.integrations.source_code_management.metrics import SCMIntegrationInteractionType
 from sentry.integrations.source_code_management.search import SourceCodeSearchEndpoint
 from sentry.integrations.vsts.integration import VstsIntegration
 
@@ -21,17 +22,18 @@ def installation_class(self):
         return VstsIntegration
 
     def handle_search_issues(self, installation: T, query: str, repo: str | None) -> Response:
-        if not query:
-            return Response([])
-
-        assert isinstance(installation, self.installation_class)
-        resp = installation.search_issues(query=query)
-        return Response(
-            [
-                {
-                    "label": f'({i["fields"]["system.id"]}) {i["fields"]["system.title"]}',
-                    "value": i["fields"]["system.id"],
-                }
-                for i in resp.get("results", [])
-            ]
-        )
+        with self.record_event(SCMIntegrationInteractionType.HANDLE_SEARCH_ISSUES).capture():
+            if not query:
+                return Response([])
+
+            assert isinstance(installation, self.installation_class)
+            resp = installation.search_issues(query=query)
+            return Response(
+                [
+                    {
+                        "label": f'({i["fields"]["system.id"]}) {i["fields"]["system.title"]}',
+                        "value": i["fields"]["system.id"],
+                    }
+                    for i in resp.get("results", [])
+                ]
+            )
diff --git a/src/sentry/integrations/vsts/webhooks.py b/src/sentry/integrations/vsts/webhooks.py
index d0d6ea877fd48f..7490129eddc01d 100644
--- a/src/sentry/integrations/vsts/webhooks.py
+++ b/src/sentry/integrations/vsts/webhooks.py
@@ -13,8 +13,15 @@
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, region_silo_endpoint
 from sentry.constants import ObjectStatus
+from sentry.integrations.base import IntegrationDomain
 from sentry.integrations.mixins.issues import IssueSyncIntegration
+from sentry.integrations.project_management.metrics import (
+    ProjectManagementActionType,
+    ProjectManagementEvent,
+    ProjectManagementHaltReason,
+)
 from sentry.integrations.services.integration import integration_service
+from sentry.integrations.utils.metrics import IntegrationWebhookEvent, IntegrationWebhookEventType
 from sentry.integrations.utils.sync import sync_group_assignee_inbound
 from sentry.utils.email import parse_email
 
@@ -67,7 +74,12 @@ def post(self, request: Request, *args: Any, **kwargs: Any) -> Response:
             if not check_webhook_secret(request, integration, event_type):
                 return self.respond(status=status.HTTP_401_UNAUTHORIZED)
 
-            handle_updated_workitem(data, integration)
+            with IntegrationWebhookEvent(
+                interaction_type=IntegrationWebhookEventType.INBOUND_SYNC,
+                domain=IntegrationDomain.SOURCE_CODE_MANAGEMENT,
+                provider_key="vsts",
+            ).capture():
+                handle_updated_workitem(data, integration)
 
         return self.respond()
 
@@ -122,31 +134,48 @@ def handle_assign_to(
     )
 
 
+# TODO(Gabe): Consolidate this with Jira's implementation, create DTO for status
+# changes.
 def handle_status_change(
     integration: RpcIntegration,
     external_issue_key: str,
     status_change: Mapping[str, str] | None,
     project: str | None,
 ) -> None:
-    if status_change is None:
-        return
-
-    org_integrations = integration_service.get_organization_integrations(
-        integration_id=integration.id
-    )
+    with ProjectManagementEvent(
+        action_type=ProjectManagementActionType.INBOUND_STATUS_SYNC, integration=integration
+    ).capture() as lifecycle:
+        if status_change is None:
+            return
+
+        org_integrations = integration_service.get_organization_integrations(
+            integration_id=integration.id
+        )
 
-    for org_integration in org_integrations:
-        installation = integration.get_installation(organization_id=org_integration.organization_id)
-        if isinstance(installation, IssueSyncIntegration):
-            installation.sync_status_inbound(
-                external_issue_key,
-                {
-                    "new_state": status_change["newValue"],
-                    # old_state is None when the issue is New
-                    "old_state": status_change.get("oldValue"),
-                    "project": project,
-                },
+        logging_context = {
+            "org_integration_ids": [oi.id for oi in org_integrations],
+            "integration_id": integration.id,
+            "status_change": status_change,
+        }
+        for org_integration in org_integrations:
+            installation = integration.get_installation(
+                organization_id=org_integration.organization_id
             )
+            if isinstance(installation, IssueSyncIntegration):
+                installation.sync_status_inbound(
+                    external_issue_key,
+                    {
+                        "new_state": status_change["newValue"],
+                        # old_state is None when the issue is New
+                        "old_state": status_change.get("oldValue"),
+                        "project": project,
+                    },
+                )
+            else:
+                lifecycle.record_halt(
+                    ProjectManagementHaltReason.SYNC_NON_SYNC_INTEGRATION_PROVIDED,
+                    extra=logging_context,
+                )
 
 
 def handle_updated_workitem(data: Mapping[str, Any], integration: RpcIntegration) -> None:
diff --git a/src/sentry/interfaces/contexts.py b/src/sentry/interfaces/contexts.py
index 161a1f292365c6..070789529747c0 100644
--- a/src/sentry/interfaces/contexts.py
+++ b/src/sentry/interfaces/contexts.py
@@ -146,6 +146,28 @@ def change_type(self, value: int | float | list | dict) -> Any:
             return value
 
 
+# NOTE:
+# If you are adding a new context to tag mapping which creates a tag out of an interpolation
+# of multiple context fields, you will most likely have to add the same mapping creation in Relay,
+# which should be added directly to the context payload itself, and you should reflect this here.
+#
+# Current examples of this include the `os`, `runtime` and `browser` fields of their respective context.
+#
+# Example:
+# Suppose you have a new context named "my_context" which has fields:
+# - "field_1"
+# - "field_2"
+#
+# And you want to create a tag named "field_3" which is equal to "{field_1}-{field_2}".
+#
+# If you do this here, on demand metrics will stop working because if a user filters by "field_3" and
+# we generate a metrics extraction specification for it, Relay won't know what "field_3" means, it will
+# only know "field_1" and "field_2" from the context.
+#
+# To solve this, you should materialize "field_3" during event normalization in Relay and directly express
+# the mapping in Sentry as "field_3" is equal to "field_3" (which was added by Relay during normalization).
+
+
 # TODO(dcramer): contexts need to document/describe expected (optional) fields
 @contexttype
 class DefaultContextType(ContextType):
@@ -168,20 +190,20 @@ class DeviceContextType(ContextType):
 @contexttype
 class RuntimeContextType(ContextType):
     type = "runtime"
-    context_to_tag_mapping = {"": "{name} {version}", "name": "{name}"}
+    context_to_tag_mapping = {"": "{runtime}", "name": "{name}"}
 
 
 @contexttype
 class BrowserContextType(ContextType):
     type = "browser"
-    context_to_tag_mapping = {"": "{name} {version}", "name": "{name}"}
+    context_to_tag_mapping = {"": "{browser}", "name": "{name}"}
     # viewport
 
 
 @contexttype
 class OsContextType(ContextType):
     type = "os"
-    context_to_tag_mapping = {"": "{name} {version}", "name": "{name}", "rooted": "{rooted}"}
+    context_to_tag_mapping = {"": "{os}", "name": "{name}", "rooted": "{rooted}"}
     # build, rooted
 
 
diff --git a/src/sentry/interfaces/user.py b/src/sentry/interfaces/user.py
index 0923ddcc6ae1bc..814daac8d598b9 100644
--- a/src/sentry/interfaces/user.py
+++ b/src/sentry/interfaces/user.py
@@ -15,6 +15,7 @@ class EventUserApiContext(TypedDict, total=False):
     username: str | None
     ip_address: str | None
     name: str | None
+    geo: dict[str, str] | None
     data: dict[str, Any] | None
 
 
@@ -69,6 +70,7 @@ def get_api_context(self, is_public=False, platform=None) -> EventUserApiContext
             "username": self.username,
             "ip_address": self.ip_address,
             "name": self.name,
+            "geo": self.geo.to_json() if self.geo is not None else None,
             "data": self.data,
         }
 
@@ -80,6 +82,7 @@ def get_api_meta(self, meta, is_public=False, platform=None):
             "username": meta.get("username"),
             "ip_address": meta.get("ip_address"),
             "name": meta.get("name"),
+            "geo": meta.get("geo"),
             "data": meta.get("data"),
         }
 
diff --git a/src/sentry/issues/endpoints/group_hashes.py b/src/sentry/issues/endpoints/group_hashes.py
index 696a304bdf4dfd..73c5104ec47d8d 100644
--- a/src/sentry/issues/endpoints/group_hashes.py
+++ b/src/sentry/issues/endpoints/group_hashes.py
@@ -8,7 +8,7 @@
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases import GroupEndpoint
 from sentry.api.paginator import GenericOffsetPaginator
-from sentry.api.serializers import EventSerializer, serialize
+from sentry.api.serializers import EventSerializer, SimpleEventSerializer, serialize
 from sentry.models.grouphash import GroupHash
 from sentry.tasks.unmerge import unmerge
 from sentry.utils import metrics
@@ -31,8 +31,10 @@ def get(self, request: Request, group) -> Response:
         checksums used to aggregate individual events.
 
         :pparam string issue_id: the ID of the issue to retrieve.
+        :pparam bool full: If this is set to true, the event payload will include the full event body, including the stacktrace.
         :auth: required
         """
+        full = request.GET.get("full", True)
 
         data_fn = partial(
             lambda *args, **kwargs: raw_query(*args, **kwargs)["data"],
@@ -47,7 +49,9 @@ def get(self, request: Request, group) -> Response:
             tenant_ids={"organization_id": group.project.organization_id},
         )
 
-        handle_results = partial(self.__handle_results, group.project_id, group.id, request.user)
+        handle_results = partial(
+            self.__handle_results, group.project_id, group.id, request.user, full
+        )
 
         return self.paginate(
             request=request,
@@ -90,13 +94,16 @@ def put(self, request: Request, group) -> Response:
 
         return Response(status=202)
 
-    def __handle_results(self, project_id, group_id, user, results):
-        return [self.__handle_result(user, project_id, group_id, result) for result in results]
+    def __handle_results(self, project_id, group_id, user, full, results):
+        return [
+            self.__handle_result(user, project_id, group_id, full, result) for result in results
+        ]
 
-    def __handle_result(self, user, project_id, group_id, result):
+    def __handle_result(self, user, project_id, group_id, full, result):
         event = eventstore.backend.get_event_by_id(project_id, result["event_id"])
 
+        serializer = EventSerializer if full else SimpleEventSerializer
         return {
             "id": result["primary_hash"],
-            "latestEvent": serialize(event, user, EventSerializer()),
+            "latestEvent": serialize(event, user, serializer()),
         }
diff --git a/src/sentry/issues/endpoints/group_similar_issues_embeddings.py b/src/sentry/issues/endpoints/group_similar_issues_embeddings.py
index 55cdda74aa4f19..b51e57e3f8b760 100644
--- a/src/sentry/issues/endpoints/group_similar_issues_embeddings.py
+++ b/src/sentry/issues/endpoints/group_similar_issues_embeddings.py
@@ -18,6 +18,7 @@
 from sentry.seer.similarity.similar_issues import get_similarity_data_from_seer
 from sentry.seer.similarity.types import SeerSimilarIssueData, SimilarIssuesEmbeddingsRequest
 from sentry.seer.similarity.utils import (
+    TooManyOnlySystemFramesException,
     event_content_has_stacktrace,
     get_stacktrace_string,
     killswitch_enabled,
@@ -74,7 +75,7 @@ def get_formatted_results(
 
         return [(serialized_groups[group_id], group_data[group_id]) for group_id in group_data]
 
-    def get(self, request: Request, group) -> Response:
+    def get(self, request: Request, group: Group) -> Response:
         if killswitch_enabled(group.project.id):
             return Response([])
 
@@ -82,9 +83,16 @@ def get(self, request: Request, group) -> Response:
         stacktrace_string = ""
         if latest_event and event_content_has_stacktrace(latest_event):
             grouping_info = get_grouping_info(None, project=group.project, event=latest_event)
-            stacktrace_string = get_stacktrace_string(grouping_info)
-
-        if stacktrace_string == "" or not latest_event:
+            try:
+                stacktrace_string = get_stacktrace_string(
+                    grouping_info, platform=latest_event.platform
+                )
+            except TooManyOnlySystemFramesException:
+                pass
+            except Exception:
+                logger.exception("Unexpected exception in stacktrace string formatting")
+
+        if not stacktrace_string or not latest_event:
             return Response([])  # No exception, stacktrace or in-app frames, or event
 
         similar_issues_params: SimilarIssuesEmbeddingsRequest = {
diff --git a/src/sentry/issues/endpoints/organization_group_search_views.py b/src/sentry/issues/endpoints/organization_group_search_views.py
index e0f9f123bc2764..99d46dab86c745 100644
--- a/src/sentry/issues/endpoints/organization_group_search_views.py
+++ b/src/sentry/issues/endpoints/organization_group_search_views.py
@@ -118,7 +118,6 @@ def put(self, request: Request, organization: Organization) -> Response:
 def bulk_update_views(
     org: Organization, user_id: int, views: list[GroupSearchViewValidatorResponse]
 ) -> None:
-
     existing_view_ids = [view["id"] for view in views if "id" in view]
 
     _delete_missing_views(org, user_id, view_ids_to_keep=existing_view_ids)
@@ -140,7 +139,7 @@ def _update_existing_view(
     org: Organization, user_id: int, view: GroupSearchViewValidatorResponse, position: int
 ) -> None:
     try:
-        GroupSearchView.objects.get(id=view["id"]).update(
+        GroupSearchView.objects.get(id=view["id"], user_id=user_id).update(
             name=view["name"],
             query=view["query"],
             query_sort=view["querySort"],
diff --git a/src/sentry/issues/grouptype.py b/src/sentry/issues/grouptype.py
index bd5670ddc2883c..7810e9f66ba712 100644
--- a/src/sentry/issues/grouptype.py
+++ b/src/sentry/issues/grouptype.py
@@ -22,7 +22,7 @@
     from sentry.models.organization import Organization
     from sentry.models.project import Project
     from sentry.users.models.user import User
-    from sentry.workflow_engine.processors.detector import DetectorHandler
+    from sentry.workflow_engine.handlers.detector import DetectorHandler
     from sentry.workflow_engine.endpoints.validators import BaseGroupTypeDetectorValidator
 
 import logging
diff --git a/src/sentry/issues/ignored.py b/src/sentry/issues/ignored.py
index 439159e06260e7..33e20a49424dbd 100644
--- a/src/sentry/issues/ignored.py
+++ b/src/sentry/issues/ignored.py
@@ -6,6 +6,7 @@
 from datetime import datetime, timedelta
 from typing import Any, TypedDict
 
+from django.contrib.auth.models import AnonymousUser
 from django.utils import timezone
 
 from sentry.db.postgres.transactions import in_test_hide_transaction_boundary
@@ -86,11 +87,10 @@ def handle_archived_until_escalating(
 
 
 def handle_ignored(
-    group_ids: Sequence[Group],
     group_list: Sequence[Group],
     status_details: dict[str, Any],
-    acting_user: User | None,
-    user: User | RpcUser,
+    acting_user: User | RpcUser | AnonymousUser,
+    user: User | RpcUser | AnonymousUser,
 ) -> IgnoredStatusDetails:
     """
     Handle issues that are ignored and create a snooze for them.
@@ -100,7 +100,7 @@ def handle_ignored(
     Returns: a dict with the statusDetails for ignore conditions.
     """
     metrics.incr("group.ignored", skip_internal=True)
-    for group in group_ids:
+    for group in group_list:
         remove_group_from_inbox(group, action=GroupInboxRemoveAction.IGNORED, user=acting_user)
 
     new_status_details: IgnoredStatusDetails = {}
@@ -153,6 +153,6 @@ def handle_ignored(
                 actor=serialized_user[0] if serialized_user else None,
             )
     else:
-        GroupSnooze.objects.filter(group__in=group_ids).delete()
+        GroupSnooze.objects.filter(group__in=[group.id for group in group_list]).delete()
 
     return new_status_details
diff --git a/src/sentry/issues/merge.py b/src/sentry/issues/merge.py
index 314d6fdaedc513..fdd13d5113f1f0 100644
--- a/src/sentry/issues/merge.py
+++ b/src/sentry/issues/merge.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Mapping, Sequence
 from typing import TypedDict
 from uuid import uuid4
 
@@ -23,7 +23,7 @@ class MergedGroup(TypedDict):
 
 def handle_merge(
     group_list: Sequence[Group],
-    project_lookup: dict[int, Project],
+    project_lookup: Mapping[int, Project],
     acting_user: User | None,
 ) -> MergedGroup:
     """
diff --git a/src/sentry/issues/status_change.py b/src/sentry/issues/status_change.py
index cfda68a6ef8384..25c5679235df63 100644
--- a/src/sentry/issues/status_change.py
+++ b/src/sentry/issues/status_change.py
@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import logging
-from collections import defaultdict, namedtuple
-from collections.abc import Sequence
+from collections import defaultdict
+from collections.abc import Mapping, Sequence
 from datetime import datetime, timedelta, timezone
 from typing import Any
 
@@ -25,13 +25,12 @@
 from sentry.utils import json
 
 logger = logging.getLogger(__name__)
-ActivityInfo = namedtuple("ActivityInfo", ("activity_type", "activity_data"))
 
 
 def infer_substatus(
     new_status: int | None,
     new_substatus: int | None,
-    status_details: dict[str, Any],
+    status_details: Mapping[str, Any],
     group_list: Sequence[Group],
 ) -> int | None:
     if new_substatus is not None:
@@ -67,19 +66,17 @@ def infer_substatus(
 def handle_status_update(
     group_list: Sequence[Group],
     projects: Sequence[Project],
-    project_lookup: dict[int, Project],
+    project_lookup: Mapping[int, Project],
     new_status: int,
     new_substatus: int | None,
     is_bulk: bool,
     status_details: dict[str, Any],
     acting_user: User | None,
     sender: Any,
-) -> ActivityInfo:
+) -> None:
     """
     Update the status for a list of groups and create entries for Activity and GroupHistory.
     This currently handles unresolving or ignoring groups.
-
-    Returns a tuple of (activity_type, activity_data) for the activity that was created.
     """
     activity_data = {}
     activity_type = (
@@ -173,5 +170,3 @@ def handle_status_update(
                 created=False,
                 update_fields=["status", "substatus"],
             )
-
-    return ActivityInfo(activity_type, activity_data)
diff --git a/src/sentry/issues/update_inbox.py b/src/sentry/issues/update_inbox.py
index 18421e9458e79a..698c1f8c6ff40c 100644
--- a/src/sentry/issues/update_inbox.py
+++ b/src/sentry/issues/update_inbox.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections.abc import Mapping, Sequence
 from typing import Any
 
 from sentry.issues.ongoing import bulk_transition_group_to_ongoing
@@ -18,8 +19,8 @@
 
 def update_inbox(
     in_inbox: bool,
-    group_list: list[Group],
-    project_lookup: dict[int, Project],
+    group_list: Sequence[Group],
+    project_lookup: Mapping[int, Project],
     acting_user: User | None,
     http_referrer: str,
     sender: Any,
diff --git a/src/sentry/lang/java/processing.py b/src/sentry/lang/java/processing.py
index 136f95064805e3..2da820bf0dcea8 100644
--- a/src/sentry/lang/java/processing.py
+++ b/src/sentry/lang/java/processing.py
@@ -7,7 +7,7 @@
 
 from sentry.attachments import CachedAttachment, attachment_cache
 from sentry.ingest.consumer.processors import CACHE_TIMEOUT
-from sentry.lang.java.utils import get_jvm_images, get_proguard_images
+from sentry.lang.java.utils import JAVA_PLATFORMS, get_jvm_images, get_proguard_images
 from sentry.lang.native.error import SymbolicationFailed, write_error
 from sentry.lang.native.symbolicator import Symbolicator
 from sentry.models.eventerror import EventError
@@ -85,11 +85,11 @@ def _handles_frame(frame: dict[str, Any], platform: str) -> bool:
     return (
         "function" in frame
         and "module" in frame
-        and (frame.get("platform", None) or platform) == "java"
+        and (frame.get("platform", None) or platform) in JAVA_PLATFORMS
     )
 
 
-FRAME_FIELDS = ("abs_path", "lineno", "function", "module", "filename", "in_app")
+FRAME_FIELDS = ("platform", "abs_path", "lineno", "function", "module", "filename", "in_app")
 
 
 def _normalize_frame(raw_frame: dict[str, Any], index: int) -> dict[str, Any]:
@@ -287,6 +287,7 @@ def process_jvm_stacktraces(symbolicator: Symbolicator, data: Any) -> Any:
     release_package = _get_release_package(symbolicator.project, data.get("release"))
     metrics.incr("process.java.symbolicate.request")
     response = symbolicator.process_jvm(
+        platform=data.get("platform"),
         exceptions=[
             {"module": exc["module"], "type": exc["type"]} for exc in processable_exceptions
         ],
diff --git a/src/sentry/lang/java/utils.py b/src/sentry/lang/java/utils.py
index 705ca103b8c7cc..8fb98d52d6ff08 100644
--- a/src/sentry/lang/java/utils.py
+++ b/src/sentry/lang/java/utils.py
@@ -11,9 +11,19 @@
 from sentry.lang.java.proguard import open_proguard_mapper
 from sentry.models.debugfile import ProjectDebugFile
 from sentry.models.project import Project
+from sentry.stacktraces.processing import StacktraceInfo
+from sentry.utils import metrics
 from sentry.utils.cache import cache_key_for_event
 from sentry.utils.safe import get_path
 
+# Platform values that should mark an event
+# or frame as being Java for the purposes
+# of symbolication.
+#
+# Strictly speaking, this should probably include
+# "android" too—at least we use it in profiling.
+JAVA_PLATFORMS = ("java",)
+
 
 def is_valid_proguard_image(image):
     return bool(image) and image.get("type") == "proguard" and image.get("uuid") is not None
@@ -107,10 +117,24 @@ def deobfuscation_template(data, map_type, deobfuscation_fn):
     attachment_cache.set(cache_key, attachments=new_attachments, timeout=CACHE_TIMEOUT)
 
 
-def is_jvm_event(data: Any) -> bool:
-    """Returns whether `data` is a JVM event, based on its images."""
+def is_jvm_event(data: Any, stacktraces: list[StacktraceInfo]) -> bool:
+    """Returns whether `data` is a JVM event, based on its platform,
+    the supplied stacktraces, and its images."""
+
+    platform = data.get("platform")
+
+    if platform in JAVA_PLATFORMS:
+        return True
+
+    for stacktrace in stacktraces:
+        # The platforms of a stacktrace are exactly the platforms of its frames
+        # so this is tantamount to checking if any frame has a Java platform.
+        if any(x in JAVA_PLATFORMS for x in stacktrace.platforms):
+            return True
 
     # check if there are any JVM or Proguard images
+    # TODO: Can this actually happen if the event platform
+    # is not "java"?
     images = get_path(
         data,
         "debug_meta",
@@ -118,4 +142,10 @@ def is_jvm_event(data: Any) -> bool:
         filter=lambda x: is_valid_jvm_image(x) or is_valid_proguard_image(x),
         default=(),
     )
-    return bool(images)
+
+    if images:
+        metrics.incr("process.java.symbolicate.missing_platform", tags={platform: platform})
+
+        return True
+
+    return False
diff --git a/src/sentry/lang/javascript/processing.py b/src/sentry/lang/javascript/processing.py
index 57def72b0dbe9f..3c815e6774f5d2 100644
--- a/src/sentry/lang/javascript/processing.py
+++ b/src/sentry/lang/javascript/processing.py
@@ -3,6 +3,7 @@
 from typing import Any
 
 from sentry.debug_files.artifact_bundles import maybe_renew_artifact_bundles_from_processing
+from sentry.lang.javascript.utils import JAVASCRIPT_PLATFORMS
 from sentry.lang.native.error import SymbolicationFailed, write_error
 from sentry.lang.native.symbolicator import Symbolicator
 from sentry.models.eventerror import EventError
@@ -171,6 +172,11 @@ def map_symbolicator_process_js_errors(errors):
 
 def _handles_frame(frame, data):
     abs_path = frame.get("abs_path")
+    platform = frame.get("platform") or data.get("platform", "unknown")
+
+    # Skip non-JS frames
+    if platform not in JAVASCRIPT_PLATFORMS:
+        return False
 
     # Skip frames without an `abs_path` or line number
     if not abs_path or not frame.get("lineno"):
@@ -181,7 +187,7 @@ def _handles_frame(frame, data):
         return False
 
     # Skip builtin node modules
-    if _is_built_in(abs_path, data.get("platform")):
+    if _is_built_in(abs_path, platform):
         return False
 
     return True
@@ -205,7 +211,7 @@ def _normalize_nonhandled_frame(frame, data):
     return frame
 
 
-FRAME_FIELDS = ("abs_path", "lineno", "colno", "function")
+FRAME_FIELDS = ("platform", "abs_path", "lineno", "colno", "function")
 
 
 def _normalize_frame(raw_frame: Any) -> dict:
@@ -240,6 +246,7 @@ def process_js_stacktraces(symbolicator: Symbolicator, data: Any) -> Any:
 
     metrics.incr("process.javascript.symbolicate.request")
     response = symbolicator.process_js(
+        platform=data.get("platform"),
         stacktraces=stacktraces,
         modules=modules,
         release=data.get("release"),
diff --git a/src/sentry/lang/javascript/utils.py b/src/sentry/lang/javascript/utils.py
index 6c7e5c4db1cf13..a17f6f30007cd7 100644
--- a/src/sentry/lang/javascript/utils.py
+++ b/src/sentry/lang/javascript/utils.py
@@ -11,6 +11,12 @@
 LINES_OF_CONTEXT = 5
 
 
+# Platform values that should mark an event
+# or frame as being JavaScript for the purposes
+# of symbolication.
+JAVASCRIPT_PLATFORMS = ("javascript", "node")
+
+
 def get_source_context(
     source: list[bytes], lineno: int, context=LINES_OF_CONTEXT
 ) -> tuple[list[bytes] | None, bytes | None, list[bytes] | None]:
@@ -127,11 +133,13 @@ def is_js_event(data: Any, stacktraces: list[StacktraceInfo]) -> bool:
     """Returns whether `data` is a JS event, based on its platform and
     the supplied stacktraces."""
 
-    if data.get("platform") in ("javascript", "node"):
+    if data.get("platform") in JAVASCRIPT_PLATFORMS:
         return True
 
     for stacktrace in stacktraces:
-        if any(x in ("javascript", "node") for x in stacktrace.platforms):
+        # The platforms of a stacktrace are exactly the platforms of its frames
+        # so this is tantamount to checking if any frame has a JS platform.
+        if any(x in JAVASCRIPT_PLATFORMS for x in stacktrace.platforms):
             return True
 
     return False
diff --git a/src/sentry/lang/native/processing.py b/src/sentry/lang/native/processing.py
index 7b8b9d931f0c60..022b30d4198780 100644
--- a/src/sentry/lang/native/processing.py
+++ b/src/sentry/lang/native/processing.py
@@ -285,7 +285,7 @@ def process_minidump(symbolicator: Symbolicator, data: Any) -> Any:
         return
 
     metrics.incr("process.native.symbolicate.request")
-    response = symbolicator.process_minidump(minidump.data)
+    response = symbolicator.process_minidump(data.get("platform"), minidump.data)
 
     if _handle_response_status(data, response):
         _merge_full_response(data, response)
@@ -308,7 +308,7 @@ def process_applecrashreport(symbolicator: Symbolicator, data: Any) -> Any:
         return
 
     metrics.incr("process.native.symbolicate.request")
-    response = symbolicator.process_applecrashreport(report.data)
+    response = symbolicator.process_applecrashreport(data.get("platform"), report.data)
 
     if _handle_response_status(data, response):
         _merge_full_response(data, response)
@@ -423,7 +423,9 @@ def process_native_stacktraces(symbolicator: Symbolicator, data: Any) -> Any:
     signal = signal_from_data(data)
 
     metrics.incr("process.native.symbolicate.request")
-    response = symbolicator.process_payload(stacktraces=stacktraces, modules=modules, signal=signal)
+    response = symbolicator.process_payload(
+        platform=data.get("platform"), stacktraces=stacktraces, modules=modules, signal=signal
+    )
 
     if not _handle_response_status(data, response):
         return data
diff --git a/src/sentry/lang/native/symbolicator.py b/src/sentry/lang/native/symbolicator.py
index 7a256e0891b65c..505c60b913b21c 100644
--- a/src/sentry/lang/native/symbolicator.py
+++ b/src/sentry/lang/native/symbolicator.py
@@ -156,10 +156,11 @@ def _process(self, task_name: str, path: str, **kwargs):
                 # Otherwise, we are done processing, yay
                 return json_response
 
-    def process_minidump(self, minidump):
+    def process_minidump(self, platform, minidump):
         (sources, process_response) = sources_for_symbolication(self.project)
         scraping_config = get_scraping_config(self.project)
         data = {
+            "platform": orjson.dumps(platform).decode(),
             "sources": orjson.dumps(sources).decode(),
             "scraping": orjson.dumps(scraping_config).decode(),
             "options": '{"dif_candidates": true}',
@@ -173,10 +174,11 @@ def process_minidump(self, minidump):
         )
         return process_response(res)
 
-    def process_applecrashreport(self, report):
+    def process_applecrashreport(self, platform, report):
         (sources, process_response) = sources_for_symbolication(self.project)
         scraping_config = get_scraping_config(self.project)
         data = {
+            "platform": orjson.dumps(platform).decode(),
             "sources": orjson.dumps(sources).decode(),
             "scraping": orjson.dumps(scraping_config).decode(),
             "options": '{"dif_candidates": true}',
@@ -190,10 +192,13 @@ def process_applecrashreport(self, report):
         )
         return process_response(res)
 
-    def process_payload(self, stacktraces, modules, signal=None, apply_source_context=True):
+    def process_payload(
+        self, platform, stacktraces, modules, signal=None, apply_source_context=True
+    ):
         (sources, process_response) = sources_for_symbolication(self.project)
         scraping_config = get_scraping_config(self.project)
         json = {
+            "platform": platform,
             "sources": sources,
             "options": {
                 "dif_candidates": True,
@@ -210,11 +215,12 @@ def process_payload(self, stacktraces, modules, signal=None, apply_source_contex
         res = self._process("symbolicate_stacktraces", "symbolicate", json=json)
         return process_response(res)
 
-    def process_js(self, stacktraces, modules, release, dist, apply_source_context=True):
+    def process_js(self, platform, stacktraces, modules, release, dist, apply_source_context=True):
         source = get_internal_artifact_lookup_source(self.project)
         scraping_config = get_scraping_config(self.project)
 
         json = {
+            "platform": platform,
             "source": source,
             "stacktraces": stacktraces,
             "modules": modules,
@@ -231,6 +237,7 @@ def process_js(self, stacktraces, modules, release, dist, apply_source_context=T
 
     def process_jvm(
         self,
+        platform,
         exceptions,
         stacktraces,
         modules,
@@ -242,6 +249,7 @@ def process_jvm(
         Process a JVM event by remapping its frames and exceptions with
         ProGuard.
 
+        :param platform: The event's platform. This should be either unset or "java".
         :param exceptions: The event's exceptions. These must contain a `type` and a `module`.
         :param stacktraces: The event's stacktraces. Frames must contain a `function` and a `module`.
         :param modules: ProGuard modules and source bundles. They must contain a `uuid` and have a
@@ -253,6 +261,7 @@ def process_jvm(
         source = get_internal_source(self.project)
 
         json = {
+            "platform": platform,
             "sources": [source],
             "exceptions": exceptions,
             "stacktraces": stacktraces,
diff --git a/src/sentry/management/commands/makemigrations.py b/src/sentry/management/commands/makemigrations.py
index 500e35b5e7ceff..e701094a4efea2 100644
--- a/src/sentry/management/commands/makemigrations.py
+++ b/src/sentry/management/commands/makemigrations.py
@@ -71,7 +71,7 @@ def handle(self, *app_labels, **options):
         if options.get("check_changes"):
             validate(migrations_filepath, latest_migration_by_app)
         else:
-            result = "\n".join(
+            result = "\n\n".join(
                 f"{app_label}: {name}"
                 for app_label, name in sorted(latest_migration_by_app.items())
             )
diff --git a/src/sentry/middleware/customer_domain.py b/src/sentry/middleware/customer_domain.py
index 8a81a14c2e753a..bc0de539a98136 100644
--- a/src/sentry/middleware/customer_domain.py
+++ b/src/sentry/middleware/customer_domain.py
@@ -74,8 +74,7 @@ def _resolve_redirect_url(request, activeorg):
 
     path = reverse(result.url_name or result.func, kwargs=kwargs)
     qs = _query_string(request)
-    redirect_url = f"{redirect_url}{path}{qs}"
-    return redirect_url
+    return f"{redirect_url}{path}{qs}"
 
 
 class CustomerDomainMiddleware:
diff --git a/src/sentry/middleware/flag.py b/src/sentry/middleware/flag.py
deleted file mode 100644
index 49d0e486d42c35..00000000000000
--- a/src/sentry/middleware/flag.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from collections.abc import Callable
-
-from django.http.request import HttpRequest
-from django.http.response import HttpResponseBase
-
-from sentry.utils.flag import initialize_flag_manager
-
-
-class FlagMiddleware:
-    def __init__(self, get_response: Callable[[HttpRequest], HttpResponseBase]):
-        self.get_response = get_response
-
-    def __call__(self, request: HttpRequest) -> HttpResponseBase:
-        initialize_flag_manager()
-        return self.get_response(request)
diff --git a/src/sentry/migrations/0001_squashed_0484_break_org_member_user_fk.py b/src/sentry/migrations/0001_squashed_0484_break_org_member_user_fk.py
index 5592f4a25a27a5..16ef15658ea34a 100644
--- a/src/sentry/migrations/0001_squashed_0484_break_org_member_user_fk.py
+++ b/src/sentry/migrations/0001_squashed_0484_break_org_member_user_fk.py
@@ -54,6 +54,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     replaces = [
         ("sentry", "0001_squashed_0200_release_indices"),
         ("sentry", "0201_semver_package"),
diff --git a/src/sentry/migrations/0490_add_is_test_to_org.py b/src/sentry/migrations/0490_add_is_test_to_org.py
index 5ea600ad4cf024..398394ba1409cb 100644
--- a/src/sentry/migrations/0490_add_is_test_to_org.py
+++ b/src/sentry/migrations/0490_add_is_test_to_org.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0489_index_checkin_timeout"),
     ]
diff --git a/src/sentry/migrations/0491_remove_orgmemmap_unique_constraints.py b/src/sentry/migrations/0491_remove_orgmemmap_unique_constraints.py
index a239fb98237803..4e30ad2812ad4c 100644
--- a/src/sentry/migrations/0491_remove_orgmemmap_unique_constraints.py
+++ b/src/sentry/migrations/0491_remove_orgmemmap_unique_constraints.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0490_add_is_test_to_org"),
     ]
diff --git a/src/sentry/migrations/0505_debugfile_date_accessed.py b/src/sentry/migrations/0505_debugfile_date_accessed.py
index c39b0755a95d94..ff60d15fe6bbad 100644
--- a/src/sentry/migrations/0505_debugfile_date_accessed.py
+++ b/src/sentry/migrations/0505_debugfile_date_accessed.py
@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0504_add_artifact_bundle_index"),
     ]
diff --git a/src/sentry/migrations/0526_pr_comment_type_column.py b/src/sentry/migrations/0526_pr_comment_type_column.py
index 3bfa0f8575e774..1791094fdecd7d 100644
--- a/src/sentry/migrations/0526_pr_comment_type_column.py
+++ b/src/sentry/migrations/0526_pr_comment_type_column.py
@@ -21,6 +21,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0525_add_next_checkin_latest"),
     ]
diff --git a/src/sentry/migrations/0535_add_created_date_to_outbox_model.py b/src/sentry/migrations/0535_add_created_date_to_outbox_model.py
index 179daa393d1816..abff5766528167 100644
--- a/src/sentry/migrations/0535_add_created_date_to_outbox_model.py
+++ b/src/sentry/migrations/0535_add_created_date_to_outbox_model.py
@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0534_add_notification_uuid_to_rule_fire_history"),
     ]
diff --git a/src/sentry/migrations/0544_remove_groupsubscription_columns.py b/src/sentry/migrations/0544_remove_groupsubscription_columns.py
index 10f92624209879..bc6ad90444e2d2 100644
--- a/src/sentry/migrations/0544_remove_groupsubscription_columns.py
+++ b/src/sentry/migrations/0544_remove_groupsubscription_columns.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0543_add_team_id_to_groupsubscription"),
     ]
diff --git a/src/sentry/migrations/0545_add_last_verified_auth_ident_replica.py b/src/sentry/migrations/0545_add_last_verified_auth_ident_replica.py
index b24ed739818100..71a4ebafc20939 100644
--- a/src/sentry/migrations/0545_add_last_verified_auth_ident_replica.py
+++ b/src/sentry/migrations/0545_add_last_verified_auth_ident_replica.py
@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0544_remove_groupsubscription_columns"),
     ]
diff --git a/src/sentry/migrations/0548_add_is_unclaimed_boolean_to_user.py b/src/sentry/migrations/0548_add_is_unclaimed_boolean_to_user.py
index 324603794f7859..6e2ae095940622 100644
--- a/src/sentry/migrations/0548_add_is_unclaimed_boolean_to_user.py
+++ b/src/sentry/migrations/0548_add_is_unclaimed_boolean_to_user.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0547_add_commitfilechange_language_column"),
     ]
diff --git a/src/sentry/migrations/0549_re_add_groupsubscription_columns.py b/src/sentry/migrations/0549_re_add_groupsubscription_columns.py
index f124f9337c4f8f..4468a981c603bf 100644
--- a/src/sentry/migrations/0549_re_add_groupsubscription_columns.py
+++ b/src/sentry/migrations/0549_re_add_groupsubscription_columns.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = True
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0548_add_is_unclaimed_boolean_to_user"),
     ]
diff --git a/src/sentry/migrations/0556_organizationmapping_replicate_require_2fa.py b/src/sentry/migrations/0556_organizationmapping_replicate_require_2fa.py
index e249bd0d688fd4..3185e6373b831d 100644
--- a/src/sentry/migrations/0556_organizationmapping_replicate_require_2fa.py
+++ b/src/sentry/migrations/0556_organizationmapping_replicate_require_2fa.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0555_set_neglectedrule_email_date_columns_nullable"),
     ]
diff --git a/src/sentry/migrations/0564_commitfilechange_delete_language_column.py b/src/sentry/migrations/0564_commitfilechange_delete_language_column.py
index c29268441b68d4..9a5cc11a0d9ee6 100644
--- a/src/sentry/migrations/0564_commitfilechange_delete_language_column.py
+++ b/src/sentry/migrations/0564_commitfilechange_delete_language_column.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0563_commitfilechange_drop_language_column"),
     ]
diff --git a/src/sentry/migrations/0570_repository_add_languages_column.py b/src/sentry/migrations/0570_repository_add_languages_column.py
index 8d61069af4bbdb..9b7cd95383156f 100644
--- a/src/sentry/migrations/0570_repository_add_languages_column.py
+++ b/src/sentry/migrations/0570_repository_add_languages_column.py
@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0569_dashboard_widgets_indicator"),
     ]
diff --git a/src/sentry/migrations/0583_add_early_adopter_to_organization_mapping.py b/src/sentry/migrations/0583_add_early_adopter_to_organization_mapping.py
index 8d87de590a53d8..5641c4e1d47a1d 100644
--- a/src/sentry/migrations/0583_add_early_adopter_to_organization_mapping.py
+++ b/src/sentry/migrations/0583_add_early_adopter_to_organization_mapping.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0582_add_status_indexes_checkins"),
     ]
diff --git a/src/sentry/migrations/0590_add_metadata_to_sentry_app.py b/src/sentry/migrations/0590_add_metadata_to_sentry_app.py
index 70467066f7a0b4..17c605b63b648b 100644
--- a/src/sentry/migrations/0590_add_metadata_to_sentry_app.py
+++ b/src/sentry/migrations/0590_add_metadata_to_sentry_app.py
@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0589_add_commit_date_added_indices"),
     ]
diff --git a/src/sentry/migrations/0591_remove_relocation_hybrid_cloud_foreign_keys.py b/src/sentry/migrations/0591_remove_relocation_hybrid_cloud_foreign_keys.py
index 9504b752d61bef..d4702555a72981 100644
--- a/src/sentry/migrations/0591_remove_relocation_hybrid_cloud_foreign_keys.py
+++ b/src/sentry/migrations/0591_remove_relocation_hybrid_cloud_foreign_keys.py
@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0590_add_metadata_to_sentry_app"),
     ]
diff --git a/src/sentry/migrations/0592_delete_relocation_hybrid_cloud_foreign_keys.py b/src/sentry/migrations/0592_delete_relocation_hybrid_cloud_foreign_keys.py
index f184baa6f83908..6ce84ad9f211e1 100644
--- a/src/sentry/migrations/0592_delete_relocation_hybrid_cloud_foreign_keys.py
+++ b/src/sentry/migrations/0592_delete_relocation_hybrid_cloud_foreign_keys.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0591_remove_relocation_hybrid_cloud_foreign_keys"),
     ]
diff --git a/src/sentry/migrations/0607_drop_externalactor_actorid.py b/src/sentry/migrations/0607_drop_externalactor_actorid.py
index 6f7bf3fd118686..6052d52bb1aa2f 100644
--- a/src/sentry/migrations/0607_drop_externalactor_actorid.py
+++ b/src/sentry/migrations/0607_drop_externalactor_actorid.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0606_update_user_to_optional_organization_slug_reservation"),
     ]
diff --git a/src/sentry/migrations/0610_remove_notification_setting_table.py b/src/sentry/migrations/0610_remove_notification_setting_table.py
index 47dfb155e353ac..e88cf1a990ec60 100644
--- a/src/sentry/migrations/0610_remove_notification_setting_table.py
+++ b/src/sentry/migrations/0610_remove_notification_setting_table.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0609_remove_notification_setting_model"),
     ]
diff --git a/src/sentry/migrations/0617_monitor_boolean_fields_muted_disabled.py b/src/sentry/migrations/0617_monitor_boolean_fields_muted_disabled.py
index fe25887609f43f..040d95c6bfcce5 100644
--- a/src/sentry/migrations/0617_monitor_boolean_fields_muted_disabled.py
+++ b/src/sentry/migrations/0617_monitor_boolean_fields_muted_disabled.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0616_drop_event_user_id_from_userreport_table_step_1"),
     ]
diff --git a/src/sentry/migrations/0618_drop_event_user_id_from_userreport_table_step_2.py b/src/sentry/migrations/0618_drop_event_user_id_from_userreport_table_step_2.py
index 0a2d77ed6ca01d..60c5c7d3c100c6 100644
--- a/src/sentry/migrations/0618_drop_event_user_id_from_userreport_table_step_2.py
+++ b/src/sentry/migrations/0618_drop_event_user_id_from_userreport_table_step_2.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0617_monitor_boolean_fields_muted_disabled"),
     ]
diff --git a/src/sentry/migrations/0624_add_is_muted_monitorenvironment.py b/src/sentry/migrations/0624_add_is_muted_monitorenvironment.py
index 9d36e7039b1533..28437b53203c1b 100644
--- a/src/sentry/migrations/0624_add_is_muted_monitorenvironment.py
+++ b/src/sentry/migrations/0624_add_is_muted_monitorenvironment.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0623_increase_regression_fingerprint_length"),
     ]
diff --git a/src/sentry/migrations/0631_add_priority_columns_to_groupedmessage.py b/src/sentry/migrations/0631_add_priority_columns_to_groupedmessage.py
index fdad116dc7ee45..6dffdce9d51f16 100644
--- a/src/sentry/migrations/0631_add_priority_columns_to_groupedmessage.py
+++ b/src/sentry/migrations/0631_add_priority_columns_to_groupedmessage.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0630_better_monitor_latest_index"),
     ]
diff --git a/src/sentry/migrations/0633_add_priority_locked_at_to_groupedmessage.py b/src/sentry/migrations/0633_add_priority_locked_at_to_groupedmessage.py
index f0639df01f5e08..25c185d4151429 100644
--- a/src/sentry/migrations/0633_add_priority_locked_at_to_groupedmessage.py
+++ b/src/sentry/migrations/0633_add_priority_locked_at_to_groupedmessage.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0632_apitoken_backfill_last_chars"),
     ]
diff --git a/src/sentry/migrations/0637_remove_pr_comment_pr_id_constraint.py b/src/sentry/migrations/0637_remove_pr_comment_pr_id_constraint.py
index 2c7a45b552bbf6..c06a425026ca2f 100644
--- a/src/sentry/migrations/0637_remove_pr_comment_pr_id_constraint.py
+++ b/src/sentry/migrations/0637_remove_pr_comment_pr_id_constraint.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0636_monitor_incident_env_resolving_index"),
     ]
diff --git a/src/sentry/migrations/0638_add_date_added_to_dashboard_widget_on_demand.py b/src/sentry/migrations/0638_add_date_added_to_dashboard_widget_on_demand.py
index dc5e9246bdb970..b759ff0f296f58 100644
--- a/src/sentry/migrations/0638_add_date_added_to_dashboard_widget_on_demand.py
+++ b/src/sentry/migrations/0638_add_date_added_to_dashboard_widget_on_demand.py
@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0637_remove_pr_comment_pr_id_constraint"),
     ]
diff --git a/src/sentry/migrations/0643_add_date_modified_col_dashboard_widget_query.py b/src/sentry/migrations/0643_add_date_modified_col_dashboard_widget_query.py
index 1c6498a4817afc..09068d38850701 100644
--- a/src/sentry/migrations/0643_add_date_modified_col_dashboard_widget_query.py
+++ b/src/sentry/migrations/0643_add_date_modified_col_dashboard_widget_query.py
@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0642_index_together_release"),
     ]
diff --git a/src/sentry/migrations/0651_enable_activated_alert_rules.py b/src/sentry/migrations/0651_enable_activated_alert_rules.py
index 60408e2a6f4779..4e1d2640b9edc3 100644
--- a/src/sentry/migrations/0651_enable_activated_alert_rules.py
+++ b/src/sentry/migrations/0651_enable_activated_alert_rules.py
@@ -23,6 +23,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0650_create_sentryshot"),
     ]
diff --git a/src/sentry/migrations/0657_add_status_column_for_alert_rule_trigger_action.py b/src/sentry/migrations/0657_add_status_column_for_alert_rule_trigger_action.py
index d1d5dc69bbc3d6..31fbdf83276a70 100644
--- a/src/sentry/migrations/0657_add_status_column_for_alert_rule_trigger_action.py
+++ b/src/sentry/migrations/0657_add_status_column_for_alert_rule_trigger_action.py
@@ -19,6 +19,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0656_add_discover_dataset_split_dashboard"),
     ]
diff --git a/src/sentry/migrations/0658_projectkey_usecase.py b/src/sentry/migrations/0658_projectkey_usecase.py
index 721f564704bce8..84964091d4aa0d 100644
--- a/src/sentry/migrations/0658_projectkey_usecase.py
+++ b/src/sentry/migrations/0658_projectkey_usecase.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0657_add_status_column_for_alert_rule_trigger_action"),
     ]
diff --git a/src/sentry/migrations/0663_artifactbundleindex_cleanup_step3.py b/src/sentry/migrations/0663_artifactbundleindex_cleanup_step3.py
index 70ec590c959b64..670b5d9aa5bb6f 100644
--- a/src/sentry/migrations/0663_artifactbundleindex_cleanup_step3.py
+++ b/src/sentry/migrations/0663_artifactbundleindex_cleanup_step3.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0662_monitor_drop_last_state_change"),
     ]
diff --git a/src/sentry/migrations/0665_monitor_drop_last_state_change_db.py b/src/sentry/migrations/0665_monitor_drop_last_state_change_db.py
index dbef628771474b..56e9a741d8020a 100644
--- a/src/sentry/migrations/0665_monitor_drop_last_state_change_db.py
+++ b/src/sentry/migrations/0665_monitor_drop_last_state_change_db.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0664_create_new_broken_monitor_detection_table"),
     ]
diff --git a/src/sentry/migrations/0678_add_is_hidden_dashboard_widget_query.py b/src/sentry/migrations/0678_add_is_hidden_dashboard_widget_query.py
index d45b47230af02f..6f6fb4a07250d5 100644
--- a/src/sentry/migrations/0678_add_is_hidden_dashboard_widget_query.py
+++ b/src/sentry/migrations/0678_add_is_hidden_dashboard_widget_query.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0677_unpickle_project_options_again"),
     ]
diff --git a/src/sentry/migrations/0682_monitors_constrain_to_project_id_slug.py b/src/sentry/migrations/0682_monitors_constrain_to_project_id_slug.py
index c6a78343712ecf..1bf094a1582093 100644
--- a/src/sentry/migrations/0682_monitors_constrain_to_project_id_slug.py
+++ b/src/sentry/migrations/0682_monitors_constrain_to_project_id_slug.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = True
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0681_unpickle_authenticator_again"),
     ]
diff --git a/src/sentry/migrations/0689_drop_config_from_cron_checkin.py b/src/sentry/migrations/0689_drop_config_from_cron_checkin.py
index 724035f46302cf..e2165fe3b044b8 100644
--- a/src/sentry/migrations/0689_drop_config_from_cron_checkin.py
+++ b/src/sentry/migrations/0689_drop_config_from_cron_checkin.py
@@ -18,6 +18,8 @@ class Migration(CheckedMigration):
     #   change, it's completely safe to run the operation after the code has deployed.
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0688_add_project_flag_high_priority_alerts"),
     ]
diff --git a/src/sentry/migrations/0697_remove_monitor_owner_actor_id_db.py b/src/sentry/migrations/0697_remove_monitor_owner_actor_id_db.py
index 6f09d09c5c55af..837d74f0dd3f44 100644
--- a/src/sentry/migrations/0697_remove_monitor_owner_actor_id_db.py
+++ b/src/sentry/migrations/0697_remove_monitor_owner_actor_id_db.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0696_remove_monitor_owner_actor_id"),
     ]
diff --git a/src/sentry/migrations/0700_drop_fileid_controlavatar.py b/src/sentry/migrations/0700_drop_fileid_controlavatar.py
index 0df209ea2d5de8..2e0607e567795c 100644
--- a/src/sentry/migrations/0700_drop_fileid_controlavatar.py
+++ b/src/sentry/migrations/0700_drop_fileid_controlavatar.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0699_update_monitor_owner_team_id_cascsade"),
     ]
diff --git a/src/sentry/migrations/0707_alert_rule_activations_incidents_fk.py b/src/sentry/migrations/0707_alert_rule_activations_incidents_fk.py
index ff7a700e1aa93b..084f37f4732178 100644
--- a/src/sentry/migrations/0707_alert_rule_activations_incidents_fk.py
+++ b/src/sentry/migrations/0707_alert_rule_activations_incidents_fk.py
@@ -22,6 +22,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0706_grouphistory_userteam_backfill"),
     ]
diff --git a/src/sentry/migrations/0709_alertrule_remove_owner_state.py b/src/sentry/migrations/0709_alertrule_remove_owner_state.py
index 4eb13999d671c1..8123ffc5f80607 100644
--- a/src/sentry/migrations/0709_alertrule_remove_owner_state.py
+++ b/src/sentry/migrations/0709_alertrule_remove_owner_state.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0708_rule_remove_owner_state"),
     ]
diff --git a/src/sentry/migrations/0710_grouphistory_remove_actor_state.py b/src/sentry/migrations/0710_grouphistory_remove_actor_state.py
index b011bcbde62c45..59e4bdb5806122 100644
--- a/src/sentry/migrations/0710_grouphistory_remove_actor_state.py
+++ b/src/sentry/migrations/0710_grouphistory_remove_actor_state.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0709_alertrule_remove_owner_state"),
     ]
diff --git a/src/sentry/migrations/0713_team_remove_actor_state.py b/src/sentry/migrations/0713_team_remove_actor_state.py
index 84a80d3fe1d029..f4c773750cfd7f 100644
--- a/src/sentry/migrations/0713_team_remove_actor_state.py
+++ b/src/sentry/migrations/0713_team_remove_actor_state.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0712_create_tombstone_compound_indexes"),
     ]
diff --git a/src/sentry/migrations/0714_drop_project_team_avatar.py b/src/sentry/migrations/0714_drop_project_team_avatar.py
index 73e0438f7c58bb..7e3a5b6623364f 100644
--- a/src/sentry/migrations/0714_drop_project_team_avatar.py
+++ b/src/sentry/migrations/0714_drop_project_team_avatar.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0713_team_remove_actor_state"),
     ]
diff --git a/src/sentry/migrations/0715_remove_actormodel_constraints.py b/src/sentry/migrations/0715_remove_actormodel_constraints.py
index cd87515e7ed464..9b9eb125d0a456 100644
--- a/src/sentry/migrations/0715_remove_actormodel_constraints.py
+++ b/src/sentry/migrations/0715_remove_actormodel_constraints.py
@@ -22,6 +22,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0714_drop_project_team_avatar"),
     ]
diff --git a/src/sentry/migrations/0719_querysubscription_timebox_column_deletion_db.py b/src/sentry/migrations/0719_querysubscription_timebox_column_deletion_db.py
index 59ca6933a64ed6..718648afa84e14 100644
--- a/src/sentry/migrations/0719_querysubscription_timebox_column_deletion_db.py
+++ b/src/sentry/migrations/0719_querysubscription_timebox_column_deletion_db.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0718_delete_timebox_columns"),
     ]
diff --git a/src/sentry/migrations/0720_remove_actor_columns.py b/src/sentry/migrations/0720_remove_actor_columns.py
index 6b098b9ebddbcb..add6252e7b4805 100644
--- a/src/sentry/migrations/0720_remove_actor_columns.py
+++ b/src/sentry/migrations/0720_remove_actor_columns.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0719_querysubscription_timebox_column_deletion_db"),
     ]
diff --git a/src/sentry/migrations/0722_drop_sentryfunctions.py b/src/sentry/migrations/0722_drop_sentryfunctions.py
index 8e0bcd9ece8416..bf0357c3fb98d3 100644
--- a/src/sentry/migrations/0722_drop_sentryfunctions.py
+++ b/src/sentry/migrations/0722_drop_sentryfunctions.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0721_delete_sentryfunctions"),
     ]
diff --git a/src/sentry/migrations/0724_discover_saved_query_dataset.py b/src/sentry/migrations/0724_discover_saved_query_dataset.py
index c8439d7e2261d2..0dbf432449a084 100644
--- a/src/sentry/migrations/0724_discover_saved_query_dataset.py
+++ b/src/sentry/migrations/0724_discover_saved_query_dataset.py
@@ -21,6 +21,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0723_project_template_models"),
     ]
diff --git a/src/sentry/migrations/0725_create_sentry_groupsearchview_table.py b/src/sentry/migrations/0725_create_sentry_groupsearchview_table.py
index 40120a0f0db007..eecb7007bcafa9 100644
--- a/src/sentry/migrations/0725_create_sentry_groupsearchview_table.py
+++ b/src/sentry/migrations/0725_create_sentry_groupsearchview_table.py
@@ -26,6 +26,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0724_discover_saved_query_dataset"),
     ]
diff --git a/src/sentry/migrations/0733_relocation_provenance.py b/src/sentry/migrations/0733_relocation_provenance.py
index 9600cfa7b7f2c8..72626606c5ca6e 100644
--- a/src/sentry/migrations/0733_relocation_provenance.py
+++ b/src/sentry/migrations/0733_relocation_provenance.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0732_add_span_attribute_extraction_rules"),
     ]
diff --git a/src/sentry/migrations/0737_add_discover_saved_query_dataset_source.py b/src/sentry/migrations/0737_add_discover_saved_query_dataset_source.py
index d3d14ff0930995..02ea18a44e3410 100644
--- a/src/sentry/migrations/0737_add_discover_saved_query_dataset_source.py
+++ b/src/sentry/migrations/0737_add_discover_saved_query_dataset_source.py
@@ -21,6 +21,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0736_rm_reprocessing_step2"),
     ]
diff --git a/src/sentry/migrations/0738_rm_reprocessing_step3.py b/src/sentry/migrations/0738_rm_reprocessing_step3.py
index ed23fac78edb47..de7cde8e7701bb 100644
--- a/src/sentry/migrations/0738_rm_reprocessing_step3.py
+++ b/src/sentry/migrations/0738_rm_reprocessing_step3.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0737_add_discover_saved_query_dataset_source"),
     ]
diff --git a/src/sentry/migrations/0741_metric_alert_anomaly_detection.py b/src/sentry/migrations/0741_metric_alert_anomaly_detection.py
index 3e8d7f3aeda955..86eb1ba26927a5 100644
--- a/src/sentry/migrations/0741_metric_alert_anomaly_detection.py
+++ b/src/sentry/migrations/0741_metric_alert_anomaly_detection.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0740_one_relocation_file_kind_per_relocation"),
     ]
diff --git a/src/sentry/migrations/0744_add_dataset_source_field_to_dashboards.py b/src/sentry/migrations/0744_add_dataset_source_field_to_dashboards.py
index 47159802485e5d..de09cf3ff0abee 100644
--- a/src/sentry/migrations/0744_add_dataset_source_field_to_dashboards.py
+++ b/src/sentry/migrations/0744_add_dataset_source_field_to_dashboards.py
@@ -21,6 +21,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0743_backfill_broken_monitor_notification_setting_option"),
     ]
diff --git a/src/sentry/migrations/0746_add_bitflags_to_hybrid_cloud.py b/src/sentry/migrations/0746_add_bitflags_to_hybrid_cloud.py
index 0c577fe5630a9e..9dad268ac936f7 100644
--- a/src/sentry/migrations/0746_add_bitflags_to_hybrid_cloud.py
+++ b/src/sentry/migrations/0746_add_bitflags_to_hybrid_cloud.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0745_add_prevent_superuser_access_bitflag"),
     ]
diff --git a/src/sentry/migrations/0750_disable_member_invite_in_hybrid_cloud.py b/src/sentry/migrations/0750_disable_member_invite_in_hybrid_cloud.py
index fcb366e642b1df..3eb750ff9d496b 100644
--- a/src/sentry/migrations/0750_disable_member_invite_in_hybrid_cloud.py
+++ b/src/sentry/migrations/0750_disable_member_invite_in_hybrid_cloud.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0749_disable_member_invite"),
     ]
diff --git a/src/sentry/migrations/0757_add_scopes_to_apiapplication.py b/src/sentry/migrations/0757_add_scopes_to_apiapplication.py
index e0851898bf17ab..074c9ce950dc69 100644
--- a/src/sentry/migrations/0757_add_scopes_to_apiapplication.py
+++ b/src/sentry/migrations/0757_add_scopes_to_apiapplication.py
@@ -21,6 +21,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0756_grouprelease_represented_in_django"),
     ]
diff --git a/src/sentry/migrations/0759_remove_spanattributeextraction_tables.py b/src/sentry/migrations/0759_remove_spanattributeextraction_tables.py
index d778dbf7def58d..aba74fb7c586e3 100644
--- a/src/sentry/migrations/0759_remove_spanattributeextraction_tables.py
+++ b/src/sentry/migrations/0759_remove_spanattributeextraction_tables.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0758_remove_spanattributeextraction_models"),
     ]
diff --git a/src/sentry/migrations/0760_remove_appstore_connect_integration_tables.py b/src/sentry/migrations/0760_remove_appstore_connect_integration_tables.py
index 3d62e30b52a786..5383ebc03a650c 100644
--- a/src/sentry/migrations/0760_remove_appstore_connect_integration_tables.py
+++ b/src/sentry/migrations/0760_remove_appstore_connect_integration_tables.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0759_remove_spanattributeextraction_tables"),
     ]
diff --git a/src/sentry/migrations/0776_drop_group_score_in_database.py b/src/sentry/migrations/0776_drop_group_score_in_database.py
index 53ed5f75b6f0d2..2a9f36dd7e98f8 100644
--- a/src/sentry/migrations/0776_drop_group_score_in_database.py
+++ b/src/sentry/migrations/0776_drop_group_score_in_database.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = True
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0775_add_dashboard_permissions_model"),
     ]
diff --git a/src/sentry/migrations/0785_add_new_field_to_dashboard_permissions.py b/src/sentry/migrations/0785_add_new_field_to_dashboard_permissions.py
index 32912ed3a81cfc..bae928a544df7d 100644
--- a/src/sentry/migrations/0785_add_new_field_to_dashboard_permissions.py
+++ b/src/sentry/migrations/0785_add_new_field_to_dashboard_permissions.py
@@ -23,6 +23,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0784_remove_broadcasts_cta_column"),
     ]
diff --git a/src/sentry/migrations/0786_drop_broadcasts_cta_column.py b/src/sentry/migrations/0786_drop_broadcasts_cta_column.py
index fd14d73769726a..c8cac50728a022 100644
--- a/src/sentry/migrations/0786_drop_broadcasts_cta_column.py
+++ b/src/sentry/migrations/0786_drop_broadcasts_cta_column.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0785_add_new_field_to_dashboard_permissions"),
     ]
diff --git a/src/sentry/migrations/0790_delete_dashboard_perms_col.py b/src/sentry/migrations/0790_delete_dashboard_perms_col.py
new file mode 100644
index 00000000000000..38e17ab6fda1da
--- /dev/null
+++ b/src/sentry/migrations/0790_delete_dashboard_perms_col.py
@@ -0,0 +1,44 @@
+# Generated by Django 5.1.1 on 2024-11-14 16:45
+
+from django.db import migrations
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    allow_run_sql = True
+
+    dependencies = [
+        ("sentry", "0789_add_unique_constraint_to_rollbackorganization"),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            database_operations=[
+                migrations.RunSQL(
+                    """
+                    ALTER TABLE "sentry_dashboardpermissions" DROP COLUMN "is_creator_only_editable";
+                    """,
+                    reverse_sql="""
+                    ALTER TABLE "sentry_dashboardpermissions" ADD COLUMN "is_creator_only_editable" bool NULL;
+                    """,
+                    hints={"tables": ["sentry_dashboardpermissions"]},
+                )
+            ],
+            state_operations=[],
+        )
+    ]
diff --git a/src/sentry/migrations/0791_add_hashing_metadata_to_grouphash_metadata.py b/src/sentry/migrations/0791_add_hashing_metadata_to_grouphash_metadata.py
new file mode 100644
index 00000000000000..dd11284266f888
--- /dev/null
+++ b/src/sentry/migrations/0791_add_hashing_metadata_to_grouphash_metadata.py
@@ -0,0 +1,34 @@
+# Generated by Django 5.1.1 on 2024-11-14 22:09
+
+from django.db import migrations
+
+import sentry.db.models.fields.jsonfield
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "0790_delete_dashboard_perms_col"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="grouphashmetadata",
+            name="hashing_metadata",
+            field=sentry.db.models.fields.jsonfield.JSONField(null=True),
+        ),
+    ]
diff --git a/src/sentry/migrations/0792_add_unique_index_apiauthorization.py b/src/sentry/migrations/0792_add_unique_index_apiauthorization.py
new file mode 100644
index 00000000000000..905f98324f24c6
--- /dev/null
+++ b/src/sentry/migrations/0792_add_unique_index_apiauthorization.py
@@ -0,0 +1,48 @@
+# Generated by Django 5.1.1 on 2024-11-19 17:37
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "0791_add_hashing_metadata_to_grouphash_metadata"),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name="apiauthorization",
+            constraint=models.UniqueConstraint(
+                condition=models.Q(("organization_id__isnull", True)),
+                fields=("user", "application"),
+                name="apiauthorization_user_app",
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="apiauthorization",
+            constraint=models.UniqueConstraint(
+                condition=models.Q(("organization_id__isnull", False)),
+                fields=("user", "application", "organization_id"),
+                name="apiauthorization_user_app_org",
+            ),
+        ),
+        migrations.AlterUniqueTogether(
+            name="apiauthorization",
+            unique_together=set(),
+        ),
+    ]
diff --git a/src/sentry/migrations/0793_remove_db_constraint_alert_rule_exclusion.py b/src/sentry/migrations/0793_remove_db_constraint_alert_rule_exclusion.py
new file mode 100644
index 00000000000000..8c673571a87f4d
--- /dev/null
+++ b/src/sentry/migrations/0793_remove_db_constraint_alert_rule_exclusion.py
@@ -0,0 +1,59 @@
+# Generated by Django 5.1.1 on 2024-11-22 17:43
+
+import django.db.models.deletion
+from django.db import migrations
+
+import sentry.db.models.fields.foreignkey
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "0792_add_unique_index_apiauthorization"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="alertruleexcludedprojects",
+            name="alert_rule",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                db_constraint=False,
+                db_index=False,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="sentry.alertrule",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="alertruletriggerexclusion",
+            name="alert_rule_trigger",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                db_constraint=False,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="exclusions",
+                to="sentry.alertruletrigger",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="alertruletriggerexclusion",
+            name="query_subscription",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                db_constraint=False,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="sentry.querysubscription",
+            ),
+        ),
+    ]
diff --git a/src/sentry/migrations/0794_rm_excluded_included_projects_alertrule.py b/src/sentry/migrations/0794_rm_excluded_included_projects_alertrule.py
new file mode 100644
index 00000000000000..0add9ea8dd47c6
--- /dev/null
+++ b/src/sentry/migrations/0794_rm_excluded_included_projects_alertrule.py
@@ -0,0 +1,45 @@
+# Generated by Django 5.1.1 on 2024-11-22 19:12
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+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", "0793_remove_db_constraint_alert_rule_exclusion"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="alertrule",
+            name="excluded_projects",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+        migrations.AlterField(
+            model_name="alertrule",
+            name="include_all_projects",
+            field=models.BooleanField(default=False, null=True),
+        ),
+        SafeRemoveField(
+            model_name="alertrule",
+            name="include_all_projects",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/src/sentry/migrations/0795_drop_included_excluded_projects.py b/src/sentry/migrations/0795_drop_included_excluded_projects.py
new file mode 100644
index 00000000000000..772097d94199f3
--- /dev/null
+++ b/src/sentry/migrations/0795_drop_included_excluded_projects.py
@@ -0,0 +1,36 @@
+# Generated by Django 5.1.1 on 2024-11-25 17:33
+
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+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", "0794_rm_excluded_included_projects_alertrule"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="alertrule", name="excluded_projects", deletion_action=DeletionAction.DELETE
+        ),
+        SafeRemoveField(
+            model_name="alertrule",
+            name="include_all_projects",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]
diff --git a/src/sentry/migrations/0796_rm_excluded_projects_triggers.py b/src/sentry/migrations/0796_rm_excluded_projects_triggers.py
new file mode 100644
index 00000000000000..710cea5d0cc5f7
--- /dev/null
+++ b/src/sentry/migrations/0796_rm_excluded_projects_triggers.py
@@ -0,0 +1,36 @@
+# Generated by Django 5.1.1 on 2024-11-25 20:06
+
+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", "0795_drop_included_excluded_projects"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="AlertRuleExcludedProjects",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+        SafeDeleteModel(
+            name="AlertRuleTriggerExclusion",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/src/sentry/migrations/0797_drop_excluded_project_triggers.py b/src/sentry/migrations/0797_drop_excluded_project_triggers.py
new file mode 100644
index 00000000000000..d410dcf3729a51
--- /dev/null
+++ b/src/sentry/migrations/0797_drop_excluded_project_triggers.py
@@ -0,0 +1,30 @@
+# Generated by Django 5.1.1 on 2024-11-26 18:34
+
+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", "0796_rm_excluded_projects_triggers"),
+    ]
+
+    operations = [
+        SafeDeleteModel(name="AlertRuleExcludedProjects", deletion_action=DeletionAction.DELETE),
+        SafeDeleteModel(name="AlertRuleTriggerExclusion", deletion_action=DeletionAction.DELETE),
+    ]
diff --git a/src/sentry/migrations/0798_add_favorite_dashboard_col.py b/src/sentry/migrations/0798_add_favorite_dashboard_col.py
new file mode 100644
index 00000000000000..ab274624653ed0
--- /dev/null
+++ b/src/sentry/migrations/0798_add_favorite_dashboard_col.py
@@ -0,0 +1,61 @@
+# Generated by Django 5.1.1 on 2024-12-01 08:26
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import sentry.db.models.fields.bounded
+import sentry.db.models.fields.foreignkey
+import sentry.db.models.fields.hybrid_cloud_foreign_key
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "0797_drop_excluded_project_triggers"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="DashboardFavoriteUser",
+            fields=[
+                (
+                    "id",
+                    sentry.db.models.fields.bounded.BoundedBigAutoField(
+                        primary_key=True, serialize=False
+                    ),
+                ),
+                ("date_updated", models.DateTimeField(auto_now=True)),
+                ("date_added", models.DateTimeField(auto_now_add=True)),
+                (
+                    "user_id",
+                    sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                        "sentry.User", db_index=True, on_delete="CASCADE"
+                    ),
+                ),
+                (
+                    "dashboard",
+                    sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="sentry.dashboard"
+                    ),
+                ),
+            ],
+            options={
+                "db_table": "sentry_dashboardfavoriteuser",
+                "unique_together": {("user_id", "dashboard")},
+            },
+        ),
+    ]
diff --git a/src/sentry/migrations/0799_cron_incident_index.py b/src/sentry/migrations/0799_cron_incident_index.py
new file mode 100644
index 00000000000000..73f4d4c8972715
--- /dev/null
+++ b/src/sentry/migrations/0799_cron_incident_index.py
@@ -0,0 +1,34 @@
+# Generated by Django 5.1.1 on 2024-11-27 19:11
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = True
+
+    dependencies = [
+        ("sentry", "0798_add_favorite_dashboard_col"),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name="monitorcheckin",
+            index=models.Index(
+                fields=["status", "date_added"], name="sentry_moni_status_dd2d85_idx"
+            ),
+        ),
+    ]
diff --git a/src/sentry/migrations/0800_rm_incidentseen_incidentsubscription.py b/src/sentry/migrations/0800_rm_incidentseen_incidentsubscription.py
new file mode 100644
index 00000000000000..5a77729743455f
--- /dev/null
+++ b/src/sentry/migrations/0800_rm_incidentseen_incidentsubscription.py
@@ -0,0 +1,72 @@
+# Generated by Django 5.1.1 on 2024-12-03 18:48
+import django
+from django.db import migrations
+
+import sentry
+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", "0799_cron_incident_index"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="incidentseen",
+            name="incident",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                db_constraint=False,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="sentry.incident",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="incidentseen",
+            name="user_id",
+            field=sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                "sentry.User", db_index=False, null=True, on_delete="CASCADE"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="incidentsubscription",
+            name="incident",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                db_constraint=False,
+                db_index=False,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="sentry.incident",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="incidentsubscription",
+            name="user_id",
+            field=sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                "sentry.User", db_index=True, null=True, on_delete="CASCADE"
+            ),
+        ),
+        SafeDeleteModel(
+            name="IncidentSeen",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+        SafeDeleteModel(
+            name="IncidentSubscription",
+            deletion_action=DeletionAction.MOVE_TO_PENDING,
+        ),
+    ]
diff --git a/src/sentry/migrations/0801_drop_incidentseen_incidentsubscription.py b/src/sentry/migrations/0801_drop_incidentseen_incidentsubscription.py
new file mode 100644
index 00000000000000..c53fd1533be6b5
--- /dev/null
+++ b/src/sentry/migrations/0801_drop_incidentseen_incidentsubscription.py
@@ -0,0 +1,36 @@
+# Generated by Django 5.1.1 on 2024-12-03 21:47
+
+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", "0800_rm_incidentseen_incidentsubscription"),
+    ]
+
+    operations = [
+        SafeDeleteModel(
+            name="IncidentSeen",
+            deletion_action=DeletionAction.DELETE,
+        ),
+        SafeDeleteModel(
+            name="IncidentSubscription",
+            deletion_action=DeletionAction.DELETE,
+        ),
+    ]
diff --git a/src/sentry/migrations/0802_remove_grouping_auto_update_option.py b/src/sentry/migrations/0802_remove_grouping_auto_update_option.py
new file mode 100644
index 00000000000000..9cd59ae9ceb493
--- /dev/null
+++ b/src/sentry/migrations/0802_remove_grouping_auto_update_option.py
@@ -0,0 +1,44 @@
+# Generated by Django 5.1.1 on 2024-12-04 17:57
+
+from django.apps.registry import Apps
+from django.db import migrations
+from django.db.backends.base.schema import BaseDatabaseSchemaEditor
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+def remove_grouping_auto_update_option(
+    apps: Apps, _schema_editor: BaseDatabaseSchemaEditor
+) -> None:
+    ProjectOption = apps.get_model("sentry", "ProjectOption")
+
+    for option in ProjectOption.objects.filter(key="sentry:grouping_auto_update"):
+        option.delete()
+
+
+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", "0801_drop_incidentseen_incidentsubscription"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            remove_grouping_auto_update_option,
+            migrations.RunPython.noop,
+            hints={"tables": ["sentry_projectoptions"]},
+        ),
+    ]
diff --git a/src/sentry/models/__init__.py b/src/sentry/models/__init__.py
index 1a18f4dc34799e..61a973fed1e262 100644
--- a/src/sentry/models/__init__.py
+++ b/src/sentry/models/__init__.py
@@ -60,8 +60,6 @@
 from .grouptombstone import *  # NOQA
 from .importchunk import *  # NOQA
 from .latestreporeleaseenvironment import *  # NOQA
-from .notificationmessage import *  # NOQA
-from .notificationsettingoption import *  # NOQA
 from .notificationsettingprovider import *  # NOQA
 from .options import *  # NOQA
 from .organization import *  # NOQA
diff --git a/src/sentry/models/apiauthorization.py b/src/sentry/models/apiauthorization.py
index 512b5bb85f5145..91a6ffe600fd77 100644
--- a/src/sentry/models/apiauthorization.py
+++ b/src/sentry/models/apiauthorization.py
@@ -1,4 +1,5 @@
 from django.db import models
+from django.db.models import Q
 from django.utils import timezone
 
 from sentry.backup.scopes import RelocationScope
@@ -35,7 +36,18 @@ class ApiAuthorization(Model, HasApiScopes):
     class Meta:
         app_label = "sentry"
         db_table = "sentry_apiauthorization"
-        unique_together = (("user", "application"),)
+        constraints = [
+            models.UniqueConstraint(
+                fields=["user", "application"],
+                name="apiauthorization_user_app",
+                condition=Q(organization_id__isnull=True),
+            ),
+            models.UniqueConstraint(
+                fields=["user", "application", "organization_id"],
+                name="apiauthorization_user_app_org",
+                condition=Q(organization_id__isnull=False),
+            ),
+        ]
 
     __repr__ = sane_repr("user_id", "application_id")
 
diff --git a/src/sentry/models/counter.py b/src/sentry/models/counter.py
index e42a303f214244..5a967fedb8dc69 100644
--- a/src/sentry/models/counter.py
+++ b/src/sentry/models/counter.py
@@ -45,8 +45,7 @@ def increment_project_counter(project, delta=1, using="default"):
     # To prevent the statement_timeout leaking into the session we need to use
     # set local which can be used only within a transaction
     with transaction.atomic(using=using):
-        cur = connections[using].cursor()
-        try:
+        with connections[using].cursor() as cur:
             statement_timeout = None
             if settings.SENTRY_PROJECT_COUNTER_STATEMENT_TIMEOUT:
                 # WARNING: This is not a proper fix and should be removed once
@@ -84,9 +83,6 @@ def increment_project_counter(project, delta=1, using="default"):
 
             return project_counter
 
-        finally:
-            cur.close()
-
 
 # this must be idempotent because it seems to execute twice
 # (at least during test runs)
diff --git a/src/sentry/models/dashboard.py b/src/sentry/models/dashboard.py
index d4d2ee7c38a753..21939517fb9bde 100644
--- a/src/sentry/models/dashboard.py
+++ b/src/sentry/models/dashboard.py
@@ -9,6 +9,7 @@
 from sentry import features
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import FlexibleForeignKey, Model, region_silo_model, sane_repr
+from sentry.db.models.base import DefaultFieldsModel
 from sentry.db.models.fields.bounded import BoundedBigIntegerField
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
 from sentry.db.models.fields.jsonfield import JSONField
@@ -29,6 +30,19 @@ class Meta:
         unique_together = (("project", "dashboard"),)
 
 
+@region_silo_model
+class DashboardFavoriteUser(DefaultFieldsModel):
+    __relocation_scope__ = RelocationScope.Organization
+
+    user_id = HybridCloudForeignKey("sentry.User", on_delete="CASCADE")
+    dashboard = FlexibleForeignKey("sentry.Dashboard", on_delete=models.CASCADE)
+
+    class Meta:
+        app_label = "sentry"
+        db_table = "sentry_dashboardfavoriteuser"
+        unique_together = (("user_id", "dashboard"),)
+
+
 @region_silo_model
 class Dashboard(Model):
     """
@@ -55,6 +69,30 @@ class Meta:
 
     __repr__ = sane_repr("organization", "title")
 
+    @property
+    def favorited_by(self):
+        user_ids = DashboardFavoriteUser.objects.filter(dashboard=self).values_list(
+            "user_id", flat=True
+        )
+        return user_ids
+
+    @favorited_by.setter
+    def favorited_by(self, user_ids):
+        from django.db import router, transaction
+
+        existing_user_ids = DashboardFavoriteUser.objects.filter(dashboard=self).values_list(
+            "user_id", flat=True
+        )
+        with transaction.atomic(using=router.db_for_write(DashboardFavoriteUser)):
+            newly_favourited = [
+                DashboardFavoriteUser(dashboard=self, user_id=user_id)
+                for user_id in set(user_ids) - set(existing_user_ids)
+            ]
+            DashboardFavoriteUser.objects.filter(
+                dashboard=self, user_id__in=set(existing_user_ids) - set(user_ids)
+            ).delete()
+            DashboardFavoriteUser.objects.bulk_create(newly_favourited)
+
     @staticmethod
     def get_prebuilt_list(organization, user, title_query=None):
         query = list(
@@ -156,6 +194,8 @@ def get_prebuilt_dashboards(organization, user) -> list[dict[str, Any]]:
             "title": "General",
             "dateCreated": "",
             "createdBy": "",
+            "permissions": {"isEditableByEveryone": True, "teamsWithEditAccess": []},
+            "isFavorited": False,
             "widgets": [
                 {
                     "title": "Number of Errors",
diff --git a/src/sentry/models/debugfile.py b/src/sentry/models/debugfile.py
index ea0d64793ac8b8..c7572ddccfeb48 100644
--- a/src/sentry/models/debugfile.py
+++ b/src/sentry/models/debugfile.py
@@ -338,7 +338,10 @@ def create_dif_from_id(
     return dif, True
 
 
-def _analyze_progard_filename(filename: str) -> str | None:
+def _analyze_progard_filename(filename: str | None) -> str | None:
+    if filename is None:
+        return None
+
     match = _proguard_file_re.search(filename)
     if match is None:
         return None
@@ -474,9 +477,9 @@ def detect_dif_from_path(
 
     :raises BadDif: If the file is not a valid DIF.
     """
-    # proguard files (proguard/UUID.txt) or
+    # Proguard files have a path or a name like (proguard/UUID.txt) or
     # (proguard/mapping-UUID.txt).
-    proguard_id = _analyze_progard_filename(path)
+    proguard_id = _analyze_progard_filename(path) or _analyze_progard_filename(name)
     if proguard_id is not None:
         data = {"features": ["mapping"]}
         return [
diff --git a/src/sentry/models/groupassignee.py b/src/sentry/models/groupassignee.py
index eeea257073f4a5..b4479012ecb2a9 100644
--- a/src/sentry/models/groupassignee.py
+++ b/src/sentry/models/groupassignee.py
@@ -33,7 +33,10 @@
 
 class GroupAssigneeManager(BaseManager["GroupAssignee"]):
     def get_assigned_to_data(
-        self, assigned_to: Team | RpcUser, assignee_type: str, extra: dict[str, str] | None = None
+        self,
+        assigned_to: Team | RpcUser | User,
+        assignee_type: str,
+        extra: dict[str, str] | None = None,
     ) -> dict[str, Any]:
         data = {
             "assignee": str(assigned_to.id),
@@ -45,7 +48,7 @@ def get_assigned_to_data(
 
         return data
 
-    def get_assignee_data(self, assigned_to: Team | RpcUser) -> tuple[str, str, str]:
+    def get_assignee_data(self, assigned_to: Team | RpcUser | User) -> tuple[str, str, str]:
         from sentry.models.team import Team
         from sentry.users.models.user import User
         from sentry.users.services.user import RpcUser
@@ -130,7 +133,7 @@ def remove_old_assignees(
     def assign(
         self,
         group: Group,
-        assigned_to: Team | RpcUser,
+        assigned_to: Team | RpcUser | User,
         acting_user: User | None = None,
         create_only: bool = False,
         extra: dict[str, str] | None = None,
diff --git a/src/sentry/models/grouphashmetadata.py b/src/sentry/models/grouphashmetadata.py
index 0f6d3bfb90d0fb..f8ad100527d748 100644
--- a/src/sentry/models/grouphashmetadata.py
+++ b/src/sentry/models/grouphashmetadata.py
@@ -5,6 +5,8 @@
 from sentry.db.models import Model, region_silo_model
 from sentry.db.models.base import sane_repr
 from sentry.db.models.fields.foreignkey import FlexibleForeignKey
+from sentry.db.models.fields.jsonfield import JSONField
+from sentry.types.grouphash_metadata import HashingMetadata
 
 
 # The overall grouping method used
@@ -55,7 +57,15 @@ class GroupHashMetadata(Model):
     # Most recent config to produce this hash
     latest_grouping_config = models.CharField(null=True)
     # The primary grouping method (message, stacktrace, fingerprint, etc.)
-    hash_basis = models.CharField(choices=HashBasis, null=True)
+    hash_basis: models.Field[HashBasis | None, HashBasis | None] = models.CharField(
+        choices=HashBasis, null=True
+    )
+    # Metadata about the inputs to the hashing process and the hashing process itself (what
+    # fingerprinting rules were matched? did we parameterize the message? etc.). For the specific
+    # data stored, see the class definitions of the `HashingMetadata` subtypes.
+    hashing_metadata: models.Field[HashingMetadata | None, HashingMetadata | None] = JSONField(
+        null=True
+    )
 
     # SEER
 
diff --git a/src/sentry/models/groupinbox.py b/src/sentry/models/groupinbox.py
index 9f91b1218b79ae..a4272cb1ad2cdf 100644
--- a/src/sentry/models/groupinbox.py
+++ b/src/sentry/models/groupinbox.py
@@ -9,6 +9,7 @@
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import FlexibleForeignKey, JSONField, Model, region_silo_model
 from sentry.models.activity import Activity
+from sentry.models.group import Group
 from sentry.models.grouphistory import (
     GroupHistoryStatus,
     bulk_record_group_history,
@@ -93,7 +94,7 @@ def add_group_to_inbox(group, reason, reason_details=None):
     return group_inbox
 
 
-def remove_group_from_inbox(group, action=None, user=None, referrer=None):
+def remove_group_from_inbox(group: Group, action=None, user=None, referrer=None):
     try:
         group_inbox = GroupInbox.objects.get(group=group)
         group_inbox.delete()
diff --git a/src/sentry/models/notificationaction.py b/src/sentry/models/notificationaction.py
index 87f46b3cdb4920..2cf637182639ab 100644
--- a/src/sentry/models/notificationaction.py
+++ b/src/sentry/models/notificationaction.py
@@ -1,322 +1,17 @@
-from __future__ import annotations
-
-import logging
-from abc import ABCMeta, abstractmethod
-from collections.abc import Mapping, MutableMapping
-from enum import IntEnum
-from typing import TYPE_CHECKING, Any, TypeVar
-
-from django.db import models
-
-from sentry.backup.scopes import RelocationScope
-from sentry.db.models import FlexibleForeignKey, Model, sane_repr
-from sentry.db.models.base import region_silo_model
-from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
-from sentry.integrations.services.integration import RpcIntegration
-from sentry.integrations.types import ExternalProviders
-from sentry.models.organization import Organization
-
-logger = logging.getLogger(__name__)
-
-if TYPE_CHECKING:
-    from sentry.api.serializers.rest_framework.notification_action import (
-        NotificationActionInputData,
-    )
-
-
-class FlexibleIntEnum(IntEnum):
-    @classmethod
-    def as_choices(cls) -> tuple[tuple[int, str], ...]:
-        raise NotImplementedError
-
-    @classmethod
-    def get_name(cls, value: int) -> str | None:
-        return dict(cls.as_choices()).get(value)
-
-    @classmethod
-    def get_value(cls, name: str) -> int | None:
-        invert_choices = {v: k for k, v in cls.as_choices()}
-        return invert_choices.get(name)
-
-
-class ActionService(FlexibleIntEnum):
-    """
-    The available services to fire action notifications
-    """
-
-    EMAIL = 0
-    PAGERDUTY = 1
-    SLACK = 2
-    MSTEAMS = 3
-    SENTRY_APP = 4
-    SENTRY_NOTIFICATION = 5  # Use personal notification platform (src/sentry/notifications)
-    OPSGENIE = 6
-    DISCORD = 7
-
-    @classmethod
-    def as_choices(cls) -> tuple[tuple[int, str], ...]:
-        assert ExternalProviders.EMAIL.name is not None
-        assert ExternalProviders.PAGERDUTY.name is not None
-        assert ExternalProviders.SLACK.name is not None
-        assert ExternalProviders.MSTEAMS.name is not None
-        assert ExternalProviders.OPSGENIE.name is not None
-        assert ExternalProviders.DISCORD.name is not None
-        return (
-            (cls.EMAIL.value, ExternalProviders.EMAIL.name),
-            (cls.PAGERDUTY.value, ExternalProviders.PAGERDUTY.name),
-            (cls.SLACK.value, ExternalProviders.SLACK.name),
-            (cls.MSTEAMS.value, ExternalProviders.MSTEAMS.name),
-            (cls.SENTRY_APP.value, "sentry_app"),
-            (cls.SENTRY_NOTIFICATION.value, "sentry_notification"),
-            (cls.OPSGENIE.value, ExternalProviders.OPSGENIE.name),
-            (cls.DISCORD.value, ExternalProviders.DISCORD.name),
-        )
-
-
-class ActionTarget(FlexibleIntEnum):
-    """
-    Explains the contents of target_identifier
-    """
-
-    # The target_identifier is a direct reference used by the service (e.g. email address, slack channel id)
-    SPECIFIC = 0
-    # The target_identifier is an id from the User model in Sentry
-    USER = 1
-    # The target_identifier is an id from the Team model in Sentry
-    TEAM = 2
-    # The target_identifier is an id from the SentryApp model in Sentry
-    SENTRY_APP = 3
-
-    @classmethod
-    def as_choices(cls) -> tuple[tuple[int, str], ...]:
-        return (
-            (cls.SPECIFIC.value, "specific"),
-            (cls.USER.value, "user"),
-            (cls.TEAM.value, "team"),
-            (cls.SENTRY_APP.value, "sentry_app"),
-        )
-
-
-class ActionTrigger(FlexibleIntEnum):
-    """
-    The possible sources of action notifications.
-    Items prefixed with 'GS_' have registrations in getsentry.
-    """
-
-    AUDIT_LOG = 0
-    GS_SPIKE_PROTECTION = 100
-
-    @classmethod
-    def as_choices(cls) -> tuple[tuple[int, str], ...]:
-        return (
-            (cls.AUDIT_LOG.value, "audit-log"),
-            (cls.GS_SPIKE_PROTECTION.value, "spike-protection"),
-        )
-
-
-class ActionRegistration(metaclass=ABCMeta):
-    def __init__(self, action: NotificationAction):
-        self.action = action
-
-    @abstractmethod
-    def fire(self, data: Any) -> None:
-        """
-        Handles delivering the message via the service from the action and specified data.
-        """
-
-    @classmethod
-    def validate_action(cls, data: NotificationActionInputData) -> None:
-        """
-        Optional function to provide increased validation when saving incoming NotificationActions. See NotificationActionSerializer.
-
-        :param data: The input data sent to the API before updating/creating NotificationActions
-        :raises serializers.ValidationError: Indicates that the incoming action would apply to this registration but is not valid.
-        """
-
-    @classmethod
-    def serialize_available(
-        cls, organization: Organization, integrations: list[RpcIntegration] | None = None
-    ) -> list[Any]:
-        """
-        Optional class method to serialize this registration's available actions to an organization. See NotificationActionsAvailableEndpoint.
-
-        :param organization: The relevant organization which will receive the serialized available action in their response.
-        :param integrations: A list of integrations which are set up for the organization.
-        """
-        return []
-
-
-ActionRegistrationT = TypeVar("ActionRegistrationT", bound=ActionRegistration)
-
-
-class AbstractNotificationAction(Model):
-    """
-    Abstract model meant to retroactively create a contract for notification actions
-    (e.g. metric alerts, spike protection, etc.)
-    """
-
-    integration_id = HybridCloudForeignKey(
-        "sentry.Integration", blank=True, null=True, on_delete="CASCADE"
-    )
-    sentry_app_id = HybridCloudForeignKey(
-        "sentry.SentryApp", blank=True, null=True, on_delete="CASCADE"
-    )
-
-    # The type of service which will receive the action notification (e.g. slack, pagerduty, etc.)
-    type = models.SmallIntegerField(choices=ActionService.as_choices())
-    # The type of target which the service uses for routing (e.g. user, team)
-    target_type = models.SmallIntegerField(choices=ActionTarget.as_choices())
-    # Identifier of the target for the given service (e.g. slack channel id, pagerdutyservice id)
-    target_identifier = models.TextField(null=True)
-    # User-friendly name of the target (e.g. #slack-channel, pagerduty-service-name)
-    target_display = models.TextField(null=True)
-
-    @property
-    def service_type(self) -> int:
-        """
-        Used for disambiguity of self.type
-        """
-        return self.type
-
-    class Meta:
-        abstract = True
-
-
-@region_silo_model
-class NotificationActionProject(Model):
-    __relocation_scope__ = {RelocationScope.Global, RelocationScope.Organization}
-
-    project = FlexibleForeignKey("sentry.Project")
-    action = FlexibleForeignKey("sentry.NotificationAction")
-
-    class Meta:
-        app_label = "sentry"
-        db_table = "sentry_notificationactionproject"
-
-    def get_relocation_scope(self) -> RelocationScope:
-        action = NotificationAction.objects.get(id=self.action_id)
-        return action.get_relocation_scope()
-
-
-@region_silo_model
-class NotificationAction(AbstractNotificationAction):
-    """
-    Generic notification action model to programmatically route depending on the trigger (or source) for the notification
-    """
-
-    __relocation_scope__ = {RelocationScope.Global, RelocationScope.Organization}
-    __repr__ = sane_repr("id", "trigger_type", "service_type", "target_display")
-
-    _trigger_types: tuple[tuple[int, str], ...] = ActionTrigger.as_choices()
-    _registry: MutableMapping[str, type[ActionRegistration]] = {}
-
-    organization = FlexibleForeignKey("sentry.Organization")
-    projects = models.ManyToManyField("sentry.Project", through=NotificationActionProject)
-
-    # The type of trigger which controls when the actions will go off (e.g. 'spike-protection')
-    trigger_type = models.SmallIntegerField(choices=_trigger_types)
-
-    class Meta:
-        app_label = "sentry"
-        db_table = "sentry_notificationaction"
-
-    @classmethod
-    def register_action(cls, trigger_type: int, service_type: int, target_type: int):
-        """
-        Register a new trigger/service/target combination for NotificationActions.
-        For example, allowing audit-logs (trigger) to fire actions to slack (service) channels (target)
-
-        :param trigger_type: The registered trigger_type integer value saved to the database
-        :param service_type: The service_type integer value which must exist on ActionService
-        :param target_type: The target_type integer value which must exist on ActionTarget
-        :param registration: A subclass of `ActionRegistration`.
-        """
-
-        def inner(registration: type[ActionRegistrationT]) -> type[ActionRegistrationT]:
-            if trigger_type not in dict(ActionTrigger.as_choices()):
-                raise AttributeError(
-                    f"Trigger type of {trigger_type} is not registered. Modify ActionTrigger."
-                )
-
-            if service_type not in dict(ActionService.as_choices()):
-                raise AttributeError(
-                    f"Service type of {service_type} is not registered. Modify ActionService."
-                )
-
-            if target_type not in dict(ActionTarget.as_choices()):
-                raise AttributeError(
-                    f"Target type of {target_type} is not registered. Modify ActionTarget."
-                )
-            key = cls.get_registry_key(trigger_type, service_type, target_type)
-            if cls._registry.get(key) is not None:
-                raise AttributeError(
-                    f"Existing registration found for trigger:{trigger_type}, service:{service_type}, target:{target_type}."
-                )
-
-            cls._registry[key] = registration
-            return registration
-
-        return inner
-
-    @classmethod
-    def get_trigger_types(cls):
-        return cls._trigger_types
-
-    @classmethod
-    def get_trigger_text(self, trigger_type: int) -> str:
-        return dict(NotificationAction.get_trigger_types())[trigger_type]
-
-    @classmethod
-    def get_registry_key(self, trigger_type: int, service_type: int, target_type: int) -> str:
-        return f"{trigger_type}:{service_type}:{target_type}"
-
-    @classmethod
-    def get_registry(cls) -> Mapping[str, type[ActionRegistration]]:
-        return cls._registry
-
-    @classmethod
-    def get_registration(
-        cls, trigger_type: int, service_type: int, target_type: int
-    ) -> type[ActionRegistration] | None:
-        key = cls.get_registry_key(trigger_type, service_type, target_type)
-        return cls._registry.get(key)
-
-    def get_audit_log_data(self) -> dict[str, str]:
-        """
-        Returns audit log data for NOTIFICATION_ACTION_ADD, NOTIFICATION_ACTION_EDIT
-        and NOTIFICATION_ACTION_REMOVE events
-        """
-        return {"trigger": NotificationAction.get_trigger_text(self.trigger_type)}
-
-    def fire(self, *args, **kwargs):
-        registration = NotificationAction.get_registration(
-            self.trigger_type, self.service_type, self.target_type
-        )
-        if registration:
-            logger.info(
-                "fire_action",
-                extra={
-                    "action_id": self.id,
-                    "trigger": NotificationAction.get_trigger_text(self.trigger_type),
-                    "service": ActionService.get_name(self.service_type),
-                    "target": ActionTarget.get_name(self.target_type),
-                },
-            )
-            return registration(action=self).fire(*args, **kwargs)
-        else:
-            logger.error(
-                "missing_registration",
-                extra={
-                    "id": self.id,
-                    "service_type": self.service_type,
-                    "trigger_type": self.trigger_type,
-                    "target_type": self.target_type,
-                },
-            )
-
-    def get_relocation_scope(self) -> RelocationScope:
-        if self.integration_id is not None or self.sentry_app_id is not None:
-            # TODO(getsentry/team-ospo#188): this should be extension scope once that gets added.
-            return RelocationScope.Global
-
-        return RelocationScope.Organization
+from sentry.notifications.models.notificationaction import (
+    ActionRegistration,
+    ActionService,
+    ActionTarget,
+    ActionTrigger,
+    NotificationAction,
+    NotificationActionProject,
+)
+
+__all__ = (
+    "NotificationActionProject",
+    "NotificationAction",
+    "ActionService",
+    "ActionTrigger",
+    "ActionTarget",
+    "ActionRegistration",
+)
diff --git a/src/sentry/models/notificationsettingoption.py b/src/sentry/models/notificationsettingoption.py
index 4cf79644821205..af3d50ab806eff 100644
--- a/src/sentry/models/notificationsettingoption.py
+++ b/src/sentry/models/notificationsettingoption.py
@@ -1,40 +1,3 @@
-from django.db import models
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 
-from sentry.backup.scopes import RelocationScope
-from sentry.db.models import control_silo_model, sane_repr
-
-from .notificationsettingbase import NotificationSettingBase
-
-
-@control_silo_model
-class NotificationSettingOption(NotificationSettingBase):
-    __relocation_scope__ = RelocationScope.Excluded
-
-    class Meta:
-        app_label = "sentry"
-        db_table = "sentry_notificationsettingoption"
-        unique_together = (
-            (
-                "scope_type",
-                "scope_identifier",
-                "user_id",
-                "team_id",
-                "type",
-            ),
-        )
-        constraints = [
-            models.CheckConstraint(
-                condition=models.Q(team_id__isnull=False, user_id__isnull=True)
-                | models.Q(team_id__isnull=True, user_id__isnull=False),
-                name="notification_setting_option_team_or_user_check",
-            )
-        ]
-
-    __repr__ = sane_repr(
-        "scope_type",
-        "scope_identifier",
-        "type",
-        "user_id",
-        "team_id",
-        "value",
-    )
+__all__ = ("NotificationSettingOption",)
diff --git a/src/sentry/models/notificationsettingprovider.py b/src/sentry/models/notificationsettingprovider.py
index e977e9ef54de13..ddd1e4ef765499 100644
--- a/src/sentry/models/notificationsettingprovider.py
+++ b/src/sentry/models/notificationsettingprovider.py
@@ -1,44 +1,3 @@
-from django.db import models
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 
-from sentry.backup.scopes import RelocationScope
-from sentry.db.models import control_silo_model, sane_repr
-
-from .notificationsettingbase import NotificationSettingBase
-
-
-@control_silo_model
-class NotificationSettingProvider(NotificationSettingBase):
-    __relocation_scope__ = RelocationScope.Excluded
-
-    provider = models.CharField(max_length=32, null=False)
-
-    class Meta:
-        app_label = "sentry"
-        db_table = "sentry_notificationsettingprovider"
-        unique_together = (
-            (
-                "scope_type",
-                "scope_identifier",
-                "user_id",
-                "team_id",
-                "provider",
-                "type",
-            ),
-        )
-        constraints = [
-            models.CheckConstraint(
-                condition=models.Q(team_id__isnull=False, user_id__isnull=True)
-                | models.Q(team_id__isnull=True, user_id__isnull=False),
-                name="notification_setting_provider_team_or_user_check",
-            )
-        ]
-
-    __repr__ = sane_repr(
-        "scope_type",
-        "scope_identifier",
-        "user_id",
-        "team_id",
-        "provider",
-        "type",
-        "value",
-    )
+__all__ = ("NotificationSettingProvider",)
diff --git a/src/sentry/models/release.py b/src/sentry/models/release.py
index 94d33fee57ce42..0bbe6e3c0aa298 100644
--- a/src/sentry/models/release.py
+++ b/src/sentry/models/release.py
@@ -98,7 +98,7 @@ def get_queryset(self) -> ReleaseQuerySet:
     def annotate_prerelease_column(self):
         return self.get_queryset().annotate_prerelease_column()
 
-    def filter_to_semver(self):
+    def filter_to_semver(self) -> ReleaseQuerySet:
         return self.get_queryset().filter_to_semver()
 
     def filter_by_semver_build(
diff --git a/src/sentry/models/relocation.py b/src/sentry/models/relocation.py
index 897e3530cce3d1..e563ae7c03d58b 100644
--- a/src/sentry/models/relocation.py
+++ b/src/sentry/models/relocation.py
@@ -90,6 +90,14 @@ class Provenance(IntEnum):
         def get_choices(cls) -> list[tuple[int, str]]:
             return [(key.value, key.name) for key in cls]
 
+        def __str__(self):
+            if self.name == "SELF_HOSTED":
+                return "self-hosted"
+            elif self.name == "SAAS_TO_SAAS":
+                return "saas-to-saas"
+            else:
+                raise ValueError("Cannot extract a filename from `RelocationFile.Kind.UNKNOWN`.")
+
     # The user that requested this relocation - if the request was made by an admin on behalf of a
     # user, this will be different from `owner`. Otherwise, they are identical.
     creator_id = BoundedBigIntegerField()
diff --git a/src/sentry/monitors/clock_tasks/check_missed.py b/src/sentry/monitors/clock_tasks/check_missed.py
index 0da1afc85995bd..5936ddc5e6afee 100644
--- a/src/sentry/monitors/clock_tasks/check_missed.py
+++ b/src/sentry/monitors/clock_tasks/check_missed.py
@@ -161,4 +161,9 @@ def mark_environment_missing(monitor_environment_id: int, ts: datetime):
         monitor.schedule,
     )
 
-    mark_failed(checkin, failed_at=most_recent_expected_ts)
+    mark_failed(
+        checkin,
+        failed_at=most_recent_expected_ts,
+        received=ts,
+        clock_tick=ts,
+    )
diff --git a/src/sentry/monitors/clock_tasks/check_timeout.py b/src/sentry/monitors/clock_tasks/check_timeout.py
index 019be6a4cdb329..7e8a770c9ab231 100644
--- a/src/sentry/monitors/clock_tasks/check_timeout.py
+++ b/src/sentry/monitors/clock_tasks/check_timeout.py
@@ -121,4 +121,9 @@ def mark_checkin_timeout(checkin_id: int, ts: datetime) -> None:
             monitor.schedule,
         )
 
-        mark_failed(checkin, failed_at=most_recent_expected_ts)
+        mark_failed(
+            checkin,
+            failed_at=most_recent_expected_ts,
+            received=ts,
+            clock_tick=ts,
+        )
diff --git a/src/sentry/monitors/clock_tasks/mark_unknown.py b/src/sentry/monitors/clock_tasks/mark_unknown.py
index 4fb7356fea23bb..a0061664e2d558 100644
--- a/src/sentry/monitors/clock_tasks/mark_unknown.py
+++ b/src/sentry/monitors/clock_tasks/mark_unknown.py
@@ -25,7 +25,7 @@ def dispatch_mark_unknown(ts: datetime):
     Given a clock tick timestamp datetime which was processed where an anomaly
     had been detected in the volume of check-ins that have been processed,
     determine monitors that are in-progress that can no longer be known to
-    complete as data loss has likely occured.
+    complete as data loss has likely occurred.
 
     This will dispatch MarkUnknown messages into monitors-clock-tasks.
     """
@@ -33,9 +33,9 @@ def dispatch_mark_unknown(ts: datetime):
         MonitorCheckIn.objects.filter(
             status=CheckInStatus.IN_PROGRESS,
             date_added__lte=ts,
-        ).values(
-            "id", "monitor_environment_id"
-        )[:CHECKINS_LIMIT]
+        )
+        .values("id", "monitor_environment_id")
+        .order_by("-date_added")[:CHECKINS_LIMIT]
     )
 
     metrics.gauge(
diff --git a/src/sentry/monitors/consumers/clock_tick_consumer.py b/src/sentry/monitors/consumers/clock_tick_consumer.py
index b81bd9749d1b1f..9886b6d2359019 100644
--- a/src/sentry/monitors/consumers/clock_tick_consumer.py
+++ b/src/sentry/monitors/consumers/clock_tick_consumer.py
@@ -12,14 +12,12 @@
 from sentry_kafka_schemas.codecs import Codec
 from sentry_kafka_schemas.schema_types.monitors_clock_tick_v1 import ClockTick
 
+from sentry import options
 from sentry.conf.types.kafka_definition import Topic, get_topic_codec
 from sentry.monitors.clock_tasks.check_missed import dispatch_check_missing
 from sentry.monitors.clock_tasks.check_timeout import dispatch_check_timeout
-from sentry.monitors.system_incidents import (
-    make_clock_tick_decision,
-    record_clock_tick_volume_metric,
-)
-from sentry.utils import metrics
+from sentry.monitors.clock_tasks.mark_unknown import dispatch_mark_unknown
+from sentry.monitors.system_incidents import process_clock_tick_for_system_incidents
 
 logger = logging.getLogger(__name__)
 
@@ -33,31 +31,29 @@ def process_clock_tick(message: Message[KafkaPayload | FilteredPayload]):
     wrapper: ClockTick = MONITORS_CLOCK_TICK_CODEC.decode(message.payload.value)
     ts = datetime.fromtimestamp(wrapper["ts"], tz=timezone.utc)
 
-    record_clock_tick_volume_metric(ts)
-    try:
-        result = make_clock_tick_decision(ts)
-
-        metrics.incr(
-            "monitors.tasks.clock_tick.tick_decision",
-            tags={"decision": result.decision},
-            sample_rate=1.0,
-        )
-        if result.transition:
-            metrics.incr(
-                "monitors.tasks.clock_tick.tick_transition",
-                tags={"transition": result.transition},
-                sample_rate=1.0,
-            )
-    except Exception:
-        logger.exception("sentry.tasks.clock_tick.clock_tick_decision_failed")
-
     logger.info(
         "process_clock_tick",
         extra={"reference_datetime": str(ts)},
     )
 
+    try:
+        incident_result = process_clock_tick_for_system_incidents(ts)
+    except Exception:
+        incident_result = None
+        logger.exception("failed_process_clock_tick_for_system_incidents")
+
     dispatch_check_missing(ts)
-    dispatch_check_timeout(ts)
+
+    use_decision = options.get("crons.system_incidents.use_decisions")
+
+    # During a systems incident we do NOT mark timeouts since it's possible
+    # we'll have lost the completing check-in. Instead we mark ALL in-progress
+    # check-ins as UNKNOWN. Should these check-ins recieve completing check-ins
+    # they will be properly updated, even after being marked as UNKNOWN.
+    if use_decision and incident_result and incident_result.decision.is_incident():
+        dispatch_mark_unknown(ts)
+    else:
+        dispatch_check_timeout(ts)
 
 
 class MonitorClockTickStrategyFactory(ProcessingStrategyFactory[KafkaPayload]):
diff --git a/src/sentry/monitors/consumers/incident_occurrences_consumer.py b/src/sentry/monitors/consumers/incident_occurrences_consumer.py
index 3a8799e9ae5589..73e546b57da8c5 100644
--- a/src/sentry/monitors/consumers/incident_occurrences_consumer.py
+++ b/src/sentry/monitors/consumers/incident_occurrences_consumer.py
@@ -2,16 +2,27 @@
 
 import logging
 from collections.abc import Mapping
+from datetime import UTC, datetime
+from typing import TypeGuard
 
+import sentry_sdk
 from arroyo.backends.kafka.consumer import KafkaPayload
+from arroyo.processing.strategies import MessageRejected
 from arroyo.processing.strategies.abstract import ProcessingStrategy, ProcessingStrategyFactory
 from arroyo.processing.strategies.commit import CommitOffsets
 from arroyo.processing.strategies.run_task import RunTask
 from arroyo.types import BrokerValue, Commit, FilteredPayload, Message, Partition
+from cachetools.func import ttl_cache
 from sentry_kafka_schemas.codecs import Codec
 from sentry_kafka_schemas.schema_types.monitors_incident_occurrences_v1 import IncidentOccurrence
+from sentry_sdk.tracing import Span, Transaction
 
+from sentry import options
 from sentry.conf.types.kafka_definition import Topic, get_topic_codec
+from sentry.monitors.logic.incident_occurrence import send_incident_occurrence
+from sentry.monitors.models import CheckInStatus, MonitorCheckIn, MonitorIncident
+from sentry.monitors.system_incidents import TickAnomalyDecision, get_clock_tick_decision
+from sentry.utils import metrics
 
 logger = logging.getLogger(__name__)
 
@@ -20,12 +31,106 @@
 )
 
 
-def process_incident_occurrence(message: Message[KafkaPayload | FilteredPayload]):
+@ttl_cache(ttl=5)
+def memoized_tick_decision(tick: datetime) -> TickAnomalyDecision | None:
+    """
+    Memoized version of get_clock_tick_decision. Used in
+    process_incident_occurrence to avoid stampeding calls when waiting for a
+    tick decision to resolve.
+    """
+    return get_clock_tick_decision(tick)
+
+
+def _process_incident_occurrence(
+    message: Message[KafkaPayload | FilteredPayload], txn: Transaction | Span
+):
+    """
+    Process a incident occurrence message. This will immediately dispatch an
+    issue occurrence via send_incident_occurrence.
+    """
     assert not isinstance(message.payload, FilteredPayload)
     assert isinstance(message.value, BrokerValue)
 
-    # wrapper: IncidentOccurrence = MONITORS_INCIDENT_OCCURRENCES.decode(message.payload.value)
-    # TODO(epurkhiser): Do something with issue occurrence
+    wrapper: IncidentOccurrence = MONITORS_INCIDENT_OCCURRENCES.decode(message.payload.value)
+    clock_tick = datetime.fromtimestamp(wrapper["clock_tick_ts"], UTC)
+
+    # May be used as a killswitch if system incident decisions become incorrect
+    # for any reason
+    use_decision = options.get("crons.system_incidents.use_decisions")
+    tick_decision = memoized_tick_decision(clock_tick)
+
+    if use_decision and tick_decision and tick_decision.is_pending():
+        # The decision is pending resolution. We need to stop consuming until
+        # the tick decision is resolved so we can know if it's OK to dispatch the
+        # incident occurrence, or if we should drop the occurrence and mark the
+        # associated check-ins as UNKNOWN due to a system incident.
+        txn.set_tag("result", "delayed")
+
+        # XXX(epurkhiser): MessageRejected tells arroyo that we can't process
+        # this message right now and it should try again
+        raise MessageRejected()
+
+    try:
+        incident = MonitorIncident.objects.get(id=int(wrapper["incident_id"]))
+    except MonitorIncident.DoesNotExist:
+        logger.exception("missing_incident")
+        return
+
+    # previous_checkin_ids includes the failed_checkin_id
+    checkins = MonitorCheckIn.objects.filter(id__in=wrapper["previous_checkin_ids"])
+    checkins_map: dict[int, MonitorCheckIn] = {checkin.id: checkin for checkin in checkins}
+
+    failed_checkin = checkins_map.get(int(wrapper["failed_checkin_id"]))
+    previous_checkins = [checkins_map.get(int(id)) for id in wrapper["previous_checkin_ids"]]
+
+    def has_all(checkins: list[MonitorCheckIn | None]) -> TypeGuard[list[MonitorCheckIn]]:
+        return None not in checkins
+
+    # Unlikely, but if we can't find all the check-ins we can't produce an occurrence
+    if failed_checkin is None or not has_all(previous_checkins):
+        logger.error("missing_check_ins")
+        return
+
+    received = datetime.fromtimestamp(wrapper["received_ts"], UTC)
+
+    if use_decision and tick_decision and tick_decision.is_incident():
+        # Update the failed check-in as unknown and drop the occurrence.
+        #
+        # Only consider synthetic check-ins (timeout and miss) since failed
+        # check-ins must have been correctly ingested and cannot have been
+        # produced during a system incident.
+        #
+        # XXX(epurkhiser): There is an edge case here where we'll want to
+        # determine if the check-in is within the system incident timeframe,
+        # since we dispatch occurrences for all check-ins that met a failure
+        # threshold. Imagine a monitor that checks-in once a day with a failure
+        # threshold of 5. If the last check-in happens to be a miss that is
+        # detected during a system-incident, then all 5 previous check-ins
+        # would also be marked as unknown, which is incorrect.
+        MonitorCheckIn.objects.filter(
+            id=failed_checkin.id,
+            status__in=CheckInStatus.SYNTHETIC_TERMINAL_VALUES,
+        ).update(status=CheckInStatus.UNKNOWN)
+
+        # Do NOT send the occurrence
+        txn.set_tag("result", "dropped")
+        metrics.incr("monitors.incident_ocurrences.dropped_incident_occurrence")
+        return
+
+    try:
+        send_incident_occurrence(failed_checkin, previous_checkins, incident, received)
+        txn.set_tag("result", "sent")
+        metrics.incr("monitors.incident_ocurrences.sent_incident_occurrence")
+    except Exception:
+        logger.exception("failed_send_incident_occurrence")
+
+
+def process_incident_occurrence(message: Message[KafkaPayload | FilteredPayload]):
+    with sentry_sdk.start_transaction(
+        op="_process_incident_occurrence",
+        name="monitors.incident_occurrence_consumer",
+    ) as txn:
+        _process_incident_occurrence(message, txn)
 
 
 class MonitorIncidentOccurenceStrategyFactory(ProcessingStrategyFactory[KafkaPayload]):
diff --git a/src/sentry/monitors/consumers/monitor_consumer.py b/src/sentry/monitors/consumers/monitor_consumer.py
index 01495eeecfd228..976f3818ac6c06 100644
--- a/src/sentry/monitors/consumers/monitor_consumer.py
+++ b/src/sentry/monitors/consumers/monitor_consumer.py
@@ -1013,8 +1013,7 @@ def process_single(message: Message[KafkaPayload | FilteredPayload]):
         ts = message.value.timestamp
         partition = message.value.partition.index
 
-        if wrapper["message_type"] != "clock_pulse":
-            update_check_in_volume([ts])
+        update_check_in_volume([ts])
 
         try:
             try_monitor_clock_tick(ts, partition)
diff --git a/src/sentry/monitors/endpoints/base_monitor_stats.py b/src/sentry/monitors/endpoints/base_monitor_stats.py
index 3f49f3d94be338..664bbfcc8192f1 100644
--- a/src/sentry/monitors/endpoints/base_monitor_stats.py
+++ b/src/sentry/monitors/endpoints/base_monitor_stats.py
@@ -36,6 +36,7 @@ def get_monitor_stats(self, request: Request, project, monitor) -> Response:
             CheckInStatus.ERROR,
             CheckInStatus.MISSED,
             CheckInStatus.TIMEOUT,
+            CheckInStatus.UNKNOWN,
         ]
 
         check_ins = MonitorCheckIn.objects.filter(
diff --git a/src/sentry/monitors/endpoints/organization_monitor_index_stats.py b/src/sentry/monitors/endpoints/organization_monitor_index_stats.py
index 08961488278d85..ba08695ccca103 100644
--- a/src/sentry/monitors/endpoints/organization_monitor_index_stats.py
+++ b/src/sentry/monitors/endpoints/organization_monitor_index_stats.py
@@ -23,6 +23,7 @@
     CheckInStatus.ERROR,
     CheckInStatus.MISSED,
     CheckInStatus.TIMEOUT,
+    CheckInStatus.UNKNOWN,
 ]
 
 
diff --git a/src/sentry/monitors/logic/incident_occurrence.py b/src/sentry/monitors/logic/incident_occurrence.py
index 07e8d077b1ed9d..cb57f4e7155f59 100644
--- a/src/sentry/monitors/logic/incident_occurrence.py
+++ b/src/sentry/monitors/logic/incident_occurrence.py
@@ -7,33 +7,135 @@
 from datetime import datetime, timezone
 from typing import TYPE_CHECKING
 
+from arroyo import Topic as ArroyoTopic
+from arroyo.backends.kafka import KafkaPayload, KafkaProducer, build_kafka_configuration
 from django.utils.text import get_text_list
 from django.utils.translation import gettext_lazy as _
+from sentry_kafka_schemas.codecs import Codec
+from sentry_kafka_schemas.schema_types.monitors_incident_occurrences_v1 import IncidentOccurrence
 
+from sentry import options
+from sentry.conf.types.kafka_definition import Topic, get_topic_codec
 from sentry.issues.grouptype import MonitorIncidentType
+from sentry.issues.issue_occurrence import IssueEvidence, IssueOccurrence
+from sentry.issues.producer import PayloadType, produce_occurrence_to_kafka
+from sentry.issues.status_change_message import StatusChangeMessage
+from sentry.models.group import GroupStatus
 from sentry.monitors.models import (
     CheckInStatus,
     MonitorCheckIn,
     MonitorEnvironment,
     MonitorIncident,
 )
-from sentry.monitors.types import SimpleCheckIn
+from sentry.utils.arroyo_producer import SingletonProducer
+from sentry.utils.kafka_config import get_kafka_producer_cluster_options, get_topic_definition
 
 if TYPE_CHECKING:
     from django.utils.functional import _StrPromise
 
 logger = logging.getLogger(__name__)
 
+MONITORS_INCIDENT_OCCURRENCES: Codec[IncidentOccurrence] = get_topic_codec(
+    Topic.MONITORS_INCIDENT_OCCURRENCES
+)
+
+
+def _get_producer() -> KafkaProducer:
+    cluster_name = get_topic_definition(Topic.MONITORS_INCIDENT_OCCURRENCES)["cluster"]
+    producer_config = get_kafka_producer_cluster_options(cluster_name)
+    producer_config.pop("compression.type", None)
+    producer_config.pop("message.max.bytes", None)
+    return KafkaProducer(build_kafka_configuration(default_config=producer_config))
+
+
+_incident_occurrence_producer = SingletonProducer(_get_producer)
+
+
+def dispatch_incident_occurrence(
+    failed_checkin: MonitorCheckIn,
+    previous_checkins: Sequence[MonitorCheckIn],
+    incident: MonitorIncident,
+    received: datetime,
+    clock_tick: datetime | None,
+) -> None:
+    """
+    Determine how to route a incident occurrence.
 
-def create_incident_occurrence(
-    failed_checkins: Sequence[SimpleCheckIn],
+    - When failed check-in triggers mark_failed directly from the
+      monitor_consumer we will immediately dispatch the associated incident
+      occurrence.
+
+      This is indicated by the lack of a `clock_tick`.
+
+    - When a synthetic failed check-in (time-out or miss) triggers mark_failed
+      we will queue the incident occurrence to be processed later, allowing for
+      the occurrence to be delayed or dropped in the case a systems incident.
+
+      This is indicated by the presence of a `clock_tick`.
+    """
+    # XXX(epurkhiser): Dispatching via the consumer is behind a flag while we
+    # verify things are working well.
+    consumer_dispatch_enabled = options.get("crons.dispatch_incident_occurrences_to_consumer")
+
+    if clock_tick and consumer_dispatch_enabled:
+        queue_incident_occurrence(failed_checkin, previous_checkins, incident, received, clock_tick)
+    else:
+        send_incident_occurrence(failed_checkin, previous_checkins, incident, received)
+
+
+def queue_incident_occurrence(
     failed_checkin: MonitorCheckIn,
+    previous_checkins: Sequence[MonitorCheckIn],
     incident: MonitorIncident,
-    received: datetime | None,
+    received: datetime,
+    clock_tick: datetime,
 ) -> None:
-    from sentry.issues.issue_occurrence import IssueEvidence, IssueOccurrence
-    from sentry.issues.producer import PayloadType, produce_occurrence_to_kafka
+    """
+    Queue an issue occurrence for a monitor incident.
 
+    This incident occurrence will be processed by the
+    `incident_occurrence_consumer`. Queuing is used here to allow for issue
+    occurrences to be delayed in the scenario where Sentry may be experiencing
+    a systems incident (eg. Relay cannot process check-ins). In these scenarios
+    the consumer will delay consumption until we can determine there is no
+    systems incident. Or in the worst case, will drop incident occurrences
+    since we can no longer reliably guarantee the occurrences are accurate.
+    """
+    monitor_env = failed_checkin.monitor_environment
+
+    if monitor_env is None:
+        return
+
+    incident_occurrence: IncidentOccurrence = {
+        "incident_id": incident.id,
+        "failed_checkin_id": failed_checkin.id,
+        "previous_checkin_ids": [checkin.id for checkin in previous_checkins],
+        "received_ts": int(received.timestamp()),
+        "clock_tick_ts": int(clock_tick.timestamp()),
+    }
+
+    # The incident occurrence is partitioned by monitor environment ID, just
+    # the same as the clock tasks. Ensures issue occurences are sent in order.
+    payload = KafkaPayload(
+        str(monitor_env.id).encode(),
+        MONITORS_INCIDENT_OCCURRENCES.encode(incident_occurrence),
+        [],
+    )
+
+    topic = get_topic_definition(Topic.MONITORS_INCIDENT_OCCURRENCES)["real_topic_name"]
+    _incident_occurrence_producer.produce(ArroyoTopic(topic), payload)
+
+
+def send_incident_occurrence(
+    failed_checkin: MonitorCheckIn,
+    previous_checkins: Sequence[MonitorCheckIn],
+    incident: MonitorIncident,
+    received: datetime,
+) -> None:
+    """
+    Construct and send an issue occurrence given an incident and the associated
+    failing check-ins which caused that incident.
+    """
     monitor_env = failed_checkin.monitor_environment
 
     if monitor_env is None:
@@ -59,7 +161,7 @@ def create_incident_occurrence(
         evidence_display=[
             IssueEvidence(
                 name="Failure reason",
-                value=str(get_failure_reason(failed_checkins)),
+                value=str(get_failure_reason(previous_checkins)),
                 important=True,
             ),
             IssueEvidence(
@@ -92,8 +194,10 @@ def create_incident_occurrence(
         "fingerprint": [incident.grouphash],
         "platform": "other",
         "project_id": monitor_env.monitor.project_id,
-        # We set this to the time that the checkin that triggered the occurrence was written to relay if available
-        "received": (received if received else current_timestamp).isoformat(),
+        # This is typically the time that the checkin that triggered the
+        # occurrence was written to relay, otherwise it is when we detected a
+        # missed or timeout.
+        "received": received.isoformat(),
         "sdk": None,
         "tags": {
             "monitor.id": str(monitor_env.monitor.guid),
@@ -127,7 +231,7 @@ def create_incident_occurrence(
 }
 
 
-def get_failure_reason(failed_checkins: Sequence[SimpleCheckIn]):
+def get_failure_reason(failed_checkins: Sequence[MonitorCheckIn]):
     """
     Builds a human readable string from a list of failed check-ins.
 
@@ -137,9 +241,9 @@ def get_failure_reason(failed_checkins: Sequence[SimpleCheckIn]):
     """
 
     status_counts = Counter(
-        checkin["status"]
+        checkin.status
         for checkin in failed_checkins
-        if checkin["status"] in HUMAN_FAILURE_STATUS_MAP.keys()
+        if checkin.status in HUMAN_FAILURE_STATUS_MAP.keys()
     )
 
     if sum(status_counts.values()) == 1:
@@ -169,3 +273,16 @@ def get_monitor_environment_context(monitor_environment: MonitorEnvironment):
         "status": monitor_environment.get_status_display(),
         "type": monitor_environment.monitor.get_type_display(),
     }
+
+
+def resolve_incident_group(incident: MonitorIncident, project_id: int):
+    status_change = StatusChangeMessage(
+        fingerprint=[incident.grouphash],
+        project_id=project_id,
+        new_status=GroupStatus.RESOLVED,
+        new_substatus=None,
+    )
+    produce_occurrence_to_kafka(
+        payload_type=PayloadType.STATUS_CHANGE,
+        status_change=status_change,
+    )
diff --git a/src/sentry/monitors/logic/incidents.py b/src/sentry/monitors/logic/incidents.py
index 10fb253543e294..2067286cf987ad 100644
--- a/src/sentry/monitors/logic/incidents.py
+++ b/src/sentry/monitors/logic/incidents.py
@@ -1,20 +1,52 @@
 from __future__ import annotations
 
 import logging
-from datetime import datetime
-from typing import cast
+from dataclasses import dataclass
+from datetime import datetime, timedelta
 
-from sentry.monitors.logic.incident_occurrence import create_incident_occurrence
+from django.utils import timezone
+
+from sentry import analytics
+from sentry.monitors.logic.incident_occurrence import (
+    dispatch_incident_occurrence,
+    resolve_incident_group,
+)
 from sentry.monitors.models import CheckInStatus, MonitorCheckIn, MonitorIncident, MonitorStatus
-from sentry.monitors.types import SimpleCheckIn
+from sentry.monitors.tasks.detect_broken_monitor_envs import NUM_DAYS_BROKEN_PERIOD
 
 logger = logging.getLogger(__name__)
 
 
+@dataclass
+class SimpleCheckIn:
+    """
+    A stripped down check in object
+    """
+
+    id: int
+    date_added: datetime
+    status: int
+
+    @classmethod
+    def from_checkin(cls, checkin: MonitorCheckIn) -> SimpleCheckIn:
+        return cls(checkin.id, checkin.date_added, checkin.status)
+
+
 def try_incident_threshold(
     failed_checkin: MonitorCheckIn,
-    received: datetime | None,
+    received: datetime,
+    clock_tick: datetime | None = None,
 ) -> bool:
+    """
+    Determine if a monitor environment has reached it's incident threshold
+    given the most recent failed check-in. When the threshold is reached a
+    MonitorIncident will be created and an incident occurrence will be
+    dispatched, which will later produce an issue occurrence.
+
+    If an incident already exists additional occurrences will be dispatched.
+
+    Returns True if we produce an incident occurrence.
+    """
     from sentry.signals import monitor_environment_failed
 
     monitor_env = failed_checkin.monitor_environment
@@ -29,30 +61,25 @@ def try_incident_threshold(
     # check to see if we need to update the status
     if monitor_env.status in [MonitorStatus.OK, MonitorStatus.ACTIVE]:
         if failure_issue_threshold == 1:
-            previous_checkins: list[SimpleCheckIn] = [
-                {
-                    "id": failed_checkin.id,
-                    "date_added": failed_checkin.date_added,
-                    "status": failed_checkin.status,
-                }
-            ]
+            previous_checkins: list[SimpleCheckIn] = [SimpleCheckIn.from_checkin(failed_checkin)]
         else:
-            previous_checkins = cast(
-                list[SimpleCheckIn],
+            previous_checkins = [
+                SimpleCheckIn(**row)
+                for row in
                 # Using .values for performance reasons
                 MonitorCheckIn.objects.filter(
                     monitor_environment=monitor_env, date_added__lte=failed_checkin.date_added
                 )
                 .order_by("-date_added")
-                .values("id", "date_added", "status"),
-            )
+                .values("id", "date_added", "status")[:failure_issue_threshold]
+            ]
 
             # reverse the list after slicing in order to start with oldest check-in
-            previous_checkins = list(reversed(previous_checkins[:failure_issue_threshold]))
+            previous_checkins = list(reversed(previous_checkins))
 
             # If we have any successful check-ins within the threshold of
             # commits we have NOT reached an incident state
-            if any([checkin["status"] == CheckInStatus.OK for checkin in previous_checkins]):
+            if any([checkin.status == CheckInStatus.OK for checkin in previous_checkins]):
                 return False
 
         # change monitor status + update fingerprint timestamp
@@ -67,21 +94,15 @@ def try_incident_threshold(
             resolving_checkin=None,
             defaults={
                 "monitor": monitor_env.monitor,
-                "starting_checkin_id": starting_checkin["id"],
-                "starting_timestamp": starting_checkin["date_added"],
+                "starting_checkin_id": starting_checkin.id,
+                "starting_timestamp": starting_checkin.date_added,
             },
         )
 
     elif monitor_env.status == MonitorStatus.ERROR:
-        # if monitor environment has a failed status, use the failed
-        # check-in and send occurrence
-        previous_checkins = [
-            {
-                "id": failed_checkin.id,
-                "date_added": failed_checkin.date_added,
-                "status": failed_checkin.status,
-            }
-        ]
+        # If the monitor was already in an incident there are no previous
+        # check-ins to pass long when creating the occurrence
+        previous_checkins = [SimpleCheckIn.from_checkin(failed_checkin)]
 
         # get the active incident from the monitor environment
         incident = monitor_env.active_incident
@@ -93,15 +114,83 @@ def try_incident_threshold(
     # - We have an active incident and fingerprint
     # - The monitor and env are not muted
     if not monitor_env.monitor.is_muted and not monitor_env.is_muted and incident:
-        checkins = MonitorCheckIn.objects.filter(id__in=[c["id"] for c in previous_checkins])
+        checkins = list(MonitorCheckIn.objects.filter(id__in=[c.id for c in previous_checkins]))
         for checkin in checkins:
-            create_incident_occurrence(
-                previous_checkins,
-                checkin,
-                incident,
-                received=received,
-            )
+            dispatch_incident_occurrence(checkin, checkins, incident, received, clock_tick)
 
     monitor_environment_failed.send(monitor_environment=monitor_env, sender=type(monitor_env))
 
     return True
+
+
+def try_incident_resolution(ok_checkin: MonitorCheckIn) -> bool:
+    """
+    Attempt to resolve any open incidents for a monitor given he most recent
+    successful check-in.
+
+    Returns True if the incident was resolved.
+    """
+    monitor_env = ok_checkin.monitor_environment
+
+    if monitor_env is None:
+        return False
+
+    if monitor_env.status == MonitorStatus.OK or ok_checkin.status != CheckInStatus.OK:
+        return False
+
+    recovery_threshold = monitor_env.monitor.config.get("recovery_threshold", 1)
+    if not recovery_threshold:
+        recovery_threshold = 1
+
+    # Run incident logic if recovery threshold is set
+    if recovery_threshold > 1:
+        # Check if our incident is recovering
+        previous_checkins = (
+            MonitorCheckIn.objects.filter(monitor_environment=monitor_env)
+            .values("id", "date_added", "status")
+            .order_by("-date_added")[:recovery_threshold]
+        )
+
+        # Incident recovers when we have successive threshold check-ins
+        incident_recovering = all(
+            previous_checkin["status"] == CheckInStatus.OK for previous_checkin in previous_checkins
+        )
+    else:
+        # Mark any open incidents as recovering by default
+        incident_recovering = True
+
+    if not incident_recovering:
+        return False
+
+    incident = monitor_env.active_incident
+    if incident:
+        resolve_incident_group(incident, ok_checkin.monitor.project_id)
+        incident.update(
+            resolving_checkin=ok_checkin,
+            resolving_timestamp=ok_checkin.date_added,
+        )
+        logger.info(
+            "monitors.logic.mark_ok.resolving_incident",
+            extra={
+                "monitor_env_id": monitor_env.id,
+                "incident_id": incident.id,
+                "grouphash": incident.grouphash,
+            },
+        )
+        # if incident was longer than the broken env time, check if there was a
+        # broken detection that is also now resolved
+        if (
+            incident.starting_timestamp is not None
+            and incident.starting_timestamp
+            <= timezone.now() - timedelta(days=NUM_DAYS_BROKEN_PERIOD)
+        ):
+            if incident.monitorenvbrokendetection_set.exists():
+                analytics.record(
+                    "cron_monitor_broken_status.recovery",
+                    organization_id=monitor_env.monitor.organization_id,
+                    project_id=monitor_env.monitor.project_id,
+                    monitor_id=monitor_env.monitor.id,
+                    monitor_env_id=monitor_env.id,
+                )
+
+    return True
diff --git a/src/sentry/monitors/logic/mark_failed.py b/src/sentry/monitors/logic/mark_failed.py
index 27912aa15754e8..6877380d528aa0 100644
--- a/src/sentry/monitors/logic/mark_failed.py
+++ b/src/sentry/monitors/logic/mark_failed.py
@@ -15,6 +15,7 @@ def mark_failed(
     failed_checkin: MonitorCheckIn,
     failed_at: datetime,
     received: datetime | None = None,
+    clock_tick: datetime | None = None,
 ) -> bool:
     """
     Given a failing check-in, mark the monitor environment as failed and trigger
@@ -30,6 +31,10 @@ def mark_failed(
     if monitor_env is None:
         return False
 
+    # Use the failure time as recieved if there is no received time
+    if received is None:
+        received = failed_at
+
     # Compute the next check-in time from our reference time
     next_checkin = monitor_env.monitor.get_next_expected_checkin(failed_at)
     next_checkin_latest = monitor_env.monitor.get_next_expected_checkin_latest(failed_at)
@@ -72,4 +77,4 @@ def mark_failed(
     monitor_env.refresh_from_db()
 
     # Create incidents + issues
-    return try_incident_threshold(failed_checkin, received)
+    return try_incident_threshold(failed_checkin, received, clock_tick)
diff --git a/src/sentry/monitors/logic/mark_ok.py b/src/sentry/monitors/logic/mark_ok.py
index e49f37d51f2966..1d49eccc26fa4f 100644
--- a/src/sentry/monitors/logic/mark_ok.py
+++ b/src/sentry/monitors/logic/mark_ok.py
@@ -1,14 +1,11 @@
 from __future__ import annotations
 
 import logging
-from datetime import datetime, timedelta
+from datetime import datetime
 from typing import NotRequired, TypedDict
 
-from django.utils import timezone
-
-from sentry import analytics
-from sentry.monitors.models import CheckInStatus, MonitorCheckIn, MonitorEnvironment, MonitorStatus
-from sentry.monitors.tasks.detect_broken_monitor_envs import NUM_DAYS_BROKEN_PERIOD
+from sentry.monitors.logic.incidents import try_incident_resolution
+from sentry.monitors.models import MonitorCheckIn, MonitorEnvironment, MonitorStatus
 
 logger = logging.getLogger(__name__)
 
@@ -43,83 +40,11 @@ def mark_ok(checkin: MonitorCheckIn, succeeded_at: datetime) -> None:
         "next_checkin_latest": next_checkin_latest,
     }
 
-    if monitor_env.status != MonitorStatus.OK and checkin.status == CheckInStatus.OK:
-        recovery_threshold = monitor_env.monitor.config.get("recovery_threshold", 1)
-        if not recovery_threshold:
-            recovery_threshold = 1
-
-        # Run incident logic if recovery threshold is set
-        if recovery_threshold > 1:
-            # Check if our incident is recovering
-            previous_checkins = (
-                MonitorCheckIn.objects.filter(monitor_environment=monitor_env)
-                .values("id", "date_added", "status")
-                .order_by("-date_added")[:recovery_threshold]
-            )
+    incident_resolved = try_incident_resolution(checkin)
 
-            # Incident recovers when we have successive threshold check-ins
-            incident_recovering = all(
-                previous_checkin["status"] == CheckInStatus.OK
-                for previous_checkin in previous_checkins
-            )
-        else:
-            # Mark any open incidents as recovering by default
-            incident_recovering = True
-
-        # Resolve any open incidents
-        if incident_recovering:
-            params["status"] = MonitorStatus.OK
-            incident = monitor_env.active_incident
-            if incident:
-                resolve_incident_group(incident.grouphash, checkin.monitor.project_id)
-                incident.update(
-                    resolving_checkin=checkin,
-                    resolving_timestamp=checkin.date_added,
-                )
-                logger.info(
-                    "monitors.logic.mark_ok.resolving_incident",
-                    extra={
-                        "monitor_env_id": monitor_env.id,
-                        "incident_id": incident.id,
-                        "grouphash": incident.grouphash,
-                    },
-                )
-                # if incident was longer than the broken env time, check if there was a broken detection that is also now resolved
-                if (
-                    incident.starting_timestamp is not None
-                    and incident.starting_timestamp
-                    <= timezone.now() - timedelta(days=NUM_DAYS_BROKEN_PERIOD)
-                ):
-                    if incident.monitorenvbrokendetection_set.exists():
-                        analytics.record(
-                            "cron_monitor_broken_status.recovery",
-                            organization_id=monitor_env.monitor.organization_id,
-                            project_id=monitor_env.monitor.project_id,
-                            monitor_id=monitor_env.monitor.id,
-                            monitor_env_id=monitor_env.id,
-                        )
+    if incident_resolved:
+        params["status"] = MonitorStatus.OK
 
     MonitorEnvironment.objects.filter(id=monitor_env.id).exclude(
         last_checkin__gt=succeeded_at
     ).update(**params)
-
-
-def resolve_incident_group(
-    fingerprint: str,
-    project_id: int,
-):
-    from sentry.issues.producer import PayloadType, produce_occurrence_to_kafka
-    from sentry.issues.status_change_message import StatusChangeMessage
-    from sentry.models.group import GroupStatus
-
-    status_change = StatusChangeMessage(
-        fingerprint=[fingerprint],
-        project_id=project_id,
-        new_status=GroupStatus.RESOLVED,
-        new_substatus=None,
-    )
-
-    produce_occurrence_to_kafka(
-        payload_type=PayloadType.STATUS_CHANGE,
-        status_change=status_change,
-    )
diff --git a/src/sentry/monitors/models.py b/src/sentry/monitors/models.py
index 51eb187c4989e6..511b6019b5b3e8 100644
--- a/src/sentry/monitors/models.py
+++ b/src/sentry/monitors/models.py
@@ -563,6 +563,8 @@ class Meta:
             models.Index(fields=["monitor_environment", "status", "date_added"]),
             # used for timeout task
             models.Index(fields=["status", "timeout_at"]),
+            # used for dispatch_mark_unknown
+            models.Index(fields=["status", "date_added"]),
             # used for check-in list
             models.Index(fields=["trace_id"]),
         ]
diff --git a/src/sentry/monitors/system_incidents.py b/src/sentry/monitors/system_incidents.py
index 8d2b6d93fb248b..4b7531802b90e7 100644
--- a/src/sentry/monitors/system_incidents.py
+++ b/src/sentry/monitors/system_incidents.py
@@ -13,7 +13,7 @@
 from collections import Counter
 from collections.abc import Generator, Sequence
 from dataclasses import dataclass
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 from enum import StrEnum
 from itertools import batched, chain
 
@@ -22,7 +22,7 @@
 from sentry import options
 from sentry.utils import metrics, redis
 
-logger = logging.getLogger("sentry")
+logger = logging.getLogger(__name__)
 
 # This key is used to record historical date about the volume of check-ins.
 MONITOR_VOLUME_HISTORY = "sentry.monitors.volume_history:{ts}"
@@ -30,9 +30,12 @@
 # This key is used to record the metric volume metric for the tick.
 MONITOR_TICK_METRIC = "sentry.monitors.volume_metric:{ts}"
 
-# This key is used to record the anomaly decision for a tick
+# This key is used to record the anomaly decision for a tick.
 MONITOR_TICK_DECISION = "sentry.monitors.tick_decision:{ts}"
 
+# Tracks the timestamp of the first clock tick of a system incident.
+MONITR_LAST_SYSTEM_INCIDENT_TS = "sentry.monitors.last_system_incident_ts"
+
 # When fetching historic volume data to make a decision whether we have lost
 # data this value will determine how many historic volume data-points we fetch
 # of the window of the MONITOR_VOLUME_RETENTION. It is important to consider
@@ -78,6 +81,90 @@ def update_check_in_volume(ts_list: Sequence[datetime]):
         pipeline.execute()
 
 
+def process_clock_tick_for_system_incidents(tick: datetime) -> DecisionResult:
+    """
+    Encapsulates logic specific to determining if we are in a system incident
+    during each clock tick.
+    """
+    record_clock_tick_volume_metric(tick)
+    result = make_clock_tick_decision(tick)
+
+    logger.info(
+        "process_clock_tick",
+        extra={"decision": result.decision, "transition": result.transition},
+    )
+
+    # Record metrics for each tick decision
+    metrics.incr(
+        "monitors.tasks.clock_tick.tick_decision",
+        tags={"decision": result.decision},
+        sample_rate=1.0,
+    )
+    if result.transition:
+        metrics.incr(
+            "monitors.tasks.clock_tick.tick_transition",
+            tags={"transition": result.transition},
+            sample_rate=1.0,
+        )
+
+    # When entering an incident record the starting timestamp of the incident
+    if result.transition == AnomalyTransition.INCIDENT_STARTED:
+        record_last_incident_ts(result.ts)
+
+    # When exiting an incident prune check-in volume during that incident
+    if result.transition == AnomalyTransition.INCIDENT_RECOVERED:
+        if start := get_last_incident_ts():
+            prune_incident_check_in_volume(start, result.ts)
+        else:
+            logger.error("recovered_without_start_ts")
+
+    return result
+
+
+def record_last_incident_ts(ts: datetime) -> None:
+    """
+    Records the timestamp of the most recent
+    """
+    redis_client = redis.redis_clusters.get(settings.SENTRY_MONITORS_REDIS_CLUSTER)
+    redis_client.set(MONITR_LAST_SYSTEM_INCIDENT_TS, int(ts.timestamp()))
+
+
+def get_last_incident_ts() -> datetime | None:
+    """
+    Retrieves the timestamp of the last system incident
+    """
+    redis_client = redis.redis_clusters.get(settings.SENTRY_MONITORS_REDIS_CLUSTER)
+    value = _int_or_none(redis_client.get(MONITR_LAST_SYSTEM_INCIDENT_TS))
+    return datetime.fromtimestamp(value, UTC) if value else None
+
+
+def prune_incident_check_in_volume(start: datetime, end: datetime) -> None:
+    """
+    After recovering from a system incident the volume data must be discarded
+    to avoid skewing future computations. Note that the start time is inclusive
+    and the end time is exclusive.
+    """
+    redis_client = redis.redis_clusters.get(settings.SENTRY_MONITORS_REDIS_CLUSTER)
+
+    # Length of the incident in minutes
+    length = int((end - start).total_seconds()) // 60
+
+    # XXX(epurkhiser): Because we make clock tick decisions at the timestamp of
+    # the clock ticking, we are storing the decision at the tick timestamp
+    # AFTER the tick timestamp where the volume and metric values are stored.
+    #
+    # Adjust for this by moving the start back a minute.
+    start = start - timedelta(minutes=1)
+    dates = (start + timedelta(minutes=offset) for offset in range(length))
+
+    # Batch deletes
+    for timestamp_batch in batched(dates, 30):
+        pipeline = redis_client.pipeline()
+        for ts in timestamp_batch:
+            pipeline.delete(MONITOR_VOLUME_HISTORY.format(ts=_make_reference_ts(ts)))
+        pipeline.execute()
+
+
 def record_clock_tick_volume_metric(tick: datetime) -> None:
     """
     Look at the historic volume of check-ins for this tick over the last
@@ -91,7 +178,7 @@ def record_clock_tick_volume_metric(tick: datetime) -> None:
     NOTE that this records a metric for the tick timestamp that we just ticked
     over. So when ticking at 12:01 the metric is recorded for 12:00.
     """
-    if not options.get("crons.tick_volume_anomaly_detection"):
+    if not options.get("crons.system_incidents.collect_metrics"):
         return
 
     redis_client = redis.redis_clusters.get(settings.SENTRY_MONITORS_REDIS_CLUSTER)
@@ -120,10 +207,12 @@ def record_clock_tick_volume_metric(tick: datetime) -> None:
 
     # Can't make any decisions if we didn't have data for the past minute
     if past_minute_volume is None:
+        logger.info("past_minute_volume_missing", extra={"reference_datetime": tick})
         return
 
     # We need AT LEAST two data points to calculate standard deviation
     if len(historic_volume) < 2:
+        logger.info("history_volume_low", extra={"reference_datetime": tick})
         return
 
     # Record some statistics about the past_minute_volume volume in comparison
@@ -155,7 +244,7 @@ def record_clock_tick_volume_metric(tick: datetime) -> None:
     metrics.gauge("monitors.task.volume_history.pct_deviation", pct_deviation, sample_rate=1.0)
 
     logger.info(
-        "monitors.system_incidents.volume_history",
+        "volume_history",
         extra={
             "reference_datetime": str(tick),
             "evaluation_minute": past_ts.strftime("%H:%M"),
@@ -223,6 +312,16 @@ class TickAnomalyDecision(StrEnum):
     either NORMAL or back into INCIDENT.
     """
 
+    def is_pending(self) -> bool:
+        """
+        Returns True when the decision is ABNORMAL or RECOVERING, indicating
+        that we are currently pending resolution of this decision.
+        """
+        return self in [TickAnomalyDecision.ABNORMAL, TickAnomalyDecision.RECOVERING]
+
+    def is_incident(self) -> bool:
+        return self == TickAnomalyDecision.INCIDENT
+
     @classmethod
     def from_str(cls, st: str) -> TickAnomalyDecision:
         return cls[st.upper()]
@@ -267,6 +366,16 @@ class AnomalyTransition(StrEnum):
 
 @dataclass
 class DecisionResult:
+    ts: datetime
+    """
+    The associated timestamp of the decision. Typically this will be the clock
+    tick when the decision was made. However for a incident start and end
+    transitions this will be the back-dated timestamp of when the state began.
+
+    INCIDENT_STARTED   -> Tick when the incident truly starts
+    INCIDENT_RECOVERED -> Tick when the incident truly recovered
+    """
+
     decision: TickAnomalyDecision
     """
     The recorded decision made for the clock tick
@@ -354,8 +463,8 @@ def make_clock_tick_decision(tick: datetime) -> DecisionResult:
     # Alias TickAnomalyDecision to improve code readability
     Decision = TickAnomalyDecision
 
-    if not options.get("crons.tick_volume_anomaly_detection"):
-        return DecisionResult(Decision.NORMAL)
+    if not options.get("crons.system_incidents.collect_metrics"):
+        return DecisionResult(tick, Decision.NORMAL)
 
     redis_client = redis.redis_clusters.get(settings.SENTRY_MONITORS_REDIS_CLUSTER)
 
@@ -395,6 +504,7 @@ def make_clock_tick_decision(tick: datetime) -> DecisionResult:
     def make_decision(
         decision: TickAnomalyDecision,
         transition: AnomalyTransition | None = None,
+        ts: datetime | None = None,
     ) -> DecisionResult:
         decision_key = MONITOR_TICK_DECISION.format(ts=_make_reference_ts(tick))
         pipeline = redis_client.pipeline()
@@ -402,7 +512,16 @@ def make_decision(
         pipeline.expire(decision_key, MONITOR_VOLUME_RETENTION)
         pipeline.execute()
 
-        return DecisionResult(decision, transition)
+        logger.info(
+            "clock_tick_decision",
+            extra={
+                "reference_datetime": str(tick),
+                "decision": decision,
+                "transition": transition,
+            },
+        )
+
+        return DecisionResult(ts or tick, decision, transition)
 
     def metrics_match(metric: Metric) -> Generator[bool]:
         return (d == metric for d in tick_metrics)
@@ -434,8 +553,8 @@ def metrics_match(metric: Metric) -> Generator[bool]:
     # If the previous result was recovering, check if we have recovered and can
     # backfill these decisions as normal.
     if last_decision == Decision.RECOVERING and all(metrics_match(Metric.NORMAL)):
-        _backfill_decisions(past_ts, Decision.NORMAL, Decision.RECOVERING)
-        return make_decision(Decision.NORMAL, AnomalyTransition.INCIDENT_RECOVERED)
+        ts = _backfill_decisions(past_ts, Decision.NORMAL, Decision.RECOVERING)
+        return make_decision(Decision.NORMAL, AnomalyTransition.INCIDENT_RECOVERED, ts)
 
     # E: RECOVERING -> INCIDENT
     #
@@ -451,8 +570,8 @@ def metrics_match(metric: Metric) -> Generator[bool]:
     # an incident, mark this tick as an incident and backfill all abnormal
     # decisions to an incident decision.
     if last_decision != Decision.INCIDENT and last_metric == Metric.INCIDENT:
-        _backfill_decisions(past_ts, Decision.INCIDENT, Decision.ABNORMAL)
-        return make_decision(Decision.INCIDENT, AnomalyTransition.INCIDENT_STARTED)
+        ts = _backfill_decisions(past_ts, Decision.INCIDENT, Decision.ABNORMAL)
+        return make_decision(Decision.INCIDENT, AnomalyTransition.INCIDENT_STARTED, ts)
 
     # NORMAL     -> NORMAL
     # ABNORMAL   -> ABNORMAL
@@ -475,10 +594,16 @@ def get_clock_tick_decision(tick: datetime) -> TickAnomalyDecision | None:
         return None
 
 
-def _backfill_keys(start: datetime, until_not: TickAnomalyDecision) -> Generator[str]:
+@dataclass
+class BackfillItem:
+    key: str
+    ts: datetime
+
+
+def _make_backfill(start: datetime, until_not: TickAnomalyDecision) -> Generator[BackfillItem]:
     """
-    Yields keys from the `start` tick until the value of the key is not a
-    `until_not` tick decision.
+    Yields keys and associated timestamps from the `start` tick until the value
+    of the key is not a `until_not` tick decision.
     """
     redis_client = redis.redis_clusters.get(settings.SENTRY_MONITORS_REDIS_CLUSTER)
 
@@ -486,13 +611,15 @@ def _backfill_keys(start: datetime, until_not: TickAnomalyDecision) -> Generator
         pipeline = redis_client.pipeline()
 
         keys: list[str] = []
+        timestamps: list[datetime] = []
         for offset in chunked_offsets:
             ts = start - timedelta(minutes=offset)
             key = MONITOR_TICK_DECISION.format(ts=_make_reference_ts(ts))
             pipeline.get(key)
             keys.append(key)
+            timestamps.append(ts)
 
-        for key, value in zip(keys, pipeline.execute()):
+        for key, ts, value in zip(keys, timestamps, pipeline.execute()):
             # Edge case, we found a hole gap in decisions
             if value is None:
                 return
@@ -502,29 +629,41 @@ def _backfill_keys(start: datetime, until_not: TickAnomalyDecision) -> Generator
             if prev_decision != until_not:
                 return
 
-            yield key
+            yield BackfillItem(key, ts)
 
     # If we've iterated through the entire BACKFILL_CUTOFF we have a
     # "decision runaway" and should report this as an error
-    logger.error("sentry.system_incidents.decision_backfill_runaway")
+    logger.error("decision_backfill_runaway")
 
 
 def _backfill_decisions(
     start: datetime,
     decision: TickAnomalyDecision,
     until_not: TickAnomalyDecision,
-) -> None:
+) -> datetime | None:
     """
     Update historic tick decisions from `start` to `decision` until we no
     longer see the `until_not` decision.
+
+    If a backfill occurred, returns the timestamp just before
     """
     redis_client = redis.redis_clusters.get(settings.SENTRY_MONITORS_REDIS_CLUSTER)
 
     pipeline = redis_client.pipeline()
-    for key in _backfill_keys(start, until_not):
-        pipeline.set(key, decision.value)
+    backfill_items = list(_make_backfill(start, until_not))
+
+    for item in backfill_items:
+        pipeline.set(item.key, decision.value)
     pipeline.execute()
 
+    # Return the timestamp just before we reached until_not. Note
+    # backfill_items is in reverse chronological order here.
+    if backfill_items:
+        return backfill_items[-1].ts
+
+    # In the case that we didn't backfill anything return None
+    return None
+
 
 def _make_reference_ts(ts: datetime):
     """
diff --git a/src/sentry/monitors/types.py b/src/sentry/monitors/types.py
index afed758efa55f0..50f17140da8558 100644
--- a/src/sentry/monitors/types.py
+++ b/src/sentry/monitors/types.py
@@ -101,16 +101,6 @@ def from_dict(cls, data: CheckinItemData) -> CheckinItem:
         )
 
 
-class SimpleCheckIn(TypedDict):
-    """
-    A stripped down check in object
-    """
-
-    id: int
-    date_added: datetime
-    status: int
-
-
 IntervalUnit = Literal["year", "month", "week", "day", "hour", "minute"]
 
 
diff --git a/src/sentry/new_migrations/migrations.py b/src/sentry/new_migrations/migrations.py
index ecb9968ebf677b..9dc3a5128e2807 100644
--- a/src/sentry/new_migrations/migrations.py
+++ b/src/sentry/new_migrations/migrations.py
@@ -1,4 +1,5 @@
-from django.db.migrations import Migration
+from django.db.migrations import Migration, RunSQL
+from django_zero_downtime_migrations.backends.postgres.schema import UnsafeOperationException
 
 
 class CheckedMigration(Migration):
@@ -16,7 +17,20 @@ class CheckedMigration(Migration):
     # the `owners-migrations` team.
     checked = True
 
+    # This determines whether we allow `RunSQL` to be used in migrations. We want to discourage this going forward,
+    # because it's hard for our framework to determine whether SQL is safe. It can also cause problems with setting
+    # lock/statement timeouts appropriately.
+    allow_run_sql = False
+
     def apply(self, project_state, schema_editor, collect_sql=False):
         if self.checked:
             schema_editor.safe = True
+        for op in self.operations:
+            if not self.allow_run_sql and type(op) is RunSQL:
+                raise UnsafeOperationException(
+                    "Using RunSQL is unsafe because our migrations safety framework can't detect problems with the "
+                    "migration. If you need to use RunSQL, set `allow_run_sql = True` and get approval from "
+                    "`owners-migrations` to make sure that it's safe."
+                )
+
         return super().apply(project_state, schema_editor, collect_sql)
diff --git a/src/sentry/new_migrations/monkey/__init__.py b/src/sentry/new_migrations/monkey/__init__.py
index a6b52294b510c1..1f581c9e0a6323 100644
--- a/src/sentry/new_migrations/monkey/__init__.py
+++ b/src/sentry/new_migrations/monkey/__init__.py
@@ -1,5 +1,4 @@
 from django import VERSION
-from django.db import models
 
 from sentry.new_migrations.monkey.executor import SentryMigrationExecutor
 from sentry.new_migrations.monkey.fields import deconstruct
@@ -19,6 +18,10 @@
     is copied and modified from `Queryset.update()` to add `RETURNING <fields>` to
     the update query. Verify that the `update` code hasn't significantly changed,
     and if it has update as needed.
+ - We monkeypatch `SentryProjectState` over `ProjectState` in a few places. Check where
+    Django is importing it and make sure that we're still patching correctly.
+    We also need to verify that the patched `SentryProjectState` isn't missing new
+    features added by Django.
 
 When you're happy that these changes are good to go, update
 `LAST_VERIFIED_DJANGO_VERSION` to the version of Django you're upgrading to. If the
@@ -77,6 +80,8 @@ class Migration(CheckedMigration):
 
 
 def monkey_migrations():
+    from django.db import models
+
     # This import needs to be below the other imports for `executor` and `writer` so
     # that we can successfully monkeypatch them.
     from django.db.migrations import executor, migration, writer
@@ -86,3 +91,11 @@ def monkey_migrations():
     migration.Migration.initial = None
     writer.MIGRATION_TEMPLATE = SENTRY_MIGRATION_TEMPLATE
     models.Field.deconstruct = deconstruct  # type: ignore[method-assign]
+
+    from django.db.migrations import graph, state
+
+    from sentry.new_migrations.monkey.state import SentryProjectState
+
+    state.ProjectState = SentryProjectState  # type: ignore[misc]
+    graph.ProjectState = SentryProjectState  # type: ignore[attr-defined]
+    executor.ProjectState = SentryProjectState  # type: ignore[attr-defined]
diff --git a/src/sentry/new_migrations/monkey/fields.py b/src/sentry/new_migrations/monkey/fields.py
index d45d426bbe6c0f..b11e363dfb68ca 100644
--- a/src/sentry/new_migrations/monkey/fields.py
+++ b/src/sentry/new_migrations/monkey/fields.py
@@ -1,4 +1,10 @@
-from django.db.models import Field
+from django.db.migrations import RemoveField
+from django.db.models import Field, ManyToManyField
+from django.db.models.fields import NOT_PROVIDED
+from django_zero_downtime_migrations.backends.postgres.schema import UnsafeOperationException
+
+from sentry.db.postgres.schema import SafePostgresDatabaseSchemaEditor
+from sentry.new_migrations.monkey.state import DeletionAction, SentryProjectState
 
 IGNORED_ATTRS = ["verbose_name", "help_text", "choices"]
 original_deconstruct = Field.deconstruct
@@ -14,3 +20,66 @@ def deconstruct(self):
     for attr in IGNORED_ATTRS:
         kwargs.pop(attr, None)
     return name, path, args, kwargs
+
+
+class SafeRemoveField(RemoveField):
+    def __init__(self, *args, deletion_action: DeletionAction, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.deletion_action = deletion_action
+
+    def state_forwards(self, app_label: str, state: SentryProjectState) -> None:  # type: ignore[override]
+        if self.deletion_action == DeletionAction.MOVE_TO_PENDING:
+            field = state.apps.get_model(app_label, self.model_name_lower)._meta.get_field(
+                self.name_lower
+            )
+            if getattr(field, "db_constraint", False):
+                raise UnsafeOperationException(
+                    f"Foreign key db constraint must be removed before dropping {app_label}.{self.model_name_lower}.{self.name}. "
+                    "More info: https://develop.sentry.dev/api-server/application-domains/database-migrations/#deleting-columns"
+                )
+            if (
+                not isinstance(field, ManyToManyField)
+                and not field.null
+                and field.db_default is NOT_PROVIDED
+            ):
+                raise UnsafeOperationException(
+                    f"Field {app_label}.{self.model_name_lower}.{self.name} must either be nullable or have a db_default before dropping. "
+                    "More info: https://develop.sentry.dev/api-server/application-domains/database-migrations/#deleting-columns"
+                )
+
+        state.remove_field(
+            app_label, self.model_name_lower, self.name_lower, deletion_action=self.deletion_action
+        )
+
+    def database_forwards(
+        self,
+        app_label: str,
+        schema_editor: SafePostgresDatabaseSchemaEditor,  # type: ignore[override]
+        from_state: SentryProjectState,  # type: ignore[override]
+        to_state: SentryProjectState,  # type: ignore[override]
+    ) -> None:
+        if self.deletion_action == DeletionAction.MOVE_TO_PENDING:
+            return
+
+        field = from_state.get_pending_deletion_field(app_label, self.model_name, self.name)
+        if self.allow_migrate_model(schema_editor.connection.alias, field.model):
+            schema_editor.remove_field(field.model, field, is_safe=True)
+
+    def database_backwards(
+        self,
+        app_label: str,
+        schema_editor: SafePostgresDatabaseSchemaEditor,  # type: ignore[override]
+        from_state: SentryProjectState,  # type: ignore[override]
+        to_state: SentryProjectState,  # type: ignore[override]
+    ) -> None:
+        if self.deletion_action == DeletionAction.MOVE_TO_PENDING:
+            return
+        field = to_state.get_pending_deletion_field(app_label, self.model_name, self.name)
+        if self.allow_migrate_model(schema_editor.connection.alias, field.model):
+            schema_editor.add_field(field.model, field)
+
+    def describe(self) -> str:
+        if self.deletion_action == DeletionAction.MOVE_TO_PENDING:
+            return f"Moved {self.model_name}.{self.name} field to pending deletion state"
+        else:
+            return super().describe()
diff --git a/src/sentry/new_migrations/monkey/models.py b/src/sentry/new_migrations/monkey/models.py
new file mode 100644
index 00000000000000..e744e11b356e70
--- /dev/null
+++ b/src/sentry/new_migrations/monkey/models.py
@@ -0,0 +1,58 @@
+from django.db.migrations import DeleteModel
+from django_zero_downtime_migrations.backends.postgres.schema import UnsafeOperationException
+
+from sentry.db.postgres.schema import SafePostgresDatabaseSchemaEditor
+from sentry.new_migrations.monkey.state import DeletionAction, SentryProjectState
+
+
+class SafeDeleteModel(DeleteModel):
+    def __init__(self, *args, deletion_action: DeletionAction, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.deletion_action = deletion_action
+
+    def state_forwards(self, app_label: str, state: SentryProjectState) -> None:  # type: ignore[override]
+        if self.deletion_action == DeletionAction.MOVE_TO_PENDING:
+            model = state.apps.get_model(app_label, self.name)
+            fields_with_constraints = [
+                f.name for f in model._meta.fields if getattr(f, "db_constraint", False)
+            ]
+            if fields_with_constraints:
+                raise UnsafeOperationException(
+                    "Foreign key db constraints must be removed before dropping "
+                    f"{app_label}.{self.name}. Fields with constraints: {fields_with_constraints}"
+                    "More info: https://develop.sentry.dev/api-server/application-domains/database-migrations/#deleting-tables"
+                )
+        state.remove_model(app_label, self.name_lower, deletion_action=self.deletion_action)
+
+    def database_forwards(
+        self,
+        app_label: str,
+        schema_editor: SafePostgresDatabaseSchemaEditor,  # type: ignore[override]
+        from_state: SentryProjectState,  # type: ignore[override]
+        to_state: SentryProjectState,  # type: ignore[override]
+    ) -> None:
+        if self.deletion_action == DeletionAction.MOVE_TO_PENDING:
+            return
+
+        model = from_state.get_pending_deletion_model(app_label, self.name)
+        if self.allow_migrate_model(schema_editor.connection.alias, model):
+            schema_editor.delete_model(model, is_safe=True)
+
+    def database_backwards(
+        self,
+        app_label: str,
+        schema_editor: SafePostgresDatabaseSchemaEditor,  # type: ignore[override]
+        from_state: SentryProjectState,  # type: ignore[override]
+        to_state: SentryProjectState,  # type: ignore[override]
+    ) -> None:
+        if self.deletion_action == DeletionAction.MOVE_TO_PENDING:
+            return
+        model = to_state.get_pending_deletion_model(app_label, self.name)
+        if self.allow_migrate_model(schema_editor.connection.alias, model):
+            schema_editor.create_model(model)
+
+    def describe(self) -> str:
+        if self.deletion_action == DeletionAction.MOVE_TO_PENDING:
+            return f"Moved model {self.name} to pending deletion state"
+        else:
+            return super().describe()
diff --git a/src/sentry/new_migrations/monkey/state.py b/src/sentry/new_migrations/monkey/state.py
new file mode 100644
index 00000000000000..aa78cf1b3569a1
--- /dev/null
+++ b/src/sentry/new_migrations/monkey/state.py
@@ -0,0 +1,96 @@
+from __future__ import annotations
+
+from copy import deepcopy
+from enum import Enum
+
+from django.db.migrations.state import ProjectState
+from django.db.models import Field, Model
+from django_zero_downtime_migrations.backends.postgres.schema import UnsafeOperationException
+
+
+class DeletionAction(Enum):
+    MOVE_TO_PENDING = 0
+    DELETE = 1
+
+
+class SentryProjectState(ProjectState):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.pending_deletion_models: dict[tuple[str, str], type[Model]] = {}
+        self.pending_deletion_fields: dict[tuple[str, str, str], type[Field]] = {}
+
+    def get_pending_deletion_model(self, app_label: str, model_name: str) -> type[Model]:
+        model_key = (app_label.lower(), model_name.lower())
+        if model_key not in self.pending_deletion_models:
+            raise UnsafeOperationException(
+                "Model must be in the pending deletion state before full deletion. "
+                "More info: https://develop.sentry.dev/api-server/application-domains/database-migrations/#deleting-tables"
+            )
+        return self.pending_deletion_models[model_key]
+
+    def get_pending_deletion_field(
+        self, app_label: str, model_name: str, field_name: str
+    ) -> type[Field]:
+        field_key = (app_label.lower(), model_name.lower(), field_name.lower())
+        if field_key not in self.pending_deletion_fields:
+            raise UnsafeOperationException(
+                "Field must be in the pending deletion state before full deletion. "
+                "More info: https://develop.sentry.dev/api-server/application-domains/database-migrations/#deleting-columns"
+            )
+        return self.pending_deletion_fields[field_key]
+
+    def remove_model(
+        self, app_label: str, model_name: str, deletion_action: DeletionAction | None = None
+    ) -> None:
+        model_key = (app_label.lower(), model_name.lower())
+        if deletion_action == DeletionAction.DELETE:
+            if model_key not in self.pending_deletion_models:
+                raise UnsafeOperationException(
+                    "Model must be in the pending deletion state before full deletion. "
+                    "More info: https://develop.sentry.dev/api-server/application-domains/database-migrations/#deleting-tables"
+                )
+            del self.pending_deletion_models[model_key]
+            return
+        if deletion_action == DeletionAction.MOVE_TO_PENDING:
+            if model_key in self.pending_deletion_models:
+                raise UnsafeOperationException(
+                    f"{app_label}.{model_name} is already pending deletion. Use DeletionAction.DELETE to delete"
+                    "More info: https://develop.sentry.dev/api-server/application-domains/database-migrations/#deleting-tables"
+                )
+            self.pending_deletion_models[model_key] = self.apps.get_model(app_label, model_name)
+        super().remove_model(app_label, model_name)
+
+    def remove_field(
+        self,
+        app_label: str,
+        model_name: str,
+        name: str,
+        deletion_action: DeletionAction | None = None,
+    ):
+        field_key = app_label.lower(), model_name.lower(), name.lower()
+        if deletion_action == DeletionAction.DELETE:
+            if field_key not in self.pending_deletion_fields:
+                raise UnsafeOperationException(
+                    "Field must be in the pending deletion state before full deletion. "
+                    "More info: https://develop.sentry.dev/api-server/application-domains/database-migrations/#deleting-columns"
+                )
+            del self.pending_deletion_fields[field_key]
+            return
+
+        if deletion_action == DeletionAction.MOVE_TO_PENDING:
+            if field_key in self.pending_deletion_fields:
+                raise UnsafeOperationException(
+                    f"{app_label}.{model_name}.{name} is already pending deletion. Use DeletionAction.DELETE to delete"
+                    "More info: https://develop.sentry.dev/api-server/application-domains/database-migrations/#deleting-columns"
+                )
+            self.pending_deletion_fields[field_key] = self.apps.get_model(
+                app_label, model_name
+            )._meta.get_field(name)
+
+        super().remove_field(app_label, model_name, name)
+
+    def clone(self) -> SentryProjectState:
+        new_state = super().clone()
+        new_state.pending_deletion_models = deepcopy(self.pending_deletion_models)  # type: ignore[attr-defined]
+        new_state.pending_deletion_fields = deepcopy(self.pending_deletion_fields)  # type: ignore[attr-defined]
+        return new_state  # type: ignore[return-value]
diff --git a/src/sentry/notifications/models/__init__.py b/src/sentry/notifications/models/__init__.py
new file mode 100644
index 00000000000000..3b403cc7775ac4
--- /dev/null
+++ b/src/sentry/notifications/models/__init__.py
@@ -0,0 +1,25 @@
+from sentry.notifications.models.notificationaction import (
+    ActionRegistration,
+    ActionService,
+    ActionTarget,
+    ActionTrigger,
+    NotificationAction,
+    NotificationActionProject,
+)
+from sentry.notifications.models.notificationmessage import NotificationMessage
+from sentry.notifications.models.notificationsettingbase import NotificationSettingBase
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
+
+__all__ = (
+    "NotificationActionProject",
+    "NotificationAction",
+    "ActionService",
+    "ActionTrigger",
+    "ActionTarget",
+    "ActionRegistration",
+    "NotificationSettingBase",
+    "NotificationMessage",
+    "NotificationSettingOption",
+    "NotificationSettingProvider",
+)
diff --git a/src/sentry/notifications/models/notificationaction.py b/src/sentry/notifications/models/notificationaction.py
new file mode 100644
index 00000000000000..c73d7560da6d85
--- /dev/null
+++ b/src/sentry/notifications/models/notificationaction.py
@@ -0,0 +1,322 @@
+from __future__ import annotations
+
+import logging
+from abc import ABCMeta, abstractmethod
+from collections.abc import Mapping, MutableMapping
+from enum import IntEnum
+from typing import TYPE_CHECKING, Any, TypeVar
+
+from django.db import models
+
+from sentry.backup.scopes import RelocationScope
+from sentry.db.models import FlexibleForeignKey, Model, sane_repr
+from sentry.db.models.base import region_silo_model
+from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.integrations.types import ExternalProviders
+from sentry.models.organization import Organization
+
+logger = logging.getLogger(__name__)
+
+if TYPE_CHECKING:
+    from sentry.api.serializers.rest_framework.notification_action import (
+        NotificationActionInputData,
+    )
+    from sentry.integrations.services.integration import RpcIntegration
+
+
+class FlexibleIntEnum(IntEnum):
+    @classmethod
+    def as_choices(cls) -> tuple[tuple[int, str], ...]:
+        raise NotImplementedError
+
+    @classmethod
+    def get_name(cls, value: int) -> str | None:
+        return dict(cls.as_choices()).get(value)
+
+    @classmethod
+    def get_value(cls, name: str) -> int | None:
+        invert_choices = {v: k for k, v in cls.as_choices()}
+        return invert_choices.get(name)
+
+
+class ActionService(FlexibleIntEnum):
+    """
+    The available services to fire action notifications
+    """
+
+    EMAIL = 0
+    PAGERDUTY = 1
+    SLACK = 2
+    MSTEAMS = 3
+    SENTRY_APP = 4
+    SENTRY_NOTIFICATION = 5  # Use personal notification platform (src/sentry/notifications)
+    OPSGENIE = 6
+    DISCORD = 7
+
+    @classmethod
+    def as_choices(cls) -> tuple[tuple[int, str], ...]:
+        assert ExternalProviders.EMAIL.name is not None
+        assert ExternalProviders.PAGERDUTY.name is not None
+        assert ExternalProviders.SLACK.name is not None
+        assert ExternalProviders.MSTEAMS.name is not None
+        assert ExternalProviders.OPSGENIE.name is not None
+        assert ExternalProviders.DISCORD.name is not None
+        return (
+            (cls.EMAIL.value, ExternalProviders.EMAIL.name),
+            (cls.PAGERDUTY.value, ExternalProviders.PAGERDUTY.name),
+            (cls.SLACK.value, ExternalProviders.SLACK.name),
+            (cls.MSTEAMS.value, ExternalProviders.MSTEAMS.name),
+            (cls.SENTRY_APP.value, "sentry_app"),
+            (cls.SENTRY_NOTIFICATION.value, "sentry_notification"),
+            (cls.OPSGENIE.value, ExternalProviders.OPSGENIE.name),
+            (cls.DISCORD.value, ExternalProviders.DISCORD.name),
+        )
+
+
+class ActionTarget(FlexibleIntEnum):
+    """
+    Explains the contents of target_identifier
+    """
+
+    # The target_identifier is a direct reference used by the service (e.g. email address, slack channel id)
+    SPECIFIC = 0
+    # The target_identifier is an id from the User model in Sentry
+    USER = 1
+    # The target_identifier is an id from the Team model in Sentry
+    TEAM = 2
+    # The target_identifier is an id from the SentryApp model in Sentry
+    SENTRY_APP = 3
+
+    @classmethod
+    def as_choices(cls) -> tuple[tuple[int, str], ...]:
+        return (
+            (cls.SPECIFIC.value, "specific"),
+            (cls.USER.value, "user"),
+            (cls.TEAM.value, "team"),
+            (cls.SENTRY_APP.value, "sentry_app"),
+        )
+
+
+class ActionTrigger(FlexibleIntEnum):
+    """
+    The possible sources of action notifications.
+    Items prefixed with 'GS_' have registrations in getsentry.
+    """
+
+    AUDIT_LOG = 0
+    GS_SPIKE_PROTECTION = 100
+
+    @classmethod
+    def as_choices(cls) -> tuple[tuple[int, str], ...]:
+        return (
+            (cls.AUDIT_LOG.value, "audit-log"),
+            (cls.GS_SPIKE_PROTECTION.value, "spike-protection"),
+        )
+
+
+class ActionRegistration(metaclass=ABCMeta):
+    def __init__(self, action: NotificationAction):
+        self.action = action
+
+    @abstractmethod
+    def fire(self, data: Any) -> None:
+        """
+        Handles delivering the message via the service from the action and specified data.
+        """
+
+    @classmethod
+    def validate_action(cls, data: NotificationActionInputData) -> None:
+        """
+        Optional function to provide increased validation when saving incoming NotificationActions. See NotificationActionSerializer.
+
+        :param data: The input data sent to the API before updating/creating NotificationActions
+        :raises serializers.ValidationError: Indicates that the incoming action would apply to this registration but is not valid.
+        """
+
+    @classmethod
+    def serialize_available(
+        cls, organization: Organization, integrations: list[RpcIntegration] | None = None
+    ) -> list[Any]:
+        """
+        Optional class method to serialize this registration's available actions to an organization. See NotificationActionsAvailableEndpoint.
+
+        :param organization: The relevant organization which will receive the serialized available action in their response.
+        :param integrations: A list of integrations which are set up for the organization.
+        """
+        return []
+
+
+ActionRegistrationT = TypeVar("ActionRegistrationT", bound=ActionRegistration)
+
+
+class AbstractNotificationAction(Model):
+    """
+    Abstract model meant to retroactively create a contract for notification actions
+    (e.g. metric alerts, spike protection, etc.)
+    """
+
+    integration_id = HybridCloudForeignKey(
+        "sentry.Integration", blank=True, null=True, on_delete="CASCADE"
+    )
+    sentry_app_id = HybridCloudForeignKey(
+        "sentry.SentryApp", blank=True, null=True, on_delete="CASCADE"
+    )
+
+    # The type of service which will receive the action notification (e.g. slack, pagerduty, etc.)
+    type = models.SmallIntegerField(choices=ActionService.as_choices())
+    # The type of target which the service uses for routing (e.g. user, team)
+    target_type = models.SmallIntegerField(choices=ActionTarget.as_choices())
+    # Identifier of the target for the given service (e.g. slack channel id, pagerdutyservice id)
+    target_identifier = models.TextField(null=True)
+    # User-friendly name of the target (e.g. #slack-channel, pagerduty-service-name)
+    target_display = models.TextField(null=True)
+
+    @property
+    def service_type(self) -> int:
+        """
+        Used for disambiguity of self.type
+        """
+        return self.type
+
+    class Meta:
+        abstract = True
+
+
+@region_silo_model
+class NotificationActionProject(Model):
+    __relocation_scope__ = {RelocationScope.Global, RelocationScope.Organization}
+
+    project = FlexibleForeignKey("sentry.Project")
+    action = FlexibleForeignKey("sentry.NotificationAction")
+
+    class Meta:
+        app_label = "sentry"
+        db_table = "sentry_notificationactionproject"
+
+    def get_relocation_scope(self) -> RelocationScope:
+        action = NotificationAction.objects.get(id=self.action_id)
+        return action.get_relocation_scope()
+
+
+@region_silo_model
+class NotificationAction(AbstractNotificationAction):
+    """
+    Generic notification action model to programmatically route depending on the trigger (or source) for the notification
+    """
+
+    __relocation_scope__ = {RelocationScope.Global, RelocationScope.Organization}
+    __repr__ = sane_repr("id", "trigger_type", "service_type", "target_display")
+
+    _trigger_types: tuple[tuple[int, str], ...] = ActionTrigger.as_choices()
+    _registry: MutableMapping[str, type[ActionRegistration]] = {}
+
+    organization = FlexibleForeignKey("sentry.Organization")
+    projects = models.ManyToManyField("sentry.Project", through=NotificationActionProject)
+
+    # The type of trigger which controls when the actions will go off (e.g. 'spike-protection')
+    trigger_type = models.SmallIntegerField(choices=_trigger_types)
+
+    class Meta:
+        app_label = "sentry"
+        db_table = "sentry_notificationaction"
+
+    @classmethod
+    def register_action(cls, trigger_type: int, service_type: int, target_type: int):
+        """
+        Register a new trigger/service/target combination for NotificationActions.
+        For example, allowing audit-logs (trigger) to fire actions to slack (service) channels (target)
+
+        :param trigger_type: The registered trigger_type integer value saved to the database
+        :param service_type: The service_type integer value which must exist on ActionService
+        :param target_type: The target_type integer value which must exist on ActionTarget
+        :param registration: A subclass of `ActionRegistration`.
+        """
+
+        def inner(registration: type[ActionRegistrationT]) -> type[ActionRegistrationT]:
+            if trigger_type not in dict(ActionTrigger.as_choices()):
+                raise AttributeError(
+                    f"Trigger type of {trigger_type} is not registered. Modify ActionTrigger."
+                )
+
+            if service_type not in dict(ActionService.as_choices()):
+                raise AttributeError(
+                    f"Service type of {service_type} is not registered. Modify ActionService."
+                )
+
+            if target_type not in dict(ActionTarget.as_choices()):
+                raise AttributeError(
+                    f"Target type of {target_type} is not registered. Modify ActionTarget."
+                )
+            key = cls.get_registry_key(trigger_type, service_type, target_type)
+            if cls._registry.get(key) is not None:
+                raise AttributeError(
+                    f"Existing registration found for trigger:{trigger_type}, service:{service_type}, target:{target_type}."
+                )
+
+            cls._registry[key] = registration
+            return registration
+
+        return inner
+
+    @classmethod
+    def get_trigger_types(cls):
+        return cls._trigger_types
+
+    @classmethod
+    def get_trigger_text(self, trigger_type: int) -> str:
+        return dict(NotificationAction.get_trigger_types())[trigger_type]
+
+    @classmethod
+    def get_registry_key(self, trigger_type: int, service_type: int, target_type: int) -> str:
+        return f"{trigger_type}:{service_type}:{target_type}"
+
+    @classmethod
+    def get_registry(cls) -> Mapping[str, type[ActionRegistration]]:
+        return cls._registry
+
+    @classmethod
+    def get_registration(
+        cls, trigger_type: int, service_type: int, target_type: int
+    ) -> type[ActionRegistration] | None:
+        key = cls.get_registry_key(trigger_type, service_type, target_type)
+        return cls._registry.get(key)
+
+    def get_audit_log_data(self) -> dict[str, str]:
+        """
+        Returns audit log data for NOTIFICATION_ACTION_ADD, NOTIFICATION_ACTION_EDIT
+        and NOTIFICATION_ACTION_REMOVE events
+        """
+        return {"trigger": NotificationAction.get_trigger_text(self.trigger_type)}
+
+    def fire(self, *args, **kwargs):
+        registration = NotificationAction.get_registration(
+            self.trigger_type, self.service_type, self.target_type
+        )
+        if registration:
+            logger.info(
+                "fire_action",
+                extra={
+                    "action_id": self.id,
+                    "trigger": NotificationAction.get_trigger_text(self.trigger_type),
+                    "service": ActionService.get_name(self.service_type),
+                    "target": ActionTarget.get_name(self.target_type),
+                },
+            )
+            return registration(action=self).fire(*args, **kwargs)
+        else:
+            logger.error(
+                "missing_registration",
+                extra={
+                    "id": self.id,
+                    "service_type": self.service_type,
+                    "trigger_type": self.trigger_type,
+                    "target_type": self.target_type,
+                },
+            )
+
+    def get_relocation_scope(self) -> RelocationScope:
+        if self.integration_id is not None or self.sentry_app_id is not None:
+            # TODO(getsentry/team-ospo#188): this should be extension scope once that gets added.
+            return RelocationScope.Global
+
+        return RelocationScope.Organization
diff --git a/src/sentry/models/notificationmessage.py b/src/sentry/notifications/models/notificationmessage.py
similarity index 100%
rename from src/sentry/models/notificationmessage.py
rename to src/sentry/notifications/models/notificationmessage.py
diff --git a/src/sentry/models/notificationsettingbase.py b/src/sentry/notifications/models/notificationsettingbase.py
similarity index 100%
rename from src/sentry/models/notificationsettingbase.py
rename to src/sentry/notifications/models/notificationsettingbase.py
diff --git a/src/sentry/notifications/models/notificationsettingoption.py b/src/sentry/notifications/models/notificationsettingoption.py
new file mode 100644
index 00000000000000..0f60f02b1081e9
--- /dev/null
+++ b/src/sentry/notifications/models/notificationsettingoption.py
@@ -0,0 +1,39 @@
+from django.db import models
+
+from sentry.backup.scopes import RelocationScope
+from sentry.db.models import control_silo_model, sane_repr
+from sentry.notifications.models.notificationsettingbase import NotificationSettingBase
+
+
+@control_silo_model
+class NotificationSettingOption(NotificationSettingBase):
+    __relocation_scope__ = RelocationScope.Excluded
+
+    class Meta:
+        app_label = "sentry"
+        db_table = "sentry_notificationsettingoption"
+        unique_together = (
+            (
+                "scope_type",
+                "scope_identifier",
+                "user_id",
+                "team_id",
+                "type",
+            ),
+        )
+        constraints = [
+            models.CheckConstraint(
+                condition=models.Q(team_id__isnull=False, user_id__isnull=True)
+                | models.Q(team_id__isnull=True, user_id__isnull=False),
+                name="notification_setting_option_team_or_user_check",
+            )
+        ]
+
+    __repr__ = sane_repr(
+        "scope_type",
+        "scope_identifier",
+        "type",
+        "user_id",
+        "team_id",
+        "value",
+    )
diff --git a/src/sentry/notifications/models/notificationsettingprovider.py b/src/sentry/notifications/models/notificationsettingprovider.py
new file mode 100644
index 00000000000000..57e947b4878c67
--- /dev/null
+++ b/src/sentry/notifications/models/notificationsettingprovider.py
@@ -0,0 +1,43 @@
+from django.db import models
+
+from sentry.backup.scopes import RelocationScope
+from sentry.db.models import control_silo_model, sane_repr
+from sentry.notifications.models.notificationsettingbase import NotificationSettingBase
+
+
+@control_silo_model
+class NotificationSettingProvider(NotificationSettingBase):
+    __relocation_scope__ = RelocationScope.Excluded
+
+    provider = models.CharField(max_length=32, null=False)
+
+    class Meta:
+        app_label = "sentry"
+        db_table = "sentry_notificationsettingprovider"
+        unique_together = (
+            (
+                "scope_type",
+                "scope_identifier",
+                "user_id",
+                "team_id",
+                "provider",
+                "type",
+            ),
+        )
+        constraints = [
+            models.CheckConstraint(
+                condition=models.Q(team_id__isnull=False, user_id__isnull=True)
+                | models.Q(team_id__isnull=True, user_id__isnull=False),
+                name="notification_setting_provider_team_or_user_check",
+            )
+        ]
+
+    __repr__ = sane_repr(
+        "scope_type",
+        "scope_identifier",
+        "user_id",
+        "team_id",
+        "provider",
+        "type",
+        "value",
+    )
diff --git a/src/sentry/notifications/notificationcontroller.py b/src/sentry/notifications/notificationcontroller.py
index 9909452ea613ff..6c21d8dbd7cf77 100644
--- a/src/sentry/notifications/notificationcontroller.py
+++ b/src/sentry/notifications/notificationcontroller.py
@@ -14,8 +14,6 @@
     ExternalProviderEnum,
     ExternalProviders,
 )
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.team import Team
 from sentry.notifications.helpers import (
@@ -26,6 +24,8 @@
     recipient_is_user,
     team_is_valid_recipient,
 )
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.types import (
     GroupSubscriptionStatus,
     NotificationScopeEnum,
diff --git a/src/sentry/notifications/notifications/activity/release.py b/src/sentry/notifications/notifications/activity/release.py
index 8b767f85f2a4ea..ac0b73e2e6d769 100644
--- a/src/sentry/notifications/notifications/activity/release.py
+++ b/src/sentry/notifications/notifications/activity/release.py
@@ -106,10 +106,10 @@ def get_projects(self, recipient: Actor) -> set[Project]:
         else:
             team_ids = [recipient.id]
 
-        projects: set[Project] = Project.objects.get_for_team_ids(team_ids).filter(
+        projects = Project.objects.get_for_team_ids(team_ids).filter(
             id__in={p.id for p in self.projects}
         )
-        return projects
+        return set(projects)
 
     def get_recipient_context(
         self, recipient: Actor, extra_context: Mapping[str, Any]
diff --git a/src/sentry/notifications/serializers.py b/src/sentry/notifications/serializers.py
index f4ef2f4144698a..f7ef5c1fc14771 100644
--- a/src/sentry/notifications/serializers.py
+++ b/src/sentry/notifications/serializers.py
@@ -4,8 +4,8 @@
 from typing import Any
 
 from sentry.api.serializers import Serializer
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 
 
 class NotificationSettingsBaseSerializer(Serializer):
diff --git a/src/sentry/notifications/services/impl.py b/src/sentry/notifications/services/impl.py
index 9740cc34aa589a..0fde09dd733761 100644
--- a/src/sentry/notifications/services/impl.py
+++ b/src/sentry/notifications/services/impl.py
@@ -5,8 +5,8 @@
 from django.db import router, transaction
 
 from sentry.integrations.types import EXTERNAL_PROVIDERS, ExternalProviderEnum, ExternalProviders
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.notificationcontroller import NotificationController
 from sentry.notifications.services import NotificationsService
 from sentry.notifications.services.model import RpcSubscriptionStatus
diff --git a/src/sentry/notifications/utils/__init__.py b/src/sentry/notifications/utils/__init__.py
index f9aa249fcfbb72..370a6d5259305c 100644
--- a/src/sentry/notifications/utils/__init__.py
+++ b/src/sentry/notifications/utils/__init__.py
@@ -68,9 +68,7 @@ def get_release(activity: Activity, organization: Organization) -> Release | Non
         return None
 
 
-def get_group_counts_by_project(
-    release: Release, projects: Iterable[Project]
-) -> Mapping[Project, int]:
+def get_group_counts_by_project(release: Release, projects: Iterable[Project]) -> dict[int, int]:
     return dict(
         Group.objects.filter(
             project__in=projects,
diff --git a/src/sentry/onboarding_tasks/backends/organization_onboarding_task.py b/src/sentry/onboarding_tasks/backends/organization_onboarding_task.py
index 2aed874fa9d4b7..c7510abb4c66c1 100644
--- a/src/sentry/onboarding_tasks/backends/organization_onboarding_task.py
+++ b/src/sentry/onboarding_tasks/backends/organization_onboarding_task.py
@@ -1,3 +1,4 @@
+from django.contrib.auth.models import AnonymousUser
 from django.db import IntegrityError, router, transaction
 from django.db.models import Q
 from django.utils import timezone
@@ -10,6 +11,8 @@
     OrganizationOnboardingTask,
 )
 from sentry.onboarding_tasks.base import OnboardingTaskBackend
+from sentry.users.models.user import User
+from sentry.users.services.user.model import RpcUser
 from sentry.utils import json
 
 
@@ -27,7 +30,9 @@ def create_or_update_onboarding_task(self, organization, user, task, values):
             defaults={"user_id": user.id},
         )
 
-    def try_mark_onboarding_complete(self, organization_id):
+    def try_mark_onboarding_complete(
+        self, organization_id: int, user: User | RpcUser | AnonymousUser
+    ):
         if OrganizationOption.objects.filter(
             organization_id=organization_id, key="onboarding:complete"
         ).exists():
@@ -40,8 +45,8 @@ def try_mark_onboarding_complete(self, organization_id):
             ).values_list("task", flat=True)
         )
 
-        organization = Organization.objects.get(id=organization_id)
-        if features.has("organizations:quick-start-updates", organization):
+        organization = Organization.objects.get_from_cache(id=organization_id)
+        if features.has("organizations:quick-start-updates", organization, actor=user):
             required_tasks = OrganizationOnboardingTask.NEW_REQUIRED_ONBOARDING_TASKS
         else:
             required_tasks = OrganizationOnboardingTask.REQUIRED_ONBOARDING_TASKS
@@ -54,8 +59,6 @@ def try_mark_onboarding_complete(self, organization_id):
                         key="onboarding:complete",
                         value={"updated": json.datetime_to_str(timezone.now())},
                     )
-
-                organization = Organization.objects.get(id=organization_id)
                 analytics.record(
                     "onboarding.complete",
                     user_id=organization.default_owner_id,
diff --git a/src/sentry/onboarding_tasks/base.py b/src/sentry/onboarding_tasks/base.py
index f17a743d3222c9..146a87f9b68adf 100644
--- a/src/sentry/onboarding_tasks/base.py
+++ b/src/sentry/onboarding_tasks/base.py
@@ -2,8 +2,13 @@
 
 from typing import Generic, TypeVar
 
+from django.contrib.auth.models import AnonymousUser
+
 from sentry import features
+from sentry.models.organization import Organization
 from sentry.models.organizationonboardingtask import AbstractOnboardingTask
+from sentry.users.models.user import User
+from sentry.users.services.user.model import RpcUser
 from sentry.utils.services import Service
 
 T = TypeVar("T", bound=AbstractOnboardingTask)
@@ -26,8 +31,8 @@ def get_task_lookup_by_key(self, key):
     def get_status_lookup_by_key(self, key):
         return self.Model.STATUS_LOOKUP_BY_KEY.get(key)
 
-    def get_skippable_tasks(self, organization):
-        if features.has("organizations:quick-start-updates", organization):
+    def get_skippable_tasks(self, organization: Organization, user: User | RpcUser | AnonymousUser):
+        if features.has("organizations:quick-start-updates", organization, actor=user):
             return self.Model.NEW_SKIPPABLE_TASKS
         return self.Model.SKIPPABLE_TASKS
 
@@ -37,5 +42,7 @@ def fetch_onboarding_tasks(self, organization, user):
     def create_or_update_onboarding_task(self, organization, user, task, values):
         raise NotImplementedError
 
-    def try_mark_onboarding_complete(self, organization_id):
+    def try_mark_onboarding_complete(
+        self, organization_id: int, user: User | RpcUser | AnonymousUser
+    ):
         raise NotImplementedError
diff --git a/src/sentry/options/defaults.py b/src/sentry/options/defaults.py
index 49c13bc991020d..56868202949446 100644
--- a/src/sentry/options/defaults.py
+++ b/src/sentry/options/defaults.py
@@ -2010,10 +2010,28 @@
 # Killswitch for monitor check-ins
 register("crons.organization.disable-check-in", type=Sequence, default=[])
 
-# Enables system incident anomaly detection based on the volume of check-ins
-# being processed
+
+# Temporary killswitch to enable dispatching incident occurrences into the
+# incident_occurrence_consumer
 register(
-    "crons.tick_volume_anomaly_detection",
+    "crons.dispatch_incident_occurrences_to_consumer",
+    default=False,
+    flags=FLAG_BOOL | FLAG_AUTOMATOR_MODIFIABLE,
+)
+
+# Enables recording tick volume metrics and tick decisions based on those
+# metrics. Decisions are used to delay notifications in a system incident.
+register(
+    "crons.system_incidents.collect_metrics",
+    default=False,
+    flags=FLAG_BOOL | FLAG_AUTOMATOR_MODIFIABLE,
+)
+
+# Enables the the crons incident occurrence consumer to consider the clock-tick
+# decision made based on volume metrics to determine if a incident occurrence
+# should be processed, delayed, or dropped entirely.
+register(
+    "crons.system_incidents.use_decisions",
     default=False,
     flags=FLAG_BOOL | FLAG_AUTOMATOR_MODIFIABLE,
 )
@@ -2348,12 +2366,29 @@
 
 # Relocation: the step at which new relocations should be autopaused, requiring admin approval
 # before continuing.
+# DEPRECATED: will be removed after the new `relocation.autopause.*` options are fully rolled out.
 register(
     "relocation.autopause",
     default="",
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
 
+# Relocation: the step at which new `SELF_HOSTED` relocations should be autopaused, requiring an
+# admin to unpause before continuing.
+register(
+    "relocation.autopause.self-hosted",
+    default="",
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
+
+# Relocation: the step at which new `SELF_HOSTED` relocations should be autopaused, requiring an
+# admin to unpause before continuing.
+register(
+    "relocation.autopause.saas-to-saas",
+    default="",
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
+
 # Relocation: globally limits the number of small (<=10MB) relocations allowed per silo per day.
 register(
     "relocation.daily-limit.small",
@@ -2858,24 +2893,17 @@
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
 
-# killswitch for profile consumers outcome emission.
-# If false, processed outcomes for profiles will keep
-# being emitted in the billing metrics consumer.
-#
-# If true, we'll stop emitting processed outcomes for
-# profiles in the billing metrics consumer and we'll
-# start emitting them in the profiling consumers
+# option for sample size when fetching project tag keys
 register(
-    "profiling.emit_outcomes_in_profiling_consumer.enabled",
-    default=False,
-    type=Bool,
+    "visibility.tag-key-sample-size",
+    default=1_000_000,
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
 
-# option for sample size when fetching project tag keys
+# option for clamping project tag key date range
 register(
-    "visibility.tag-key-sample-size",
-    default=1_000_000,
+    "visibility.tag-key-max-date-range.days",
+    default=14,
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
 
@@ -2897,3 +2925,29 @@
     default=[],
     flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
 )
+register(
+    "performance.event-tracker.sample-rate.transactions",
+    default=0.0,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
+
+# migrating send_alert_event task to not pass Event
+register(
+    "sentryapps.send_alert_event.use-eventid",
+    type=Float,
+    default=0.0,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
+register(
+    "transactions.do_post_process_in_save",
+    default=0.0,
+    flags=FLAG_AUTOMATOR_MODIFIABLE | FLAG_RATE,
+)
+
+# allows us to disable indexing during maintenance events
+register(
+    "sentry.similarity.indexing.enabled",
+    default=True,
+    type=Bool,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
diff --git a/src/sentry/organizations/services/organization/impl.py b/src/sentry/organizations/services/organization/impl.py
index 136ec177bad66a..033aecddd3bd28 100644
--- a/src/sentry/organizations/services/organization/impl.py
+++ b/src/sentry/organizations/services/organization/impl.py
@@ -17,9 +17,9 @@
 from sentry.hybridcloud.outbox.category import OutboxCategory, OutboxScope
 from sentry.hybridcloud.rpc import OptionValue, logger
 from sentry.incidents.models.alert_rule import AlertRule, AlertRuleActivity
-from sentry.incidents.models.incident import IncidentActivity, IncidentSubscription
+from sentry.incidents.models.incident import IncidentActivity
 from sentry.models.activity import Activity
-from sentry.models.dashboard import Dashboard
+from sentry.models.dashboard import Dashboard, DashboardFavoriteUser
 from sentry.models.dynamicsampling import CustomDynamicSamplingRule
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.groupbookmark import GroupBookmark
@@ -590,6 +590,7 @@ def merge_users(self, *, organization_id: int, from_user_id: int, to_user_id: in
                 AlertRuleActivity,
                 CustomDynamicSamplingRule,
                 Dashboard,
+                DashboardFavoriteUser,
                 GroupAssignee,
                 GroupBookmark,
                 GroupSeen,
@@ -597,7 +598,6 @@ def merge_users(self, *, organization_id: int, from_user_id: int, to_user_id: in
                 GroupSearchView,
                 GroupSubscription,
                 IncidentActivity,
-                IncidentSubscription,
                 OrganizationAccessRequest,
                 ProjectBookmark,
                 RecentSearch,
diff --git a/src/sentry/plugins/config.py b/src/sentry/plugins/config.py
index 0aaf870be57eb4..2b53fd594815e2 100644
--- a/src/sentry/plugins/config.py
+++ b/src/sentry/plugins/config.py
@@ -83,12 +83,6 @@ def validate_field(self, name, value):
 
 
 class PluginConfigMixin(ProviderMixin):
-    asset_key = None
-    assets = []
-
-    def get_assets(self):
-        return self.assets
-
     def get_metadata(self):
         """
         Return extra metadata which is used to represent this plugin.
diff --git a/src/sentry/plugins/providers/base.py b/src/sentry/plugins/providers/base.py
index 88acf22ae7ec89..a7befe1f862187 100644
--- a/src/sentry/plugins/providers/base.py
+++ b/src/sentry/plugins/providers/base.py
@@ -8,6 +8,7 @@
 from sentry.exceptions import InvalidIdentity, PluginError
 from sentry.integrations.services.integration import integration_service
 from sentry.organizations.services.organization.serial import serialize_rpc_organization
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.users.services.usersocialauth.model import RpcUserSocialAuth
 from sentry.users.services.usersocialauth.service import usersocialauth_service
@@ -98,7 +99,7 @@ def needs_auth(self, user, **kwargs):
         )
         return len(auths) == 0
 
-    def get_auth(self, user: RpcUser, **kwargs) -> RpcUserSocialAuth | None:
+    def get_auth(self, user: RpcUser | User, **kwargs) -> RpcUserSocialAuth | None:
         if self.auth_provider is None:
             return None
 
diff --git a/src/sentry/profiles/flamegraph.py b/src/sentry/profiles/flamegraph.py
index d732f9f6a01537..dd105dab14b504 100644
--- a/src/sentry/profiles/flamegraph.py
+++ b/src/sentry/profiles/flamegraph.py
@@ -6,11 +6,9 @@
 
 from snuba_sdk import (
     And,
-    BooleanCondition,
     Column,
     Condition,
     Direction,
-    Entity,
     Function,
     Limit,
     Op,
@@ -26,245 +24,10 @@
 from sentry.search.events.builder.profile_functions import ProfileFunctionsQueryBuilder
 from sentry.search.events.fields import resolve_datetime64
 from sentry.search.events.types import QueryBuilderConfig, SnubaParams
-from sentry.snuba import functions
-from sentry.snuba.dataset import Dataset, EntityKey, StorageKey
+from sentry.snuba.dataset import Dataset, StorageKey
 from sentry.snuba.referrer import Referrer
 from sentry.utils.iterators import chunked
-from sentry.utils.snuba import bulk_snuba_queries, raw_snql_query
-
-
-class StartEnd(TypedDict):
-    start: str
-    end: str
-
-
-class ProfileIds(TypedDict):
-    profile_ids: list[str]
-
-
-def get_profile_ids(
-    snuba_params: SnubaParams,
-    query: str | None = None,
-) -> ProfileIds:
-    builder = DiscoverQueryBuilder(
-        dataset=Dataset.Discover,
-        params={},
-        snuba_params=snuba_params,
-        query=query,
-        selected_columns=["profile.id"],
-        limit=options.get("profiling.flamegraph.profile-set.size"),
-    )
-
-    builder.add_conditions(
-        [
-            Condition(Column("type"), Op.EQ, "transaction"),
-            Condition(Column("profile_id"), Op.IS_NOT_NULL),
-        ]
-    )
-
-    result = builder.run_query(Referrer.API_PROFILING_PROFILE_FLAMEGRAPH.value)
-
-    return {"profile_ids": [row["profile.id"] for row in result["data"]]}
-
-
-def get_profiles_with_function(
-    organization_id: int,
-    project_id: int,
-    function_fingerprint: int,
-    snuba_params: SnubaParams,
-    query: str,
-) -> ProfileIds:
-    conditions = [query, f"fingerprint:{function_fingerprint}"]
-
-    result = functions.query(
-        selected_columns=["timestamp", "unique_examples()"],
-        query=" ".join(cond for cond in conditions if cond),
-        snuba_params=snuba_params,
-        limit=100,
-        orderby=["-timestamp"],
-        referrer=Referrer.API_PROFILING_FUNCTION_SCOPED_FLAMEGRAPH.value,
-        auto_aggregations=True,
-        use_aggregate_conditions=True,
-        transform_alias_to_input_format=True,
-    )
-
-    def extract_profile_ids() -> list[str]:
-        max_profiles = options.get("profiling.flamegraph.profile-set.size")
-        profile_ids = []
-
-        for i in range(5):
-            for row in result["data"]:
-                examples = row["unique_examples()"]
-                if i < len(examples):
-                    profile_ids.append(examples[i])
-
-                    if len(profile_ids) >= max_profiles:
-                        return profile_ids
-
-        return profile_ids
-
-    return {"profile_ids": extract_profile_ids()}
-
-
-class IntervalMetadata(TypedDict):
-    start: str
-    end: str
-    active_thread_id: str
-
-
-def get_spans_from_group(
-    organization_id: int,
-    project_id: int,
-    snuba_params: SnubaParams,
-    span_group: str,
-) -> dict[str, list[IntervalMetadata]]:
-    query = Query(
-        match=Entity(EntityKey.Spans.value),
-        select=[
-            Column("start_timestamp_precise"),
-            Column("end_timestamp_precise"),
-            Function(
-                "arrayElement",
-                parameters=[
-                    Column("sentry_tags.value"),
-                    Function(
-                        "indexOf",
-                        parameters=[
-                            Column("sentry_tags.key"),
-                            "profiler_id",
-                        ],
-                    ),
-                ],
-                alias="profiler_id",
-            ),
-            Function(
-                "arrayElement",
-                parameters=[
-                    Column("sentry_tags.value"),
-                    Function(
-                        "indexOf",
-                        parameters=[
-                            Column("sentry_tags.key"),
-                            "thread.id",
-                        ],
-                    ),
-                ],
-                alias="active_thread_id",
-            ),
-        ],
-        where=[
-            Condition(Column("project_id"), Op.EQ, project_id),
-            Condition(Column("timestamp"), Op.GTE, snuba_params.start),
-            Condition(Column("timestamp"), Op.LT, snuba_params.end),
-            Condition(Column("group"), Op.EQ, span_group),
-            Condition(Column("profiler_id"), Op.NEQ, ""),
-        ],
-        limit=Limit(100),
-    )
-    request = Request(
-        dataset=Dataset.SpansIndexed.value,
-        app_id="default",
-        query=query,
-        tenant_ids={
-            "referrer": Referrer.API_PROFILING_FLAMEGRAPH_SPANS_WITH_GROUP.value,
-            "organization_id": organization_id,
-        },
-    )
-    data = raw_snql_query(
-        request,
-        referrer=Referrer.API_PROFILING_FLAMEGRAPH_SPANS_WITH_GROUP.value,
-    )["data"]
-    spans: dict[str, list[IntervalMetadata]] = defaultdict(list)
-    for row in data:
-        spans[row["profiler_id"]].append(
-            {
-                "active_thread_id": row["active_thread_id"],
-                "start": row["start_timestamp_precise"],
-                "end": row["end_timestamp_precise"],
-            }
-        )
-
-    return spans
-
-
-class SpanMetadata(TypedDict):
-    profiler_id: list[IntervalMetadata]
-
-
-def get_chunk_snuba_conditions_from_spans_metadata(
-    spans: dict[str, list[IntervalMetadata]],
-) -> list[BooleanCondition | Condition]:
-    cond = []
-    for profiler_id, intervals in spans.items():
-        chunk_range_cond = []
-        for interval in intervals:
-            start = interval.get("start")
-            end = interval.get("end")
-            chunk_range_cond.append(
-                And(
-                    [
-                        Condition(Column("end_timestamp"), Op.GTE, start),
-                        Condition(Column("start_timestamp"), Op.LT, end),
-                    ],
-                )
-            )
-        cond.append(
-            And(
-                [
-                    Condition(Column("profiler_id"), Op.EQ, profiler_id),
-                    Or(chunk_range_cond) if len(chunk_range_cond) >= 2 else chunk_range_cond[0],
-                ]
-            )
-        )
-    return [Or(cond)] if len(cond) >= 2 else cond
-
-
-def get_chunks_from_spans_metadata(
-    organization_id: int,
-    project_id: int,
-    spans: dict[str, list[IntervalMetadata]],
-) -> list[dict[str, Any]]:
-    query = Query(
-        match=Storage(StorageKey.ProfileChunks.value),
-        select=[
-            Column("profiler_id"),
-            Column("chunk_id"),
-        ],
-        where=[Condition(Column("project_id"), Op.EQ, project_id)]
-        + get_chunk_snuba_conditions_from_spans_metadata(spans),
-        limit=Limit(100),
-    )
-    request = Request(
-        dataset=Dataset.Profiles.value,
-        app_id="default",
-        query=query,
-        tenant_ids={
-            "referrer": Referrer.API_PROFILING_FLAMEGRAPH_CHUNKS_FROM_SPANS.value,
-            "organization_id": organization_id,
-        },
-    )
-    data = raw_snql_query(
-        request,
-        referrer=Referrer.API_PROFILING_FLAMEGRAPH_CHUNKS_FROM_SPANS.value,
-    )["data"]
-    chunks = []
-    for row in data:
-        intervals = [
-            {
-                "start": str(int(datetime.fromisoformat(el["start"]).timestamp() * 1e9)),
-                "end": str(int(datetime.fromisoformat(el["end"]).timestamp() * 1e9)),
-                "active_thread_id": el["active_thread_id"],
-            }
-            for el in spans[row["profiler_id"]]
-        ]
-        chunks.append(
-            {
-                "profiler_id": row["profiler_id"],
-                "chunk_id": row["chunk_id"],
-                "span_intervals": intervals,
-            }
-        )
-    return chunks
+from sentry.utils.snuba import bulk_snuba_queries
 
 
 class TransactionProfileCandidate(TypedDict):
@@ -295,7 +58,7 @@ class ProfilerMeta:
     thread_id: str
     start: float
     end: float
-    transaction_id: str
+    transaction_id: str | None = None
 
     def as_condition(self) -> Condition:
         return And(
@@ -341,14 +104,13 @@ def get_profile_candidates(self) -> ProfileCandidates:
         raise NotImplementedError
 
     def get_profile_candidates_from_functions(self) -> ProfileCandidates:
-        # TODO: continuous profiles support
         max_profiles = options.get("profiling.flamegraph.profile-set.size")
 
         builder = ProfileFunctionsQueryBuilder(
             dataset=Dataset.Functions,
             params={},
             snuba_params=self.snuba_params,
-            selected_columns=["project.id", "timestamp", "unique_examples()"],
+            selected_columns=["project.id", "timestamp", "all_examples()"],
             query=self.query,
             limit=max_profiles,
             config=QueryBuilderConfig(
@@ -365,49 +127,58 @@ def get_profile_candidates_from_functions(self) -> ProfileCandidates:
         results = builder.process_results(results)
 
         transaction_profile_candidates: list[TransactionProfileCandidate] = []
+        profiler_metas: list[ProfilerMeta] = []
 
         for row in results["data"]:
             project = row["project.id"]
-            for example in row["unique_examples()"]:
+            for example in row["all_examples()"]:
                 if len(transaction_profile_candidates) > max_profiles:
                     break
-                transaction_profile_candidates.append(
-                    {
-                        "project_id": project,
-                        "profile_id": example,
-                    }
-                )
+
+                if "profile_id" in example:
+                    transaction_profile_candidates.append(
+                        {
+                            "project_id": project,
+                            "profile_id": example["profile_id"],
+                        }
+                    )
+                elif "profiler_id" in example:
+                    profiler_metas.append(
+                        ProfilerMeta(
+                            project_id=project,
+                            profiler_id=example["profiler_id"],
+                            thread_id=example["thread_id"],
+                            start=example["start"],
+                            end=example["end"],
+                        )
+                    )
+            else:
+                # Will go to break if the inner loop breaks
+                continue
+            break
+
+        max_continuous_profile_candidates = max(
+            max_profiles - len(transaction_profile_candidates), 0
+        )
 
         return {
             "transaction": transaction_profile_candidates,
-            "continuous": [],
+            "continuous": self.get_chunks_for_profilers(
+                profiler_metas,
+                max_continuous_profile_candidates,
+            ),
         }
 
     def get_profile_candidates_from_transactions(self) -> ProfileCandidates:
-        builder = self.get_transactions_based_candidate_query(query=self.query)
+        max_profiles = options.get("profiling.flamegraph.profile-set.size")
+
+        builder = self.get_transactions_based_candidate_query(query=self.query, limit=max_profiles)
 
         results = builder.run_query(
             Referrer.API_PROFILING_PROFILE_FLAMEGRAPH_TRANSACTION_CANDIDATES.value,
         )
         results = builder.process_results(results)
 
-        continuous_profile_candidates: list[ContinuousProfileCandidate] = (
-            self.get_chunks_for_profilers(
-                [
-                    ProfilerMeta(
-                        project_id=row["project.id"],
-                        profiler_id=row["profiler.id"],
-                        thread_id=row["thread.id"],
-                        start=row["precise.start_ts"],
-                        end=row["precise.finish_ts"],
-                        transaction_id=row["id"],
-                    )
-                    for row in results["data"]
-                    if row["profiler.id"] is not None and row["thread.id"]
-                ]
-            )
-        )
-
         transaction_profile_candidates: list[TransactionProfileCandidate] = [
             {
                 "project_id": row["project.id"],
@@ -417,14 +188,32 @@ def get_profile_candidates_from_transactions(self) -> ProfileCandidates:
             if row["profile.id"] is not None
         ]
 
+        max_continuous_profile_candidates = max(
+            max_profiles - len(transaction_profile_candidates), 0
+        )
+
         return {
             "transaction": transaction_profile_candidates,
-            "continuous": continuous_profile_candidates,
+            "continuous": self.get_chunks_for_profilers(
+                [
+                    ProfilerMeta(
+                        project_id=row["project.id"],
+                        profiler_id=row["profiler.id"],
+                        thread_id=row["thread.id"],
+                        start=row["precise.start_ts"],
+                        end=row["precise.finish_ts"],
+                        transaction_id=row["id"],
+                    )
+                    for row in results["data"]
+                    if row["profiler.id"] is not None and row["thread.id"]
+                ],
+                max_continuous_profile_candidates,
+            ),
         }
 
-    def get_transactions_based_candidate_query(self, query: str | None) -> DiscoverQueryBuilder:
-        max_profiles = options.get("profiling.flamegraph.profile-set.size")
-
+    def get_transactions_based_candidate_query(
+        self, query: str | None, limit: int
+    ) -> DiscoverQueryBuilder:
         builder = DiscoverQueryBuilder(
             dataset=Dataset.Discover,
             params={},
@@ -441,7 +230,7 @@ def get_transactions_based_candidate_query(self, query: str | None) -> DiscoverQ
             ],
             query=query,
             orderby=["-timestamp"],
-            limit=max_profiles,
+            limit=limit,
             config=QueryBuilderConfig(
                 transform_alias_to_input_format=True,
             ),
@@ -470,7 +259,7 @@ def get_transactions_based_candidate_query(self, query: str | None) -> DiscoverQ
         return builder
 
     def get_chunks_for_profilers(
-        self, profiler_metas: list[ProfilerMeta]
+        self, profiler_metas: list[ProfilerMeta], limit: int
     ) -> list[ContinuousProfileCandidate]:
         if len(profiler_metas) == 0:
             return []
@@ -499,17 +288,30 @@ def get_chunks_for_profilers(
                     if start > profiler_meta.end or end < profiler_meta.start:
                         continue
 
-                    continuous_profile_candidates.append(
-                        {
-                            "project_id": profiler_meta.project_id,
-                            "profiler_id": profiler_meta.profiler_id,
-                            "chunk_id": row["chunk_id"],
-                            "thread_id": profiler_meta.thread_id,
-                            "start": str(int(profiler_meta.start * 1.0e9)),
-                            "end": str(int(profiler_meta.end * 1.0e9)),
-                            "transaction_id": profiler_meta.transaction_id,
-                        }
-                    )
+                    if len(continuous_profile_candidates) > limit:
+                        break
+
+                    candidate: ContinuousProfileCandidate = {
+                        "project_id": profiler_meta.project_id,
+                        "profiler_id": profiler_meta.profiler_id,
+                        "chunk_id": row["chunk_id"],
+                        "thread_id": profiler_meta.thread_id,
+                        "start": str(int(profiler_meta.start * 1e9)),
+                        "end": str(int(profiler_meta.end * 1e9)),
+                    }
+
+                    if profiler_meta.transaction_id is not None:
+                        candidate["transaction_id"] = profiler_meta.transaction_id
+
+                    continuous_profile_candidates.append(candidate)
+                else:
+                    # Will go to break if the inner loop breaks
+                    continue
+                break
+            else:
+                # Will go to break if the inner loop breaks
+                continue
+            break
 
         return continuous_profile_candidates
 
@@ -594,7 +396,9 @@ def get_profile_candidates_from_profiles(self) -> ProfileCandidates:
 
         referrer = Referrer.API_PROFILING_PROFILE_FLAMEGRAPH_PROFILE_CANDIDATES.value
 
-        transaction_profiles_builder = self.get_transactions_based_candidate_query(query=None)
+        transaction_profiles_builder = self.get_transactions_based_candidate_query(
+            query=None, limit=max_profiles
+        )
 
         project_condition = Condition(
             Column("project_id"),
@@ -656,6 +460,10 @@ def get_profile_candidates_from_profiles(self) -> ProfileCandidates:
             if row["profile.id"] is not None
         ]
 
+        max_continuous_profile_candidates = max(
+            max_profiles - len(transaction_profile_candidates), 0
+        )
+
         profiler_metas = [
             ProfilerMeta(
                 project_id=row["project.id"],
@@ -674,7 +482,9 @@ def get_profile_candidates_from_profiles(self) -> ProfileCandidates:
         # If there are continuous profiles attached to transactions, we prefer those as
         # the active thread id gives us more user friendly flamegraphs than without.
         if profiler_metas:
-            continuous_profile_candidates = self.get_chunks_for_profilers(profiler_metas)
+            continuous_profile_candidates = self.get_chunks_for_profilers(
+                profiler_metas, max_continuous_profile_candidates
+            )
 
         # If we still don't have any continuous profile candidates, we'll fall back to
         # directly using the continuous profiling data
@@ -689,7 +499,7 @@ def get_profile_candidates_from_profiles(self) -> ProfileCandidates:
                     ),
                     "end": str(int(datetime.fromisoformat(row["end_timestamp"]).timestamp() * 1e9)),
                 }
-                for row in continuous_profile_results["data"]
+                for row in continuous_profile_results["data"][:max_continuous_profile_candidates]
             ]
 
         return {
diff --git a/src/sentry/profiles/task.py b/src/sentry/profiles/task.py
index 254d5f5555ec36..71cc3c98db3bf2 100644
--- a/src/sentry/profiles/task.py
+++ b/src/sentry/profiles/task.py
@@ -179,9 +179,7 @@ def process_profile_task(
         except Exception as e:
             sentry_sdk.capture_exception(e)
 
-    if options.get("profiling.stack_trace_rules.enabled") and project.id in options.get(
-        "profiling.stack_trace_rules.allowed_project_ids"
-    ):
+    if options.get("profiling.stack_trace_rules.enabled"):
         try:
             with metrics.timer("process_profile.apply_stack_trace_rules"):
                 rules_config = project.get_option("sentry:grouping_enhancements")
@@ -205,22 +203,15 @@ def process_profile_task(
             except Exception as e:
                 sentry_sdk.capture_exception(e)
             if "profiler_id" not in profile:
-                if options.get("profiling.emit_outcomes_in_profiling_consumer.enabled"):
-                    _track_outcome(
-                        profile=profile,
-                        project=project,
-                        outcome=Outcome.ACCEPTED,
-                        categories=[DataCategory.PROFILE, DataCategory.PROFILE_INDEXED],
-                    )
-                else:
-                    _track_outcome_legacy(
-                        profile=profile, project=project, outcome=Outcome.ACCEPTED
-                    )
+                _track_outcome(
+                    profile=profile,
+                    project=project,
+                    outcome=Outcome.ACCEPTED,
+                    categories=[DataCategory.PROFILE, DataCategory.PROFILE_INDEXED],
+                )
+
     else:
-        if (
-            options.get("profiling.emit_outcomes_in_profiling_consumer.enabled")
-            and "profiler_id" not in profile
-        ):
+        if "profiler_id" not in profile:
             _track_outcome(
                 profile=profile,
                 project=project,
@@ -506,6 +497,7 @@ def symbolicate(
 ) -> Any:
     if platform in SHOULD_SYMBOLICATE_JS:
         return symbolicator.process_js(
+            platform=platform,
             stacktraces=stacktraces,
             modules=modules,
             release=profile.get("release"),
@@ -514,6 +506,7 @@ def symbolicate(
         )
     elif platform == "android":
         return symbolicator.process_jvm(
+            platform=platform,
             exceptions=[],
             stacktraces=stacktraces,
             modules=modules,
@@ -522,7 +515,7 @@ def symbolicate(
             classes=[],
         )
     return symbolicator.process_payload(
-        stacktraces=stacktraces, modules=modules, apply_source_context=False
+        platform=platform, stacktraces=stacktraces, modules=modules, apply_source_context=False
     )
 
 
@@ -916,26 +909,6 @@ def get_data_category(profile: Profile) -> DataCategory:
     return DataCategory.PROFILE_INDEXED
 
 
-@metrics.wraps("process_profile.track_outcome")
-def _track_outcome_legacy(
-    profile: Profile,
-    project: Project,
-    outcome: Outcome,
-    reason: str | None = None,
-) -> None:
-    track_outcome(
-        org_id=project.organization_id,
-        project_id=project.id,
-        key_id=None,
-        outcome=outcome,
-        reason=reason,
-        timestamp=datetime.now(timezone.utc),
-        event_id=get_event_id(profile),
-        category=get_data_category(profile),
-        quantity=1,
-    )
-
-
 @metrics.wraps("process_profile.track_outcome")
 def _track_outcome(
     profile: Profile,
@@ -960,28 +933,20 @@ def _track_outcome(
 
 
 def _track_failed_outcome(profile: Profile, project: Project, reason: str) -> None:
-    if options.get("profiling.emit_outcomes_in_profiling_consumer.enabled"):
-        categories = []
-        if "profiler_id" not in profile:
-            categories.append(DataCategory.PROFILE)
-            if profile.get("sampled"):
-                categories.append(DataCategory.PROFILE_INDEXED)
-        else:
-            categories.append(DataCategory.PROFILE_CHUNK)
-        _track_outcome(
-            profile=profile,
-            project=project,
-            outcome=Outcome.INVALID,
-            categories=categories,
-            reason=reason,
-        )
+    categories = []
+    if "profiler_id" not in profile:
+        categories.append(DataCategory.PROFILE)
+        if profile.get("sampled"):
+            categories.append(DataCategory.PROFILE_INDEXED)
     else:
-        _track_outcome_legacy(
-            profile=profile,
-            project=project,
-            outcome=Outcome.INVALID,
-            reason=reason,
-        )
+        categories.append(DataCategory.PROFILE_CHUNK)
+    _track_outcome(
+        profile=profile,
+        project=project,
+        outcome=Outcome.INVALID,
+        categories=categories,
+        reason=reason,
+    )
 
 
 @metrics.wraps("process_profile.insert_vroom_profile")
diff --git a/src/sentry/projects/services/project/impl.py b/src/sentry/projects/services/project/impl.py
index b5d73ae6e28153..e935baa96ed331 100644
--- a/src/sentry/projects/services/project/impl.py
+++ b/src/sentry/projects/services/project/impl.py
@@ -2,6 +2,7 @@
 
 from django.db import router, transaction
 
+from sentry.api.helpers.default_symbol_sources import set_default_symbol_sources
 from sentry.api.serializers import ProjectSerializer
 from sentry.auth.services.auth import AuthenticationContext
 from sentry.constants import ObjectStatus
@@ -126,6 +127,8 @@ def create_project_for_organization(
                 if team:
                     project.add_team(team)
 
+            set_default_symbol_sources(project)
+
             project_created.send(
                 project=project,
                 default_rules=True,
diff --git a/src/sentry/receivers/onboarding.py b/src/sentry/receivers/onboarding.py
index 9caa9c85bc52f6..97d8976ebcba98 100644
--- a/src/sentry/receivers/onboarding.py
+++ b/src/sentry/receivers/onboarding.py
@@ -104,7 +104,13 @@ def record_new_project(project, user=None, user_id=None, **kwargs):
             organization_id=project.organization_id,
             task=OnboardingTask.SECOND_PLATFORM,
             user_id=user_id,
-            status=OnboardingTaskStatus.PENDING,
+            status=(
+                OnboardingTaskStatus.COMPLETE
+                if features.has(
+                    "organizations:quick-start-updates", project.organization, actor=user
+                )
+                else OnboardingTaskStatus.PENDING
+            ),
             project_id=project.id,
         )
 
@@ -131,7 +137,9 @@ def record_first_event(project, event, **kwargs):
     )
 
     try:
-        user: RpcUser = Organization.objects.get(id=project.organization_id).get_default_owner()
+        user: RpcUser = Organization.objects.get_from_cache(
+            id=project.organization_id
+        ).get_default_owner()
     except IndexError:
         logger.warning(
             "Cannot record first event for organization (%s) due to missing owners",
@@ -255,7 +263,16 @@ def record_first_replay(project, **kwargs):
             platform=project.platform,
         )
         logger.info("record_first_replay_analytics_end")
-        try_mark_onboarding_complete(project.organization_id)
+        # TODO(Telemetry): Remove this once we remove the feature flag 'quick-start-updates'
+        try:
+            user: RpcUser = project.organization.get_default_owner()
+        except IndexError:
+            logger.warning(
+                "Cannot record first replay for organization (%s) due to missing owners",
+                project.organization_id,
+            )
+            return
+        try_mark_onboarding_complete(project.organization_id, user)
 
 
 @first_feedback_received.connect(weak=False)
@@ -402,11 +419,22 @@ def record_member_joined(organization_id: int, organization_member_id: int, **kw
         },
     )
     if created or rows_affected:
-        try_mark_onboarding_complete(organization_id)
+        # TODO(Telemetry): Remove this once we remove the feature flag 'quick-start-updates'
+        try:
+            user: RpcUser = Organization.objects.get_from_cache(
+                id=organization_id
+            ).get_default_owner()
+        except IndexError:
+            logger.warning(
+                "Cannot record member joined an organization (%s) due to missing owners",
+                organization_id,
+            )
+            return
+        try_mark_onboarding_complete(organization_id, user)
 
 
 def record_release_received(project, event, **kwargs):
-    if not event.get_tag("sentry:release"):
+    if not event.data.get("release"):
         return
 
     success = OrganizationOnboardingTask.objects.record(
@@ -417,8 +445,9 @@ def record_release_received(project, event, **kwargs):
     )
     if success:
         organization = Organization.objects.get_from_cache(id=project.organization_id)
-        owner_id = organization.default_owner_id
-        if not owner_id:
+        try:
+            owner: RpcUser = organization.get_default_owner()
+        except IndexError:
             logger.warning(
                 "Cannot record release received for organization (%s) due to missing owners",
                 project.organization_id,
@@ -427,11 +456,11 @@ def record_release_received(project, event, **kwargs):
 
         analytics.record(
             "first_release_tag.sent",
-            user_id=owner_id,
+            user_id=owner.id,
             project_id=project.id,
             organization_id=project.organization_id,
         )
-        try_mark_onboarding_complete(project.organization_id)
+        try_mark_onboarding_complete(project.organization_id, owner)
 
 
 event_processed.connect(record_release_received, weak=False)
@@ -454,8 +483,9 @@ def record_user_context_received(project, event, **kwargs):
         )
         if success:
             organization = Organization.objects.get_from_cache(id=project.organization_id)
-            owner_id = organization.default_owner_id
-            if not owner_id:
+            try:
+                owner: RpcUser = organization.get_default_owner()
+            except IndexError:
                 logger.warning(
                     "Cannot record user context received for organization (%s) due to missing owners",
                     project.organization_id,
@@ -464,11 +494,12 @@ def record_user_context_received(project, event, **kwargs):
 
             analytics.record(
                 "first_user_context.sent",
-                user_id=owner_id,
+                user_id=owner.id,
                 organization_id=project.organization_id,
                 project_id=project.id,
             )
-            try_mark_onboarding_complete(project.organization_id)
+
+            try_mark_onboarding_complete(project.organization_id, owner)
 
 
 event_processed.connect(record_user_context_received, weak=False)
@@ -525,8 +556,9 @@ def record_sourcemaps_received(project, event, **kwargs):
     )
     if success:
         organization = Organization.objects.get_from_cache(id=project.organization_id)
-        owner_id = organization.default_owner_id
-        if not owner_id:
+        try:
+            owner: RpcUser = organization.get_default_owner()
+        except IndexError:
             logger.warning(
                 "Cannot record sourcemaps received for organization (%s) due to missing owners",
                 project.organization_id,
@@ -534,14 +566,14 @@ def record_sourcemaps_received(project, event, **kwargs):
             return
         analytics.record(
             "first_sourcemaps.sent",
-            user_id=owner_id,
+            user_id=owner.id,
             organization_id=project.organization_id,
             project_id=project.id,
             platform=event.platform,
             project_platform=project.platform,
             url=dict(event.tags).get("url", None),
         )
-        try_mark_onboarding_complete(project.organization_id)
+        try_mark_onboarding_complete(project.organization_id, owner)
 
 
 @event_processed.connect(weak=False)
@@ -596,7 +628,7 @@ def record_plugin_enabled(plugin, project, user, **kwargs):
         data={"plugin": plugin.slug},
     )
     if success:
-        try_mark_onboarding_complete(project.organization_id)
+        try_mark_onboarding_complete(project.organization_id, user)
 
     analytics.record(
         "plugin.enabled",
@@ -624,7 +656,7 @@ def record_alert_rule_created(user, project: Project, rule_type: str, **kwargs):
     )
 
     if rows_affected or created:
-        try_mark_onboarding_complete(project.organization_id)
+        try_mark_onboarding_complete(project.organization_id, user)
 
 
 @issue_tracker_used.connect(weak=False)
@@ -643,7 +675,7 @@ def record_issue_tracker_used(plugin, project, user, **kwargs):
     )
 
     if rows_affected or created:
-        try_mark_onboarding_complete(project.organization_id)
+        try_mark_onboarding_complete(project.organization_id, user)
 
     if user and user.is_authenticated:
         user_id = default_user_id = user.id
@@ -678,9 +710,17 @@ def record_integration_added(
     if integration is None:
         return
 
-    organization = Organization.objects.get(id=organization_id)
+    organization = Organization.objects.get_from_cache(id=organization_id)
+    try:
+        user: RpcUser = organization.get_default_owner()
+    except IndexError:
+        logger.warning(
+            "Cannot record first integration for organization (%s) due to missing owners",
+            organization_id,
+        )
+        return
 
-    if features.has("organizations:quick-start-updates", organization):
+    if features.has("organizations:quick-start-updates", organization, actor=user):
         integration_types = get_integration_types(integration.provider)
 
         task_mapping = {
diff --git a/src/sentry/receivers/sentry_apps.py b/src/sentry/receivers/sentry_apps.py
index 5a46a0878eeea3..2db122bc92991d 100644
--- a/src/sentry/receivers/sentry_apps.py
+++ b/src/sentry/receivers/sentry_apps.py
@@ -152,7 +152,7 @@ def send_workflow_webhooks(
 def installations_to_notify(
     organization: Organization, resource_type: str
 ) -> list[RpcSentryAppInstallation]:
-    installations = app_service.get_installed_for_organization(organization_id=organization.id)
+    installations = app_service.installations_for_organization(organization_id=organization.id)
     # All issue webhooks are under one subscription, so if an intallation is subscribed to any issue
     # events it should get notified for all the issue events
     # TODO: Refactor sentry_app model so it doesn't store event, instead it stores subscription
diff --git a/src/sentry/remote_subscriptions/migrations/0003_drop_remote_subscription.py b/src/sentry/remote_subscriptions/migrations/0003_drop_remote_subscription.py
index 650fd61c8b7e04..32b828597f44fa 100644
--- a/src/sentry/remote_subscriptions/migrations/0003_drop_remote_subscription.py
+++ b/src/sentry/remote_subscriptions/migrations/0003_drop_remote_subscription.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("remote_subscriptions", "0002_remove_separate_remote_subscription"),
         ("uptime", "0003_drop_remote_subscription"),
diff --git a/src/sentry/replays/lib/query.py b/src/sentry/replays/lib/query.py
index 57b041c4689845..ae57c15a3f795c 100644
--- a/src/sentry/replays/lib/query.py
+++ b/src/sentry/replays/lib/query.py
@@ -1,503 +1,10 @@
 """Dynamic query parsing library."""
 
 import uuid
-from typing import Any
 
-from rest_framework.exceptions import ParseError
-from snuba_sdk import Column, Condition, Function, Identifier, Lambda, Op
+from snuba_sdk import Column, Condition, Function, Identifier, Lambda
 from snuba_sdk.conditions import And, Or
 from snuba_sdk.expressions import Expression
-from snuba_sdk.orderby import Direction, OrderBy
-
-from sentry.api.event_search import ParenExpression, SearchFilter
-from sentry.replays.lib.selector.parse import QueryType, parse_selector
-from sentry.replays.lib.selector.query import union_find
-
-OPERATOR_MAP = {
-    "=": Op.EQ,
-    "!=": Op.NEQ,
-    ">": Op.GT,
-    ">=": Op.GTE,
-    "<": Op.LT,
-    "<=": Op.LTE,
-    "IN": Op.IN,
-    "NOT IN": Op.NOT_IN,
-}
-
-
-class Field:
-    def __init__(
-        self,
-        name: str | None = None,
-        field_alias: str | None = None,
-        query_alias: str | None = None,
-        is_filterable: bool = True,
-        is_sortable: bool = True,
-        is_uuid: bool = False,
-        operators: list | None = None,
-        validators: list | None = None,
-    ) -> None:
-        self.attribute_name = None
-        self.field_alias = field_alias or name
-        self.query_alias = query_alias or name
-        self.is_filterable = is_filterable
-        self.is_sortable = is_sortable
-        self.is_uuid = is_uuid
-        self.operators = operators or self._operators
-        self.validators = validators or []
-
-    def deserialize_operator(self, operator: str) -> tuple[Any, list[str]]:
-        op = OPERATOR_MAP.get(operator)
-        if op is None:
-            return None, ["Operator not found."]
-        elif op not in self.operators:
-            return None, ["Operator not permitted."]
-        else:
-            return op, []
-
-    def deserialize_values(self, values: list[str]) -> tuple[list[Any], list[str]]:
-        parsed_values = []
-        for value in values:
-            parsed_value, errors = self.deserialize_value(value)
-            if errors:
-                return None, errors
-
-            parsed_values.append(parsed_value)
-
-        return parsed_values, []
-
-    def deserialize_value(self, value: list[str] | str) -> tuple[Any, list[str]]:
-        if isinstance(value, list):
-            return self.deserialize_values(value)
-
-        try:
-            if self._python_type:
-                typed_value = self._python_type(value)
-            else:
-                typed_value = value
-        except ValueError:
-            return None, ["Invalid value specified."]
-
-        for validator in self.validators:
-            error = validator(typed_value)
-            if error:
-                return None, [error]
-
-        return typed_value, []
-
-    def as_condition(
-        self,
-        field_alias: str,
-        operator: Op,
-        value: list[str] | str,
-        is_wildcard: bool = False,
-    ) -> Condition:
-        return Condition(Column(self.query_alias or self.attribute_name), operator, value)
-
-
-class UUIDField(Field):
-    """
-    as our minimum supported clickhouse version is 20.3, we don't have
-    isUUIDOrZero function, so we must validate the uuid before supplying to clickhouse.
-    """
-
-    _operators = [Op.EQ, Op.NEQ, Op.IN, Op.NOT_IN]
-    _python_type = str
-
-    def as_condition(
-        self, field_alias: str, operator: Op, value: list[str] | str, is_wildcard: bool
-    ) -> Condition:
-        if isinstance(value, list):
-            uuids = _transform_uuids(value)
-            if uuids is None:
-                return Condition(Function("identity", parameters=[1]), Op.EQ, 2)
-            value = uuids
-        else:
-            uuids = _transform_uuids([value])
-            if uuids is None:
-                return Condition(Function("identity", parameters=[1]), Op.EQ, 2)
-
-            value = uuids[0]
-
-        return super().as_condition(field_alias, operator, value)
-
-
-class IPAddress(Field):
-    _operators = [Op.EQ, Op.NEQ, Op.IN, Op.NOT_IN]
-    _python_type = str
-
-    def as_condition(
-        self,
-        field_alias: str,
-        operator: Op,
-        value: list[str] | str,
-        is_wildcard: bool = False,
-    ) -> Condition:
-        if isinstance(value, list):
-            value = [Function("toIPv4", parameters=[v]) for v in value]
-        else:
-            value = Function("toIPv4", parameters=[value])
-
-        return Condition(Column(self.query_alias or self.attribute_name), operator, value)
-
-
-class String(Field):
-    _operators = [Op.EQ, Op.NEQ, Op.IN, Op.NOT_IN]
-    _python_type = str
-
-    def as_condition(
-        self, field_alias: str, operator: Op, value: list[str] | str, is_wildcard: bool
-    ) -> Condition:
-        if is_wildcard:
-            return Condition(
-                _wildcard_search_function(value, Column(self.query_alias or self.attribute_name)),
-                operator,
-                1,
-            )
-
-        return super().as_condition(field_alias, operator, value, is_wildcard)
-
-
-class Selector(Field):
-    _operators = [Op.EQ, Op.NEQ]
-    _python_type = str
-
-    def as_condition(
-        self, field_alias: str, operator: Op, value: list[str] | str, is_wildcard: bool
-    ) -> Condition:
-        # This list of queries implies an `OR` operation between each item in the set. To `AND`
-        # selector queries apply them separately.
-        queries: list[QueryType] = parse_selector(value)
-
-        # A valid selector will always return at least one query condition. If this did not occur
-        # then the selector was not well-formed. We return an empty resultset.
-        if len(queries) == 0:
-            return Condition(Function("identity", parameters=[1]), Op.EQ, 2)
-
-        # Conditions are pre-made and intended for application in the HAVING clause.
-        conditions: list[Condition] = []
-
-        for query in queries:
-            columns, values = [], []
-
-            if query.alt:
-                columns.append(Column("click_alt"))
-                values.append(query.alt)
-            if query.aria_label:
-                columns.append(Column("click_aria_label"))
-                values.append(query.aria_label)
-            if query.classes:
-                columns.append(Column("click_classes"))
-                values.append(query.classes)
-            if query.id:
-                columns.append(Column("click_id"))
-                values.append(query.id)
-            if query.role:
-                columns.append(Column("click_role"))
-                values.append(query.role)
-            if query.tag:
-                columns.append(Column("click_tag"))
-                values.append(query.tag)
-            if query.testid:
-                columns.append(Column("click_testid"))
-                values.append(query.testid)
-            if query.title:
-                columns.append(Column("click_title"))
-                values.append(query.title)
-            if query.component_name:
-                columns.append(Column("click_component_name"))
-                values.append(query.component_name)
-
-            if columns and values:
-                conditions.append(Condition(union_find(columns, values), operator, 1))
-
-        if len(conditions) == 1:
-            return conditions[0]
-        else:
-            return Or(conditions)
-
-
-class Number(Field):
-    _operators = [Op.EQ, Op.NEQ, Op.GT, Op.GTE, Op.LT, Op.LTE, Op.IN, Op.NOT_IN]
-    _python_type = int
-
-
-class ListField(Field):
-    _operators = [Op.EQ, Op.NEQ, Op.IN, Op.NOT_IN]
-    _python_type = None
-
-    def as_condition(
-        self, _: str, operator: Op, value: list[str] | str, is_wildcard: bool = False
-    ) -> Condition:
-        if operator in [Op.EQ, Op.NEQ]:
-            if is_wildcard:
-                # wildcard search isn't supported with the IN operator
-                return self._wildcard_condition(operator, value)
-
-            return self._has_condition(operator, value)
-        else:
-            return self._has_any_condition(operator, value)
-
-    def _wildcard_condition(self, operator: Op, value: str):
-        return Condition(
-            Function(
-                "arrayExists",
-                parameters=[
-                    Lambda(
-                        ["list_element"],
-                        _wildcard_search_function(value, Identifier("list_element")),
-                    ),
-                    Column(self.query_alias or self.attribute_name),
-                ],
-            ),
-            Op.EQ,
-            1 if operator == Op.EQ else 0,
-        )
-
-    def _has_condition(
-        self,
-        operator: Op,
-        value: list[str] | str,
-    ) -> Condition:
-        if isinstance(value, list):
-            return self._has_any_condition(Op.IN if operator == Op.EQ else Op.NOT_IN, value)
-
-        if self.is_uuid:
-            # Client side UUID validation.  If this fails we use a condition which is always
-            # false.  E.g. 1 == 2.  We don't use toUUIDOrZero because our Clickhouse version does
-            # not support it.
-            uuids = _transform_uuids([value])
-            if uuids is None:
-                return Condition(Function("identity", parameters=[1]), Op.EQ, 2)
-
-            v = Function("toUUID", parameters=uuids)
-        else:
-            v = value
-
-        return Condition(
-            Function("has", parameters=[Column(self.query_alias or self.attribute_name), v]),
-            Op.EQ,
-            1 if operator == Op.EQ else 0,
-        )
-
-    def _has_any_condition(
-        self,
-        operator: Op,
-        values: list[str] | str,
-    ) -> Condition:
-        if not isinstance(values, list):
-            return self._has_condition(Op.EQ if operator == Op.IN else Op.NEQ, values)
-
-        if self.is_uuid:
-            # Client side UUID validation.  If this fails we use a condition which is always
-            # false.  E.g. 1 == 2.  We don't use toUUIDOrZero because our Clickhouse version does
-            # not support it.
-            uuids = _transform_uuids(values)
-            if uuids is None:
-                return Condition(Function("identity", parameters=[1]), Op.EQ, 2)
-
-            vs = [Function("toUUID", parameters=[uid]) for uid in uuids]
-        else:
-            vs = values
-
-        return Condition(
-            Function("hasAny", parameters=[Column(self.query_alias or self.attribute_name), vs]),
-            Op.EQ,
-            1 if operator == Op.IN else 0,
-        )
-
-
-class Tag(Field):
-    _operators = [Op.EQ, Op.NEQ, Op.IN, Op.NOT_IN]
-    _negation_map = [False, True, False, True]
-    _python_type = str
-
-    def __init__(self, tag_key_alias="tk", tag_value_alias="tv", **kwargs):
-        self.tag_key_alias = tag_key_alias
-        self.tag_value_alias = tag_value_alias
-        kwargs.pop("operators", None)
-        return super().__init__(**kwargs)
-
-    def deserialize_operator(self, operator: str) -> tuple[Op, list[str]]:
-        op = OPERATOR_MAP.get(operator)
-        if op is None:
-            return None, ["Operator not found."]
-        elif op not in self._operators:
-            return None, ["Operator not permitted."]
-        else:
-            return op, []
-
-    def as_condition(
-        self,
-        field_alias: str,
-        operator: Op,
-        value: list[str] | str,
-        is_wildcard: bool = False,
-    ) -> Condition:
-
-        if is_wildcard:
-            return self._filter_tag_by_wildcard_search(field_alias, value, operator)
-
-        return self._filter_tag_by_value(field_alias, value, operator)
-
-    def _filter_tag_by_wildcard_search(self, field_alias: str, value: str, operator: Op):
-        return Condition(
-            Function(
-                "arrayExists",
-                parameters=[
-                    Lambda(
-                        ["tag_value"], _wildcard_search_function(value, Identifier("tag_value"))
-                    ),
-                    all_values_for_tag_key(
-                        field_alias, Column(self.tag_key_alias), Column(self.tag_value_alias)
-                    ),
-                ],
-            ),
-            operator,
-            1,
-        )
-
-    def _filter_tag_by_value(self, key: str, values: list[str] | str, operator: Op) -> Condition:
-        """Helper function that allows filtering a tag by multiple values."""
-        expected = 0 if operator not in (Op.EQ, Op.IN) else 1
-        function = "hasAny" if isinstance(values, list) else "has"
-        return Condition(
-            Function(
-                function,
-                parameters=[
-                    all_values_for_tag_key(
-                        key, Column(self.tag_key_alias), Column(self.tag_value_alias)
-                    ),
-                    values,
-                ],
-            ),
-            Op.EQ,
-            expected,
-        )
-
-
-class InvalidField(Field):
-    _operators = [Op.EQ, Op.NEQ, Op.IN, Op.NOT_IN]
-    _python_type = str
-
-    def as_condition(
-        self, _: str, operator: Op, value: list[str] | str, is_wildcard: bool = False
-    ) -> Condition:
-        raise ParseError()
-
-    def _wildcard_condition(self, operator: Op, value: str):
-        raise ParseError()
-
-    def _has_condition(
-        self,
-        operator: Op,
-        value: list[str] | str,
-    ) -> Condition:
-        raise ParseError()
-
-    def _has_any_condition(
-        self,
-        operator: Op,
-        values: list[str] | str,
-    ) -> Condition:
-        raise ParseError()
-
-
-class QueryConfig:
-    def __init__(self, only: tuple[str] | None = None) -> None:
-        self.fields = {}
-        for field_name in only or self.__class__.__dict__:
-            field = getattr(self, field_name)
-            if isinstance(field, Field):
-                field.attribute_name = field_name
-                if field.field_alias:
-                    self.insert(field.field_alias, field)
-                else:
-                    self.insert(field_name, field)
-
-    def get(self, field_name: str, default=None) -> Field:
-        return self.fields.get(field_name, default)
-
-    def insert(self, field_name: str | None, value: Field) -> None:
-        if field_name is None:
-            return None
-        elif field_name in self.fields:
-            raise KeyError(f"Field already exists: {field_name}")
-        else:
-            self.fields[field_name] = value
-
-
-# Implementation.
-
-
-def generate_valid_conditions(
-    query: list[SearchFilter | ParenExpression | str], query_config: QueryConfig
-) -> list[Expression]:
-    """Convert search filters to snuba conditions."""
-    result: list[Expression] = []
-    look_back = None
-    for search_filter in query:
-        # SearchFilters are appended to the result set.  If they are top level filters they are
-        # implicitly And'ed in the WHERE/HAVING clause.
-        if isinstance(search_filter, SearchFilter):
-            condition = filter_to_condition(search_filter, query_config)
-            if look_back == "AND":
-                look_back = None
-                attempt_compressed_condition(result, condition, And)
-            elif look_back == "OR":
-                look_back = None
-                attempt_compressed_condition(result, condition, Or)
-            else:
-                result.append(condition)
-        # ParenExpressions are recursively computed.  If more than one condition is returned then
-        # those conditions are And'ed.
-        elif isinstance(search_filter, ParenExpression):
-            conditions = generate_valid_conditions(search_filter.children, query_config)
-            if len(conditions) < 2:
-                result.extend(conditions)
-            else:
-                result.append(And(conditions))
-        # String types are limited to AND and OR... I think?  In the case where its not a valid
-        # look-back it is implicitly ignored.
-        elif isinstance(search_filter, str):
-            look_back = search_filter
-
-    return result
-
-
-def filter_to_condition(search_filter: SearchFilter, query_config: QueryConfig) -> Condition:
-    """Coerce SearchFilter syntax to snuba Condition syntax."""
-    # Validate field exists and is filterable.
-    field_alias = search_filter.key.name
-    field = query_config.get(field_alias)
-    is_tag = field is None
-
-    if is_tag:
-        field = query_config.get("*")
-
-    if field is None:
-        raise ParseError(f"Invalid field specified: {field_alias}.")
-    if not field.is_filterable:
-        raise ParseError(f'"{field_alias}" is not filterable.')
-
-    # Validate strategy is correct.
-    query_operator = search_filter.operator
-    operator, errors = field.deserialize_operator(query_operator)
-    if errors:
-        raise ParseError(f"Invalid operator specified: {field_alias}.")
-
-    # Deserialize value to its correct type or error.
-    query_value = search_filter.value.value
-    value, errors = field.deserialize_value(query_value)
-    if errors:
-        raise ParseError(f"Invalid value specified: {field_alias}.")
-
-    is_wildcard = search_filter.value.is_wildcard()
-
-    if is_tag and field_alias.startswith("tags[") and field_alias.endswith("]"):
-        field_alias = field_alias[5:-1]
-
-    return field.as_condition(field_alias, operator, value, is_wildcard)
 
 
 def attempt_compressed_condition(
@@ -518,35 +25,6 @@ def attempt_compressed_condition(
         result.append(condition_type([result.pop(), condition]))
 
 
-def get_valid_sort_commands(
-    sort: str | None,
-    default: OrderBy,
-    query_config: QueryConfig,
-) -> list[OrderBy]:
-    if not sort:
-        return [default]
-
-    if sort.startswith("-"):
-        strategy = Direction.DESC
-        field_name = sort[1:]
-    else:
-        strategy = Direction.ASC
-        field_name = sort
-
-    field = query_config.get(field_name)
-    if not field:
-        raise ParseError(f"Invalid field specified: {field_name}.")
-
-    if isinstance(field, InvalidField):
-        raise ParseError("field can't be used to sort query")
-
-    else:
-        return [OrderBy(Column(field.query_alias or field.attribute_name), strategy)]
-
-
-# Tag filtering behavior.
-
-
 def all_values_for_tag_key(key: str, tag_key_column: Column, tag_value_column: Column) -> Function:
     return Function(
         "arrayFilter",
@@ -594,9 +72,6 @@ def _wildcard_search_function(value, identifier):
     )
 
 
-# Helpers
-
-
 def _transform_uuids(values: list[str]) -> list[str] | None:
     try:
         return [str(uuid.UUID(value)) for value in values]
diff --git a/src/sentry/rules/actions/integrations/create_ticket/utils.py b/src/sentry/rules/actions/integrations/create_ticket/utils.py
index 4d9476c8cb377c..67c2e826e802ce 100644
--- a/src/sentry/rules/actions/integrations/create_ticket/utils.py
+++ b/src/sentry/rules/actions/integrations/create_ticket/utils.py
@@ -9,9 +9,14 @@
 from sentry.eventstore.models import GroupEvent
 from sentry.integrations.base import IntegrationInstallation
 from sentry.integrations.models.external_issue import ExternalIssue
+from sentry.integrations.project_management.metrics import (
+    ProjectManagementActionType,
+    ProjectManagementEvent,
+)
 from sentry.integrations.services.integration.model import RpcIntegration
 from sentry.integrations.services.integration.service import integration_service
 from sentry.models.grouplink import GroupLink
+from sentry.shared_integrations.exceptions import IntegrationFormError
 from sentry.silo.base import region_silo_function
 from sentry.types.rules import RuleFuture
 from sentry.utils import metrics
@@ -114,27 +119,34 @@ def create_issue(event: GroupEvent, futures: Sequence[RuleFuture]) -> None:
                 },
             )
             return
-        try:
-            response = installation.create_issue(data)
-        except Exception as e:
-            logger.info(
-                "%s.rule_trigger.create_ticket.failure",
-                provider,
-                extra={
-                    "rule_id": rule_id,
-                    "provider": provider,
-                    "integration_id": integration.id,
-                    "error_message": str(e),
-                    "exception_type": type(e).__name__,
-                },
-            )
-            metrics.incr(
-                f"{provider}.rule_trigger.create_ticket.failure",
-                tags={
-                    "provider": provider,
-                },
-            )
 
-            raise
+        with ProjectManagementEvent(
+            action_type=ProjectManagementActionType.CREATE_EXTERNAL_ISSUE,
+            integration=integration,
+        ).capture() as lifecycle:
+            lifecycle.add_extra("provider", provider)
+            lifecycle.add_extra("integration_id", integration.id)
+            lifecycle.add_extra("rule_id", rule_id)
+
+            try:
+                response = installation.create_issue(data)
+            except Exception as e:
+                if isinstance(e, IntegrationFormError):
+                    # Most of the time, these aren't explicit failures, they're
+                    # some misconfiguration of an issue field - typically Jira.
+                    lifecycle.record_halt(str(e))
+                else:
+                    # Don't pass the full exception here, as it can contain a
+                    # massive request response along with its stacktrace
+                    lifecycle.record_failure(str(e))
+
+                metrics.incr(
+                    f"{provider}.rule_trigger.create_ticket.failure",
+                    tags={
+                        "provider": provider,
+                    },
+                )
+
+                raise
 
         create_link(integration, installation, event, response)
diff --git a/src/sentry/rules/conditions/event_attribute.py b/src/sentry/rules/conditions/event_attribute.py
index e5fb5699a1707b..0c630c418ead2f 100644
--- a/src/sentry/rules/conditions/event_attribute.py
+++ b/src/sentry/rules/conditions/event_attribute.py
@@ -63,8 +63,8 @@ def _handle(cls, path: list[str], event: GroupEvent) -> list[str]:
     "stacktrace.package": Columns.STACK_PACKAGE,
     "unreal.crashtype": Columns.UNREAL_CRASH_TYPE,
     "app.in_foreground": Columns.APP_IN_FOREGROUND,
-    "os.distribution.name": Columns.OS_DISTRIBUTION_NAME,
-    "os.distribution.version": Columns.OS_DISTRIBUTION_VERSION,
+    "os.distribution_name": Columns.OS_DISTRIBUTION_NAME,
+    "os.distribution_version": Columns.OS_DISTRIBUTION_VERSION,
 }
 
 
@@ -418,21 +418,14 @@ def _handle(cls, path: list[str], event: GroupEvent) -> list[str]:
 
 @attribute_registry.register("os")
 class OsAttributeHandler(AttributeHandler):
-    minimum_path_length = 3
+    minimum_path_length = 2
 
     @classmethod
     def _handle(cls, path: list[str], event: GroupEvent) -> list[str]:
-        if path[1] in ("distribution"):
-            if path[2] in ("name", "version"):
-                contexts = event.data.get("contexts", {})
-                os_context = contexts.get("os")
-                if os_context is None:
-                    os_context = {}
-
-                distribution = os_context.get(path[1])
-                if distribution is None:
-                    distribution = {}
-
-                return [distribution.get(path[2])]
-            return []
+        if path[1] in ("distribution_name", "distribution_version"):
+            contexts = event.data.get("contexts", {})
+            os_context = contexts.get("os")
+            if os_context is None:
+                os_context = {}
+            return [os_context.get(path[1])]
         return []
diff --git a/src/sentry/rules/processing/delayed_processing.py b/src/sentry/rules/processing/delayed_processing.py
index 67c01edcab890d..6e24c0226b5d3c 100644
--- a/src/sentry/rules/processing/delayed_processing.py
+++ b/src/sentry/rules/processing/delayed_processing.py
@@ -207,17 +207,17 @@ def bulk_fetch_events(event_ids: list[str], project_id: int) -> dict[str, Event]
 
 def parse_rulegroup_to_event_data(
     rulegroup_to_event_data: dict[str, str]
-) -> dict[tuple[str, str], dict[str, str]]:
+) -> dict[tuple[int, int], dict[str, str]]:
     parsed_rulegroup_to_event_data = {}
     for rule_group, instance_data in rulegroup_to_event_data.items():
         event_data = json.loads(instance_data)
         rule_id, group_id = rule_group.split(":")
-        parsed_rulegroup_to_event_data[(rule_id, group_id)] = event_data
+        parsed_rulegroup_to_event_data[(int(rule_id), int(group_id))] = event_data
     return parsed_rulegroup_to_event_data
 
 
 def build_group_to_groupevent(
-    parsed_rulegroup_to_event_data: dict[tuple[str, str], dict[str, str]],
+    parsed_rulegroup_to_event_data: dict[tuple[int, int], dict[str, str]],
     bulk_event_id_to_events: dict[str, Event],
     bulk_occurrence_id_to_occurrence: dict[str, IssueOccurrence],
     group_id_to_group: dict[int, Group],
@@ -258,7 +258,7 @@ def build_group_to_groupevent(
 
 
 def get_group_to_groupevent(
-    parsed_rulegroup_to_event_data: dict[tuple[str, str], dict[str, str]],
+    parsed_rulegroup_to_event_data: dict[tuple[int, int], dict[str, str]],
     project_id: int,
     group_ids: set[int],
 ) -> dict[Group, GroupEvent]:
@@ -413,7 +413,7 @@ def get_rules_to_fire(
 
 def fire_rules(
     rules_to_fire: DefaultDict[Rule, set[int]],
-    parsed_rulegroup_to_event_data: dict[tuple[str, str], dict[str, str]],
+    parsed_rulegroup_to_event_data: dict[tuple[int, int], dict[str, str]],
     alert_rules: list[Rule],
     project: Project,
 ) -> None:
diff --git a/src/sentry/runner/commands/devserver.py b/src/sentry/runner/commands/devserver.py
index ce55cc8a3e7902..5a2b9a947a8f4a 100644
--- a/src/sentry/runner/commands/devserver.py
+++ b/src/sentry/runner/commands/devserver.py
@@ -37,6 +37,7 @@
     "transactions-subscription-results",
     "generic-metrics-subscription-results",
     "metrics-subscription-results",
+    "eap-spans-subscription-results",
 ]
 
 
@@ -353,7 +354,10 @@ def devserver(
 
     # Create all topics if the Kafka eventstream is selected
     if kafka_consumers:
-        if "sentry_kafka" not in containers and "shared-kafka-kafka-1" not in containers:
+        kafka_container_name = (
+            "kafka-kafka-1" if os.environ.get("USE_NEW_DEVSERVICES") == "1" else "sentry_kafka"
+        )
+        if kafka_container_name not in containers:
             raise click.ClickException(
                 f"""
 Devserver is configured to start some kafka consumers, but Kafka
diff --git a/src/sentry/runner/commands/openai.py b/src/sentry/runner/commands/openai.py
deleted file mode 100644
index 2152d8c894d555..00000000000000
--- a/src/sentry/runner/commands/openai.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# The sentry utils json cannot pretty print
-import json  # noqa: S003
-from typing import IO
-
-import click
-
-
-@click.command("openai")
-@click.option("--event", type=click.File("r"))
-@click.option("--model", default="gpt-3.5-turbo")
-@click.option("--dump-prompt", is_flag=True)
-def openai(event: IO[str], model: str, dump_prompt: bool) -> None:
-    """
-    Runs the OpenAI assistent against a JSON event payload.
-    """
-    from sentry.runner import configure
-
-    configure()
-
-    from sentry.api.endpoints.event_ai_suggested_fix import describe_event_for_ai, suggest_fix
-
-    event_data = json.load(event)
-    if dump_prompt:
-        click.echo(json.dumps(describe_event_for_ai(event_data, model=model), indent=2))
-    else:
-        resp = suggest_fix(event_data, stream=True, model=model)
-        for chunk in resp:
-            click.echo(chunk, nl=False)
-        click.echo()
diff --git a/src/sentry/runner/commands/run.py b/src/sentry/runner/commands/run.py
index 1c17cbf8d85712..73814b5e4e77d6 100644
--- a/src/sentry/runner/commands/run.py
+++ b/src/sentry/runner/commands/run.py
@@ -237,6 +237,7 @@ def worker(ignore_unknown_queues: bool, **options: Any) -> None:
         run_worker(**options)
 
 
+@run.command()
 @click.option("--rpc-host", help="The hostname for the taskworker-rpc", default="127.0.0.1:50051")
 @click.option("--autoreload", is_flag=True, default=False, help="Enable autoreloading.")
 @click.option(
@@ -253,6 +254,53 @@ def taskworker(rpc_host: str, max_task_count: int, **options: Any) -> None:
         raise SystemExit(exitcode)
 
 
+@run.command()
+@log_options()
+@configuration
+@click.option(
+    "--repeat",
+    type=int,
+    help="Number of messages to send to the kafka topic",
+    default=1,
+    show_default=True,
+)
+@click.option(
+    "--kwargs",
+    type=str,
+    help="Task function keyword arguments",
+)
+@click.option(
+    "--args",
+    type=str,
+    help="Task function arguments",
+)
+@click.option(
+    "--task-function-path",
+    type=str,
+    help="The path to the function name of the task to execute",
+    required=True,
+)
+def taskbroker_send_tasks(
+    task_function_path: str,
+    args: str,
+    kwargs: str,
+    repeat: int,
+) -> None:
+    from sentry.utils.imports import import_string
+
+    try:
+        func = import_string(task_function_path)
+    except Exception as e:
+        click.echo(f"Error: {e}")
+        raise click.Abort()
+    task_args = [] if not args else eval(args)
+    task_kwargs = {} if not kwargs else eval(kwargs)
+
+    for _ in range(repeat):
+        func.delay(*task_args, **task_kwargs)
+    click.echo(message=f"Successfully sent {repeat} messages.")
+
+
 @run.command()
 @click.option(
     "--pidfile",
diff --git a/src/sentry/runner/main.py b/src/sentry/runner/main.py
index a24249045386f8..2c3517b94945ae 100644
--- a/src/sentry/runner/main.py
+++ b/src/sentry/runner/main.py
@@ -68,7 +68,6 @@ def cli(config: str) -> None:
         "sentry.runner.commands.performance.performance",
         "sentry.runner.commands.spans.spans",
         "sentry.runner.commands.spans.write_hashes",
-        "sentry.runner.commands.openai.openai",
         "sentry.runner.commands.llm.llm",
         "sentry.runner.commands.workstations.workstations",
     ),
diff --git a/src/sentry/search/eap/columns.py b/src/sentry/search/eap/columns.py
index 7664d981d5106c..58245dc36b872e 100644
--- a/src/sentry/search/eap/columns.py
+++ b/src/sentry/search/eap/columns.py
@@ -1,10 +1,13 @@
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any
+from datetime import datetime
+from typing import Any, Literal
 
+from dateutil.tz import tz
 from sentry_protos.snuba.v1.trace_item_attribute_pb2 import (
     AttributeAggregation,
     AttributeKey,
+    ExtrapolationMode,
     Function,
     VirtualColumnContext,
 )
@@ -16,16 +19,14 @@
 from sentry.utils.validators import is_event_id, is_span_id
 
 
-@dataclass(frozen=True)
-class ResolvedColumn:
+@dataclass(frozen=True, kw_only=True)
+class ResolvedAttribute:
     # The alias for this column
     public_alias: (
         str  # `p95() as foo` has the public alias `foo` and `p95()` has the public alias `p95()`
     )
-    # The internal rpc alias for this column
-    internal_name: str | Function.ValueType
     # The public type for this column
-    search_type: str
+    search_type: constants.SearchType
     # The internal rpc type for this column, optional as it can mostly be inferred from search_type
     internal_type: AttributeKey.Type.ValueType | None = None
     # Only for aggregates, we only support functions with 1 argument right now
@@ -34,6 +35,9 @@ class ResolvedColumn:
     processor: Callable[[Any], Any] | None = None
     # Validator to check if the value in a query is correct
     validator: Callable[[Any], bool] | None = None
+    # Indicates this attribute is a secondary alias for the attribute.
+    # It exists for compatibility or convenience reasons and should NOT be preferred.
+    secondary_alias: bool = False
 
     def process_column(self, value: Any) -> Any:
         """Given the value from results, return a processed value if a processor is defined otherwise return it"""
@@ -46,21 +50,6 @@ def validate(self, value: Any) -> None:
             if not self.validator(value):
                 raise InvalidSearchQuery(f"{value} is an invalid value for {self.public_alias}")
 
-    @property
-    def proto_definition(self) -> AttributeAggregation | AttributeKey:
-        """The definition of this function as needed by the RPC"""
-        if isinstance(self.internal_name, Function.ValueType):
-            return AttributeAggregation(
-                aggregate=self.internal_name,
-                key=self.argument,
-                label=self.public_alias,
-            )
-        else:
-            return AttributeKey(
-                name=self.internal_name,
-                type=self.proto_type,
-            )
-
     @property
     def proto_type(self) -> AttributeKey.Type.ValueType:
         """The proto's AttributeKey type for this column"""
@@ -69,20 +58,24 @@ def proto_type(self) -> AttributeKey.Type.ValueType:
         else:
             return constants.TYPE_MAP[self.search_type]
 
+
+@dataclass(frozen=True, kw_only=True)
+class ResolvedColumn(ResolvedAttribute):
+    # The internal rpc alias for this column
+    internal_name: str
+
     @property
-    def meta_type(self) -> str:
-        """This column's type for the meta response from the API"""
-        if self.search_type == "duration":
-            return "duration"
-        elif self.search_type == "number":
-            return "integer"
-        else:
-            return self.search_type
+    def proto_definition(self) -> AttributeKey:
+        """The definition of this function as needed by the RPC"""
+        return AttributeKey(
+            name=self.internal_name,
+            type=self.proto_type,
+        )
 
 
 @dataclass
 class ArgumentDefinition:
-    argument_types: list[str] | None = None
+    argument_types: list[constants.SearchType] | None = None
     # The public alias for the default arg, the SearchResolver will resolve this value
     default_arg: str | None = None
     # Whether this argument is completely ignored, used for `count()`
@@ -92,24 +85,74 @@ class ArgumentDefinition:
 @dataclass
 class FunctionDefinition:
     internal_function: Function.ValueType
-    # the search_type the argument should be
+    # The list of arguments for this function
     arguments: list[ArgumentDefinition]
-    # The public type for this column
-    search_type: str
+    # The search_type the argument should be the default type for this column
+    default_search_type: constants.SearchType
+    # Try to infer the search type from the function arguments
+    infer_search_type_from_arguments: bool = True
     # The internal rpc type for this function, optional as it can mostly be inferred from search_type
     internal_type: AttributeKey.Type.ValueType | None = None
     # Processor is the function run in the post process step to transform a row into the final result
     processor: Callable[[Any], Any] | None = None
+    # Whether to request extrapolation or not, should be true for all functions except for _sample functions for debugging
+    extrapolation: bool = True
 
     @property
     def required_arguments(self) -> list[ArgumentDefinition]:
         return [arg for arg in self.arguments if arg.default_arg is None and not arg.ignored]
 
 
+@dataclass(frozen=True, kw_only=True)
+class ResolvedFunction(ResolvedAttribute):
+    # The internal rpc alias for this column
+    internal_name: Function.ValueType
+    # Whether to enable extrapolation
+    extrapolation: bool = True
+
+    @property
+    def proto_definition(self) -> AttributeAggregation:
+        """The definition of this function as needed by the RPC"""
+        return AttributeAggregation(
+            aggregate=self.internal_name,
+            key=self.argument,
+            label=self.public_alias,
+            extrapolation_mode=(
+                ExtrapolationMode.EXTRAPOLATION_MODE_SAMPLE_WEIGHTED
+                if self.extrapolation
+                else ExtrapolationMode.EXTRAPOLATION_MODE_NONE
+            ),
+        )
+
+    @property
+    def proto_type(self) -> AttributeKey.Type.ValueType:
+        """The rpc always returns functions as floats, especially count() even though it should be an integer
+
+        see: https://www.notion.so/sentry/Should-count-return-an-int-in-the-v1-RPC-API-1348b10e4b5d80498bfdead194cc304e
+        """
+        return constants.FLOAT
+
+
 def simple_sentry_field(field) -> ResolvedColumn:
     """For a good number of fields, the public alias matches the internal alias
-    This helper functions makes defining them easier"""
-    return ResolvedColumn(field, f"sentry.{field}", "string")
+    without the `sentry.` suffix. This helper functions makes defining them easier"""
+    return ResolvedColumn(public_alias=field, internal_name=f"sentry.{field}", search_type="string")
+
+
+def simple_measurements_field(
+    field, search_type: constants.SearchType = "number"
+) -> ResolvedColumn:
+    """For a good number of fields, the public alias matches the internal alias
+    with the `measurements.` prefix. This helper functions makes defining them easier"""
+    return ResolvedColumn(
+        public_alias=f"measurements.{field}",
+        internal_name=field,
+        search_type=search_type,
+    )
+
+
+def datetime_processor(datetime_string: str) -> str:
+    return datetime.fromisoformat(datetime_string).replace(tzinfo=tz.tzutc()).isoformat()
 
 
 SPAN_COLUMN_DEFINITIONS = {
@@ -123,7 +166,7 @@ def simple_sentry_field(field) -> ResolvedColumn:
         ),
         ResolvedColumn(
             public_alias="parent_span",
-            internal_name="sentry.sentry,parent_span_id",
+            internal_name="sentry.parent_span_id",
             search_type="string",
             validator=is_span_id,
         ),
@@ -143,6 +186,7 @@ def simple_sentry_field(field) -> ResolvedColumn:
             internal_name="sentry.project_id",
             internal_type=constants.INT,
             search_type="string",
+            secondary_alias=True,
         ),
         ResolvedColumn(
             public_alias="span.action",
@@ -158,12 +202,14 @@ def simple_sentry_field(field) -> ResolvedColumn:
             public_alias="description",
             internal_name="sentry.name",
             search_type="string",
+            secondary_alias=True,
         ),
         # Message maps to description, this is to allow wildcard searching
         ResolvedColumn(
             public_alias="message",
             internal_name="sentry.name",
             search_type="string",
+            secondary_alias=True,
         ),
         ResolvedColumn(
             public_alias="span.domain",
@@ -188,12 +234,12 @@ def simple_sentry_field(field) -> ResolvedColumn:
         ResolvedColumn(
             public_alias="span.self_time",
             internal_name="sentry.exclusive_time_ms",
-            search_type="duration",
+            search_type="millisecond",
         ),
         ResolvedColumn(
             public_alias="span.duration",
             internal_name="sentry.duration_ms",
-            search_type="duration",
+            search_type="millisecond",
         ),
         ResolvedColumn(
             public_alias="span.status",
@@ -210,7 +256,16 @@ def simple_sentry_field(field) -> ResolvedColumn:
             public_alias="transaction",
             internal_name="sentry.segment_name",
             search_type="string",
-            validator=is_event_id,
+        ),
+        ResolvedColumn(
+            public_alias="transaction.span_id",
+            internal_name="sentry.segment_id",
+            search_type="string",
+        ),
+        ResolvedColumn(
+            public_alias="profile.id",
+            internal_name="sentry.profile_id",
+            search_type="string",
         ),
         ResolvedColumn(
             public_alias="replay.id",
@@ -232,15 +287,45 @@ def simple_sentry_field(field) -> ResolvedColumn:
             internal_name="ai.total_cost",
             search_type="number",
         ),
+        ResolvedColumn(
+            public_alias="http.decoded_response_content_length",
+            internal_name="http.decoded_response_content_length",
+            search_type="byte",
+        ),
+        ResolvedColumn(
+            public_alias="http.response_content_length",
+            internal_name="http.response_content_length",
+            search_type="byte",
+        ),
+        ResolvedColumn(
+            public_alias="http.response_transfer_size",
+            internal_name="http.response_transfer_size",
+            search_type="byte",
+        ),
+        ResolvedColumn(
+            public_alias="sampling_rate",
+            internal_name="sentry.sampling_factor",
+            search_type="percentage",
+        ),
+        ResolvedColumn(
+            public_alias="timestamp",
+            internal_name="sentry.timestamp",
+            search_type="string",
+            processor=datetime_processor,
+        ),
         simple_sentry_field("browser.name"),
+        simple_sentry_field("environment"),
         simple_sentry_field("messaging.destination.name"),
         simple_sentry_field("messaging.message.id"),
+        simple_sentry_field("platform"),
         simple_sentry_field("release"),
         simple_sentry_field("sdk.name"),
+        simple_sentry_field("sdk.version"),
         simple_sentry_field("span.status_code"),
         simple_sentry_field("span_id"),
         simple_sentry_field("trace.status"),
         simple_sentry_field("transaction.method"),
+        simple_sentry_field("transaction.op"),
         simple_sentry_field("user"),
         simple_sentry_field("user.email"),
         simple_sentry_field("user.geo.country_code"),
@@ -248,10 +333,76 @@ def simple_sentry_field(field) -> ResolvedColumn:
         simple_sentry_field("user.id"),
         simple_sentry_field("user.ip"),
         simple_sentry_field("user.username"),
+        simple_measurements_field("app_start_cold", "millisecond"),
+        simple_measurements_field("app_start_warm", "millisecond"),
+        simple_measurements_field("frames_frozen"),
+        simple_measurements_field("frames_frozen_rate", "percentage"),
+        simple_measurements_field("frames_slow"),
+        simple_measurements_field("frames_slow_rate", "percentage"),
+        simple_measurements_field("frames_total"),
+        simple_measurements_field("time_to_initial_display", "millisecond"),
+        simple_measurements_field("time_to_full_display", "millisecond"),
+        simple_measurements_field("stall_count"),
+        simple_measurements_field("stall_percentage", "percentage"),
+        simple_measurements_field("stall_stall_longest_time"),
+        simple_measurements_field("stall_stall_total_time"),
+        simple_measurements_field("cls"),
+        simple_measurements_field("fcp", "millisecond"),
+        simple_measurements_field("fid", "millisecond"),
+        simple_measurements_field("fp", "millisecond"),
+        simple_measurements_field("inp", "millisecond"),
+        simple_measurements_field("lcp", "millisecond"),
+        simple_measurements_field("ttfb", "millisecond"),
+        simple_measurements_field("ttfb.requesttime", "millisecond"),
+        simple_measurements_field("score.cls"),
+        simple_measurements_field("score.fcp"),
+        simple_measurements_field("score.fid"),
+        simple_measurements_field("score.fp"),
+        simple_measurements_field("score.inp"),
+        simple_measurements_field("score.lcp"),
+        simple_measurements_field("score.ttfb"),
+        simple_measurements_field("score.total"),
+        simple_measurements_field("score.weight.cls"),
+        simple_measurements_field("score.weight.fcp"),
+        simple_measurements_field("score.weight.fid"),
+        simple_measurements_field("score.weight.fp"),
+        simple_measurements_field("score.weight.inp"),
+        simple_measurements_field("score.weight.lcp"),
+        simple_measurements_field("score.weight.ttfb"),
+        simple_measurements_field("cache.item_size"),
+        simple_measurements_field("messaging.message.body.size"),
+        simple_measurements_field("messaging.message.receive.latency"),
+        simple_measurements_field("messaging.message.retry.count"),
     ]
 }
 
 
+INTERNAL_TO_PUBLIC_ALIAS_MAPPINGS: dict[Literal["string", "number"], dict[str, str]] = {
+    "string": {
+        definition.internal_name: definition.public_alias
+        for definition in SPAN_COLUMN_DEFINITIONS.values()
+        if not definition.secondary_alias and definition.search_type == "string"
+    }
+    | {
+        # sentry.service is the project id as a string, but map to project for convenience
+        "sentry.service": "project",
+    },
+    "number": {
+        definition.internal_name: definition.public_alias
+        for definition in SPAN_COLUMN_DEFINITIONS.values()
+        if not definition.secondary_alias and definition.search_type != "string"
+    },
+}
+
+
+def translate_internal_to_public_alias(
+    internal_alias: str,
+    type: Literal["string", "number"],
+) -> str | None:
+    mappings = INTERNAL_TO_PUBLIC_ALIAS_MAPPINGS.get(type, {})
+    return mappings.get(internal_alias)
+
+
 def project_context_constructor(column_name: str) -> Callable[[SnubaParams], VirtualColumnContext]:
     def context_constructor(params: SnubaParams) -> VirtualColumnContext:
         return VirtualColumnContext(
@@ -290,77 +441,152 @@ def device_class_context_constructor(params: SnubaParams) -> VirtualColumnContex
 SPAN_FUNCTION_DEFINITIONS = {
     "sum": FunctionDefinition(
         internal_function=Function.FUNCTION_SUM,
-        search_type="duration",
+        default_search_type="duration",
         arguments=[
-            ArgumentDefinition(argument_types=["duration", "number"], default_arg="span.duration")
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number"],
+                default_arg="span.duration",
+            )
         ],
     ),
     "avg": FunctionDefinition(
         internal_function=Function.FUNCTION_AVERAGE,
-        search_type="duration",
+        default_search_type="duration",
+        arguments=[
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number", "percentage"],
+                default_arg="span.duration",
+            )
+        ],
+    ),
+    "avg_sample": FunctionDefinition(
+        internal_function=Function.FUNCTION_AVERAGE,
+        default_search_type="duration",
         arguments=[
-            ArgumentDefinition(argument_types=["duration", "number"], default_arg="span.duration")
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number", "percentage"],
+                default_arg="span.duration",
+            )
         ],
+        extrapolation=False,
     ),
     "count": FunctionDefinition(
         internal_function=Function.FUNCTION_COUNT,
-        search_type="number",
+        infer_search_type_from_arguments=False,
+        default_search_type="integer",
+        arguments=[
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number"],
+                default_arg="span.duration",
+            )
+        ],
+    ),
+    "count_sample": FunctionDefinition(
+        internal_function=Function.FUNCTION_COUNT,
+        infer_search_type_from_arguments=False,
+        default_search_type="integer",
         arguments=[
-            ArgumentDefinition(argument_types=["duration", "number"], default_arg="span.duration")
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number"],
+                default_arg="span.duration",
+            )
         ],
+        extrapolation=False,
     ),
     "p50": FunctionDefinition(
         internal_function=Function.FUNCTION_P50,
-        search_type="duration",
+        default_search_type="duration",
+        arguments=[
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number"],
+                default_arg="span.duration",
+            )
+        ],
+    ),
+    "p50_sample": FunctionDefinition(
+        internal_function=Function.FUNCTION_P50,
+        default_search_type="duration",
+        arguments=[
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number"],
+                default_arg="span.duration",
+            )
+        ],
+        extrapolation=False,
+    ),
+    "p75": FunctionDefinition(
+        internal_function=Function.FUNCTION_P75,
+        default_search_type="duration",
         arguments=[
-            ArgumentDefinition(argument_types=["duration", "number"], default_arg="span.duration")
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number"],
+                default_arg="span.duration",
+            )
         ],
     ),
     "p90": FunctionDefinition(
         internal_function=Function.FUNCTION_P90,
-        search_type="duration",
+        default_search_type="duration",
         arguments=[
-            ArgumentDefinition(argument_types=["duration", "number"], default_arg="span.duration")
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number"],
+                default_arg="span.duration",
+            )
         ],
     ),
     "p95": FunctionDefinition(
         internal_function=Function.FUNCTION_P95,
-        search_type="duration",
+        default_search_type="duration",
         arguments=[
-            ArgumentDefinition(argument_types=["duration", "number"], default_arg="span.duration")
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number"],
+                default_arg="span.duration",
+            )
         ],
     ),
     "p99": FunctionDefinition(
         internal_function=Function.FUNCTION_P99,
-        search_type="duration",
+        default_search_type="duration",
         arguments=[
-            ArgumentDefinition(argument_types=["duration", "number"], default_arg="span.duration")
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number"],
+                default_arg="span.duration",
+            )
         ],
     ),
     "p100": FunctionDefinition(
         internal_function=Function.FUNCTION_MAX,
-        search_type="duration",
+        default_search_type="duration",
         arguments=[
-            ArgumentDefinition(argument_types=["duration", "number"], default_arg="span.duration")
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number"],
+                default_arg="span.duration",
+            )
         ],
     ),
     "max": FunctionDefinition(
         internal_function=Function.FUNCTION_MAX,
-        search_type="duration",
+        default_search_type="duration",
         arguments=[
-            ArgumentDefinition(argument_types=["duration", "number"], default_arg="span.duration")
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number", "percentage"],
+                default_arg="span.duration",
+            )
         ],
     ),
     "min": FunctionDefinition(
         internal_function=Function.FUNCTION_MIN,
-        search_type="duration",
+        default_search_type="duration",
         arguments=[
-            ArgumentDefinition(argument_types=["duration", "number"], default_arg="span.duration")
+            ArgumentDefinition(
+                argument_types=["byte", "duration", "millisecond", "number", "percentage"],
+                default_arg="span.duration",
+            )
         ],
     ),
     "count_unique": FunctionDefinition(
         internal_function=Function.FUNCTION_UNIQ,
-        search_type="number",
+        default_search_type="number",
         arguments=[
             ArgumentDefinition(
                 argument_types=["string"],
diff --git a/src/sentry/search/eap/constants.py b/src/sentry/search/eap/constants.py
index 860b0481c1005b..f1968b47dea9a1 100644
--- a/src/sentry/search/eap/constants.py
+++ b/src/sentry/search/eap/constants.py
@@ -1,3 +1,5 @@
+from typing import Literal
+
 from sentry_protos.snuba.v1.trace_item_attribute_pb2 import AttributeKey
 from sentry_protos.snuba.v1.trace_item_filter_pb2 import ComparisonFilter
 
@@ -13,6 +15,16 @@
 }
 IN_OPERATORS = ["IN", "NOT IN"]
 
+SearchType = Literal[
+    "byte",
+    "duration",
+    "integer",
+    "millisecond",
+    "number",
+    "percentage",
+    "string",
+]
+
 STRING = AttributeKey.TYPE_STRING
 BOOLEAN = AttributeKey.TYPE_BOOLEAN
 FLOAT = AttributeKey.TYPE_FLOAT
@@ -20,9 +32,13 @@
 
 # TODO: we need a datetime type
 # Maps search types back to types for the proto
-TYPE_MAP = {
+TYPE_MAP: dict[SearchType, AttributeKey.Type.ValueType] = {
+    "byte": FLOAT,
+    "duration": FLOAT,
+    "integer": INT,
+    "millisecond": FLOAT,
     # TODO:  need to update these to float once the proto supports float arrays
     "number": INT,
-    "duration": FLOAT,
+    "percentage": FLOAT,
     "string": STRING,
 }
diff --git a/src/sentry/search/eap/spans.py b/src/sentry/search/eap/spans.py
index d47d4bdb77b934..e1b477bfc528fb 100644
--- a/src/sentry/search/eap/spans.py
+++ b/src/sentry/search/eap/spans.py
@@ -29,6 +29,7 @@
     SPAN_FUNCTION_DEFINITIONS,
     VIRTUAL_CONTEXTS,
     ResolvedColumn,
+    ResolvedFunction,
 )
 from sentry.search.eap.types import SearchResolverConfig
 from sentry.search.events import constants as qb_constants
@@ -46,7 +47,12 @@ class SearchResolver:
 
     params: SnubaParams
     config: SearchResolverConfig
-    resolved_columns: dict[str, ResolvedColumn] = field(default_factory=dict)
+    _resolved_attribute_cache: dict[str, tuple[ResolvedColumn, VirtualColumnContext | None]] = (
+        field(default_factory=dict)
+    )
+    _resolved_function_cache: dict[str, tuple[ResolvedFunction, VirtualColumnContext | None]] = (
+        field(default_factory=dict)
+    )
 
     def resolve_meta(self, referrer: str) -> RequestMeta:
         if self.params.organization_id is None:
@@ -59,8 +65,59 @@ def resolve_meta(self, referrer: str) -> RequestMeta:
             end_timestamp=self.params.rpc_end_date,
         )
 
-    def resolve_query(self, querystring: str) -> TraceItemFilter | None:
+    def resolve_query(self, querystring: str | None) -> TraceItemFilter | None:
         """Given a query string in the public search syntax eg. `span.description:foo` construct the TraceItemFilter"""
+        environment_query = self.__resolve_environment_query()
+        query = self.__resolve_query(querystring)
+
+        # The RPC request meta does not contain the environment.
+        # So we have to inject it as a query condition.
+        #
+        # To do so, we want to AND it with the query.
+        # So if either one is not defined, we just use the other.
+        # But if both are defined, we AND them together.
+
+        if not environment_query:
+            return query
+
+        if not query:
+            return environment_query
+
+        return TraceItemFilter(
+            and_filter=AndFilter(
+                filters=[
+                    environment_query,
+                    query,
+                ]
+            )
+        )
+
+    def __resolve_environment_query(self) -> TraceItemFilter | None:
+        resolved_column, _ = self.resolve_column("environment")
+        if not isinstance(resolved_column.proto_definition, AttributeKey):
+            return None
+
+        # TODO: replace this with an IN condition when the RPC supports it
+        filters = [
+            TraceItemFilter(
+                comparison_filter=ComparisonFilter(
+                    key=resolved_column.proto_definition,
+                    op=ComparisonFilter.OP_EQUALS,
+                    value=AttributeValue(val_str=environment.name),
+                )
+            )
+            for environment in self.params.environments
+            if environment is not None
+        ]
+
+        if not filters:
+            return None
+
+        return TraceItemFilter(and_filter=AndFilter(filters=filters))
+
+    def __resolve_query(self, querystring: str | None) -> TraceItemFilter | None:
+        if querystring is None:
+            return None
         try:
             parsed_terms = event_search.parse_search_query(
                 querystring,
@@ -158,44 +215,7 @@ def _resolve_terms(self, terms: event_filter.ParsedTerms) -> TraceItemFilter | N
         parsed_terms = []
         for item in terms:
             if isinstance(item, event_search.SearchFilter):
-                resolved_column, context = self.resolve_column(item.key.name)
-                raw_value = item.value.raw_value
-                if item.value.is_wildcard():
-                    if item.operator == "=":
-                        operator = ComparisonFilter.OP_LIKE
-                    elif item.operator == "!=":
-                        operator = ComparisonFilter.OP_NOT_LIKE
-                    else:
-                        raise InvalidSearchQuery(
-                            f"Cannot use a wildcard with a {item.operator} filter"
-                        )
-                    # Slashes have to be double escaped so they are
-                    # interpreted as a string literal.
-                    raw_value = (
-                        str(item.value.raw_value)
-                        .replace("\\", "\\\\")
-                        .replace("%", "\\%")
-                        .replace("_", "\\_")
-                        .replace("*", "%")
-                    )
-                elif item.operator in constants.OPERATOR_MAP:
-                    operator = constants.OPERATOR_MAP[item.operator]
-                else:
-                    raise InvalidSearchQuery(f"Unknown operator: {item.operator}")
-                if isinstance(resolved_column.proto_definition, AttributeKey):
-                    parsed_terms.append(
-                        TraceItemFilter(
-                            comparison_filter=ComparisonFilter(
-                                key=resolved_column.proto_definition,
-                                op=operator,
-                                value=self._resolve_search_value(
-                                    resolved_column, item.operator, raw_value
-                                ),
-                            )
-                        )
-                    )
-                else:
-                    raise NotImplementedError("Can't filter on aggregates yet")
+                parsed_terms.append(self.resolve_term(cast(event_search.SearchFilter, item)))
             else:
                 if self.config.use_aggregate_conditions:
                     raise NotImplementedError("Can't filter on aggregates yet")
@@ -207,6 +227,40 @@ def _resolve_terms(self, terms: event_filter.ParsedTerms) -> TraceItemFilter | N
         else:
             return None
 
+    def resolve_term(self, term: event_search.SearchFilter) -> TraceItemFilter:
+        resolved_column, context = self.resolve_column(term.key.name)
+        raw_value = term.value.raw_value
+        if term.value.is_wildcard():
+            if term.operator == "=":
+                operator = ComparisonFilter.OP_LIKE
+            elif term.operator == "!=":
+                operator = ComparisonFilter.OP_NOT_LIKE
+            else:
+                raise InvalidSearchQuery(f"Cannot use a wildcard with a {term.operator} filter")
+            # Slashes have to be double escaped so they are
+            # interpreted as a string literal.
+            raw_value = (
+                str(term.value.raw_value)
+                .replace("\\", "\\\\")
+                .replace("%", "\\%")
+                .replace("_", "\\_")
+                .replace("*", "%")
+            )
+        elif term.operator in constants.OPERATOR_MAP:
+            operator = constants.OPERATOR_MAP[term.operator]
+        else:
+            raise InvalidSearchQuery(f"Unknown operator: {term.operator}")
+        if isinstance(resolved_column.proto_definition, AttributeKey):
+            return TraceItemFilter(
+                comparison_filter=ComparisonFilter(
+                    key=resolved_column.proto_definition,
+                    op=operator,
+                    value=self._resolve_search_value(resolved_column, term.operator, raw_value),
+                )
+            )
+        else:
+            raise NotImplementedError("Can't filter on aggregates yet")
+
     def _resolve_search_value(
         self,
         column: ResolvedColumn,
@@ -237,7 +291,7 @@ def _resolve_search_value(
                         raise InvalidSearchQuery(
                             f"{value} is not a valid value for doing an IN filter"
                         )
-                elif isinstance(value, float):
+                elif isinstance(value, (float, int)):
                     return AttributeValue(val_int=int(value))
             elif column_type == constants.FLOAT:
                 if operator in constants.IN_OPERATORS:
@@ -273,7 +327,7 @@ def clean_contexts(
 
     def resolve_columns(
         self, selected_columns: list[str]
-    ) -> tuple[list[ResolvedColumn], list[VirtualColumnContext]]:
+    ) -> tuple[list[ResolvedColumn | ResolvedFunction], list[VirtualColumnContext]]:
         """Given a list of columns resolve them and get their context if applicable
 
         This function will also dedupe the virtual column contexts if necessary
@@ -305,7 +359,7 @@ def resolve_columns(
 
     def resolve_column(
         self, column: str, match: Match | None = None
-    ) -> tuple[ResolvedColumn, VirtualColumnContext | None]:
+    ) -> tuple[ResolvedColumn | ResolvedFunction, VirtualColumnContext | None]:
         """Column is either an attribute or an aggregate, this function will determine which it is and call the relevant
         resolve function"""
         match = fields.is_function(column)
@@ -314,10 +368,6 @@ def resolve_column(
         else:
             return self.resolve_attribute(column)
 
-        # TODO: Cache the column
-        # self.resolved_coluumn[alias] = ResolvedColumn()
-        # return ResolvedColumn()
-
     def get_field_type(self, column: str) -> str:
         resolved_column, _ = self.resolve_column(column)
         return resolved_column.search_type
@@ -338,6 +388,8 @@ def resolve_attribute(self, column: str) -> tuple[ResolvedColumn, VirtualColumnC
         """Attributes are columns that aren't 'functions' or 'aggregates', usually this means string or numeric
         attributes (aka. tags), but can also refer to fields like span.description"""
         # If a virtual context is defined the column definition is always the same
+        if column in self._resolved_attribute_cache:
+            return self._resolved_attribute_cache[column]
         if column in VIRTUAL_CONTEXTS:
             column_context = VIRTUAL_CONTEXTS[column](self.params)
             column_definition = ResolvedColumn(
@@ -368,19 +420,21 @@ def resolve_attribute(self, column: str) -> tuple[ResolvedColumn, VirtualColumnC
             if field_type not in constants.TYPE_MAP:
                 raise InvalidSearchQuery(f"Unsupported type {field_type} in {column}")
 
+            search_type = cast(constants.SearchType, field_type)
             column_definition = ResolvedColumn(
-                public_alias=column, internal_name=field, search_type=field_type
+                public_alias=column, internal_name=field, search_type=search_type
             )
             column_context = None
 
         if column_definition:
-            return column_definition, column_context
+            self._resolved_attribute_cache[column] = (column_definition, column_context)
+            return self._resolved_attribute_cache[column]
         else:
             raise InvalidSearchQuery(f"Could not parse {column}")
 
     def resolve_aggregates(
         self, columns: list[str]
-    ) -> tuple[list[ResolvedColumn], list[VirtualColumnContext | None]]:
+    ) -> tuple[list[ResolvedFunction], list[VirtualColumnContext | None]]:
         """Helper function to resolve a list of aggregates instead of 1 attribute at a time"""
         resolved_aggregates, resolved_contexts = [], []
         for column in columns:
@@ -391,7 +445,9 @@ def resolve_aggregates(
 
     def resolve_aggregate(
         self, column: str, match: Match | None = None
-    ) -> tuple[ResolvedColumn, VirtualColumnContext | None]:
+    ) -> tuple[ResolvedFunction, VirtualColumnContext | None]:
+        if column in self._resolved_function_cache:
+            return self._resolved_function_cache[column]
         # Check if this is a valid function, parse the function name and args out
         if match is None:
             match = fields.is_function(column)
@@ -441,23 +497,29 @@ def resolve_aggregate(
         # Proto doesn't support anything more than 1 argument yet
         if len(parsed_columns) > 1:
             raise InvalidSearchQuery("Cannot use more than one argument")
-        elif len(parsed_columns) == 1:
-            resolved_argument = (
-                parsed_columns[0].proto_definition
-                if isinstance(parsed_columns[0].proto_definition, AttributeKey)
-                else None
+        elif len(parsed_columns) == 1 and isinstance(
+            parsed_columns[0].proto_definition, AttributeKey
+        ):
+            parsed_column = parsed_columns[0]
+            resolved_argument = parsed_column.proto_definition
+            search_type = (
+                parsed_column.search_type
+                if function_definition.infer_search_type_from_arguments
+                else function_definition.default_search_type
             )
         else:
             resolved_argument = None
-
-        return (
-            ResolvedColumn(
-                public_alias=alias,
-                internal_name=function_definition.internal_function,
-                search_type=function_definition.search_type,
-                internal_type=function_definition.internal_type,
-                processor=function_definition.processor,
-                argument=resolved_argument,
-            ),
-            None,
+            search_type = function_definition.default_search_type
+
+        resolved_function = ResolvedFunction(
+            public_alias=alias,
+            internal_name=function_definition.internal_function,
+            search_type=search_type,
+            internal_type=function_definition.internal_type,
+            processor=function_definition.processor,
+            extrapolation=function_definition.extrapolation,
+            argument=resolved_argument,
         )
+        resolved_context = None
+        self._resolved_function_cache[column] = (resolved_function, resolved_context)
+        return self._resolved_function_cache[column]
diff --git a/src/sentry/search/eap/types.py b/src/sentry/search/eap/types.py
index 3650bca03d4e59..949c23974678dc 100644
--- a/src/sentry/search/eap/types.py
+++ b/src/sentry/search/eap/types.py
@@ -1,4 +1,9 @@
 from dataclasses import dataclass
+from typing import Literal
+
+from sentry_protos.snuba.v1.trace_item_attribute_pb2 import Reliability
+
+from sentry.search.events.types import EventsResponse
 
 
 @dataclass(frozen=True)
@@ -10,3 +15,15 @@ class SearchResolverConfig:
     # TODO: do we need parser_config_overrides? it looks like its just for alerts
     # Whether to process the results from snuba
     process_results: bool = True
+
+
+CONFIDENCES: dict[Reliability.ValueType, Literal["low", "high"]] = {
+    Reliability.RELIABILITY_LOW: "low",
+    Reliability.RELIABILITY_HIGH: "high",
+}
+Confidence = Literal["low", "high"] | None
+ConfidenceData = list[dict[str, Confidence]]
+
+
+class EAPResponse(EventsResponse):
+    confidence: ConfidenceData
diff --git a/src/sentry/search/events/builder/base.py b/src/sentry/search/events/builder/base.py
index b02a6cf7b181fe..bcf70f7c87adac 100644
--- a/src/sentry/search/events/builder/base.py
+++ b/src/sentry/search/events/builder/base.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import math
 from collections.abc import Callable, Mapping, Sequence
 from datetime import datetime, timedelta
 from re import Match
@@ -70,6 +69,7 @@
     is_numeric_measurement,
     is_percentage_measurement,
     is_span_op_breakdown,
+    process_value,
     raw_snql_query,
     resolve_column,
 )
@@ -87,10 +87,10 @@ class BaseQueryBuilder:
     organization_column: str = "organization.id"
     function_alias_prefix: str | None = None
     spans_metrics_builder = False
-    profile_functions_metrics_builder = False
     entity: Entity | None = None
     config_class: type[DatasetConfig] | None = None
     duration_fields: set[str] = set()
+    size_fields: dict[str, str] = {}
     uuid_fields: set[str] = set()
     span_id_fields: set[str] = set()
 
@@ -1004,7 +1004,7 @@ def get_field_type(self, field: str) -> str | None:
             return self.meta_resolver_map[field]
         if is_percentage_measurement(field):
             return "percentage"
-        elif is_numeric_measurement(field):
+        if is_numeric_measurement(field):
             return "number"
 
         if (
@@ -1014,6 +1014,9 @@ def get_field_type(self, field: str) -> str | None:
         ):
             return "duration"
 
+        if unit := self.size_fields.get(field):
+            return unit
+
         measurement = self.get_measurement_by_name(field)
         # let the caller decide what to do
         if measurement is None:
@@ -1530,16 +1533,6 @@ def get_snql_query(self) -> Request:
             tenant_ids=self.tenant_ids,
         )
 
-    @classmethod
-    def handle_invalid_float(cls, value: float | None) -> float | None:
-        if value is None:
-            return value
-        elif math.isnan(value):
-            return 0
-        elif math.isinf(value):
-            return None
-        return value
-
     def run_query(
         self, referrer: str | None, use_cache: bool = False, query_source: QuerySource | None = None
     ) -> Any:
@@ -1592,18 +1585,7 @@ def process_results(self, results: Any) -> EventsResponse:
             def get_row(row: dict[str, Any]) -> dict[str, Any]:
                 transformed = {}
                 for key, value in row.items():
-                    if isinstance(value, float):
-                        # 0 for nan, and none for inf were chosen arbitrarily, nan and inf are invalid json
-                        # so needed to pick something valid to use instead
-                        if math.isnan(value):
-                            value = 0
-                        elif math.isinf(value):
-                            value = None
-                        value = self.handle_invalid_float(value)
-                    if isinstance(value, list):
-                        for index, item in enumerate(value):
-                            if isinstance(item, float):
-                                value[index] = self.handle_invalid_float(item)
+                    value = process_value(value)
                     if key in self.value_resolver_map:
                         new_value = self.value_resolver_map[key](value)
                     else:
diff --git a/src/sentry/search/events/builder/errors.py b/src/sentry/search/events/builder/errors.py
index 4869fe65ac191f..650d4963513009 100644
--- a/src/sentry/search/events/builder/errors.py
+++ b/src/sentry/search/events/builder/errors.py
@@ -88,7 +88,13 @@ def aliased_column(self, name: str) -> SelectType:
                 aliased_col, exp=self._apply_column_entity(aliased_col.exp.name)
             )
         elif isinstance(aliased_col, Column):
-            return self._apply_column_entity(aliased_col.name)
+            if self.config.use_entity_prefix_for_fields:
+                return self._apply_column_entity(aliased_col.name)
+
+            # Map the column with the entity name back to the original resolved name
+            return AliasedExpression(
+                self._apply_column_entity(aliased_col.name), alias=aliased_col.name
+            )
 
         raise NotImplementedError(f"{type(aliased_col)} not implemented in aliased_column")
 
diff --git a/src/sentry/search/events/builder/metrics.py b/src/sentry/search/events/builder/metrics.py
index 23342295762102..d57893ae33b027 100644
--- a/src/sentry/search/events/builder/metrics.py
+++ b/src/sentry/search/events/builder/metrics.py
@@ -444,8 +444,6 @@ def use_case_id(self) -> UseCaseID:
             return UseCaseID.SPANS
         elif self.is_performance:
             return UseCaseID.TRANSACTIONS
-        elif self.profile_functions_metrics_builder:
-            return UseCaseID.PROFILES
         else:
             return UseCaseID.SESSIONS
 
@@ -759,7 +757,7 @@ def resolve_metric_index(self, value: str) -> int | None:
 
     def resolve_tag_value(self, value: str) -> int | str | None:
         # We only use the indexer for alerts queries
-        if self.is_performance or self.use_metrics_layer or self.profile_functions_metrics_builder:
+        if self.is_performance or self.use_metrics_layer:
             return value
         return self.resolve_metric_index(value)
 
diff --git a/src/sentry/search/events/builder/metrics_summaries.py b/src/sentry/search/events/builder/metrics_summaries.py
deleted file mode 100644
index 5d2968ab2ba104..00000000000000
--- a/src/sentry/search/events/builder/metrics_summaries.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from snuba_sdk import Entity, Flags, Query, Request
-
-from sentry.search.events.builder.base import BaseQueryBuilder
-from sentry.search.events.datasets.metrics_summaries import MetricsSummariesDatasetConfig
-from sentry.snuba.dataset import Dataset
-
-
-class MetricsSummariesQueryBuilder(BaseQueryBuilder):
-    requires_organization_condition = False
-    config_class = MetricsSummariesDatasetConfig
-
-    def get_field_type(self, field: str) -> str | None:
-        if field in ["min_metric", "max_metric", "sum_metric", "count_metric"]:
-            return "number"
-        return None
-
-    def get_snql_query(self) -> Request:
-        self.validate_having_clause()
-
-        return Request(
-            # the metrics summaries entity exists within the spans indexed dataset
-            dataset=Dataset.SpansIndexed.value,
-            app_id="default",
-            query=Query(
-                match=Entity(self.dataset.value, sample=self.sample_rate),
-                select=self.columns,
-                array_join=self.array_join,
-                where=self.where,
-                having=self.having,
-                groupby=self.groupby,
-                orderby=self.orderby,
-                limit=self.limit,
-                offset=self.offset,
-                limitby=self.limitby,
-            ),
-            flags=Flags(turbo=self.turbo),
-            tenant_ids=self.tenant_ids,
-        )
diff --git a/src/sentry/search/events/builder/profile_functions.py b/src/sentry/search/events/builder/profile_functions.py
index c38bcaebb61483..08ee6e71c8520d 100644
--- a/src/sentry/search/events/builder/profile_functions.py
+++ b/src/sentry/search/events/builder/profile_functions.py
@@ -120,9 +120,13 @@ def time_column(self) -> SelectType:
     def process_results(self, results: Any) -> EventsResponse:
         # Calling `super().process_results(results)` on the timeseries data
         # mutates the data in such a way that breaks the zerofill later such
-        # as applying `transform_alias_to_input_format` setting.  So skip it.
+        # as applying `transform_alias_to_input_format` setting.  So only run
+        # it to get the correct meta.
         for row in results["data"]:
             self.process_profiling_function_columns(row)
+
+        results["meta"] = super().process_results(results)["meta"]
+
         return results
 
 
diff --git a/src/sentry/search/events/builder/profile_functions_metrics.py b/src/sentry/search/events/builder/profile_functions_metrics.py
deleted file mode 100644
index 43a956e256f26d..00000000000000
--- a/src/sentry/search/events/builder/profile_functions_metrics.py
+++ /dev/null
@@ -1,60 +0,0 @@
-from sentry.search.events.builder.metrics import (
-    MetricsQueryBuilder,
-    TimeseriesMetricQueryBuilder,
-    TopMetricsQueryBuilder,
-)
-from sentry.search.events.datasets.profile_functions_metrics import (
-    ProfileFunctionsMetricsDatasetConfig,
-)
-from sentry.search.events.types import SelectType
-
-
-class ProfileFunctionsMetricsQueryBuilder(MetricsQueryBuilder):
-    requires_organization_condition = True
-    profile_functions_metrics_builder = True
-    config_class = ProfileFunctionsMetricsDatasetConfig
-
-    column_remapping = {
-        # We want to remap `message` to `name` for the free
-        # text search use case so that it searches the `name`
-        # (function name) when the user performs a free text search
-        "message": "name",
-    }
-    default_metric_tags = {
-        "project_id",
-        "fingerprint",
-        "function",
-        "package",
-        "is_application",
-        "platform",
-        "environment",
-        "release",
-    }
-
-    @property
-    def use_default_tags(self) -> bool:
-        return True
-
-    def get_field_type(self, field: str) -> str | None:
-        if field in self.meta_resolver_map:
-            return self.meta_resolver_map[field]
-        return None
-
-    def resolve_select(
-        self, selected_columns: list[str] | None, equations: list[str] | None
-    ) -> list[SelectType]:
-        if selected_columns and "transaction" in selected_columns:
-            self.has_transaction = True  # if always true can we skip this?
-        return super().resolve_select(selected_columns, equations)
-
-
-class TimeseriesProfileFunctionsMetricsQueryBuilder(
-    ProfileFunctionsMetricsQueryBuilder, TimeseriesMetricQueryBuilder
-):
-    pass
-
-
-class TopProfileFunctionsMetricsQueryBuilder(
-    TimeseriesProfileFunctionsMetricsQueryBuilder, TopMetricsQueryBuilder
-):
-    pass
diff --git a/src/sentry/search/events/builder/spans_indexed.py b/src/sentry/search/events/builder/spans_indexed.py
index 853ed7ea307f15..79a82d81f46a1e 100644
--- a/src/sentry/search/events/builder/spans_indexed.py
+++ b/src/sentry/search/events/builder/spans_indexed.py
@@ -33,23 +33,24 @@
     "segment_id",
 }
 
+DURATION_FIELDS = {
+    "span.duration",
+    "span.self_time",
+}
 
-class SpansIndexedQueryBuilderMixin:
-    meta_resolver_map: dict[str, str]
-
-    def get_field_type(self, field: str) -> str | None:
-        if field in self.meta_resolver_map:
-            return self.meta_resolver_map[field]
-        if field in ["span.duration", "span.self_time"]:
-            return "duration"
-
-        return None
+SIZE_FIELDS = {
+    "http.decoded_response_content_length": "byte",
+    "http.response_content_length": "byte",
+    "http.response_transfer_size": "byte",
+}
 
 
-class SpansIndexedQueryBuilder(SpansIndexedQueryBuilderMixin, BaseQueryBuilder):
+class SpansIndexedQueryBuilder(BaseQueryBuilder):
     requires_organization_condition = False
     uuid_fields = SPAN_UUID_FIELDS
     span_id_fields = SPAN_ID_FIELDS
+    duration_fields = DURATION_FIELDS
+    size_fields = SIZE_FIELDS
     config_class = SpansIndexedDatasetConfig
 
     def __init__(self, *args, **kwargs):
@@ -59,10 +60,12 @@ def __init__(self, *args, **kwargs):
         )
 
 
-class SpansEAPQueryBuilder(SpansIndexedQueryBuilderMixin, BaseQueryBuilder):
+class SpansEAPQueryBuilder(BaseQueryBuilder):
     requires_organization_condition = True
     uuid_fields = SPAN_UUID_FIELDS
     span_id_fields = SPAN_ID_FIELDS
+    duration_fields = DURATION_FIELDS
+    size_fields = SIZE_FIELDS
     config_class = SpansEAPDatasetConfig
 
     def __init__(self, *args, **kwargs):
@@ -106,10 +109,12 @@ def resolve_field(self, raw_field: str, alias: bool = False) -> Column:
         return field_col
 
 
-class TimeseriesSpanIndexedQueryBuilder(SpansIndexedQueryBuilderMixin, TimeseriesQueryBuilder):
+class TimeseriesSpanIndexedQueryBuilder(TimeseriesQueryBuilder):
     config_class = SpansIndexedDatasetConfig
     uuid_fields = SPAN_UUID_FIELDS
     span_id_fields = SPAN_ID_FIELDS
+    duration_fields = DURATION_FIELDS
+    size_fields = SIZE_FIELDS
 
     @property
     def time_column(self) -> SelectType:
@@ -122,10 +127,12 @@ class TimeseriesSpanEAPIndexedQueryBuilder(SpansEAPQueryBuilder, TimeseriesQuery
     pass
 
 
-class TopEventsSpanIndexedQueryBuilder(SpansIndexedQueryBuilderMixin, TopEventsQueryBuilder):
+class TopEventsSpanIndexedQueryBuilder(TopEventsQueryBuilder):
     config_class = SpansIndexedDatasetConfig
     uuid_fields = SPAN_UUID_FIELDS
     span_id_fields = SPAN_ID_FIELDS
+    duration_fields = DURATION_FIELDS
+    size_fields = SIZE_FIELDS
 
     @property
     def time_column(self) -> SelectType:
diff --git a/src/sentry/search/events/constants.py b/src/sentry/search/events/constants.py
index b77093a6b9b06b..22cc901451e0a8 100644
--- a/src/sentry/search/events/constants.py
+++ b/src/sentry/search/events/constants.py
@@ -367,9 +367,6 @@ class ThresholdDict(TypedDict):
     "mobile.frames_delay": "g:spans/mobile.frames_delay@second",
     "messaging.message.receive.latency": SPAN_MESSAGING_LATENCY,
 }
-PROFILE_METRICS_MAP = {
-    "function.duration": "d:profiles/function.duration@millisecond",
-}
 # 50 to match the size of tables in the UI + 1 for pagination reasons
 METRICS_MAX_LIMIT = 101
 
diff --git a/src/sentry/search/events/datasets/discover.py b/src/sentry/search/events/datasets/discover.py
index f422ad4361b918..9178ae61de05cd 100644
--- a/src/sentry/search/events/datasets/discover.py
+++ b/src/sentry/search/events/datasets/discover.py
@@ -107,6 +107,7 @@ class DiscoverDatasetConfig(DatasetConfig):
         "user_misery()",
     }
     non_nullable_keys = {"event.type"}
+    use_entity_prefix_for_fields: bool = False
 
     def __init__(self, builder: BaseQueryBuilder):
         self.builder = builder
diff --git a/src/sentry/search/events/datasets/profile_functions_metrics.py b/src/sentry/search/events/datasets/profile_functions_metrics.py
deleted file mode 100644
index f05fb1d6fa4ae5..00000000000000
--- a/src/sentry/search/events/datasets/profile_functions_metrics.py
+++ /dev/null
@@ -1,518 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Callable, Mapping
-from datetime import datetime
-
-from snuba_sdk import Column, Function, OrderBy
-
-from sentry.api.event_search import SearchFilter
-from sentry.exceptions import IncompatibleMetricsQuery, InvalidSearchQuery
-from sentry.search.events import constants, fields
-from sentry.search.events.builder import profile_functions_metrics
-from sentry.search.events.constants import PROJECT_ALIAS, PROJECT_NAME_ALIAS
-from sentry.search.events.datasets import field_aliases, filter_aliases, function_aliases
-from sentry.search.events.datasets.base import DatasetConfig
-from sentry.search.events.types import SelectType, WhereType
-
-
-class ProfileFunctionsMetricsDatasetConfig(DatasetConfig):
-    missing_function_error = IncompatibleMetricsQuery
-
-    def __init__(self, builder: profile_functions_metrics.ProfileFunctionsMetricsQueryBuilder):
-        self.builder = builder
-
-    def resolve_mri(self, value: str) -> Column:
-        return Column(constants.PROFILE_METRICS_MAP[value])
-
-    @property
-    def search_filter_converter(
-        self,
-    ) -> Mapping[str, Callable[[SearchFilter], WhereType | None]]:
-        return {
-            PROJECT_ALIAS: self._project_slug_filter_converter,
-            PROJECT_NAME_ALIAS: self._project_slug_filter_converter,
-        }
-
-    @property
-    def orderby_converter(self) -> Mapping[str, OrderBy]:
-        return {}
-
-    @property
-    def field_alias_converter(self) -> Mapping[str, Callable[[str], SelectType]]:
-        return {
-            PROJECT_ALIAS: self._resolve_project_slug_alias,
-            PROJECT_NAME_ALIAS: self._resolve_project_slug_alias,
-        }
-
-    def _project_slug_filter_converter(self, search_filter: SearchFilter) -> WhereType | None:
-        return filter_aliases.project_slug_converter(self.builder, search_filter)
-
-    def _resolve_project_slug_alias(self, alias: str) -> SelectType:
-        return field_aliases.resolve_project_slug_alias(self.builder, alias)
-
-    def resolve_metric(self, value: str) -> int:
-        # "function.duration" --> "d:profiles/function.duration@millisecond"
-        metric_id = self.builder.resolve_metric_index(
-            constants.PROFILE_METRICS_MAP.get(value, value)
-        )
-        # If it's still None its not a custom measurement
-        if metric_id is None:
-            raise IncompatibleMetricsQuery(f"Metric: {value} could not be resolved")
-        self.builder.metric_ids.add(metric_id)
-        return metric_id
-
-    def _resolve_avg(self, args, alias):
-        return Function(
-            "avgIf",
-            [
-                Column("value"),
-                Function("equals", [Column("metric_id"), args["metric_id"]]),
-            ],
-            alias,
-        )
-
-    def _resolve_cpm(
-        self,
-        args: Mapping[str, str | Column | SelectType | int | float],
-        alias: str | None,
-        extra_condition: Function | None = None,
-    ) -> SelectType:
-        assert (
-            self.builder.params.end is not None and self.builder.params.start is not None
-        ), f"params.end: {self.builder.params.end} - params.start: {self.builder.params.start}"
-        interval = (self.builder.params.end - self.builder.params.start).total_seconds()
-
-        base_condition = Function(
-            "equals",
-            [
-                Column("metric_id"),
-                self.resolve_metric("function.duration"),
-            ],
-        )
-        if extra_condition:
-            condition = Function("and", [base_condition, extra_condition])
-        else:
-            condition = base_condition
-
-        return Function(
-            "divide",
-            [
-                Function(
-                    "countIf",
-                    [
-                        Column("value"),
-                        condition,
-                    ],
-                ),
-                Function("divide", [interval, 60]),
-            ],
-            alias,
-        )
-
-    def _resolve_cpm_cond(
-        self,
-        args: Mapping[str, str | Column | SelectType | int | float | datetime],
-        cond: str,
-        alias: str | None,
-    ) -> SelectType:
-        timestmp = args["timestamp"]
-        if cond == "greater":
-            assert isinstance(self.builder.params.end, datetime) and isinstance(
-                timestmp, datetime
-            ), f"params.end: {self.builder.params.end} - timestmp: {timestmp}"
-            interval = (self.builder.params.end - timestmp).total_seconds()
-            # interval = interval
-        elif cond == "less":
-            assert isinstance(self.builder.params.start, datetime) and isinstance(
-                timestmp, datetime
-            ), f"params.start: {self.builder.params.start} - timestmp: {timestmp}"
-            interval = (timestmp - self.builder.params.start).total_seconds()
-        else:
-            raise InvalidSearchQuery(f"Unsupported condition for cpm: {cond}")
-
-        metric_id_condition = Function(
-            "equals", [Column("metric_id"), self.resolve_metric("function.duration")]
-        )
-
-        return Function(
-            "divide",
-            [
-                Function(
-                    "countIf",
-                    [
-                        Column("value"),
-                        Function(
-                            "and",
-                            [
-                                metric_id_condition,
-                                Function(
-                                    cond,
-                                    [
-                                        Column("timestamp"),
-                                        args["timestamp"],
-                                    ],
-                                ),
-                            ],
-                        ),  # close and condition
-                    ],
-                ),
-                Function("divide", [interval, 60]),
-            ],
-            alias,
-        )
-
-    def _resolve_cpm_delta(
-        self,
-        args: Mapping[str, str | Column | SelectType | int | float],
-        alias: str,
-    ) -> SelectType:
-        return Function(
-            "minus",
-            [
-                self._resolve_cpm_cond(args, "greater", None),
-                self._resolve_cpm_cond(args, "less", None),
-            ],
-            alias,
-        )
-
-    def _resolve_regression_score(
-        self,
-        args: Mapping[str, str | Column | SelectType | int | float | datetime],
-        alias: str | None = None,
-    ) -> SelectType:
-        return Function(
-            "minus",
-            [
-                Function(
-                    "multiply",
-                    [
-                        self._resolve_cpm_cond(args, "greater", None),
-                        function_aliases.resolve_metrics_percentile(
-                            args=args,
-                            alias=None,
-                            extra_conditions=[
-                                Function("greater", [Column("timestamp"), args["timestamp"]])
-                            ],
-                        ),
-                    ],
-                ),
-                Function(
-                    "multiply",
-                    [
-                        self._resolve_cpm_cond(args, "less", None),
-                        function_aliases.resolve_metrics_percentile(
-                            args=args,
-                            alias=None,
-                            extra_conditions=[
-                                Function("less", [Column("timestamp"), args["timestamp"]])
-                            ],
-                        ),
-                    ],
-                ),
-            ],
-            alias,
-        )
-
-    @property
-    def function_converter(self) -> Mapping[str, fields.MetricsFunction]:
-        """While the final functions in clickhouse must have their -Merge combinators in order to function, we don't
-        need to add them here since snuba has a FunctionMapper that will add it for us. Basically it turns expressions
-        like quantiles(0.9)(value) into quantilesMerge(0.9)(percentiles)
-        Make sure to update METRIC_FUNCTION_LIST_BY_TYPE when adding functions here, can't be a dynamic list since the
-        Metric Layer will actually handle which dataset each function goes to
-        """
-        resolve_metric_id = {
-            "name": "metric_id",
-            "fn": lambda args: self.resolve_metric(args["column"]),
-        }
-        function_converter = {
-            function.name: function
-            for function in [
-                fields.MetricsFunction(
-                    "count",
-                    snql_distribution=lambda args, alias: Function(
-                        "countIf",
-                        [
-                            Column("value"),
-                            Function(
-                                "equals",
-                                [
-                                    Column("metric_id"),
-                                    self.resolve_metric("function.duration"),
-                                ],
-                            ),
-                        ],
-                        alias,
-                    ),
-                    default_result_type="integer",
-                ),
-                fields.MetricsFunction(
-                    "cpm",  # calls per minute
-                    snql_distribution=lambda args, alias: self._resolve_cpm(args, alias),
-                    default_result_type="number",
-                ),
-                fields.MetricsFunction(
-                    "cpm_before",
-                    required_args=[fields.TimestampArg("timestamp")],
-                    snql_distribution=lambda args, alias: self._resolve_cpm_cond(
-                        args, "less", alias
-                    ),
-                    default_result_type="number",
-                ),
-                fields.MetricsFunction(
-                    "cpm_after",
-                    required_args=[fields.TimestampArg("timestamp")],
-                    snql_distribution=lambda args, alias: self._resolve_cpm_cond(
-                        args, "greater", alias
-                    ),
-                    default_result_type="number",
-                ),
-                fields.MetricsFunction(
-                    "cpm_delta",
-                    required_args=[fields.TimestampArg("timestamp")],
-                    snql_distribution=self._resolve_cpm_delta,
-                    default_result_type="number",
-                ),
-                fields.MetricsFunction(
-                    "percentile",
-                    required_args=[
-                        fields.with_default(
-                            "function.duration",
-                            fields.MetricArg("column", allowed_columns=["function.duration"]),
-                        ),
-                        fields.NumberRange("percentile", 0, 1),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=function_aliases.resolve_metrics_percentile,
-                    is_percentile=True,
-                    result_type_fn=self.reflective_result_type(),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "p50",
-                    optional_args=[
-                        fields.with_default(
-                            "function.duration",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=["function.duration"],
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=lambda args, alias: function_aliases.resolve_metrics_percentile(
-                        args=args, alias=alias, fixed_percentile=0.50
-                    ),
-                    is_percentile=True,
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "p75",
-                    optional_args=[
-                        fields.with_default(
-                            "function.duration",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=["function.duration"],
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=lambda args, alias: function_aliases.resolve_metrics_percentile(
-                        args=args, alias=alias, fixed_percentile=0.75
-                    ),
-                    is_percentile=True,
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "p95",
-                    optional_args=[
-                        fields.with_default(
-                            "function.duration",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=["function.duration"],
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=lambda args, alias: function_aliases.resolve_metrics_percentile(
-                        args=args, alias=alias, fixed_percentile=0.95
-                    ),
-                    is_percentile=True,
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "p99",
-                    optional_args=[
-                        fields.with_default(
-                            "function.duration",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=["function.duration"],
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=lambda args, alias: function_aliases.resolve_metrics_percentile(
-                        args=args, alias=alias, fixed_percentile=0.99
-                    ),
-                    is_percentile=True,
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "avg",
-                    optional_args=[
-                        fields.with_default(
-                            "function.duration",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=["function.duration"],
-                            ),
-                        ),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_gauge=self._resolve_avg,
-                    snql_distribution=self._resolve_avg,
-                    result_type_fn=self.reflective_result_type(),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "sum",
-                    optional_args=[
-                        fields.with_default(
-                            "function.duration",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=["function.duration"],
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=lambda args, alias: Function(
-                        "sumIf",
-                        [
-                            Column("value"),
-                            Function("equals", [Column("metric_id"), args["metric_id"]]),
-                        ],
-                        alias,
-                    ),
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "percentile_before",
-                    required_args=[
-                        fields.TimestampArg("timestamp"),
-                        fields.NumberRange("percentile", 0, 1),
-                    ],
-                    optional_args=[
-                        fields.with_default(
-                            "function.duration",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=["function.duration"],
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=lambda args, alias: function_aliases.resolve_metrics_percentile(
-                        args=args,
-                        alias=alias,
-                        extra_conditions=[
-                            Function("less", [Column("timestamp"), args["timestamp"]])
-                        ],
-                    ),
-                    is_percentile=True,
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "percentile_after",
-                    required_args=[
-                        fields.TimestampArg("timestamp"),
-                        fields.NumberRange("percentile", 0, 1),
-                    ],
-                    optional_args=[
-                        fields.with_default(
-                            "function.duration",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=["function.duration"],
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=lambda args, alias: function_aliases.resolve_metrics_percentile(
-                        args=args,
-                        alias=alias,
-                        extra_conditions=[
-                            Function("greater", [Column("timestamp"), args["timestamp"]])
-                        ],
-                    ),
-                    is_percentile=True,
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "percentile_delta",
-                    required_args=[
-                        fields.TimestampArg("timestamp"),
-                        fields.NumberRange("percentile", 0, 1),
-                    ],
-                    optional_args=[
-                        fields.with_default(
-                            "function.duration",
-                            fields.MetricArg(
-                                "column",
-                                allowed_columns=["function.duration"],
-                                allow_custom_measurements=False,
-                            ),
-                        ),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=lambda args, alias: Function(
-                        "minus",
-                        [
-                            function_aliases.resolve_metrics_percentile(
-                                args=args,
-                                alias=alias,
-                                extra_conditions=[
-                                    Function("greater", [Column("timestamp"), args["timestamp"]])
-                                ],
-                            ),
-                            function_aliases.resolve_metrics_percentile(
-                                args=args,
-                                alias=alias,
-                                extra_conditions=[
-                                    Function("less", [Column("timestamp"), args["timestamp"]])
-                                ],
-                            ),
-                        ],
-                        alias,
-                    ),
-                    is_percentile=True,
-                    default_result_type="duration",
-                ),
-                fields.MetricsFunction(
-                    "regression_score",
-                    required_args=[
-                        fields.MetricArg(
-                            "column",
-                            allowed_columns=["function.duration"],
-                            allow_custom_measurements=False,
-                        ),
-                        fields.TimestampArg("timestamp"),
-                        fields.NumberRange("percentile", 0, 1),
-                    ],
-                    calculated_args=[resolve_metric_id],
-                    snql_distribution=self._resolve_regression_score,
-                    default_result_type="number",
-                ),
-            ]
-        }
-        return function_converter
diff --git a/src/sentry/search/events/datasets/spans_indexed.py b/src/sentry/search/events/datasets/spans_indexed.py
index a9b045ba4536bd..d32691f62e64b4 100644
--- a/src/sentry/search/events/datasets/spans_indexed.py
+++ b/src/sentry/search/events/datasets/spans_indexed.py
@@ -44,7 +44,7 @@ def __init__(self, builder: BaseQueryBuilder):
     @property
     def search_filter_converter(
         self,
-    ) -> Mapping[str, Callable[[SearchFilter], WhereType | None]]:
+    ) -> dict[str, Callable[[SearchFilter], WhereType | None]]:
         return {
             "message": self._message_filter_converter,
             constants.PROJECT_ALIAS: self._project_slug_filter_converter,
@@ -620,10 +620,11 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     snql_aggregate=lambda args, alias: function_aliases.resolve_epm(
                         args, alias, self.builder
                     ),
+                    optional_args=[IntervalDefault("interval", 1, None)],
                     default_result_type="rate",
                 ),
                 SnQLFunction(
-                    "count",
+                    "count_sample",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -637,14 +638,14 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     default_result_type="integer",
                 ),
                 SnQLFunction(
-                    "sum",
+                    "sum_sample",
                     required_args=[NumericColumn("column", spans=True)],
                     snql_aggregate=self._resolve_aggregate_if("sum"),
                     result_type_fn=self.reflective_result_type(),
                     default_result_type="duration",
                 ),
                 SnQLFunction(
-                    "avg",
+                    "avg_sample",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -654,7 +655,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p50",
+                    "p50_sample",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -664,7 +665,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p75",
+                    "p75_sample",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -674,7 +675,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p90",
+                    "p90_sample",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -684,7 +685,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p95",
+                    "p95_sample",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -694,7 +695,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p99",
+                    "p99_sample",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -704,7 +705,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p100",
+                    "p100_sample",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -730,7 +731,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "count_weighted",
+                    "count",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -738,20 +739,14 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     default_result_type="integer",
                 ),
                 SnQLFunction(
-                    "count_unique_weighted",
-                    required_args=[ColumnTagArg("column")],
-                    snql_aggregate=self._resolve_aggregate_if("uniq"),
-                    default_result_type="integer",
-                ),
-                SnQLFunction(
-                    "sum_weighted",
+                    "sum",
                     required_args=[NumericColumn("column", spans=True)],
                     result_type_fn=self.reflective_result_type(),
                     snql_aggregate=lambda args, alias: self._resolve_sum_weighted(args, alias),
                     default_result_type="duration",
                 ),
                 SnQLFunction(
-                    "avg_weighted",
+                    "avg",
                     required_args=[NumericColumn("column", spans=True)],
                     result_type_fn=self.reflective_result_type(),
                     snql_aggregate=lambda args, alias: Function(
@@ -765,7 +760,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     default_result_type="duration",
                 ),
                 SnQLFunction(
-                    "percentile_weighted",
+                    "percentile",
                     required_args=[
                         NumericColumn("column", spans=True),
                         NumberRange("percentile", 0, 1),
@@ -776,7 +771,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p50_weighted",
+                    "p50",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -788,7 +783,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p75_weighted",
+                    "p75",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -800,7 +795,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p90_weighted",
+                    "p90",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -812,7 +807,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p95_weighted",
+                    "p95",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -824,7 +819,7 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p99_weighted",
+                    "p99",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
@@ -836,29 +831,10 @@ def function_converter(self) -> dict[str, SnQLFunction]:
                     redundant_grouping=True,
                 ),
                 SnQLFunction(
-                    "p100_weighted",
+                    "p100",
                     optional_args=[
                         with_default("span.duration", NumericColumn("column", spans=True)),
                     ],
-                    snql_aggregate=lambda args, alias: self._resolve_percentile_weighted(
-                        args, alias, 1.0
-                    ),
-                    result_type_fn=self.reflective_result_type(),
-                    default_result_type="duration",
-                    redundant_grouping=True,
-                ),
-                # Min and Max are identical to their existing implementations
-                SnQLFunction(
-                    "min_weighted",
-                    required_args=[NumericColumn("column", spans=True)],
-                    snql_aggregate=self._resolve_aggregate_if("min"),
-                    result_type_fn=self.reflective_result_type(),
-                    default_result_type="duration",
-                    redundant_grouping=True,
-                ),
-                SnQLFunction(
-                    "max_weighted",
-                    required_args=[NumericColumn("column", spans=True)],
                     snql_aggregate=self._resolve_aggregate_if("max"),
                     result_type_fn=self.reflective_result_type(),
                     default_result_type="duration",
@@ -938,6 +914,14 @@ def field_alias_converter(self) -> Mapping[str, Callable[[str], SelectType]]:
         existing_field_aliases.update(field_alias_converter)
         return existing_field_aliases
 
+    @property
+    def search_filter_converter(
+        self,
+    ) -> dict[str, Callable[[SearchFilter], WhereType | None]]:
+        existing_search_filters = super().search_filter_converter
+        del existing_search_filters[constants.SPAN_STATUS]
+        return existing_search_filters
+
     def _resolve_sum_weighted(
         self,
         args: Mapping[str, str | SelectType | int | float],
@@ -1059,14 +1043,14 @@ def _query_total_counts(self) -> tuple[float | int, float | int]:
                 dataset=self.builder.dataset,
                 params={},
                 snuba_params=self.builder.params,
-                selected_columns=["count()", "count_weighted()"],
+                selected_columns=["count_sample()", "count()"],
             )
             total_results = total_query.run_query(Referrer.API_SPANS_TOTAL_COUNT_FIELD.value)
             results = total_query.process_results(total_results)
             if len(results["data"]) != 1:
                 raise Exception("Could not query population size")
-            self._cached_count = results["data"][0]["count"]
-            self._cached_count_weighted = results["data"][0]["count_weighted"]
+            self._cached_count = results["data"][0]["count_sample"]
+            self._cached_count_weighted = results["data"][0]["count"]
         return self._cached_count, self._cached_count_weighted
 
     @cached_property
diff --git a/src/sentry/search/events/types.py b/src/sentry/search/events/types.py
index 81992445893f47..f4b8e4e4672311 100644
--- a/src/sentry/search/events/types.py
+++ b/src/sentry/search/events/types.py
@@ -231,6 +231,8 @@ class QueryBuilderConfig:
     skip_field_validation_for_entity_subscription_deletion: bool = False
     allow_metric_aggregates: bool | None = False
     insights_metrics_override_metric_layer: bool = False
+    # Allow the errors query builder to use the entity prefix for fields
+    use_entity_prefix_for_fields: bool = False
 
 
 @dataclass(frozen=True)
diff --git a/src/sentry/seer/similarity/utils.py b/src/sentry/seer/similarity/utils.py
index 9db410eb8fdd73..3e5d47527e06f5 100644
--- a/src/sentry/seer/similarity/utils.py
+++ b/src/sentry/seer/similarity/utils.py
@@ -1,8 +1,10 @@
 import logging
+from collections.abc import Mapping, Sequence
+from enum import StrEnum
 from typing import Any, TypeVar
 
 from sentry import options
-from sentry.eventstore.models import Event
+from sentry.eventstore.models import Event, GroupEvent
 from sentry.killswitches import killswitch_matches_context
 from sentry.models.project import Project
 from sentry.utils import metrics
@@ -15,6 +17,7 @@
 FULLY_MINIFIED_STACKTRACE_MAX_FRAME_COUNT = 20
 SEER_ELIGIBLE_PLATFORMS_EVENTS = frozenset(
     [
+        "csharp",
         "go",
         "java",
         "javascript",
@@ -24,17 +27,14 @@
         "ruby",
     ]
 )
-SEER_ELIGIBLE_PLATFORMS = frozenset(
+# An original set of platforms were backfilled allowing more than 30 system contributing frames
+# being set to seer. Unfortunately, this can cause over grouping. We will need to reduce
+# these set of platforms but for now we will blacklist them.
+SYSTEM_FRAME_CHECK_BLACKLIST_PLATFORMS = frozenset(
     [
-        # "android",
-        # "android-profiling-onboarding-1-install",
-        # "android-profiling-onboarding-3-configure-profiling",
-        # "android-profiling-onboarding-4-upload",
         "bun",
-        # "dart",
         "deno",
         "django",
-        # "flutter",
         "go",
         "go-echo",
         "go-fasthttp",
@@ -44,16 +44,6 @@
         "go-iris",
         "go-martini",
         "go-negroni",
-        # "groovy",
-        "java",
-        "java-android",
-        # "java-appengine",
-        # "java-log4j",
-        # "java-log4j2",
-        # "java-logging",
-        "java-logback",
-        # "java-spring",
-        # "java-spring-boot",
         "javascript",
         "javascript-angular",
         "javascript-angularjs",
@@ -143,6 +133,29 @@
         "ruby-rails",
     ]
 )
+SEER_ELIGIBLE_PLATFORMS = SYSTEM_FRAME_CHECK_BLACKLIST_PLATFORMS | frozenset(
+    [
+        "android",
+        "android-profiling-onboarding-1-install",
+        "android-profiling-onboarding-3-configure-profiling",
+        "android-profiling-onboarding-4-upload",
+        "csharp",
+        "csharp-aspnetcore",
+        "dart",
+        "dotnet",
+        "flutter",
+        "groovy",
+        "java",
+        "java-android",
+        "java-appengine",
+        "java-log4j",
+        "java-log4j2",
+        "java-logging",
+        "java-logback",
+        "java-spring",
+        "java-spring-boot",
+    ]
+)
 BASE64_ENCODED_PREFIXES = [
     "data:text/html;base64",
     "data:text/javascript;base64",
@@ -151,11 +164,20 @@
 ]
 
 
-def _get_value_if_exists(exception_value: dict[str, Any]) -> str:
+class ReferrerOptions(StrEnum):
+    INGEST = "ingest"
+    BACKFILL = "backfill"
+
+
+class TooManyOnlySystemFramesException(Exception):
+    pass
+
+
+def _get_value_if_exists(exception_value: Mapping[str, Any]) -> str:
     return exception_value["values"][0] if exception_value.get("values") else ""
 
 
-def get_stacktrace_string(data: dict[str, Any]) -> str:
+def get_stacktrace_string(data: dict[str, Any], platform: str | None = None) -> str:
     """Format a stacktrace string from the grouping information."""
     app_hash = get_path(data, "app", "hash")
     app_component = get_path(data, "app", "component", "values")
@@ -177,6 +199,7 @@ def get_stacktrace_string(data: dict[str, Any]) -> str:
 
     frame_count = 0
     html_frame_count = 0  # for a temporary metric
+    is_frames_truncated = False
     stacktrace_str = ""
     found_non_snipped_context_line = False
 
@@ -185,22 +208,23 @@ def get_stacktrace_string(data: dict[str, Any]) -> str:
     def _process_frames(frames: list[dict[str, Any]]) -> list[str]:
         nonlocal frame_count
         nonlocal html_frame_count
+        nonlocal is_frames_truncated
         nonlocal found_non_snipped_context_line
         frame_strings = []
 
         contributing_frames = [
             frame for frame in frames if frame.get("id") == "frame" and frame.get("contributes")
         ]
+        if len(contributing_frames) + frame_count > MAX_FRAME_COUNT:
+            is_frames_truncated = True
         contributing_frames = _discard_excess_frames(
             contributing_frames, MAX_FRAME_COUNT, frame_count
         )
         frame_count += len(contributing_frames)
 
         for frame in contributing_frames:
-            frame_dict = {"filename": "", "function": "", "context-line": ""}
-            for frame_values in frame.get("values", []):
-                if frame_values.get("id") in frame_dict:
-                    frame_dict[frame_values["id"]] = _get_value_if_exists(frame_values)
+            frame_dict = extract_values_from_frame_values(frame.get("values", []))
+            filename = extract_filename(frame_dict) or "None"
 
             if not _is_snipped_context_line(frame_dict["context-line"]):
                 found_non_snipped_context_line = True
@@ -213,22 +237,11 @@ def _process_frames(frames: list[dict[str, Any]]) -> list[str]:
             if frame_dict["filename"].endswith("html") or "<html>" in frame_dict["context-line"]:
                 html_frame_count += 1
 
-            # We want to skip frames with base64 encoded filenames since they can be large
-            # and not contain any usable information
-            base64_encoded = False
-            for base64_prefix in BASE64_ENCODED_PREFIXES:
-                if frame_dict["filename"].startswith(base64_prefix):
-                    metrics.incr(
-                        "seer.grouping.base64_encoded_filename",
-                        sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-                    )
-                    base64_encoded = True
-                    break
-            if base64_encoded:
+            if is_base64_encoded_frame(frame_dict):
                 continue
 
             frame_strings.append(
-                f'  File "{frame_dict["filename"]}", function {frame_dict["function"]}\n    {frame_dict["context-line"]}\n'
+                f'  File "{filename}", function {frame_dict["function"]}\n    {frame_dict["context-line"]}\n'
             )
 
         return frame_strings
@@ -259,6 +272,13 @@ def _process_frames(frames: list[dict[str, Any]]) -> list[str]:
                     exc_value = _get_value_if_exists(exception_value)
                 elif exception_value.get("id") == "stacktrace" and frame_count < MAX_FRAME_COUNT:
                     frame_strings = _process_frames(exception_value["values"])
+        if (
+            platform not in SYSTEM_FRAME_CHECK_BLACKLIST_PLATFORMS
+            and is_frames_truncated
+            and not app_hash
+        ):
+            raise TooManyOnlySystemFramesException
+
         # Only exceptions have the type and value properties, so we don't need to handle the threads
         # case here
         header = f"{exc_type}: {exc_value}\n" if exception["id"] == "exception" else ""
@@ -294,7 +314,63 @@ def _process_frames(frames: list[dict[str, Any]]) -> list[str]:
     return stacktrace_str.strip()
 
 
-def event_content_has_stacktrace(event: Event) -> bool:
+def extract_values_from_frame_values(values: Sequence[Mapping[str, Any]]) -> dict[str, Any]:
+    frame_dict = {"filename": "", "function": "", "context-line": "", "module": ""}
+    for frame_values in values:
+        if frame_values.get("id") in frame_dict:
+            frame_dict[frame_values["id"]] = _get_value_if_exists(frame_values)
+    return frame_dict
+
+
+def extract_filename(frame_dict: Mapping[str, Any]) -> str:
+    """
+    Extract the filename from the frame dictionary. Fallback to module if filename is not present.
+    """
+    filename = frame_dict["filename"]
+    if filename == "" and frame_dict["module"] != "":
+        filename = frame_dict["module"]
+    return filename
+
+
+def is_base64_encoded_frame(frame_dict: Mapping[str, Any]) -> bool:
+    # We want to skip frames with base64 encoded filenames since they can be large
+    # and not contain any usable information
+    base64_encoded = False
+    for base64_prefix in BASE64_ENCODED_PREFIXES:
+        if frame_dict["filename"].startswith(base64_prefix):
+            base64_encoded = True
+            break
+    return base64_encoded
+
+
+def get_stacktrace_string_with_metrics(
+    data: dict[str, Any], platform: str | None, referrer: ReferrerOptions
+) -> str | None:
+    stacktrace_string = None
+    key = "grouping.similarity.did_call_seer"
+    sample_rate = options.get("seer.similarity.metrics_sample_rate")
+    try:
+        stacktrace_string = get_stacktrace_string(data, platform)
+    except TooManyOnlySystemFramesException:
+        platform = platform if platform else "unknown"
+        metrics.incr(
+            "grouping.similarity.over_threshold_only_system_frames",
+            sample_rate=sample_rate,
+            tags={"platform": platform, "referrer": referrer},
+        )
+        if referrer == ReferrerOptions.INGEST:
+            metrics.incr(
+                key,
+                sample_rate=sample_rate,
+                tags={"call_made": False, "blocker": "over-threshold-only-system-frames"},
+            )
+    except Exception:
+        logger.exception("Unexpected exception in stacktrace string formatting")
+
+    return stacktrace_string
+
+
+def event_content_has_stacktrace(event: GroupEvent | Event) -> bool:
     # If an event has no stacktrace, there's no data for Seer to analyze, so no point in making the
     # API call. If we ever start analyzing message-only events, we'll need to add `event.title in
     # PLACEHOLDER_EVENT_TITLES` to this check.
@@ -304,7 +380,7 @@ def event_content_has_stacktrace(event: Event) -> bool:
     return exception_stacktrace or threads_stacktrace or only_stacktrace
 
 
-def event_content_is_seer_eligible(event: Event) -> bool:
+def event_content_is_seer_eligible(event: GroupEvent | Event) -> bool:
     """
     Determine if an event's contents makes it fit for using with Seer's similar issues model.
     """
@@ -333,7 +409,7 @@ def event_content_is_seer_eligible(event: Event) -> bool:
     return True
 
 
-def killswitch_enabled(project_id: int, event: Event | None = None) -> bool:
+def killswitch_enabled(project_id: int, event: GroupEvent | Event | None = None) -> bool:
     """
     Check both the global and similarity-specific Seer killswitches.
     """
diff --git a/src/sentry/sentry_apps/api/endpoints/sentry_apps.py b/src/sentry/sentry_apps/api/endpoints/sentry_apps.py
index efa42e1c3752ed..1ebe56f95d6374 100644
--- a/src/sentry/sentry_apps/api/endpoints/sentry_apps.py
+++ b/src/sentry/sentry_apps/api/endpoints/sentry_apps.py
@@ -14,6 +14,8 @@
 from sentry.auth.staff import is_active_staff
 from sentry.auth.superuser import is_active_superuser
 from sentry.constants import SentryAppStatus
+from sentry.db.models.manager.base_query_set import BaseQuerySet
+from sentry.organizations.services.organization import organization_service
 from sentry.sentry_apps.api.bases.sentryapps import SentryAppsBaseEndpoint
 from sentry.sentry_apps.api.parsers.sentry_app import SentryAppParser
 from sentry.sentry_apps.api.serializers.sentry_app import (
@@ -46,25 +48,11 @@ def get(self, request: Request) -> Response:
         elif status == "unpublished":
             queryset = SentryApp.objects.filter(status=SentryAppStatus.UNPUBLISHED)
             if not elevated_user:
-                queryset = queryset.filter(
-                    owner_id__in=[
-                        o.id
-                        for o in user_service.get_organizations(
-                            user_id=request.user.id, only_visible=True
-                        )
-                    ]
-                )
+                queryset = self._filter_queryset_for_user(queryset, request.user.id)
         elif status == "internal":
             queryset = SentryApp.objects.filter(status=SentryAppStatus.INTERNAL)
             if not elevated_user:
-                queryset = queryset.filter(
-                    owner_id__in=[
-                        o.id
-                        for o in user_service.get_organizations(
-                            user_id=request.user.id, only_visible=True
-                        )
-                    ]
-                )
+                queryset = self._filter_queryset_for_user(queryset, request.user.id)
         else:
             if elevated_user:
                 queryset = SentryApp.objects.all()
@@ -168,6 +156,15 @@ def post(self, request: Request, organization) -> Response:
                 analytics.record(name, **log_info)
         return Response(serializer.errors, status=400)
 
+    def _filter_queryset_for_user(self, queryset: BaseQuerySet[SentryApp, SentryApp], user_id: int):
+        owner_ids = []
+        for o in user_service.get_organizations(user_id=user_id, only_visible=True):
+            org_context = organization_service.get_organization_by_id(id=o.id, user_id=user_id)
+            if org_context and org_context.member and "org:read" in org_context.member.scopes:
+                owner_ids.append(o.id)
+
+        return queryset.filter(owner_id__in=owner_ids)
+
     def _has_hook_events(self, request: Request):
         if not request.json_body.get("events"):
             return False
diff --git a/src/sentry/sentry_apps/api/endpoints/sentry_apps_stats.py b/src/sentry/sentry_apps/api/endpoints/sentry_apps_stats.py
index d0ad44c5f50932..7f8aae8ad5f161 100644
--- a/src/sentry/sentry_apps/api/endpoints/sentry_apps_stats.py
+++ b/src/sentry/sentry_apps/api/endpoints/sentry_apps_stats.py
@@ -16,7 +16,7 @@
 class SentryAppsStatsEndpoint(SentryAppsBaseEndpoint):
     owner = ApiOwner.INTEGRATIONS
     publish_status = {
-        "GET": ApiPublishStatus.UNKNOWN,
+        "GET": ApiPublishStatus.PRIVATE,
     }
     permission_classes = (SuperuserOrStaffFeatureFlaggedPermission,)
 
diff --git a/src/sentry/sentry_apps/external_requests/issue_link_requester.py b/src/sentry/sentry_apps/external_requests/issue_link_requester.py
index f999dcd5d5f17c..50279b4d79f8ff 100644
--- a/src/sentry/sentry_apps/external_requests/issue_link_requester.py
+++ b/src/sentry/sentry_apps/external_requests/issue_link_requester.py
@@ -12,6 +12,7 @@
 from sentry.models.group import Group
 from sentry.sentry_apps.external_requests.utils import send_and_save_sentry_app_request, validate
 from sentry.sentry_apps.services.app import RpcSentryAppInstallation
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.utils import json
 
@@ -54,7 +55,7 @@ class IssueLinkRequester:
     uri: str
     group: Group
     fields: dict[str, Any]
-    user: RpcUser
+    user: RpcUser | User
     action: str
 
     def run(self) -> dict[str, Any]:
diff --git a/src/sentry/sentry_apps/external_requests/select_requester.py b/src/sentry/sentry_apps/external_requests/select_requester.py
index b7e746811f3e7b..9df1240653f150 100644
--- a/src/sentry/sentry_apps/external_requests/select_requester.py
+++ b/src/sentry/sentry_apps/external_requests/select_requester.py
@@ -1,6 +1,7 @@
 import logging
+from collections.abc import Sequence
 from dataclasses import dataclass, field
-from typing import Any
+from typing import Annotated, Any, TypedDict
 from urllib.parse import urlencode, urlparse, urlunparse
 from uuid import uuid4
 
@@ -17,6 +18,12 @@
 logger = logging.getLogger("sentry.sentry_apps.external_requests")
 
 
+class SelectRequesterResult(TypedDict, total=False):
+    # Each contained Sequence of strings is of length 2 i.e ["label", "value"]
+    choices: Sequence[Annotated[Sequence[str], 2]]
+    defaultValue: str
+
+
 @dataclass
 class SelectRequester:
     """
@@ -34,7 +41,7 @@ class SelectRequester:
     query: str | None = field(default=None)
     dependent_data: str | None = field(default=None)
 
-    def run(self) -> dict[str, Any]:
+    def run(self) -> SelectRequesterResult:
         response: list[dict[str, str]] = []
         try:
             url = self._build_url()
@@ -71,7 +78,9 @@ def run(self) -> dict[str, Any]:
                 message = "select-requester.request-failed"
 
             logger.info(message, extra=extra)
-            raise APIError from e
+            raise APIError(
+                f"Something went wrong while getting SelectFields from {self.sentry_app.slug}"
+            ) from e
 
         if not self._validate_response(response):
             logger.info(
@@ -85,7 +94,7 @@ def run(self) -> dict[str, Any]:
                 },
             )
             raise ValidationError(
-                f"Invalid response format for SelectField in {self.sentry_app} from uri: {self.uri}"
+                f"Invalid response format for SelectField in {self.sentry_app.slug} from uri: {self.uri}"
             )
         return self._format_response(response)
 
@@ -107,14 +116,16 @@ def _build_url(self) -> str:
         urlparts[4] = urlencode(query)
         return str(urlunparse(urlparts))
 
-    def _validate_response(self, resp: list[dict[str, Any]]) -> bool:
+    # response format must be:
+    # https://docs.sentry.io/organization/integrations/integration-platform/ui-components/formfield/#uri-response-format
+    def _validate_response(self, resp: Sequence[dict[str, Any]]) -> bool:
         return validate(instance=resp, schema_type="select")
 
-    def _format_response(self, resp: list[dict[str, Any]]) -> dict[str, Any]:
+    def _format_response(self, resp: Sequence[dict[str, Any]]) -> SelectRequesterResult:
         # the UI expects the following form:
         # choices: [[label, value]]
         # default: [label, value]
-        response: dict[str, Any] = {}
+        response: SelectRequesterResult = {}
         choices: list[list[str]] = []
 
         for option in resp:
diff --git a/src/sentry/sentry_apps/models/sentry_app.py b/src/sentry/sentry_apps/models/sentry_app.py
index 2693de9b2c7699..effdbaa0bbabb2 100644
--- a/src/sentry/sentry_apps/models/sentry_app.py
+++ b/src/sentry/sentry_apps/models/sentry_app.py
@@ -31,7 +31,7 @@
 from sentry.hybridcloud.models.outbox import ControlOutbox, outbox_context
 from sentry.hybridcloud.outbox.category import OutboxCategory, OutboxScope
 from sentry.models.apiscopes import HasApiScopes
-from sentry.types.region import find_all_region_names
+from sentry.types.region import find_all_region_names, find_regions_for_sentry_app
 from sentry.utils import metrics
 
 # When a developer selects to receive "<Resource> Webhooks" it really means
@@ -234,6 +234,9 @@ def outboxes_for_update(self) -> list[ControlOutbox]:
             for region_name in find_all_region_names()
         ]
 
+    def regions_with_installations(self) -> set[str]:
+        return find_regions_for_sentry_app(self)
+
     def delete(self, *args, **kwargs):
         from sentry.sentry_apps.models.sentry_app_avatar import SentryAppAvatar
 
diff --git a/src/sentry/sentry_apps/services/app/impl.py b/src/sentry/sentry_apps/services/app/impl.py
index 74f3a5fa033484..e266283516b35e 100644
--- a/src/sentry/sentry_apps/services/app/impl.py
+++ b/src/sentry/sentry_apps/services/app/impl.py
@@ -97,7 +97,7 @@ def get_sentry_app_by_slug(self, *, slug: str) -> RpcSentryApp | None:
         except SentryApp.DoesNotExist:
             return None
 
-    def get_installed_for_organization(
+    def get_installations_for_organization(
         self, *, organization_id: int
     ) -> list[RpcSentryAppInstallation]:
         installations = SentryAppInstallation.objects.get_installed_for_organization(
diff --git a/src/sentry/sentry_apps/services/app/service.py b/src/sentry/sentry_apps/services/app/service.py
index beac279d86361c..7d8d8f466fcc60 100644
--- a/src/sentry/sentry_apps/services/app/service.py
+++ b/src/sentry/sentry_apps/services/app/service.py
@@ -8,7 +8,7 @@
 from typing import Any
 
 from sentry.auth.services.auth import AuthenticationContext
-from sentry.hybridcloud.rpc.caching.service import back_with_silo_cache
+from sentry.hybridcloud.rpc.caching.service import back_with_silo_cache, back_with_silo_cache_list
 from sentry.hybridcloud.rpc.filter_query import OpaqueSerializedResponse
 from sentry.hybridcloud.rpc.service import RpcService, rpc_method
 from sentry.sentry_apps.services.app import (
@@ -60,12 +60,20 @@ def find_installation_by_proxy_user(
     ) -> RpcSentryAppInstallation | None:
         pass
 
+    def installations_for_organization(
+        self, *, organization_id: int
+    ) -> list[RpcSentryAppInstallation]:
+        """
+        Get a list of installations for an organization_id
+
+        This is a cached wrapper around get_installations_for_organization
+        """
+        return get_installations_for_organization(organization_id)
+
     @rpc_method
     @abc.abstractmethod
-    def get_installed_for_organization(
-        self,
-        *,
-        organization_id: int,
+    def get_installations_for_organization(
+        self, *, organization_id: int
     ) -> list[RpcSentryAppInstallation]:
         pass
 
@@ -199,6 +207,13 @@ def get_installation(id: int) -> RpcSentryAppInstallation | None:
     return app_service.get_installation_by_id(id=id)
 
 
+@back_with_silo_cache_list(
+    "app_service.get_installed_for_organization", SiloMode.REGION, RpcSentryAppInstallation
+)
+def get_installations_for_organization(organization_id: int) -> list[RpcSentryAppInstallation]:
+    return app_service.get_installations_for_organization(organization_id=organization_id)
+
+
 @back_with_silo_cache("app_service.get_by_application_id", SiloMode.REGION, RpcSentryApp)
 def get_by_application_id(application_id: int) -> RpcSentryApp | None:
     return app_service.find_service_hook_sentry_app(api_application_id=application_id)
diff --git a/src/sentry/sentry_apps/services/app_request/__init__.py b/src/sentry/sentry_apps/services/app_request/__init__.py
new file mode 100644
index 00000000000000..2a9746c30ef42c
--- /dev/null
+++ b/src/sentry/sentry_apps/services/app_request/__init__.py
@@ -0,0 +1,2 @@
+from .model import *  # noqa
+from .service import *  # noqa
diff --git a/src/sentry/sentry_apps/services/app_request/impl.py b/src/sentry/sentry_apps/services/app_request/impl.py
new file mode 100644
index 00000000000000..b791620fff09a2
--- /dev/null
+++ b/src/sentry/sentry_apps/services/app_request/impl.py
@@ -0,0 +1,30 @@
+from sentry.sentry_apps.services.app import app_service
+from sentry.sentry_apps.services.app_request.model import (
+    RpcSentryAppRequest,
+    SentryAppRequestFilterArgs,
+)
+from sentry.sentry_apps.services.app_request.serial import serialize_rpc_sentry_app_request
+from sentry.sentry_apps.services.app_request.service import SentryAppRequestService
+from sentry.utils.sentry_apps import SentryAppWebhookRequestsBuffer
+
+
+class DatabaseBackedSentryAppRequestService(SentryAppRequestService):
+    def get_buffer_requests_for_region(
+        self,
+        *,
+        sentry_app_id: str,
+        region_name: str,
+        filter: SentryAppRequestFilterArgs | None = None,
+    ) -> list[RpcSentryAppRequest] | None:
+        sentry_app = app_service.get_sentry_app_by_id(id=sentry_app_id)
+        if not sentry_app:
+            return None
+        buffer = SentryAppWebhookRequestsBuffer(sentry_app)
+
+        event = filter.get("event", None) if filter else None
+        errors_only = filter.get("errors_only", False) if filter else False
+
+        return [
+            serialize_rpc_sentry_app_request(req)
+            for req in buffer.get_requests(event=event, errors_only=errors_only)
+        ]
diff --git a/src/sentry/sentry_apps/services/app_request/model.py b/src/sentry/sentry_apps/services/app_request/model.py
new file mode 100644
index 00000000000000..c676f5eeb0af8e
--- /dev/null
+++ b/src/sentry/sentry_apps/services/app_request/model.py
@@ -0,0 +1,21 @@
+from typing_extensions import TypedDict
+
+from sentry.hybridcloud.rpc import RpcModel
+
+
+class RpcSentryAppOrganization(RpcModel):
+    name: str
+    slug: str
+
+
+class RpcSentryAppRequest(RpcModel):
+    date: str
+    response_code: int
+    webhook_url: str
+    organization_id: int
+    event_type: str
+
+
+class SentryAppRequestFilterArgs(TypedDict, total=False):
+    event: str
+    errors_only: bool
diff --git a/src/sentry/sentry_apps/services/app_request/serial.py b/src/sentry/sentry_apps/services/app_request/serial.py
new file mode 100644
index 00000000000000..87eff5f677a0c3
--- /dev/null
+++ b/src/sentry/sentry_apps/services/app_request/serial.py
@@ -0,0 +1,13 @@
+from typing import Any
+
+from sentry.sentry_apps.services.app_request.model import RpcSentryAppRequest
+
+
+def serialize_rpc_sentry_app_request(request: dict[str, Any]) -> RpcSentryAppRequest:
+    return RpcSentryAppRequest(
+        date=request.get("date"),
+        response_code=request.get("response_code"),
+        webhook_url=request.get("webhook_url"),
+        organization_id=request.get("organization_id"),
+        event_type=request.get("event_type"),
+    )
diff --git a/src/sentry/sentry_apps/services/app_request/service.py b/src/sentry/sentry_apps/services/app_request/service.py
new file mode 100644
index 00000000000000..88567a5ed34e3d
--- /dev/null
+++ b/src/sentry/sentry_apps/services/app_request/service.py
@@ -0,0 +1,36 @@
+import abc
+
+from sentry.hybridcloud.rpc.resolvers import ByRegionName
+from sentry.hybridcloud.rpc.service import RpcService, regional_rpc_method
+from sentry.sentry_apps.services.app_request.model import (
+    RpcSentryAppRequest,
+    SentryAppRequestFilterArgs,
+)
+from sentry.silo.base import SiloMode
+
+
+class SentryAppRequestService(RpcService):
+    key = "sentry_app_request"
+    local_mode = SiloMode.REGION
+
+    @classmethod
+    def get_local_implementation(cls) -> RpcService:
+        from sentry.sentry_apps.services.app_request.impl import (
+            DatabaseBackedSentryAppRequestService,
+        )
+
+        return DatabaseBackedSentryAppRequestService()
+
+    @regional_rpc_method(resolve=ByRegionName())
+    @abc.abstractmethod
+    def get_buffer_requests_for_region(
+        self,
+        *,
+        sentry_app_id: str,
+        region_name: str,
+        filter: SentryAppRequestFilterArgs | None = None,
+    ) -> list[RpcSentryAppRequest] | None:
+        pass
+
+
+app_request_service = SentryAppRequestService.create_delegation()
diff --git a/src/sentry/sentry_apps/tasks/__init__.py b/src/sentry/sentry_apps/tasks/__init__.py
index 62d7eee5405b7d..26909deb270a05 100644
--- a/src/sentry/sentry_apps/tasks/__init__.py
+++ b/src/sentry/sentry_apps/tasks/__init__.py
@@ -5,6 +5,7 @@
     installation_webhook,
     process_resource_change_bound,
     send_alert_event,
+    send_alert_webhook,
     send_resource_change_webhook,
     workflow_notification,
 )
@@ -20,4 +21,5 @@
     "send_resource_change_webhook",
     "workflow_notification",
     "process_service_hook",
+    "send_alert_webhook",
 )
diff --git a/src/sentry/sentry_apps/tasks/sentry_apps.py b/src/sentry/sentry_apps/tasks/sentry_apps.py
index 0d2aef314790fd..62e35c5197cdaf 100644
--- a/src/sentry/sentry_apps/tasks/sentry_apps.py
+++ b/src/sentry/sentry_apps/tasks/sentry_apps.py
@@ -2,7 +2,7 @@
 
 import logging
 from collections import defaultdict
-from collections.abc import Mapping
+from collections.abc import Mapping, Sequence
 from typing import Any
 
 from celery import Task, current_task
@@ -13,8 +13,10 @@
 from sentry.api.serializers import serialize
 from sentry.constants import SentryAppInstallationStatus
 from sentry.db.models.base import Model
-from sentry.eventstore.models import Event, GroupEvent
+from sentry.eventstore.models import BaseEvent, Event, GroupEvent
+from sentry.features.rollout import in_random_rollout
 from sentry.hybridcloud.rpc.caching import region_caching_service
+from sentry.issues.issue_occurrence import IssueOccurrence
 from sentry.models.activity import Activity
 from sentry.models.group import Group
 from sentry.models.organization import Organization
@@ -29,10 +31,12 @@
     app_service,
     get_by_application_id,
     get_installation,
+    get_installations_for_organization,
 )
 from sentry.shared_integrations.exceptions import ApiHostError, ApiTimeoutError, ClientError
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task, retry
+from sentry.types.rules import RuleFuture
 from sentry.users.services.user.model import RpcUser
 from sentry.users.services.user.service import user_service
 from sentry.utils import metrics
@@ -74,6 +78,8 @@
 def _webhook_event_data(
     event: Event | GroupEvent, group_id: int, project_id: int
 ) -> dict[str, Any]:
+    from sentry.api.serializers.rest_framework import convert_dict_key_case, snake_to_camel_case
+
     project = Project.objects.get_from_cache(id=project_id)
     organization = Organization.objects.get_from_cache(id=project.organization_id)
 
@@ -90,6 +96,10 @@ def _webhook_event_data(
             "sentry-organization-event-detail", args=[organization.slug, group_id, event.event_id]
         )
     )
+    if hasattr(event, "occurrence") and event.occurrence is not None:
+        event_context["occurrence"] = convert_dict_key_case(
+            event.occurrence.to_dict(), snake_to_camel_case
+        )
 
     # The URL has a regex OR in it ("|") which means `reverse` cannot generate
     # a valid URL (it can't know which option to pick). We have to manually
@@ -99,6 +109,104 @@ def _webhook_event_data(
     return event_context
 
 
+@instrumented_task(name="sentry.sentry_apps.tasks.sentry_apps.send_alert_webhook", **TASK_OPTIONS)
+@retry_decorator
+def send_alert_webhook(
+    rule: str,
+    sentry_app_id: int,
+    instance_id: str,
+    group_id: int,
+    occurrence_id: str,
+    additional_payload_key: str | None = None,
+    additional_payload: Mapping[str, Any] | None = None,
+    **kwargs: Any,
+):
+    group = Group.objects.get_from_cache(id=group_id)
+    assert group, "Group must exist to get related attributes"
+    project = Project.objects.get_from_cache(id=group.project_id)
+    organization = Organization.objects.get_from_cache(id=project.organization_id)
+    extra = {
+        "sentry_app_id": sentry_app_id,
+        "project_slug": project.slug,
+        "organization_slug": organization.slug,
+        "rule": rule,
+    }
+
+    sentry_app = app_service.get_sentry_app_by_id(id=sentry_app_id)
+    if sentry_app is None:
+        logger.info("event_alert_webhook.missing_sentry_app", extra=extra)
+        return
+
+    installations = app_service.get_many(
+        filter=dict(
+            organization_id=organization.id,
+            app_ids=[sentry_app.id],
+            status=SentryAppInstallationStatus.INSTALLED,
+        )
+    )
+    if not installations:
+        logger.info("event_alert_webhook.missing_installation", extra=extra)
+        return
+    (install,) = installations
+
+    nodedata = nodestore.backend.get(
+        BaseEvent.generate_node_id(project_id=project.id, event_id=instance_id)
+    )
+
+    if not nodedata:
+        extra = {
+            "event_id": instance_id,
+            "occurrence_id": occurrence_id,
+            "rule": rule,
+            "sentry_app": sentry_app.slug,
+            "group_id": group_id,
+        }
+        logger.info("send_alert_event.missing_event", extra=extra)
+        return
+
+    occurrence = None
+    if occurrence_id:
+        occurrence = IssueOccurrence.fetch(occurrence_id, project_id=project.id)
+
+        if not occurrence:
+            logger.info(
+                "send_alert_event.missing_occurrence",
+                extra={"occurrence_id": occurrence_id, "project_id": project.id},
+            )
+            return
+
+    group_event = GroupEvent(
+        project_id=project.id,
+        event_id=instance_id,
+        group=group,
+        data=nodedata,
+        occurrence=occurrence,
+    )
+
+    event_context = _webhook_event_data(group_event, group.id, project.id)
+
+    data = {"event": event_context, "triggered_rule": rule}
+
+    # Attach extra payload to the webhook
+    if additional_payload_key and additional_payload:
+        data[additional_payload_key] = additional_payload
+
+    request_data = AppPlatformEvent(
+        resource="event_alert", action="triggered", install=install, data=data
+    )
+
+    send_and_save_webhook_request(sentry_app, request_data)
+
+    # On success, record analytic event for Alert Rule UI Component
+    if request_data.data.get("issue_alert"):
+        analytics.record(
+            "alert_rule_ui_component_webhook.sent",
+            organization_id=organization.id,
+            sentry_app_id=sentry_app_id,
+            event=f"{request_data.resource}.{request_data.action}",
+        )
+
+
 @instrumented_task(name="sentry.sentry_apps.tasks.sentry_apps.send_alert_event", **TASK_OPTIONS)
 @retry_decorator
 def send_alert_event(
@@ -226,9 +334,10 @@ def _process_resource_change(
             id=Project.objects.get_from_cache(id=instance.project_id).organization_id
         )
         assert org, "organization must exist to get related sentry app installations"
-        installations: list[RpcSentryAppInstallation] = [
+
+        installations = [
             installation
-            for installation in app_service.get_installed_for_organization(organization_id=org.id)
+            for installation in app_service.installations_for_organization(organization_id=org.id)
             if event in installation.sentry_app.events
         ]
 
@@ -314,6 +423,10 @@ def clear_region_cache(sentry_app_id: int, region_name: str) -> None:
         organization_id__in=list(install_map.keys()), region_name=region_name
     ).values("organization_id")
     for region_row in region_query:
+        region_caching_service.clear_key(
+            key=get_installations_for_organization.key_from(region_row["organization_id"]),
+            region_name=region_name,
+        )
         installs = install_map[region_row["organization_id"]]
         for install_id in installs:
             region_caching_service.clear_key(
@@ -420,7 +533,7 @@ def send_resource_change_webhook(
     metrics.incr("resource_change.processed", sample_rate=1.0, tags={"change_event": event})
 
 
-def notify_sentry_app(event: Event | GroupEvent, futures):
+def notify_sentry_app(event: GroupEvent, futures: Sequence[RuleFuture]):
     for f in futures:
         if not f.kwargs.get("sentry_app"):
             continue
@@ -440,12 +553,22 @@ def notify_sentry_app(event: Event | GroupEvent, futures):
                 "settings": settings,
             }
 
-        send_alert_event.delay(
-            event=event,
-            rule=f.rule.label,
-            sentry_app_id=f.kwargs["sentry_app"].id,
-            **extra_kwargs,
-        )
+        if in_random_rollout("sentryapps.send_alert_event.use-eventid"):
+            send_alert_webhook.delay(
+                instance_id=event.event_id,
+                group_id=event.group_id,
+                occurrence_id=event.occurrence_id if hasattr(event, "occurrence_id") else None,
+                rule=f.rule.label,
+                sentry_app_id=f.kwargs["sentry_app"].id,
+                **extra_kwargs,
+            )
+        else:
+            send_alert_event.delay(
+                event=event,
+                rule=f.rule.label,
+                sentry_app_id=f.kwargs["sentry_app"].id,
+                **extra_kwargs,
+            )
 
 
 def send_webhooks(installation: RpcSentryAppInstallation, event: str, **kwargs: Any) -> None:
diff --git a/src/sentry/sentry_metrics/querying/samples_list.py b/src/sentry/sentry_metrics/querying/samples_list.py
deleted file mode 100644
index ef305548c71a71..00000000000000
--- a/src/sentry/sentry_metrics/querying/samples_list.py
+++ /dev/null
@@ -1,1225 +0,0 @@
-from abc import ABC, abstractmethod
-from bisect import bisect
-from collections.abc import Callable
-from dataclasses import dataclass
-from datetime import datetime
-from typing import Any, Literal, TypedDict, cast
-
-from snuba_sdk import And, Column, Condition, Function, Op, Or
-
-from sentry import options
-from sentry.api.event_search import SearchFilter, SearchKey, SearchValue
-from sentry.search.events.builder.base import BaseQueryBuilder
-from sentry.search.events.builder.discover import DiscoverQueryBuilder
-from sentry.search.events.builder.metrics_summaries import MetricsSummariesQueryBuilder
-from sentry.search.events.builder.spans_indexed import SpansIndexedQueryBuilder
-from sentry.search.events.types import QueryBuilderConfig, SelectType, SnubaParams
-from sentry.snuba.dataset import Dataset
-from sentry.snuba.metrics.naming_layer.mri import (
-    SpanMRI,
-    TransactionMRI,
-    is_custom_metric,
-    is_measurement,
-    parse_mri,
-)
-from sentry.snuba.referrer import Referrer
-from sentry.utils.numbers import clip
-
-
-@dataclass(frozen=True)
-class SpanKey:
-    group: str
-    timestamp: str
-    span_id: str
-
-
-class Summary(TypedDict):
-    min: float
-    max: float
-    sum: float
-    count: int
-
-
-class AbstractSamplesListExecutor(ABC):
-    # picking 30 samples gives a decent chance to surface a few samples from the higher percentiles
-    num_samples = 30
-
-    sortable_columns: set[str]
-
-    def __init__(
-        self,
-        *,
-        mri: str,
-        snuba_params: SnubaParams,
-        referrer: Referrer,
-        fields: list[str],
-        operation: str | None = None,
-        query: str | None = None,
-        min: float | None = None,
-        max: float | None = None,
-        sort: str | None = None,
-        rollup: int | None = None,
-    ):
-        self.mri = mri
-        self.snuba_params = snuba_params
-        self.fields = fields
-        self.operation = operation
-        self.query = query
-        self.min = min
-        self.max = max
-        self.sort = sort
-        self.rollup = rollup
-        self.referrer = referrer
-
-    @classmethod
-    @abstractmethod
-    def supports_mri(cls, mri: str) -> bool:
-        raise NotImplementedError
-
-    @classmethod
-    def supports_sort(cls, column: str) -> bool:
-        return column in cls.sortable_columns
-
-    @abstractmethod
-    def get_matching_traces(self, limit: int) -> tuple[list[str], list[datetime]]:
-        raise NotImplementedError
-
-    @abstractmethod
-    def get_matching_spans_from_traces(
-        self,
-        trace_ids: list[str],
-        max_spans_per_trace: int,
-    ) -> list[SpanKey]:
-        raise NotImplementedError
-
-    def get_matching_spans(self, offset, limit):
-        assert self.rollup is not None
-
-        if self.sort is None:
-            execute_fn = self.get_matching_spans_unsorted
-        else:
-            execute_fn = self.get_matching_spans_sorted
-        return execute_fn(offset, limit)
-
-    @abstractmethod
-    def get_matching_spans_sorted(self, offset, limit):
-        raise NotImplementedError
-
-    @abstractmethod
-    def get_matching_spans_unsorted(self, offset, limit):
-        raise NotImplementedError
-
-    def get_spans_by_key(
-        self,
-        span_keys: list[SpanKey],
-        additional_fields: list[str] | None = None,
-    ):
-        if not span_keys:
-            return {"data": []}
-
-        fields = self.fields[:]
-        if additional_fields is not None:
-            fields.extend(additional_fields)
-
-        builder = SpansIndexedQueryBuilder(
-            Dataset.SpansIndexed,
-            params={},
-            snuba_params=self.snuba_params,
-            selected_columns=fields,
-            limit=len(span_keys),
-            offset=0,
-        )
-
-        # This are the additional conditions to better take advantage of the ORDER BY
-        # on the spans table. This creates a list of conditions to be `OR`ed together
-        # that can will be used by ClickHouse to narrow down the granules.
-        #
-        # The span ids are not in this condition because they are more effective when
-        # specified within the `PREWHERE` clause. So, it's in a separate condition.
-        conditions = [
-            And(
-                [
-                    Condition(builder.column("span.group"), Op.EQ, key.group),
-                    Condition(
-                        builder.column("timestamp"), Op.EQ, datetime.fromisoformat(key.timestamp)
-                    ),
-                ]
-            )
-            for key in span_keys
-        ]
-
-        if len(conditions) == 1:
-            order_by_condition = conditions[0]
-        else:
-            order_by_condition = Or(conditions)
-
-        # Using `IN` combined with putting the list in a SnQL "tuple" triggers an optimizer
-        # in snuba where it
-        # 1. moves the condition into the `PREWHERE` clause
-        # 2. maps the ids to the underlying UInt64 and uses the bloom filter index
-        #
-        # NOTE: the "tuple" here is critical as without it, snuba will not correctly
-        # rewrite the condition and keep it in the WHERE and as a hexidecimal.
-        span_id_condition = Condition(
-            builder.column("id"),
-            Op.IN,
-            Function("tuple", [key.span_id for key in span_keys]),
-        )
-
-        builder.add_conditions([order_by_condition, span_id_condition])
-
-        query_results = builder.run_query(self.referrer.value)
-        return builder.process_results(query_results)
-
-
-class SegmentsSamplesListExecutor(AbstractSamplesListExecutor):
-    sortable_columns = {"timestamp", "span.duration", "summary"}
-
-    SORT_MAPPING = {
-        "span.duration": "transaction.duration",
-        "timestamp": "timestamp",
-    }
-
-    @classmethod
-    @abstractmethod
-    def mri_to_column(cls, mri: str) -> str | None:
-        raise NotImplementedError
-
-    @classmethod
-    def convert_sort(cls, sort: str, mri: str) -> tuple[Literal["", "-"], str] | None:
-        direction: Literal["", "-"] = ""
-
-        if sort.startswith("-"):
-            direction = "-"
-            sort = sort[1:]
-
-        if sort in cls.SORT_MAPPING:
-            return direction, cls.SORT_MAPPING[sort]
-
-        if sort == "summary":
-            column = cls.mri_to_column(mri)
-            if column is not None:
-                return direction, column
-
-        return None
-
-    @classmethod
-    def supports_mri(cls, mri: str) -> bool:
-        return cls.mri_to_column(mri) is not None
-
-    def get_matching_traces(self, limit: int) -> tuple[list[str], list[datetime]]:
-        column = self.mri_to_column(self.mri)
-        assert column
-
-        builder = SpansIndexedQueryBuilder(
-            Dataset.Transactions,
-            params={},
-            snuba_params=self.snuba_params,
-            query=self.query,
-            selected_columns=["trace", "timestamp"],
-            # The orderby is intentionally `None` here as this query is much faster
-            # if we let Clickhouse decide which order to return the results in.
-            # This also means we cannot order by any columns or paginate.
-            orderby=None,
-            limit=limit,
-            limitby=("trace", 1),
-        )
-
-        additional_conditions = self.get_additional_conditions(builder)
-        min_max_conditions = self.get_min_max_conditions(builder.resolve_column(column))
-        builder.add_conditions([*additional_conditions, *min_max_conditions])
-
-        query_results = builder.run_query(self.referrer.value)
-        results = builder.process_results(query_results)
-
-        trace_ids = [row["trace"] for row in results["data"]]
-        timestamps = [datetime.fromisoformat(row["timestamp"]) for row in results["data"]]
-        return trace_ids, timestamps
-
-    def get_matching_spans_from_traces(
-        self,
-        trace_ids: list[str],
-        max_spans_per_trace: int,
-    ) -> list[SpanKey]:
-        column = self.mri_to_column(self.mri)
-        assert column is not None
-
-        builder = SpansIndexedQueryBuilder(
-            Dataset.Transactions,
-            params={},
-            snuba_params=self.snuba_params,
-            query=self.query,
-            selected_columns=["timestamp", "span_id"],
-            # The orderby is intentionally `None` here as this query is much faster
-            # if we let Clickhouse decide which order to return the results in.
-            # This also means we cannot order by any columns or paginate.
-            orderby=None,
-            limit=len(trace_ids) * max_spans_per_trace,
-            limitby=("trace", max_spans_per_trace),
-        )
-
-        trace_id_condition = Condition(Column("trace_id"), Op.IN, trace_ids)
-        additional_conditions = self.get_additional_conditions(builder)
-        min_max_conditions = self.get_min_max_conditions(builder.resolve_column(column))
-        builder.add_conditions(
-            [
-                trace_id_condition,
-                *additional_conditions,
-                *min_max_conditions,
-            ]
-        )
-
-        query_results = builder.run_query(self.referrer.value)
-        results = builder.process_results(query_results)
-
-        return [
-            SpanKey(
-                group="00",  # all segments have a group of `00` currently
-                timestamp=row["timestamp"],
-                span_id=row["span_id"],
-            )
-            for row in results["data"]
-        ]
-
-    def _get_spans(
-        self,
-        span_keys: list[SpanKey],
-        summaries: dict[str, Summary],
-    ):
-        result = self.get_spans_by_key(
-            span_keys,
-            # force `id` to be one of the fields
-            additional_fields=["id"],
-        )
-
-        # if there is a sort, we want to preserve the result in the same
-        # order as the span keys which we can do by checking the span ids
-        if self.sort:
-            order = {key.span_id: i for i, key in enumerate(span_keys)}
-            result["data"].sort(key=lambda row: order[row["id"]])
-
-        # if `id` wasn't initially there, we should remove it
-        should_pop_id = "id" not in self.fields
-
-        for row in result["data"]:
-            span_id = row.pop("id") if should_pop_id else row["id"]
-            row["summary"] = summaries[span_id]
-
-        return result
-
-    def get_matching_spans_sorted(self, offset, limit):
-        span_keys, summaries = self.get_sorted_span_keys(offset, limit)
-        return self._get_spans(span_keys, summaries)
-
-    def get_sorted_span_keys(
-        self,
-        offset: int,
-        limit: int,
-    ) -> tuple[list[SpanKey], dict[str, Summary]]:
-        """
-        When getting examples for a segment, it's actually much faster to read it
-        from the transactions dataset compared to the spans dataset as it's a much
-        smaller dataset.
-
-        One consideration here is that there is an one to one mapping between a
-        transaction to a segment today. If this relationship changes, we'll have to
-        rethink how to fetch segment samples a little as the transactions dataset
-        may not contain all the necessary data.
-        """
-        assert self.sort
-        sort = self.convert_sort(self.sort, self.mri)
-        assert sort is not None
-        direction, sort_column = sort
-
-        mri_column = self.mri_to_column(self.mri)
-        assert mri_column is not None
-
-        fields = ["span_id", "timestamp"]
-        if sort_column not in fields:
-            fields.append(sort_column)
-        if mri_column not in fields:
-            fields.append(mri_column)
-
-        builder = DiscoverQueryBuilder(
-            Dataset.Transactions,
-            params={},
-            snuba_params=self.snuba_params,
-            query=self.query,
-            selected_columns=fields,
-            orderby=f"{direction}{sort_column}",
-            limit=limit,
-            offset=offset,
-        )
-
-        additional_conditions = self.get_additional_conditions(builder)
-        min_max_conditions = self.get_min_max_conditions(builder.column(mri_column))
-        builder.add_conditions([*additional_conditions, *min_max_conditions])
-
-        query_results = builder.run_query(self.referrer.value)
-        result = builder.process_results(query_results)
-
-        span_keys = [
-            SpanKey(
-                group="00",  # all segments have a group of `00` currently
-                timestamp=row["timestamp"],
-                span_id=row["span_id"],
-            )
-            for row in result["data"]
-        ]
-
-        """
-        Because transaction level measurements currently do not get
-        propagated to the spans dataset, we have to query them here,
-        generate the summary for it here, and propagate it to the
-        results of the next stage.
-
-        Once we start writing transaction level measurements to the
-        indexed spans dataset, we can stop doing this and read the
-        value directly from the indexed spans dataset.
-
-        For simplicity, all transaction based metrics use this approach.
-        """
-        summaries = {
-            cast(str, row["span_id"]): cast(
-                Summary,
-                {
-                    "min": row[mri_column],
-                    "max": row[mri_column],
-                    "sum": row[mri_column],
-                    "count": 1,
-                },
-            )
-            for row in result["data"]
-        }
-
-        return span_keys, summaries
-
-    def get_matching_spans_unsorted(self, offset, limit):
-        span_keys, summaries = self.get_unsorted_span_keys(offset, limit)
-        return self._get_spans(span_keys, summaries)
-
-    def get_unsorted_span_keys(
-        self,
-        offset: int,
-        limit: int,
-    ) -> tuple[list[SpanKey], dict[str, Summary]]:
-        """
-        When getting examples for a segment, it's actually much faster to read it
-        from the transactions dataset compared to the spans dataset as it's a much
-        smaller dataset.
-
-        One consideration here is that there is an one to one mapping between a
-        transaction to a segment today. If this relationship changes, we'll have to
-        rethink how to fetch segment samples a little as the transactions dataset
-        may not contain all the necessary data.
-        """
-        column = self.mri_to_column(self.mri)
-        assert column is not None
-
-        builder = DiscoverQueryBuilder(
-            Dataset.Transactions,
-            params={},
-            snuba_params=self.snuba_params,
-            query=self.query,
-            selected_columns=[
-                f"rounded_timestamp({self.rollup})",
-                f"examples({column}, {self.num_samples}) AS examples",
-            ],
-            limit=limit,
-            offset=offset,
-            sample_rate=options.get("metrics.sample-list.sample-rate"),
-            config=QueryBuilderConfig(functions_acl=["rounded_timestamp", "examples"]),
-        )
-
-        additional_conditions = self.get_additional_conditions(builder)
-        min_max_conditions = self.get_min_max_conditions(builder.column(column))
-        builder.add_conditions([*additional_conditions, *min_max_conditions])
-
-        query_results = builder.run_query(self.referrer.value)
-        result = builder.process_results(query_results)
-
-        metric_key = lambda example: example[2]  # sort by metric
-        for row in result["data"]:
-            row["examples"] = pick_samples(row["examples"], metric_key=metric_key)
-
-        span_keys = [
-            SpanKey(
-                group="00",  # all segments have a group of `00` currently
-                timestamp=example[0],
-                span_id=example[1],
-            )
-            for row in result["data"]
-            for example in row["examples"]
-        ][:limit]
-
-        """
-        Because transaction level measurements currently do not get
-        propagated to the spans dataset, we have to query them here,
-        generate the summary for it here, and propagate it to the
-        results of the next stage.
-
-        Once we start writing transaction level measurements to the
-        indexed spans dataset, we can stop doing this and read the
-        value directly from the indexed spans dataset.
-
-        For simplicity, all transaction based metrics use this approach.
-        """
-        summaries = {
-            cast(str, example[1]): cast(
-                Summary,
-                {
-                    "min": example[2],
-                    "max": example[2],
-                    "sum": example[2],
-                    "count": 1,
-                },
-            )
-            for row in result["data"]
-            for example in row["examples"]
-        }
-
-        return span_keys, summaries
-
-    def get_additional_conditions(self, builder: BaseQueryBuilder) -> list[Condition]:
-        raise NotImplementedError
-
-    def get_min_max_conditions(self, column: Column) -> list[Condition]:
-        conditions = []
-
-        if self.min is not None:
-            conditions.append(Condition(column, Op.GTE, self.min))
-        if self.max is not None:
-            conditions.append(Condition(column, Op.LTE, self.max))
-
-        return conditions
-
-
-class TransactionDurationSamplesListExecutor(SegmentsSamplesListExecutor):
-    @classmethod
-    def mri_to_column(cls, mri: str) -> str | None:
-        if mri == TransactionMRI.DURATION.value:
-            # Because we read this from the transactions dataset,
-            # we use the name for the transactions dataset instead.
-            return "transaction.duration"
-        return None
-
-    def get_additional_conditions(self, builder: BaseQueryBuilder) -> list[Condition]:
-        return []
-
-
-class TransactionMeasurementsSamplesListExecutor(SegmentsSamplesListExecutor):
-    @classmethod
-    def mri_to_column(cls, mri) -> str | None:
-        name = cls.mri_to_measurement_name(mri)
-        if name is not None:
-            return f"measurements.{name}"
-
-        return None
-
-    @classmethod
-    def mri_to_measurement_name(cls, mri) -> str | None:
-        parsed_mri = parse_mri(mri)
-        if parsed_mri is not None and is_measurement(parsed_mri):
-            return parsed_mri.name[len("measurements:") :]
-        return None
-
-    def get_additional_conditions(self, builder: BaseQueryBuilder) -> list[Condition]:
-        name = self.mri_to_measurement_name(self.mri)
-        return [Condition(Function("has", [Column("measurements.key"), name]), Op.EQ, 1)]
-
-
-class SpansSamplesListExecutor(AbstractSamplesListExecutor):
-    sortable_columns = {"timestamp", "span.duration", "span.self_time", "summary"}
-
-    @classmethod
-    @abstractmethod
-    def mri_to_column(cls, mri) -> str | None:
-        raise NotImplementedError
-
-    @classmethod
-    def convert_sort(cls, sort: str, mri: str) -> tuple[Literal["", "-"], str] | None:
-        direction: Literal["", "-"] = ""
-
-        if sort.startswith("-"):
-            direction = "-"
-            sort = sort[1:]
-
-        if sort == "summary":
-            column = cls.mri_to_column(mri)
-            if column is not None:
-                return direction, column
-
-        if sort in cls.sortable_columns:
-            return direction, sort
-
-        return None
-
-    @classmethod
-    def supports_mri(cls, mri: str) -> bool:
-        return cls.mri_to_column(mri) is not None
-
-    def get_matching_traces(self, limit: int) -> tuple[list[str], list[datetime]]:
-        column = self.mri_to_column(self.mri)
-        assert column is not None
-
-        builder = SpansIndexedQueryBuilder(
-            Dataset.SpansIndexed,
-            params={},
-            snuba_params=self.snuba_params,
-            query=self.query,
-            selected_columns=["trace", "timestamp"],
-            # The orderby is intentionally `None` here as this query is much faster
-            # if we let Clickhouse decide which order to return the results in.
-            # This also means we cannot order by any columns or paginate.
-            orderby=None,
-            limit=limit,
-            limitby=("trace", 1),
-        )
-
-        additional_conditions = self.get_additional_conditions(builder)
-        min_max_conditions = self.get_min_max_conditions(builder.resolve_column(column))
-        builder.add_conditions([*additional_conditions, *min_max_conditions])
-
-        query_results = builder.run_query(self.referrer.value)
-        results = builder.process_results(query_results)
-
-        trace_ids = [row["trace"] for row in results["data"]]
-        timestamps = [datetime.fromisoformat(row["timestamp"]) for row in results["data"]]
-        return trace_ids, timestamps
-
-    def get_matching_spans_from_traces(
-        self,
-        trace_ids: list[str],
-        max_spans_per_trace: int,
-    ) -> list[SpanKey]:
-        column = self.mri_to_column(self.mri)
-        assert column is not None
-
-        builder = SpansIndexedQueryBuilder(
-            Dataset.SpansIndexed,
-            params={},
-            snuba_params=self.snuba_params,
-            query=self.query,
-            selected_columns=["span.group", "timestamp", "id"],
-            # The orderby is intentionally `None` here as this query is much faster
-            # if we let Clickhouse decide which order to return the results in.
-            # This also means we cannot order by any columns or paginate.
-            orderby=None,
-            limit=len(trace_ids) * max_spans_per_trace,
-            limitby=("trace", max_spans_per_trace),
-        )
-
-        trace_id_condition = Condition(Column("trace_id"), Op.IN, trace_ids)
-        additional_conditions = self.get_additional_conditions(builder)
-        min_max_conditions = self.get_min_max_conditions(builder.resolve_column(column))
-        builder.add_conditions(
-            [
-                trace_id_condition,
-                *additional_conditions,
-                *min_max_conditions,
-            ]
-        )
-
-        query_results = builder.run_query(self.referrer.value)
-        results = builder.process_results(query_results)
-
-        return [
-            SpanKey(
-                group=row["span.group"],
-                timestamp=row["timestamp"],
-                span_id=row["id"],
-            )
-            for row in results["data"]
-        ]
-
-    def get_matching_spans_sorted(self, offset, limit):
-        """
-        Since we're already querying the spans table sorted on some column,
-        there's no reason to split this into 2 queries. We can go ahead and
-        just do it all in a single query.
-        """
-        assert self.sort
-        sort = self.convert_sort(self.sort, self.mri)
-        assert sort is not None
-        direction, sort_column = sort
-
-        fields = self.fields[:]
-        if sort_column not in fields:
-            fields.append(sort_column)
-
-        column = self.mri_to_column(self.mri)
-        assert column is not None
-        if column not in fields:
-            fields.append(column)
-
-        builder = SpansIndexedQueryBuilder(
-            Dataset.SpansIndexed,
-            params={},
-            snuba_params=self.snuba_params,
-            selected_columns=fields,
-            orderby=f"{direction}{sort_column}",
-            limit=limit,
-            offset=0,
-        )
-
-        additional_conditions = self.get_additional_conditions(builder)
-
-        min_max_conditions = self.get_min_max_conditions(builder.resolve_column(column))
-
-        builder.add_conditions([*additional_conditions, *min_max_conditions])
-
-        query_results = builder.run_query(self.referrer.value)
-        result = builder.process_results(query_results)
-
-        should_pop_column = column not in self.fields
-
-        for row in result["data"]:
-            value = row.pop(column) if should_pop_column else row[column]
-            row["summary"] = {
-                "min": value,
-                "max": value,
-                "sum": value,
-                "count": 1,
-            }
-
-        return result
-
-    def get_matching_spans_unsorted(self, offset, limit):
-        span_keys = self.get_unsorted_span_keys(offset, limit)
-
-        column = self.mri_to_column(self.mri)
-        assert column is not None  # should always resolve to a column here
-
-        result = self.get_spans_by_key(span_keys, additional_fields=[column])
-
-        should_pop_column = column not in self.fields
-
-        for row in result["data"]:
-            value = row.pop(column) if should_pop_column else row[column]
-            row["summary"] = {
-                "min": value,
-                "max": value,
-                "sum": value,
-                "count": 1,
-            }
-
-        return result
-
-    def get_unsorted_span_keys(self, offset: int, limit: int) -> list[SpanKey]:
-        column = self.mri_to_column(self.mri)
-
-        for dataset_segmentation_condition_fn in self.dataset_segmentation_conditions():
-            builder = SpansIndexedQueryBuilder(
-                Dataset.SpansIndexed,
-                params={},
-                snuba_params=self.snuba_params,
-                query=self.query,
-                selected_columns=[
-                    f"rounded_timestamp({self.rollup})",
-                    f"examples({column}, {self.num_samples}) AS examples",
-                ],
-                limit=limit,
-                offset=offset,
-                sample_rate=options.get("metrics.sample-list.sample-rate"),
-                config=QueryBuilderConfig(functions_acl=["rounded_timestamp", "examples"]),
-            )
-
-            segmentation_conditions = dataset_segmentation_condition_fn(builder)
-
-            additional_conditions = self.get_additional_conditions(builder)
-
-            assert column is not None
-            min_max_conditions = self.get_min_max_conditions(builder.resolve_column(column))
-
-            builder.add_conditions(
-                [
-                    *segmentation_conditions,
-                    *additional_conditions,
-                    *min_max_conditions,
-                ]
-            )
-
-            query_results = builder.run_query(self.referrer.value)
-            result = builder.process_results(query_results)
-
-            if not result["data"]:
-                continue
-
-            metric_key = lambda example: example[3]  # sort by metric
-            for row in result["data"]:
-                row["examples"] = pick_samples(row["examples"], metric_key=metric_key)
-
-            return [
-                SpanKey(
-                    group=example[0],
-                    timestamp=example[1],
-                    span_id=example[2],
-                )
-                for row in result["data"]
-                for example in row["examples"]
-            ][:limit]
-
-        return []
-
-    @abstractmethod
-    def get_additional_conditions(self, builder: BaseQueryBuilder) -> list[Condition]:
-        raise NotImplementedError
-
-    def dataset_segmentation_conditions(
-        self,
-    ) -> list[Callable[[BaseQueryBuilder], list[Condition]]]:
-        return [lambda builder: []]
-
-    def get_min_max_conditions(self, column: SelectType) -> list[Condition]:
-        conditions = []
-
-        if self.min is not None:
-            conditions.append(Condition(column, Op.GTE, self.min))
-        if self.max is not None:
-            conditions.append(Condition(column, Op.LTE, self.max))
-
-        return conditions
-
-
-class SpansTimingsSamplesListExecutor(SpansSamplesListExecutor):
-    MRI_MAPPING = {
-        SpanMRI.DURATION.value: "span.duration",
-        SpanMRI.SELF_TIME.value: "span.self_time",
-    }
-
-    @classmethod
-    def mri_to_column(cls, mri) -> str | None:
-        return cls.MRI_MAPPING.get(mri)
-
-    def get_additional_conditions(self, builder: BaseQueryBuilder) -> list[Condition]:
-        return []
-
-    def dataset_segmentation_conditions(
-        self,
-    ) -> list[Callable[[BaseQueryBuilder], list[Condition]]]:
-        return [
-            # This grouping makes the assumption that spans are divided into 2 groups right now.
-            # Those that are classified with a non zero group, and those that are unclassified
-            # with a zero group.
-            #
-            # In the future, if all span groups are classified, this segmentation should change
-            # to reflect that.
-            lambda builder: [
-                # The `00` group is used for spans not used within the
-                # new starfish experience. It's effectively the group
-                # for other. It is a massive group, so we've chosen
-                # to exclude it here.
-                Condition(builder.column("span.group"), Op.NEQ, "00"),
-            ],
-            lambda builder: [
-                # If the previous query contained no results, we'll
-                # have to search the `00` group which is slower but
-                # unfortunately necessary here.
-                Condition(builder.column("span.group"), Op.EQ, "00"),
-            ],
-        ]
-
-
-class SpansMeasurementsSamplesListExecutor(SpansSamplesListExecutor):
-    # These are some hard coded metrics in the spans name space that can be
-    # queried in the measurements of the indexed spans dataset
-    MRI_MAPPING = {
-        SpanMRI.RESPONSE_CONTENT_LENGTH.value: "http.response_content_length",
-        SpanMRI.DECODED_RESPONSE_CONTENT_LENGTH.value: "http.decoded_response_content_length",
-        SpanMRI.RESPONSE_TRANSFER_SIZE.value: "http.response_transfer_size",
-        SpanMRI.AI_TOTAL_TOKENS.value: "ai_total_tokens_used",
-        SpanMRI.AI_TOTAL_COST.value: "ai_total_cost",
-        SpanMRI.CACHE_ITEM_SIZE.value: "cache.item_size",
-        SpanMRI.MOBILE_SLOW_FRAMES.value: "frames.slow",
-        SpanMRI.MOBILE_FROZEN_FRAMES.value: "frames.frozen",
-        SpanMRI.MOBILE_TOTAL_FRAMES.value: "frames.total",
-        SpanMRI.MOBILE_FRAMES_DELAY.value: "frames.delay",
-        SpanMRI.MESSAGE_RECEIVE_LATENCY.value: "messaging.message.receive.latency",
-    }
-
-    @classmethod
-    def mri_to_column(cls, mri) -> str | None:
-        name = cls.mri_measurement_name(mri)
-        if name is not None:
-            return f"measurements.{name}"
-
-        return None
-
-    @classmethod
-    def mri_measurement_name(cls, mri) -> str | None:
-        if name := cls.MRI_MAPPING.get(mri):
-            return name
-
-        # some web vitals exist on spans
-        parsed_mri = parse_mri(mri)
-        if (
-            parsed_mri is not None
-            and parsed_mri.namespace == "spans"
-            and parsed_mri.name.startswith("webvital.")
-        ):
-            return parsed_mri.name[len("webvital:") :]
-
-        return None
-
-    def get_additional_conditions(self, builder: BaseQueryBuilder) -> list[Condition]:
-        name = self.mri_measurement_name(self.mri)
-        return [Condition(Function("has", [Column("measurements.key"), name]), Op.EQ, 1)]
-
-
-class CustomSamplesListExecutor(AbstractSamplesListExecutor):
-    sortable_columns = {"timestamp", "span.duration", "summary"}
-
-    SORT_MAPPING = {
-        "span.duration": "span.duration",
-        "timestamp": "timestamp",
-    }
-
-    OPERATION_COLUMN_MAPPING = {
-        "min": "min_metric",
-        "max": "max_metric",
-        "count": "count_metric",
-    }
-
-    # refer to the definition of `examples()` in the metrics summary dataset
-    EXAMPLES_SORT_KEY = {
-        "min": 3,
-        "max": 4,
-        "count": 6,
-    }
-
-    @classmethod
-    def convert_sort(cls, sort: str, operation: str | None) -> tuple[Literal["", "-"], str] | None:
-        direction: Literal["", "-"] = ""
-
-        if sort.startswith("-"):
-            direction = "-"
-            sort = sort[1:]
-
-        if sort in cls.SORT_MAPPING:
-            return direction, cls.SORT_MAPPING[sort]
-
-        if sort == "summary":
-            return direction, cls.OPERATION_COLUMN_MAPPING.get(operation or "", "avg_metric")
-
-        return None
-
-    @classmethod
-    def supports_mri(cls, mri: str) -> bool:
-        parsed_mri = parse_mri(mri)
-        if parsed_mri is not None and is_custom_metric(parsed_mri):
-            return True
-        return False
-
-    def get_matching_traces(self, limit: int) -> tuple[list[str], list[datetime]]:
-        builder = MetricsSummariesQueryBuilder(
-            Dataset.MetricsSummaries,
-            params={},
-            snuba_params=self.snuba_params,
-            query=self.query,
-            selected_columns=["trace", "timestamp"],
-            # The orderby is intentionally `None` here as this query is much faster
-            # if we let Clickhouse decide which order to return the results in.
-            # This also means we cannot order by any columns or paginate.
-            orderby=None,
-            limit=limit,
-            limitby=("trace", 1),
-        )
-
-        additional_conditions = self.get_additional_conditions(builder)
-        min_max_conditions = self.get_min_max_conditions(builder)
-        builder.add_conditions([*additional_conditions, *min_max_conditions])
-
-        query_results = builder.run_query(self.referrer.value)
-        results = builder.process_results(query_results)
-
-        trace_ids = [row["trace"] for row in results["data"]]
-        timestamps = [datetime.fromisoformat(row["timestamp"]) for row in results["data"]]
-        return trace_ids, timestamps
-
-    def get_matching_spans_from_traces(
-        self,
-        trace_ids: list[str],
-        max_spans_per_trace: int,
-    ) -> list[SpanKey]:
-        builder = MetricsSummariesQueryBuilder(
-            Dataset.MetricsSummaries,
-            params={},
-            snuba_params=self.snuba_params,
-            query=self.query,
-            selected_columns=["span.group", "timestamp", "id"],
-            # The orderby is intentionally `None` here as this query is much faster
-            # if we let Clickhouse decide which order to return the results in.
-            # This also means we cannot order by any columns or paginate.
-            orderby=None,
-            limit=len(trace_ids) * max_spans_per_trace,
-            limitby=("trace", max_spans_per_trace),
-        )
-
-        trace_id_condition = Condition(Column("trace_id"), Op.IN, trace_ids)
-        additional_conditions = self.get_additional_conditions(builder)
-        min_max_conditions = self.get_min_max_conditions(builder)
-        builder.add_conditions(
-            [
-                trace_id_condition,
-                *additional_conditions,
-                *min_max_conditions,
-            ]
-        )
-
-        query_results = builder.run_query(self.referrer.value)
-        results = builder.process_results(query_results)
-
-        return [
-            SpanKey(
-                group=row["span.group"],
-                timestamp=row["timestamp"],
-                span_id=row["id"],
-            )
-            for row in results["data"]
-        ]
-
-    def _get_spans(
-        self,
-        span_keys: list[SpanKey],
-        summaries: dict[str, Summary],
-    ):
-        result = self.get_spans_by_key(span_keys, additional_fields=["id"])
-
-        # if there is a sort, we want to preserve the result in the same
-        # order as the span keys which we can do by checking the span ids
-        if self.sort:
-            order = {key.span_id: i for i, key in enumerate(span_keys)}
-            result["data"].sort(key=lambda row: order[row["id"]])
-
-        should_pop_id = "id" not in self.fields
-
-        for row in result["data"]:
-            span_id = row.pop("id") if should_pop_id else row["id"]
-            row["summary"] = summaries[span_id]
-
-        return result
-
-    def get_matching_spans_sorted(self, offset, limit):
-        span_keys, summaries = self.get_sorted_span_keys(offset, limit)
-        return self._get_spans(span_keys, summaries)
-
-    def get_sorted_span_keys(
-        self,
-        offset: int,
-        limit: int,
-    ) -> tuple[list[SpanKey], dict[str, Summary]]:
-        assert self.sort
-        sort = self.convert_sort(self.sort, self.operation)
-        assert sort is not None
-        direction, sort_column = sort
-
-        fields = [
-            "id",
-            "timestamp",
-            "span.group",
-            "min_metric",
-            "max_metric",
-            "sum_metric",
-            "count_metric",
-        ]
-        if sort_column not in fields:
-            fields.append(sort_column)
-
-        builder = MetricsSummariesQueryBuilder(
-            Dataset.MetricsSummaries,
-            params={},
-            snuba_params=self.snuba_params,
-            query=self.query,
-            selected_columns=fields,
-            orderby=f"{direction}{sort_column}",
-            limit=limit,
-            offset=offset,
-            # This table has a poor SAMPLE BY so DO NOT use it for now
-            # sample_rate=options.get("metrics.sample-list.sample-rate"),
-            config=QueryBuilderConfig(functions_acl=["rounded_timestamp", "example"]),
-        )
-
-        additional_conditions = self.get_additional_conditions(builder)
-        min_max_conditions = self.get_min_max_conditions(builder)
-        builder.add_conditions([*additional_conditions, *min_max_conditions])
-
-        query_results = builder.run_query(self.referrer.value)
-        result = builder.process_results(query_results)
-
-        span_keys = [
-            SpanKey(
-                group=row["span.group"],
-                timestamp=row["timestamp"],
-                span_id=row["id"],
-            )
-            for row in result["data"]
-        ]
-
-        """
-        The indexed spans dataset does not contain any metric related
-        data. To propagate these values, we read it from the metric
-        summaries table, and copy them to the results in the next step.
-        """
-        summaries = {
-            cast(str, row["id"]): cast(
-                Summary,
-                {
-                    "min": row["min_metric"],
-                    "max": row["max_metric"],
-                    "sum": row["sum_metric"],
-                    "count": row["count_metric"],
-                },
-            )
-            for row in result["data"]
-        }
-
-        return span_keys, summaries
-
-    def get_matching_spans_unsorted(self, offset, limit):
-        span_keys, summaries = self.get_unsorted_span_keys(offset, limit)
-        return self._get_spans(span_keys, summaries)
-
-    def get_unsorted_span_keys(
-        self,
-        offset: int,
-        limit: int,
-    ) -> tuple[list[SpanKey], dict[str, Summary]]:
-        builder = MetricsSummariesQueryBuilder(
-            Dataset.MetricsSummaries,
-            params={},
-            snuba_params=self.snuba_params,
-            query=self.query,
-            selected_columns=[
-                f"rounded_timestamp({self.rollup})",
-                f"examples({self.num_samples}) AS examples",
-            ],
-            limit=limit,
-            offset=offset,
-            # This table has a poor SAMPLE BY so DO NOT use it for now
-            # sample_rate=options.get("metrics.sample-list.sample-rate"),
-            config=QueryBuilderConfig(functions_acl=["rounded_timestamp", "examples"]),
-        )
-
-        additional_conditions = self.get_additional_conditions(builder)
-        min_max_conditions = self.get_min_max_conditions(builder)
-        builder.add_conditions([*additional_conditions, *min_max_conditions])
-
-        query_results = builder.run_query(self.referrer.value)
-        result = builder.process_results(query_results)
-
-        # 7 here refers to the avg value which is the default
-        # if the operaton doesn't have metric it should sort by
-        index = self.EXAMPLES_SORT_KEY.get(self.operation or "", 7)  # sort by metric
-        metric_key = lambda example: example[index]
-
-        for row in result["data"]:
-            row["examples"] = pick_samples(row["examples"], metric_key=metric_key)
-
-        span_keys = [
-            SpanKey(
-                group=example[0],
-                timestamp=example[1],
-                span_id=example[2],
-            )
-            for row in result["data"]
-            for example in row["examples"]
-        ][:limit]
-
-        """
-        The indexed spans dataset does not contain any metric related
-        data. To propagate these values, we read it from the metric
-        summaries table, and copy them to the results in the next step.
-        """
-        summaries = {
-            cast(str, example[2]): cast(
-                Summary,
-                {
-                    "min": example[3],
-                    "max": example[4],
-                    "sum": example[5],
-                    "count": example[6],
-                },
-            )
-            for row in result["data"]
-            for example in row["examples"]
-        }
-
-        return span_keys, summaries
-
-    def get_additional_conditions(self, builder: BaseQueryBuilder) -> list[Condition]:
-        return [
-            builder.convert_search_filter_to_condition(
-                SearchFilter(SearchKey("metric"), "=", SearchValue(self.mri)),
-            )
-        ]
-
-    def get_min_max_conditions(self, builder: BaseQueryBuilder) -> list[Condition]:
-        conditions = []
-
-        column = builder.resolve_column(
-            self.OPERATION_COLUMN_MAPPING.get(self.operation or "", "avg_metric")
-        )
-
-        if self.min is not None:
-            conditions.append(Condition(column, Op.GTE, self.min))
-        if self.max is not None:
-            conditions.append(Condition(column, Op.LTE, self.max))
-
-        return conditions
-
-
-SAMPLE_LIST_EXECUTORS = [
-    TransactionDurationSamplesListExecutor,
-    TransactionMeasurementsSamplesListExecutor,
-    SpansTimingsSamplesListExecutor,
-    SpansMeasurementsSamplesListExecutor,
-    CustomSamplesListExecutor,
-]
-
-
-def get_sample_list_executor_cls(mri) -> type[AbstractSamplesListExecutor] | None:
-    for executor_cls in SAMPLE_LIST_EXECUTORS:
-        if executor_cls.supports_mri(mri):
-            return executor_cls
-    return None
-
-
-def pick_samples(
-    samples: list[Any],
-    metric_key: Callable[[Any], float],
-) -> list[Any]:
-    # if there are at most 3 samples, there's no picking needed
-    # as we want to return at most 3 from the list provided
-    if len(samples) <= 3:
-        return samples
-
-    samples.sort(key=metric_key)
-
-    keys = [metric_key(sample) for sample in samples]
-
-    # first element is the one near the average
-    # but must not be the first or last element
-    avg_m = sum(keys) / len(keys)
-    idx_m = bisect(keys, avg_m)
-    # ensure there is at least 1 element on both sides
-    # of the middle element we just picked
-    # i.e. should not pick index 0 and len(keys) - 1
-    idx_m = clip(idx_m, 1, len(keys) - 2)
-
-    # second element is near the average of first
-    # split, but must not be the split element
-    avg_l = sum(keys[:idx_m]) / idx_m
-    idx_l = bisect(keys, avg_l, hi=idx_m - 1)
-    idx_l += 1  # push it closer to the middle
-    # ensure this is not the same as middle element
-    idx_l = clip(idx_l, 0, idx_m - 1)
-
-    # third element is near the average of second
-    # split, but must not be the split element
-    avg_r = sum(keys[idx_m + 1 :]) / (len(keys) - idx_m - 1)
-    idx_r = bisect(keys, avg_r, lo=idx_m + 1)
-    idx_r -= 1  # push it closer to the middle
-    # ensure this is not the same as middle element
-    idx_r = clip(idx_r, idx_m + 1, len(keys) - 1)
-
-    return [samples[idx_m], samples[idx_l], samples[idx_r]]
diff --git a/src/sentry/snuba/dataset.py b/src/sentry/snuba/dataset.py
index 799029ea0e7b19..e2ab7d47fd87f5 100644
--- a/src/sentry/snuba/dataset.py
+++ b/src/sentry/snuba/dataset.py
@@ -54,12 +54,6 @@ class Dataset(Enum):
 
     EventsAnalyticsPlatform = "events_analytics_platform"
 
-    MetricsSummaries = "metrics_summaries"
-    """
-    Summaries of all metrics within a span. Used to correlate indexed
-    spans to a metric.
-    """
-
 
 @unique
 class EntityKey(Enum):
@@ -79,7 +73,6 @@ class EntityKey(Enum):
     GenericOrgMetricsCounters = "generic_org_metrics_counters"
     IssuePlatform = "search_issues"
     Functions = "functions"
-    MetricsSummaries = "metrics_summaries"
 
 
 @unique
diff --git a/src/sentry/snuba/discover.py b/src/sentry/snuba/discover.py
index 99e57559448d85..dbc94b6c85af38 100644
--- a/src/sentry/snuba/discover.py
+++ b/src/sentry/snuba/discover.py
@@ -20,12 +20,7 @@
     TimeseriesQueryBuilder,
     TopEventsQueryBuilder,
 )
-from sentry.search.events.fields import (
-    FIELD_ALIASES,
-    get_function_alias,
-    get_json_meta_type,
-    is_function,
-)
+from sentry.search.events.fields import FIELD_ALIASES, get_function_alias, is_function
 from sentry.search.events.types import (
     EventsResponse,
     HistogramParams,
@@ -312,6 +307,7 @@ def timeseries_query(
     dataset: Dataset = Dataset.Discover,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ) -> SnubaTSResult:
     """
     High-level API for doing arbitrary user timeseries queries against events.
@@ -337,6 +333,8 @@ def timeseries_query(
     allow_metric_aggregates - Ignored here, only used in metric enhanced performance
     fallback_to_transactions - Whether to fallback to the transactions dataset if the query
                     fails in metrics enhanced requests. To be removed once the discover dataset is split.
+    transform_alias_to_input_format - Whether aggregate columns should be returned in the originally
+                                requested function format.
     """
     assert dataset in [
         Dataset.Discover,
@@ -356,6 +354,7 @@ def timeseries_query(
             config=QueryBuilderConfig(
                 functions_acl=functions_acl,
                 has_metrics=has_metrics,
+                transform_alias_to_input_format=transform_alias_to_input_format,
             ),
         )
         query_list = [base_builder]
@@ -411,20 +410,10 @@ def timeseries_query(
             compared_value = compared_row.get(col_name, 0)
             row["comparisonCount"] = compared_value
 
-    result = results[0]
+    result = base_builder.process_results(results[0])
 
     return SnubaTSResult(
-        {
-            "data": result["data"],
-            "meta": {
-                "fields": {
-                    value["name"]: get_json_meta_type(
-                        value["name"], value.get("type"), base_builder
-                    )
-                    for value in result["meta"]
-                }
-            },
-        },
+        {"data": result["data"], "meta": result["meta"]},
         snuba_params.start_date,
         snuba_params.end_date,
         rollup,
diff --git a/src/sentry/snuba/entity_subscription.py b/src/sentry/snuba/entity_subscription.py
index e4731e6baf73ef..08c7319179d86f 100644
--- a/src/sentry/snuba/entity_subscription.py
+++ b/src/sentry/snuba/entity_subscription.py
@@ -213,6 +213,7 @@ def build_query_builder(
                 skip_time_conditions=True,
                 parser_config_overrides=parser_config_overrides,
                 skip_field_validation_for_entity_subscription_deletion=skip_field_validation_for_entity_subscription_deletion,
+                use_entity_prefix_for_fields=True,
             ),
         )
 
@@ -671,6 +672,9 @@ def get_entity_key_from_snuba_query(
     project_id: int,
     skip_field_validation_for_entity_subscription_deletion: bool = False,
 ) -> EntityKey:
+    query_dataset = Dataset(snuba_query.dataset)
+    if query_dataset == Dataset.EventsAnalyticsPlatform:
+        return EntityKey.EAPSpans
     entity_subscription = get_entity_subscription_from_snuba_query(
         snuba_query,
         organization_id,
diff --git a/src/sentry/snuba/errors.py b/src/sentry/snuba/errors.py
index 6e3de25c26257c..8466a1f40c2c78 100644
--- a/src/sentry/snuba/errors.py
+++ b/src/sentry/snuba/errors.py
@@ -14,7 +14,6 @@
     ErrorsTimeseriesQueryBuilder,
     ErrorsTopEventsQueryBuilder,
 )
-from sentry.search.events.fields import get_json_meta_type
 from sentry.search.events.types import EventsResponse, QueryBuilderConfig, SnubaParams
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.discover import OTHER_KEY, create_result_key, transform_tips, zerofill
@@ -105,6 +104,7 @@ def timeseries_query(
     on_demand_metrics_type: MetricSpecType | None = None,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ):
 
     with sentry_sdk.start_span(op="errors", name="timeseries.filter_transform"):
@@ -121,6 +121,7 @@ def timeseries_query(
                 functions_acl=functions_acl,
                 has_metrics=has_metrics,
                 parser_config_overrides=PARSER_CONFIG_OVERRIDES,
+                transform_alias_to_input_format=transform_alias_to_input_format,
             ),
         )
         query_list = [base_builder]
@@ -175,19 +176,12 @@ def timeseries_query(
             cmp_result_val = cmp_result.get(col_name, 0)
             result["comparisonCount"] = cmp_result_val
 
-    result = results[0]
+    result = base_builder.process_results(results[0])
 
     return SnubaTSResult(
         {
             "data": result["data"],
-            "meta": {
-                "fields": {
-                    value["name"]: get_json_meta_type(
-                        value["name"], value.get("type"), base_builder
-                    )
-                    for value in result["meta"]
-                }
-            },
+            "meta": result["meta"],
         },
         snuba_params.start_date,
         snuba_params.end_date,
diff --git a/src/sentry/snuba/events.py b/src/sentry/snuba/events.py
index 3b201dc4dcf1d8..24718ed5a41150 100644
--- a/src/sentry/snuba/events.py
+++ b/src/sentry/snuba/events.py
@@ -601,20 +601,20 @@ class Columns(Enum):
         alias="app.in_foreground",
     )
     OS_DISTRIBUTION_NAME = Column(
-        group_name="events.contexts[os.distribution.name]",
-        event_name="contexts[os.distribution.name]",
-        transaction_name="contexts[os.distribution.name]",
-        discover_name="contexts[os.distribution.name]",
-        issue_platform_name="contexts[os.distribution.name]",
-        alias="os.distribution.name",
+        group_name="events.contexts[os.distribution_name]",
+        event_name="contexts[os.distribution_name]",
+        transaction_name="contexts[os.distribution_name]",
+        discover_name="contexts[os.distribution_name]",
+        issue_platform_name="contexts[os.distribution_name]",
+        alias="os.distribution_name",
     )
     OS_DISTRIBUTION_VERSION = Column(
-        group_name="events.contexts[os.distribution.version]",
-        event_name="contexts[os.distribution.version]",
-        transaction_name="contexts[os.distribution.version]",
-        discover_name="contexts[os.distribution.version]",
-        issue_platform_name="contexts[os.distribution.version]",
-        alias="os.distribution.version",
+        group_name="events.contexts[os.distribution_version]",
+        event_name="contexts[os.distribution_version]",
+        transaction_name="contexts[os.distribution_version]",
+        discover_name="contexts[os.distribution_version]",
+        issue_platform_name="contexts[os.distribution_version]",
+        alias="os.distribution_version",
     )
     # Transactions specific columns
     TRANSACTION_OP = Column(
diff --git a/src/sentry/snuba/functions.py b/src/sentry/snuba/functions.py
index 8c17391226de11..c5641706f9f449 100644
--- a/src/sentry/snuba/functions.py
+++ b/src/sentry/snuba/functions.py
@@ -1,5 +1,5 @@
 import logging
-from datetime import datetime
+from datetime import timedelta
 from typing import Any
 
 import sentry_sdk
@@ -10,7 +10,6 @@
     ProfileFunctionsTimeseriesQueryBuilder,
     ProfileTopFunctionsTimeseriesQueryBuilder,
 )
-from sentry.search.events.fields import get_json_meta_type
 from sentry.search.events.types import QueryBuilderConfig, SnubaParams
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.discover import transform_tips, zerofill
@@ -82,7 +81,7 @@ def timeseries_query(
     rollup: int,
     referrer: str = "",
     zerofill_results: bool = True,
-    comparison_delta: datetime | None = None,
+    comparison_delta: timedelta | None = None,
     functions_acl: list[str] | None = None,
     allow_metric_aggregates: bool = False,
     has_metrics: bool = False,
@@ -91,6 +90,7 @@ def timeseries_query(
     on_demand_metrics_type: MetricSpecType | None = None,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ) -> Any:
 
     builder = ProfileFunctionsTimeseriesQueryBuilder(
@@ -102,6 +102,7 @@ def timeseries_query(
         selected_columns=selected_columns,
         config=QueryBuilderConfig(
             functions_acl=functions_acl,
+            transform_alias_to_input_format=transform_alias_to_input_format,
         ),
     )
     results = builder.run_query(referrer=referrer, query_source=query_source)
@@ -121,12 +122,7 @@ def timeseries_query(
                 if zerofill_results
                 else results["data"]
             ),
-            "meta": {
-                "fields": {
-                    value["name"]: get_json_meta_type(value["name"], value.get("type"), builder)
-                    for value in results["meta"]
-                }
-            },
+            "meta": results["meta"],
         },
         snuba_params.start_date,
         snuba_params.end_date,
@@ -274,14 +270,7 @@ def format_top_events_timeseries_results(
                         else item["data"]
                     ),
                     "order": item["order"],
-                    "meta": {
-                        "fields": {
-                            value["name"]: get_json_meta_type(
-                                value["name"], value.get("type"), query_builder
-                            )
-                            for value in result["meta"]
-                        }
-                    },
+                    "meta": result["meta"],
                 },
                 snuba_params.start_date,
                 snuba_params.end_date,
diff --git a/src/sentry/snuba/issue_platform.py b/src/sentry/snuba/issue_platform.py
index 7f4cb3162f3605..c4b26427682e2c 100644
--- a/src/sentry/snuba/issue_platform.py
+++ b/src/sentry/snuba/issue_platform.py
@@ -7,7 +7,6 @@
 from sentry.exceptions import InvalidSearchQuery
 from sentry.search.events.builder.discover import DiscoverQueryBuilder
 from sentry.search.events.builder.issue_platform import IssuePlatformTimeseriesQueryBuilder
-from sentry.search.events.fields import get_json_meta_type
 from sentry.search.events.types import EventsResponse, QueryBuilderConfig, SnubaParams
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.discover import transform_tips, zerofill
@@ -121,6 +120,7 @@ def timeseries_query(
     on_demand_metrics_type: MetricSpecType | None = None,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ):
     """
     High-level API for doing arbitrary user timeseries queries against events.
@@ -159,6 +159,7 @@ def timeseries_query(
             config=QueryBuilderConfig(
                 functions_acl=functions_acl,
                 has_metrics=has_metrics,
+                transform_alias_to_input_format=transform_alias_to_input_format,
             ),
         )
         query_list = [base_builder]
@@ -211,19 +212,12 @@ def timeseries_query(
             cmp_result_val = cmp_result.get(col_name, 0)
             result["comparisonCount"] = cmp_result_val
 
-    result = results[0]
+    result = base_builder.process_results(results[0])
 
     return SnubaTSResult(
         {
             "data": result["data"],
-            "meta": {
-                "fields": {
-                    value["name"]: get_json_meta_type(
-                        value["name"], value.get("type"), base_builder
-                    )
-                    for value in result["meta"]
-                }
-            },
+            "meta": result["meta"],
         },
         snuba_params.start_date,
         snuba_params.end_date,
diff --git a/src/sentry/snuba/metrics_enhanced_performance.py b/src/sentry/snuba/metrics_enhanced_performance.py
index d9e9248839e572..2273781467e894 100644
--- a/src/sentry/snuba/metrics_enhanced_performance.py
+++ b/src/sentry/snuba/metrics_enhanced_performance.py
@@ -139,6 +139,7 @@ def timeseries_query(
     on_demand_metrics_type=None,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ) -> SnubaTSResult:
     """
     High-level API for doing arbitrary user timeseries queries against events.
@@ -163,6 +164,7 @@ def timeseries_query(
                 on_demand_metrics_enabled=on_demand_metrics_enabled,
                 on_demand_metrics_type=on_demand_metrics_type,
                 query_source=query_source,
+                transform_alias_to_input_format=transform_alias_to_input_format,
             )
         # raise Invalid Queries since the same thing will happen with discover
         except InvalidSearchQuery:
@@ -191,6 +193,7 @@ def timeseries_query(
             functions_acl=functions_acl,
             has_metrics=has_metrics,
             query_source=query_source,
+            transform_alias_to_input_format=transform_alias_to_input_format,
         )
     return SnubaTSResult(
         {
diff --git a/src/sentry/snuba/metrics_performance.py b/src/sentry/snuba/metrics_performance.py
index fc586c49bccc38..68e00c52bfccf8 100644
--- a/src/sentry/snuba/metrics_performance.py
+++ b/src/sentry/snuba/metrics_performance.py
@@ -258,6 +258,7 @@ def timeseries_query(
     groupby: Column | None = None,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ) -> SnubaTSResult:
     """
     High-level API for doing arbitrary user timeseries queries against events.
@@ -282,6 +283,7 @@ def run_metrics_query(inner_params: SnubaParams):
                     use_metrics_layer=use_metrics_layer,
                     on_demand_metrics_enabled=on_demand_metrics_enabled,
                     on_demand_metrics_type=on_demand_metrics_type,
+                    transform_alias_to_input_format=transform_alias_to_input_format,
                 ),
             )
             metrics_referrer = referrer + ".metrics-enhanced"
diff --git a/src/sentry/snuba/metrics_summaries.py b/src/sentry/snuba/metrics_summaries.py
deleted file mode 100644
index 3abff797de7237..00000000000000
--- a/src/sentry/snuba/metrics_summaries.py
+++ /dev/null
@@ -1,60 +0,0 @@
-from sentry.search.events.builder.metrics_summaries import MetricsSummariesQueryBuilder
-from sentry.search.events.types import QueryBuilderConfig
-from sentry.snuba.dataset import Dataset
-from sentry.snuba.metrics.extraction import MetricSpecType
-from sentry.snuba.query_sources import QuerySource
-
-
-def query(
-    selected_columns,
-    query,
-    params,
-    snuba_params=None,
-    equations=None,
-    orderby=None,
-    offset=None,
-    limit=50,
-    referrer=None,
-    auto_fields=False,
-    auto_aggregations=False,
-    include_equation_fields=False,
-    allow_metric_aggregates=False,
-    use_aggregate_conditions=False,
-    conditions=None,
-    functions_acl=None,
-    transform_alias_to_input_format=False,
-    sample=None,
-    has_metrics=False,
-    use_metrics_layer=False,
-    skip_tag_resolution=False,
-    extra_columns=None,
-    on_demand_metrics_enabled=False,
-    on_demand_metrics_type: MetricSpecType | None = None,
-    fallback_to_transactions=False,
-    query_source: QuerySource | None = None,
-):
-    builder = MetricsSummariesQueryBuilder(
-        Dataset.MetricsSummaries,
-        params,
-        snuba_params=snuba_params,
-        query=query,
-        selected_columns=selected_columns,
-        equations=equations,
-        orderby=orderby,
-        limit=limit,
-        offset=offset,
-        sample_rate=sample,
-        config=QueryBuilderConfig(
-            has_metrics=has_metrics,
-            transform_alias_to_input_format=transform_alias_to_input_format,
-            skip_tag_resolution=skip_tag_resolution,
-            equation_config={"auto_add": include_equation_fields},
-            auto_fields=auto_fields,
-            auto_aggregations=auto_aggregations,
-            use_aggregate_conditions=use_aggregate_conditions,
-            functions_acl=functions_acl,
-        ),
-    )
-
-    result = builder.process_results(builder.run_query(referrer, query_source=query_source))
-    return result
diff --git a/src/sentry/snuba/profile_functions_metrics.py b/src/sentry/snuba/profile_functions_metrics.py
deleted file mode 100644
index eae59d3a28d9db..00000000000000
--- a/src/sentry/snuba/profile_functions_metrics.py
+++ /dev/null
@@ -1,299 +0,0 @@
-import logging
-from datetime import timedelta
-
-from snuba_sdk import Column, Condition
-
-import sentry.models
-from sentry.search.events.builder.profile_functions_metrics import (
-    ProfileFunctionsMetricsQueryBuilder,
-    TimeseriesProfileFunctionsMetricsQueryBuilder,
-    TopProfileFunctionsMetricsQueryBuilder,
-)
-from sentry.search.events.types import EventsResponse, QueryBuilderConfig, SnubaParams
-from sentry.snuba import discover
-from sentry.snuba.dataset import Dataset
-from sentry.snuba.metrics.extraction import MetricSpecType
-from sentry.snuba.query_sources import QuerySource
-from sentry.utils.snuba import SnubaTSResult
-
-logger = logging.getLogger(__name__)
-
-
-def query(
-    selected_columns: list[str],
-    query: str,
-    referrer: str,
-    snuba_params: SnubaParams | None = None,
-    equations: list[str] | None = None,
-    orderby: list[str] | None = None,
-    offset: int | None = None,
-    limit: int = 50,
-    auto_fields: bool = False,
-    auto_aggregations: bool = False,
-    include_equation_fields: bool = False,
-    allow_metric_aggregates: bool = False,
-    use_aggregate_conditions: bool = False,
-    conditions: list[Condition] | None = None,
-    functions_acl: list[str] | None = None,
-    transform_alias_to_input_format: bool = False,
-    sample: float | None = None,
-    has_metrics: bool = False,
-    use_metrics_layer: bool = False,
-    skip_tag_resolution: bool = False,
-    extra_columns: list[Column] | None = None,
-    on_demand_metrics_enabled: bool = False,
-    on_demand_metrics_type: MetricSpecType | None = None,
-    fallback_to_transactions: bool = False,
-    query_source: QuerySource | None = None,
-):
-    builder = ProfileFunctionsMetricsQueryBuilder(
-        dataset=Dataset.PerformanceMetrics,
-        params={},
-        snuba_params=snuba_params,
-        query=query,
-        selected_columns=selected_columns,
-        equations=equations,
-        orderby=orderby,
-        limit=limit,
-        offset=offset,
-        sample_rate=sample,
-        config=QueryBuilderConfig(
-            auto_fields=auto_fields,
-            auto_aggregations=auto_aggregations,
-            use_aggregate_conditions=use_aggregate_conditions,
-            functions_acl=functions_acl,
-            equation_config={"auto_add": include_equation_fields},
-            has_metrics=has_metrics,
-            use_metrics_layer=use_metrics_layer,
-            transform_alias_to_input_format=transform_alias_to_input_format,
-            skip_tag_resolution=skip_tag_resolution,
-        ),
-    )
-
-    result = builder.process_results(builder.run_query(referrer, query_source=query_source))
-    return result
-
-
-def timeseries_query(
-    selected_columns: list[str],
-    query: str,
-    snuba_params: SnubaParams,
-    rollup: int,
-    referrer: str,
-    zerofill_results: bool = True,
-    allow_metric_aggregates=True,
-    comparison_delta: timedelta | None = None,
-    functions_acl: list[str] | None = None,
-    has_metrics: bool = True,
-    use_metrics_layer: bool = False,
-    on_demand_metrics_enabled: bool = False,
-    on_demand_metrics_type: MetricSpecType | None = None,
-    groupby: Column | None = None,
-    query_source: QuerySource | None = None,
-    fallback_to_transactions: bool = False,
-) -> SnubaTSResult:
-    """
-    High-level API for doing arbitrary user timeseries queries against events.
-    this API should match that of sentry.snuba.discover.timeseries_query
-    """
-
-    metrics_query = TimeseriesProfileFunctionsMetricsQueryBuilder(
-        {},
-        rollup,
-        snuba_params=snuba_params,
-        dataset=Dataset.PerformanceMetrics,
-        query=query,
-        selected_columns=selected_columns,
-        groupby=groupby,
-        config=QueryBuilderConfig(
-            functions_acl=functions_acl,
-            allow_metric_aggregates=allow_metric_aggregates,
-            use_metrics_layer=use_metrics_layer,
-        ),
-    )
-    result = metrics_query.run_query(referrer, query_source=query_source)
-
-    result = metrics_query.process_results(result)
-    result["data"] = (
-        discover.zerofill(
-            result["data"],
-            snuba_params.start_date,
-            snuba_params.end_date,
-            rollup,
-            ["time"],
-        )
-        if zerofill_results
-        else result["data"]
-    )
-
-    result["meta"]["isMetricsData"] = True
-
-    return SnubaTSResult(
-        {
-            "data": result["data"],
-            "isMetricsData": True,
-            "meta": result["meta"],
-        },
-        snuba_params.start_date,
-        snuba_params.end_date,
-        rollup,
-    )
-
-
-def top_events_timeseries(
-    timeseries_columns: list[str],
-    selected_columns: list[str],
-    user_query: str,
-    snuba_params: SnubaParams,
-    orderby: list[str],
-    rollup: int,
-    limit: int,
-    referrer: str,
-    organization: sentry.models.Organization,
-    equations: list[str] | None = None,
-    top_events: EventsResponse | None = None,
-    allow_empty: bool = True,
-    zerofill_results: bool = True,
-    include_other: bool = False,
-    functions_acl: list[str] | None = None,
-    on_demand_metrics_enabled: bool = False,
-    on_demand_metrics_type: MetricSpecType | None = None,
-    fallback_to_transactions: bool = False,
-):
-    """
-    High-level API for doing arbitrary user timeseries queries for a limited number of top events
-
-    Returns a dictionary of SnubaTSResult objects that have been zerofilled in
-    case of gaps. Each value of the dictionary should match the result of a timeseries query
-
-    timeseries_columns (Sequence[str]) List of public aliases to fetch for the timeseries query,
-                    usually matches the y-axis of the graph
-    selected_columns (Sequence[str]) List of public aliases to fetch for the events query,
-                    this is to determine what the top events are
-    user_query (str) Filter query string to create conditions from. needs to be user_query
-                    to not conflict with the function query
-    params (Dict[str, str]) Filtering parameters with start, end, project_id, environment,
-    orderby (Sequence[str]) The fields to order results by.
-    rollup (int) The bucket width in seconds
-    limit (int) The number of events to get timeseries for
-    organization (Organization) Used to map group ids to short ids
-    referrer (str|None) A referrer string to help locate the origin of this query.
-    top_events (dict|None) A dictionary with a 'data' key containing a list of dictionaries that
-                    represent the top events matching the query. Useful when you have found
-                    the top events earlier and want to save a query.
-    """
-
-    if top_events is None:
-        top_events = query(
-            selected_columns,
-            query=user_query,
-            snuba_params=snuba_params,
-            equations=equations,
-            orderby=orderby,
-            limit=limit,
-            referrer=referrer,
-            auto_aggregations=True,
-            use_aggregate_conditions=True,
-            include_equation_fields=True,
-            skip_tag_resolution=True,
-        )
-
-    top_events_builder = TopProfileFunctionsMetricsQueryBuilder(
-        Dataset.PerformanceMetrics,
-        {},
-        rollup,
-        top_events["data"],
-        snuba_params=snuba_params,
-        other=False,
-        query=user_query,
-        selected_columns=selected_columns,
-        timeseries_columns=timeseries_columns,
-        config=QueryBuilderConfig(
-            functions_acl=functions_acl,
-            skip_tag_resolution=True,
-        ),
-    )
-    if len(top_events["data"]) == limit and include_other:
-        other_events_builder = TopProfileFunctionsMetricsQueryBuilder(
-            Dataset.PerformanceMetrics,
-            {},
-            rollup,
-            top_events["data"],
-            snuba_params=snuba_params,
-            other=True,
-            query=user_query,
-            selected_columns=selected_columns,
-            timeseries_columns=timeseries_columns,
-        )
-
-        # TODO: use bulk_snuba_queries
-        other_result = other_events_builder.run_query(referrer)
-        result = top_events_builder.run_query(referrer)
-    else:
-        result = top_events_builder.run_query(referrer)
-        other_result = {"data": []}
-    if (
-        not allow_empty
-        and not len(result.get("data", []))
-        and not len(other_result.get("data", []))
-    ):
-        return SnubaTSResult(
-            {
-                "data": (
-                    discover.zerofill(
-                        [], snuba_params.start_date, snuba_params.end_date, rollup, ["time"]
-                    )
-                    if zerofill_results
-                    else []
-                ),
-            },
-            snuba_params.start_date,
-            snuba_params.end_date,
-            rollup,
-        )
-
-    result = top_events_builder.process_results(result)
-
-    translated_groupby = top_events_builder.translated_groupby
-
-    results = (
-        {discover.OTHER_KEY: {"order": limit, "data": other_result["data"]}}
-        if len(other_result.get("data", []))
-        else {}
-    )
-    # Using the top events add the order to the results
-    for index, item in enumerate(top_events["data"]):
-        result_key = discover.create_result_key(item, translated_groupby, {})
-        results[result_key] = {"order": index, "data": []}
-    for row in result["data"]:
-        result_key = discover.create_result_key(row, translated_groupby, {})
-        if result_key in results:
-            results[result_key]["data"].append(row)
-        else:
-            logger.warning(
-                "profile_functions_metrics.top-events.timeseries.key-mismatch",
-                extra={"result_key": result_key, "top_event_keys": list(results.keys())},
-            )
-    snuba_ts_result: dict[str, SnubaTSResult] = {}
-    for key, item in results.items():
-        snuba_ts_result[key] = SnubaTSResult(
-            {
-                "data": (
-                    discover.zerofill(
-                        item["data"],
-                        snuba_params.start_date,
-                        snuba_params.end_date,
-                        rollup,
-                        ["time"],
-                    )
-                    if zerofill_results
-                    else item["data"]
-                ),
-                "order": item["order"],
-            },
-            snuba_params.start_date,
-            snuba_params.end_date,
-            rollup,
-        )
-
-    return snuba_ts_result
diff --git a/src/sentry/snuba/profiles.py b/src/sentry/snuba/profiles.py
index 8e6b92c1163b04..41b44a5e49d64d 100644
--- a/src/sentry/snuba/profiles.py
+++ b/src/sentry/snuba/profiles.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import timedelta
 from typing import Any
 
 from sentry.exceptions import InvalidSearchQuery
@@ -6,7 +6,6 @@
     ProfilesQueryBuilder,
     ProfilesTimeseriesQueryBuilder,
 )
-from sentry.search.events.fields import get_json_meta_type
 from sentry.search.events.types import QueryBuilderConfig, SnubaParams
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.discover import transform_tips, zerofill
@@ -69,7 +68,7 @@ def timeseries_query(
     rollup: int,
     referrer: str = "",
     zerofill_results: bool = True,
-    comparison_delta: datetime | None = None,
+    comparison_delta: timedelta | None = None,
     functions_acl: list[str] | None = None,
     allow_metric_aggregates: bool = False,
     has_metrics: bool = False,
@@ -78,6 +77,7 @@ def timeseries_query(
     on_demand_metrics_type: MetricSpecType | None = None,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ) -> Any:
     builder = ProfilesTimeseriesQueryBuilder(
         dataset=Dataset.Profiles,
@@ -88,9 +88,11 @@ def timeseries_query(
         selected_columns=selected_columns,
         config=QueryBuilderConfig(
             functions_acl=functions_acl,
+            transform_alias_to_input_format=transform_alias_to_input_format,
         ),
     )
     results = builder.run_query(referrer=referrer, query_source=query_source)
+    results = builder.process_results(results)
 
     return SnubaTSResult(
         {
@@ -105,12 +107,7 @@ def timeseries_query(
                 if zerofill_results
                 else results["data"]
             ),
-            "meta": {
-                "fields": {
-                    value["name"]: get_json_meta_type(value["name"], value.get("type"), builder)
-                    for value in results["meta"]
-                }
-            },
+            "meta": results["meta"],
         },
         snuba_params.start_date,
         snuba_params.end_date,
diff --git a/src/sentry/snuba/query_subscriptions/constants.py b/src/sentry/snuba/query_subscriptions/constants.py
index b04cf11f619fc6..f692db46d6d9c5 100644
--- a/src/sentry/snuba/query_subscriptions/constants.py
+++ b/src/sentry/snuba/query_subscriptions/constants.py
@@ -7,6 +7,7 @@
     Dataset.Transactions: "transactions-subscription-results",
     Dataset.PerformanceMetrics: "generic-metrics-subscription-results",
     Dataset.Metrics: "metrics-subscription-results",
+    Dataset.EventsAnalyticsPlatform: "eap-spans-subscription-results",
 }
 
 topic_to_dataset = {
diff --git a/src/sentry/snuba/referrer.py b/src/sentry/snuba/referrer.py
index bd9141627d5a99..667d39232b72dc 100644
--- a/src/sentry/snuba/referrer.py
+++ b/src/sentry/snuba/referrer.py
@@ -165,12 +165,8 @@ class Referrer(Enum):
     API_ORGANIZATION_METRICS_DATA = "api.organization.metrics-data"
     API_ORGANIZATION_METRICS_ESTIMATION_STATS = "api.organization-metrics-estimation-stats"
     API_ORGANIZATION_METRICS_METADATA_FETCH_SPANS = "api.organization.metrics-metadata.fetch-spans"
-    API_ORGANIZATION_METRICS_METADATA_FETCH_METRICS_SUMMARIES = (
-        "api.organization.metrics-metadata.fetch-metrics-summaries"
-    )
     API_ORGANIZATION_METRICS_QUERY = "api.organization.metrics-query"
     API_ORGANIZATION_METRICS_EAP_QUERY = "api.organization.metrics-eap-query"
-    API_ORGANIZATION_METRICS_SAMPLES = "api.organization.metrics-samples"
     API_ORGANIZATION_ISSUE_REPLAY_COUNT = "api.organization-issue-replay-count"
     API_ORGANIZATION_SDK_UPDATES = "api.organization-sdk-updates"
     API_ORGANIZATION_SPANS_HISTOGRAM_MIN_MAX = "api.organization-spans-histogram-min-max"
@@ -324,6 +320,12 @@ class Referrer(Enum):
     API_PERFORMANCE_GENERIC_WIDGET_CHART_SLOW_SCREENS_BY_TTID = (
         "api.performance.generic-widget-chart.slow-screens-by-ttid"
     )
+    API_PERFORMANCE_GENERIC_WIDGET_CHART_SLOW_SCREENS_BY_COLD_START = (
+        "api.performance.generic-widget-chart.slow-screens-by-cold-start"
+    )
+    API_PERFORMANCE_GENERIC_WIDGET_CHART_SLOW_SCREENS_BY_WARM_START = (
+        "api.performance.generic-widget-chart.slow-screens-by-warm-start"
+    )
     API_PERFORMANCE_GENERIC_WIDGET_CHART_TPM_AREA_METRICS_ENHANCED = (
         "api.performance.generic-widget-chart.tpm-area.metrics-enhanced"
     )
@@ -410,7 +412,6 @@ class Referrer(Enum):
     API_PROFILING_PROFILE_SUMMARY_TOTALS = "api.profiling.profile-summary-totals"
     API_PROFILING_PROFILE_SUMMARY_TABLE = "api.profiling.profile-summary-table"
     API_PROFILING_PROFILE_SUMMARY_FUNCTIONS_TABLE = "api.profiling.profile-summary-functions-table"
-    API_PROFILING_PROFILE_FLAMEGRAPH = "api.profiling.profile-flamegraph"
     API_PROFILING_PROFILE_FLAMEGRAPH_TRANSACTION_CANDIDATES = (
         "api.profiling.profile-flamegraph-transaction-candidates"
     )
diff --git a/src/sentry/snuba/spans_eap.py b/src/sentry/snuba/spans_eap.py
index bf6cfeb665f2aa..5356f2fd29f64e 100644
--- a/src/sentry/snuba/spans_eap.py
+++ b/src/sentry/snuba/spans_eap.py
@@ -97,6 +97,7 @@ def timeseries_query(
     dataset: Dataset = Dataset.Discover,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ) -> SnubaTSResult:
     """
     High-level API for doing arbitrary user timeseries queries against events.
@@ -114,6 +115,7 @@ def timeseries_query(
             selected_columns=columns,
             config=QueryBuilderConfig(
                 functions_acl=functions_acl,
+                transform_alias_to_input_format=transform_alias_to_input_format,
             ),
         )
         result = querybuilder.run_query(referrer, query_source=query_source)
diff --git a/src/sentry/snuba/spans_indexed.py b/src/sentry/snuba/spans_indexed.py
index c49021e507b884..602e0e5c256b83 100644
--- a/src/sentry/snuba/spans_indexed.py
+++ b/src/sentry/snuba/spans_indexed.py
@@ -92,6 +92,7 @@ def timeseries_query(
     on_demand_metrics_type: MetricSpecType | None = None,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ) -> SnubaTSResult:
     """
     High-level API for doing arbitrary user timeseries queries against events.
@@ -109,6 +110,7 @@ def timeseries_query(
             selected_columns=columns,
             config=QueryBuilderConfig(
                 functions_acl=functions_acl,
+                transform_alias_to_input_format=transform_alias_to_input_format,
             ),
         )
         result = query.run_query(referrer, query_source=query_source)
diff --git a/src/sentry/snuba/spans_metrics.py b/src/sentry/snuba/spans_metrics.py
index 0358beb2153ae9..d2f41948938910 100644
--- a/src/sentry/snuba/spans_metrics.py
+++ b/src/sentry/snuba/spans_metrics.py
@@ -93,6 +93,7 @@ def timeseries_query(
     groupby: Column | None = None,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ) -> SnubaTSResult:
     """
     High-level API for doing arbitrary user timeseries queries against events.
@@ -111,6 +112,7 @@ def timeseries_query(
             functions_acl=functions_acl,
             allow_metric_aggregates=allow_metric_aggregates,
             use_metrics_layer=use_metrics_layer,
+            transform_alias_to_input_format=transform_alias_to_input_format,
         ),
     )
     result = metrics_query.run_query(referrer=referrer, query_source=query_source)
diff --git a/src/sentry/snuba/spans_rpc.py b/src/sentry/snuba/spans_rpc.py
index a7ad32ec292ad8..7b01cd43bef5b6 100644
--- a/src/sentry/snuba/spans_rpc.py
+++ b/src/sentry/snuba/spans_rpc.py
@@ -1,26 +1,32 @@
 import logging
+from datetime import timedelta
 from typing import Any
 
-from sentry_protos.snuba.v1.endpoint_time_series_pb2 import TimeSeriesRequest
+from sentry_protos.snuba.v1.endpoint_time_series_pb2 import TimeSeries, TimeSeriesRequest
 from sentry_protos.snuba.v1.endpoint_trace_item_table_pb2 import Column, TraceItemTableRequest
 from sentry_protos.snuba.v1.trace_item_attribute_pb2 import AttributeAggregation, AttributeKey
+from sentry_protos.snuba.v1.trace_item_filter_pb2 import AndFilter, OrFilter, TraceItemFilter
 
-from sentry.search.eap.columns import ResolvedColumn
+from sentry.api.event_search import SearchFilter, SearchKey, SearchValue
+from sentry.exceptions import InvalidSearchQuery
+from sentry.search.eap.columns import ResolvedColumn, ResolvedFunction
 from sentry.search.eap.constants import FLOAT, INT, STRING
 from sentry.search.eap.spans import SearchResolver
-from sentry.search.eap.types import SearchResolverConfig
-from sentry.search.events.types import EventsMeta, EventsResponse, SnubaData, SnubaParams
+from sentry.search.eap.types import CONFIDENCES, ConfidenceData, EAPResponse, SearchResolverConfig
+from sentry.search.events.fields import get_function_alias, is_function
+from sentry.search.events.types import EventsMeta, SnubaData, SnubaParams
+from sentry.snuba.discover import OTHER_KEY, create_result_key, zerofill
 from sentry.utils import snuba_rpc
+from sentry.utils.snuba import SnubaTSResult, process_value
 
 logger = logging.getLogger("sentry.snuba.spans_rpc")
 
 
-def categorize_column(column: ResolvedColumn) -> Column:
-    proto_definition = column.proto_definition
-    if isinstance(proto_definition, AttributeAggregation):
-        return Column(aggregation=proto_definition, label=column.public_alias)
+def categorize_column(column: ResolvedColumn | ResolvedFunction) -> Column:
+    if isinstance(column, ResolvedFunction):
+        return Column(aggregation=column.proto_definition, label=column.public_alias)
     else:
-        return Column(key=proto_definition, label=column.public_alias)
+        return Column(key=column.proto_definition, label=column.public_alias)
 
 
 def run_table_query(
@@ -32,24 +38,40 @@ def run_table_query(
     limit: int,
     referrer: str,
     config: SearchResolverConfig,
-) -> EventsResponse:
+    search_resolver: SearchResolver | None = None,
+) -> EAPResponse:
     """Make the query"""
-    resolver = SearchResolver(params=params, config=config)
+    resolver = (
+        SearchResolver(params=params, config=config) if search_resolver is None else search_resolver
+    )
     meta = resolver.resolve_meta(referrer=referrer)
     query = resolver.resolve_query(query_string)
     columns, contexts = resolver.resolve_columns(selected_columns)
+    # We allow orderby function_aliases if they're a selected_column
+    # eg. can orderby sum_span_self_time, assuming sum(span.self_time) is selected
+    orderby_aliases = {
+        get_function_alias(column_name): resolved_column
+        for resolved_column, column_name in zip(columns, selected_columns)
+    }
     # Orderby is only applicable to TraceItemTableRequest
-    resolved_orderby = (
-        [
+    resolved_orderby = []
+    orderby_columns = orderby if orderby is not None else []
+    for orderby_column in orderby_columns:
+        stripped_orderby = orderby_column.lstrip("-")
+        if stripped_orderby in orderby_aliases:
+            resolved_column = orderby_aliases[stripped_orderby]
+        else:
+            resolved_column = resolver.resolve_column(stripped_orderby)[0]
+        resolved_orderby.append(
             TraceItemTableRequest.OrderBy(
-                column=categorize_column(resolver.resolve_column(orderby_column.lstrip("-"))[0]),
+                column=categorize_column(resolved_column),
                 descending=orderby_column.startswith("-"),
             )
-            for orderby_column in orderby
-        ]
-        if orderby
-        else []
+        )
+    has_aggregations = any(
+        col for col in columns if isinstance(col.proto_definition, AttributeAggregation)
     )
+
     labeled_columns = [categorize_column(col) for col in columns]
 
     """Run the query"""
@@ -57,18 +79,24 @@ def run_table_query(
         meta=meta,
         filter=query,
         columns=labeled_columns,
-        group_by=[
-            col.proto_definition
-            for col in columns
-            if isinstance(col.proto_definition, AttributeKey)
-        ],
+        group_by=(
+            [
+                col.proto_definition
+                for col in columns
+                if isinstance(col.proto_definition, AttributeKey)
+            ]
+            if has_aggregations
+            else []
+        ),
         order_by=resolved_orderby,
+        limit=limit,
         virtual_column_contexts=[context for context in contexts if context is not None],
     )
     rpc_response = snuba_rpc.table_rpc(rpc_request)
 
     """Process the results"""
     final_data: SnubaData = []
+    final_confidence: ConfidenceData = []
     final_meta: EventsMeta = EventsMeta(fields={})
     # Mapping from public alias to resolved column so we know type etc.
     columns_by_name = {col.public_alias: col for col in columns}
@@ -82,10 +110,18 @@ def run_table_query(
             )
             continue
         resolved_column = columns_by_name[attribute]
-        final_meta["fields"][attribute] = resolved_column.meta_type
+        final_meta["fields"][attribute] = resolved_column.search_type
+
+        # When there's no aggregates reliabilities is an empty array
+        has_reliability = len(column_value.reliabilities) > 0
+        if has_reliability:
+            assert len(column_value.results) == len(column_value.reliabilities), Exception(
+                "Length of rpc results do not match length of rpc reliabilities"
+            )
 
         while len(final_data) < len(column_value.results):
             final_data.append({})
+            final_confidence.append({})
 
         for index, result in enumerate(column_value.results):
             result_value: str | int | float
@@ -95,9 +131,14 @@ def run_table_query(
                 result_value = result.val_int
             elif resolved_column.proto_type == FLOAT:
                 result_value = result.val_float
+            result_value = process_value(result_value)
             final_data[index][attribute] = resolved_column.process_column(result_value)
+            if has_reliability:
+                final_confidence[index][attribute] = CONFIDENCES.get(
+                    column_value.reliabilities[index], None
+                )
 
-    return {"data": final_data, "meta": final_meta}
+    return {"data": final_data, "meta": final_meta, "confidence": final_confidence}
 
 
 def get_timeseries_query(
@@ -108,12 +149,18 @@ def get_timeseries_query(
     referrer: str,
     config: SearchResolverConfig,
     granularity_secs: int,
+    extra_conditions: TraceItemFilter | None = None,
 ) -> TimeSeriesRequest:
     resolver = SearchResolver(params=params, config=config)
     meta = resolver.resolve_meta(referrer=referrer)
     query = resolver.resolve_query(query_string)
     (aggregations, _) = resolver.resolve_aggregates(y_axes)
     (groupbys, _) = resolver.resolve_columns(groupby)
+    if extra_conditions is not None:
+        if query is not None:
+            query = TraceItemFilter(and_filter=AndFilter(filters=[query, extra_conditions]))
+        else:
+            query = extra_conditions
 
     return TimeSeriesRequest(
         meta=meta,
@@ -136,54 +183,243 @@ def run_timeseries_query(
     params: SnubaParams,
     query_string: str,
     y_axes: list[str],
-    groupby: list[str],
-) -> Any:
-    pass
+    referrer: str,
+    granularity_secs: int,
+    config: SearchResolverConfig,
+    comparison_delta: timedelta | None = None,
+) -> SnubaTSResult:
     """Make the query"""
-    # maker = SearchResolver(params)
-    # groupby, contexts = maker.resolve_columns(groupby)
-    # yaxes = maker.resolve_aggregate(y_axes)
-    # query = maker.resolve_query(query_string)
+    rpc_request = get_timeseries_query(
+        params, query_string, y_axes, [], referrer, config, granularity_secs
+    )
 
     """Run the query"""
-    # rpc = timeseries_RPC(columns=[column.proto_definition for column in groupby], query=query)
-    # result = rpc.run()
+    rpc_response = snuba_rpc.timeseries_rpc(rpc_request)
 
     """Process the results"""
-    # return _process_timeseries(result, columns)
+    result: SnubaData = []
+    confidences: SnubaData = []
+    for timeseries in rpc_response.result_timeseries:
+        processed, confidence = _process_timeseries(timeseries, params, granularity_secs)
+        if len(result) == 0:
+            result = processed
+            confidences = confidence
+        else:
+            for existing, new in zip(result, processed):
+                existing.update(new)
+            for existing, new in zip(confidences, confidence):
+                existing.update(new)
+    if len(result) == 0:
+        # The rpc only zerofills for us when there are results, if there aren't any we have to do it ourselves
+        result = zerofill(
+            [],
+            params.start_date,
+            params.end_date,
+            granularity_secs,
+            ["time"],
+        )
+
+    if comparison_delta is not None:
+        if len(rpc_request.aggregations) != 1:
+            raise InvalidSearchQuery("Only one column can be selected for comparison queries")
+
+        comp_query_params = params.copy()
+        assert comp_query_params.start is not None, "start is required"
+        assert comp_query_params.end is not None, "end is required"
+        comp_query_params.start = comp_query_params.start_date - comparison_delta
+        comp_query_params.end = comp_query_params.end_date - comparison_delta
+
+        comp_rpc_request = get_timeseries_query(
+            comp_query_params, query_string, y_axes, [], referrer, config, granularity_secs
+        )
+        comp_rpc_response = snuba_rpc.timeseries_rpc(comp_rpc_request)
+
+        if comp_rpc_response.result_timeseries:
+            timeseries = comp_rpc_response.result_timeseries[0]
+            processed, _ = _process_timeseries(timeseries, params, granularity_secs)
+            label = get_function_alias(timeseries.label)
+            for existing, new in zip(result, processed):
+                existing["comparisonCount"] = new[label]
+        else:
+            for existing in result:
+                existing["comparisonCount"] = 0
+
+    return SnubaTSResult(
+        {"data": result, "confidence": confidences}, params.start, params.end, granularity_secs
+    )
+
+
+def build_top_event_conditions(
+    resolver: SearchResolver, top_events: EAPResponse, groupby_columns: list[str]
+) -> Any:
+    conditions = []
+    other_conditions = []
+    for event in top_events["data"]:
+        row_conditions = []
+        other_row_conditions = []
+        for key in groupby_columns:
+            if key == "project.id":
+                value = resolver.params.project_slug_map[
+                    event.get("project", event.get("project.slug"))
+                ]
+            else:
+                value = event[key]
+            resolved_term = resolver.resolve_term(
+                SearchFilter(
+                    key=SearchKey(name=key),
+                    operator="=",
+                    value=SearchValue(raw_value=value),
+                )
+            )
+            if resolved_term is not None:
+                row_conditions.append(resolved_term)
+            other_term = resolver.resolve_term(
+                SearchFilter(
+                    key=SearchKey(name=key),
+                    operator="!=",
+                    value=SearchValue(raw_value=value),
+                )
+            )
+            if other_term is not None:
+                other_row_conditions.append(other_term)
+        conditions.append(TraceItemFilter(and_filter=AndFilter(filters=row_conditions)))
+        other_conditions.append(TraceItemFilter(or_filter=OrFilter(filters=other_row_conditions)))
+    return (
+        TraceItemFilter(or_filter=OrFilter(filters=conditions)),
+        TraceItemFilter(and_filter=AndFilter(filters=other_conditions)),
+    )
 
 
 def run_top_events_timeseries_query(
     params: SnubaParams,
     query_string: str,
     y_axes: list[str],
-    groupby: list[str],
-    orderby: list[str],
+    raw_groupby: list[str],
+    orderby: list[str] | None,
+    limit: int,
+    referrer: str,
+    granularity_secs: int,
+    config: SearchResolverConfig,
 ) -> Any:
     """We intentionally duplicate run_timeseries_query code here to reduce the complexity of needing multiple helper
     functions that both would call
     This is because at time of writing, the query construction is very straightforward, if that changes perhaps we can
     change this"""
-    pass
+    """Make a table query first to get what we need to filter by"""
+    search_resolver = SearchResolver(params, config)
+    top_events = run_table_query(
+        params,
+        query_string,
+        raw_groupby + y_axes,
+        orderby,
+        0,
+        limit,
+        referrer,
+        config,
+        search_resolver=search_resolver,
+    )
+    # Need to change the project slug columns to project.id because timeseries requests don't take virtual_column_contexts
+    groupby_columns = [col for col in raw_groupby if not is_function(col)]
+    groupby_columns_without_project = [
+        col if col not in ["project", "project.name"] else "project.id" for col in groupby_columns
+    ]
+    top_conditions, other_conditions = build_top_event_conditions(
+        search_resolver, top_events, groupby_columns_without_project
+    )
     """Make the query"""
-    # maker = SearchResolver(params)
-    # top_events = run_table_query() with process_results off
-    # new_conditions = construct conditions based on top_events
-    # resolved_query = And(new_conditions, maker.resolve_query(query_string))
-    # groupby, contexts = maker.resolve_columns(groupby)
-    # yaxes = maker.resolve_aggregate(y_axes)
+    rpc_request = get_timeseries_query(
+        params,
+        query_string,
+        y_axes,
+        groupby_columns_without_project,
+        referrer,
+        config,
+        granularity_secs,
+        extra_conditions=top_conditions,
+    )
+    other_request = get_timeseries_query(
+        params,
+        query_string,
+        y_axes,
+        groupby_columns_without_project,
+        referrer,
+        config,
+        granularity_secs,
+        extra_conditions=other_conditions,
+    )
 
     """Run the query"""
-    # rpc = timeseries_RPC(columns=[column.proto_definition for column in groupby], query=query)
+    rpc_response = snuba_rpc.timeseries_rpc(rpc_request)
+    other_response = snuba_rpc.timeseries_rpc(other_request)
 
     """Process the results"""
-    # result = rpc.run()
-    # return _process_timeseries(result, columns)
+    map_result_key_to_timeseries = {}
+    for timeseries in rpc_response.result_timeseries:
+        groupby_attributes = timeseries.group_by_attributes
+        remapped_groupby = {}
+        # Remap internal attrs back to public ones
+        for col in groupby_columns:
+            if col in ["project", "project.slug"]:
+                resolved_groupby, _ = search_resolver.resolve_attribute("project.id")
+                remapped_groupby[col] = params.project_id_map[
+                    int(groupby_attributes[resolved_groupby.internal_name])
+                ]
+            else:
+                resolved_groupby, _ = search_resolver.resolve_attribute(col)
+                remapped_groupby[col] = groupby_attributes[resolved_groupby.internal_name]
+        result_key = create_result_key(remapped_groupby, groupby_columns, {})
+        map_result_key_to_timeseries[result_key] = timeseries
+    final_result = {}
+    # Top Events actually has the order, so we need to iterate through it, regenerate the result keys
+    for index, row in enumerate(top_events["data"]):
+        result_key = create_result_key(row, groupby_columns, {})
+        result_data, result_confidence = _process_timeseries(
+            map_result_key_to_timeseries[result_key],
+            params,
+            granularity_secs,
+        )
+        final_result[result_key] = SnubaTSResult(
+            {
+                "data": result_data,
+                "confidence": result_confidence,
+                "order": index,
+            },
+            params.start,
+            params.end,
+            granularity_secs,
+        )
+    if other_response.result_timeseries:
+        result_data, result_confidence = _process_timeseries(
+            other_response.result_timeseries[0],
+            params,
+            granularity_secs,
+        )
+        final_result[OTHER_KEY] = SnubaTSResult(
+            {
+                "data": result_data,
+                "confidence": result_confidence,
+                "order": limit,
+            },
+            params.start,
+            params.end,
+            granularity_secs,
+        )
+    return final_result
+
 
+def _process_timeseries(
+    timeseries: TimeSeries, params: SnubaParams, granularity_secs: int, order: int | None = None
+) -> tuple[SnubaData, SnubaData]:
+    result: SnubaData = []
+    confidence: SnubaData = []
+    # Timeseries serialization expects the function alias (eg. `count` not `count()`)
+    label = get_function_alias(timeseries.label)
+    if len(result) < len(timeseries.buckets):
+        for bucket in timeseries.buckets:
+            result.append({"time": bucket.seconds})
+            confidence.append({"time": bucket.seconds})
+    for index, data_point in enumerate(timeseries.data_points):
+        result[index][label] = process_value(data_point.data)
+        confidence[index][label] = CONFIDENCES.get(data_point.reliability, None)
 
-def _process_timeseries(result, columns):
-    pass
-    # for row in result:
-    #     for column in columns:
-    #         column.process(row)
-    # return result
+    return result, confidence
diff --git a/src/sentry/snuba/transactions.py b/src/sentry/snuba/transactions.py
index 6a59ac6738bda2..85396238623389 100644
--- a/src/sentry/snuba/transactions.py
+++ b/src/sentry/snuba/transactions.py
@@ -89,6 +89,7 @@ def timeseries_query(
     on_demand_metrics_type=None,
     query_source: QuerySource | None = None,
     fallback_to_transactions: bool = False,
+    transform_alias_to_input_format: bool = False,
 ) -> SnubaTSResult:
     """
     High-level API for doing arbitrary user timeseries queries against events.
@@ -110,6 +111,7 @@ def timeseries_query(
         on_demand_metrics_type=on_demand_metrics_type,
         dataset=Dataset.Transactions,
         query_source=query_source,
+        transform_alias_to_input_format=transform_alias_to_input_format,
     )
 
 
diff --git a/src/sentry/snuba/utils.py b/src/sentry/snuba/utils.py
index 8b31efcf74a8b3..c48bcfdbbd819e 100644
--- a/src/sentry/snuba/utils.py
+++ b/src/sentry/snuba/utils.py
@@ -9,7 +9,6 @@
     issue_platform,
     metrics_enhanced_performance,
     metrics_performance,
-    profile_functions_metrics,
     profiles,
     spans_eap,
     spans_indexed,
@@ -32,7 +31,6 @@
     "spansIndexed": spans_indexed,
     "spansMetrics": spans_metrics,
     "transactions": transactions,
-    "profileFunctionsMetrics": profile_functions_metrics,
 }
 DATASET_LABELS = {value: key for key, value in DATASET_OPTIONS.items()}
 
diff --git a/src/sentry/spans/consumers/process/factory.py b/src/sentry/spans/consumers/process/factory.py
index 4f76b504ab073f..2ae1701f3af752 100644
--- a/src/sentry/spans/consumers/process/factory.py
+++ b/src/sentry/spans/consumers/process/factory.py
@@ -2,6 +2,7 @@
 import logging
 from collections import defaultdict
 from collections.abc import Mapping
+from datetime import datetime
 from typing import Any
 
 import orjson
@@ -15,7 +16,15 @@
 from arroyo.processing.strategies.produce import Produce
 from arroyo.processing.strategies.run_task import RunTask
 from arroyo.processing.strategies.unfold import Unfold
-from arroyo.types import FILTERED_PAYLOAD, BrokerValue, Commit, FilteredPayload, Message, Partition
+from arroyo.types import (
+    FILTERED_PAYLOAD,
+    BrokerValue,
+    Commit,
+    FilteredPayload,
+    Message,
+    Partition,
+    Value,
+)
 from sentry_kafka_schemas.codecs import Codec
 from sentry_kafka_schemas.schema_types.snuba_spans_v1 import SpanEvent
 
@@ -196,7 +205,7 @@ def batch_write_to_redis(
 
 def _expand_segments(should_process_segments: list[ProcessSegmentsContext]):
     with sentry_sdk.start_transaction(op="process", name="spans.process.expand_segments") as txn:
-        buffered_segments: list[KafkaPayload | FilteredPayload] = []
+        buffered_segments: list[Value] = []
 
         for result in should_process_segments:
             timestamp = result.timestamp
@@ -235,7 +244,13 @@ def _expand_segments(should_process_segments: list[ProcessSegmentsContext]):
                             metrics.incr("performance.buffered_segments.max_payload_size_exceeded")
                             continue
 
-                        buffered_segments.append(KafkaPayload(None, payload_data, []))
+                        buffered_segments.append(
+                            Value(
+                                KafkaPayload(None, payload_data, []),
+                                {},
+                                datetime.fromtimestamp(timestamp),
+                            )
+                        )
 
     return buffered_segments
 
diff --git a/src/sentry/static/sentry/images/logos/logo-cloudflare-worker.svg b/src/sentry/static/sentry/images/logos/logo-cloudflare-worker.svg
new file mode 100644
index 00000000000000..d54d7c285bc94d
--- /dev/null
+++ b/src/sentry/static/sentry/images/logos/logo-cloudflare-worker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 416 375"><defs><linearGradient id="a" x1="50%" x2="25.7%" y1="100%" y2="8.7%"><stop offset="0%" stop-color="#eb6f07"/><stop offset="100%" stop-color="#fab743"/></linearGradient><linearGradient id="b" x1="81%" x2="40.5%" y1="83.7%" y2="29.5%"><stop offset="0%" stop-color="#d96504"/><stop offset="100%" stop-color="#d96504" stop-opacity="0"/></linearGradient><linearGradient id="c" x1="42%" x2="84%" y1="8.7%" y2="79.9%"><stop offset="0%" stop-color="#eb6f07"/><stop offset="100%" stop-color="#eb720a" stop-opacity="0"/></linearGradient><linearGradient id="d" x1="50%" x2="25.7%" y1="100%" y2="8.7%"><stop offset="0%" stop-color="#ee6f05"/><stop offset="100%" stop-color="#fab743"/></linearGradient><linearGradient id="e" x1="-33.2%" x2="91.7%" y1="100%" y2="0%"><stop offset="0%" stop-color="#d96504" stop-opacity=".8"/><stop offset="49.8%" stop-color="#d96504" stop-opacity=".2"/><stop offset="100%" stop-color="#d96504" stop-opacity="0"/></linearGradient><linearGradient id="f" x1="50%" x2="25.7%" y1="100%" y2="8.7%"><stop offset="0%" stop-color="#ffa95f"/><stop offset="100%" stop-color="#ffebc8"/></linearGradient><linearGradient id="g" x1="8.1%" x2="96.5%" y1="1.1%" y2="48.8%"><stop offset="0%" stop-color="#fff" stop-opacity=".5"/><stop offset="100%" stop-color="#fff" stop-opacity=".1"/></linearGradient><linearGradient id="h" x1="-13.7%" y1="104.2%" y2="46.2%"><stop offset="0%" stop-color="#fff" stop-opacity=".5"/><stop offset="100%" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><path fill="url(#a)" d="m107 5.4 49 88.4-45 81a26 26 0 0 0 0 25.3l45 81.2-49 88.4A52 52 0 0 1 85 349L7 213.5a52.2 52.2 0 0 1 0-52L85 26a52 52 0 0 1 22-20.6z"/><path fill="url(#b)" d="M111 174.9a26 26 0 0 0 0 25.2l45 81.2-49 88.4A52 52 0 0 1 85 349L7 213.5C.8 202.8 35.5 190 111 175z" opacity=".7"/><path fill="url(#c)" d="m112 14.3 44 79.5-7.3 12.7-38.8-65.7C98.7 22.5 81.6 32 60.2 69l3.2-5.5L85 26a52 52 0 0 1 21.8-20.6l5.1 8.9z" opacity=".5"/><path fill="url(#d)" d="m331 26 78 135.5c9.3 16 9.3 36 0 52L331 349a52 52 0 0 1-45 26h-78l97-174.9a26 26 0 0 0 0-25.2L208 0h78a52 52 0 0 1 45 26z"/><path fill="url(#e)" d="m282 374.4-77 .7 93.2-175.8a27 27 0 0 0 0-25.4L205 0h17.6l97.8 173.1a27 27 0 0 1-.1 26.8 15624 15624 0 0 0-62.7 110c-19 33.4-10.8 54.9 24.4 64.5z"/><path fill="url(#f)" d="M130 375c-8 0-16-1.9-23-5.3l96.2-173.5c3-5.4 3-12 0-17.4L107 5.4A52 52 0 0 1 130 0h78l97 174.9a26 26 0 0 1 0 25.2L208 375h-78z"/><path fill="url(#g)" d="M298.2 178.8 199 0h9l97 174.9a26 26 0 0 1 0 25.2L208 375h-9l99.2-178.8c3-5.4 3-12 0-17.4z" opacity=".6"/><path fill="url(#h)" d="M203.2 178.8 107 5.4c3-1.6 6.6-2.8 10-3.8 21.2 38.1 52.5 95.9 94 173.3a26 26 0 0 1 0 25.2L115.5 373c-3.4-1-5.2-1.7-8.4-3.2l96-173.5c3-5.4 3-12 0-17.4z" opacity=".6"/></svg>
diff --git a/src/sentry/tagstore/snuba/backend.py b/src/sentry/tagstore/snuba/backend.py
index 0f13ae3272a148..8f0bf74cb0c826 100644
--- a/src/sentry/tagstore/snuba/backend.py
+++ b/src/sentry/tagstore/snuba/backend.py
@@ -6,6 +6,7 @@
 from datetime import timedelta, timezone
 from typing import Any
 
+import sentry_sdk
 from dateutil.parser import parse as parse_datetime
 from django.core.cache import cache
 from sentry_relay.consts import SPAN_STATUS_CODE_TO_NAME
@@ -309,11 +310,21 @@ def __get_tag_keys_for_projects(
             # Cause there's rounding to create this cache suffix, we want to update the query end so results match
             end = snuba.quantize_time(end, key_hash)
             cache_key += f":{duration}@{end.isoformat()}"
-            result = cache.get(cache_key, None)
-            if result is not None:
-                metrics.incr("testing.tagstore.cache_tag_key.hit")
-            else:
-                metrics.incr("testing.tagstore.cache_tag_key.miss")
+
+            with sentry_sdk.start_span(
+                op="cache.get", name="sentry.tagstore.cache.__get_tag_keys_for_projects"
+            ) as span:
+                result = cache.get(cache_key, None)
+
+                span.set_data("cache.key", [cache_key])
+
+                if result is not None:
+                    span.set_data("cache.hit", True)
+                    span.set_data("cache.item_size", len(str(result)))
+                    metrics.incr("testing.tagstore.cache_tag_key.hit")
+                else:
+                    span.set_data("cache.hit", False)
+                    metrics.incr("testing.tagstore.cache_tag_key.miss")
 
         if result is None:
             result = snuba.query(
@@ -330,8 +341,13 @@ def __get_tag_keys_for_projects(
                 **kwargs,
             )
             if should_cache:
-                cache.set(cache_key, result, 300)
-                metrics.incr("testing.tagstore.cache_tag_key.len", amount=len(result))
+                with sentry_sdk.start_span(
+                    op="cache.put", name="sentry.tagstore.cache.__get_tag_keys_for_projects"
+                ) as span:
+                    cache.set(cache_key, result, 300)
+                    span.set_data("cache.key", [cache_key])
+                    span.set_data("cache.item_size", len(str(result)))
+                    metrics.incr("testing.tagstore.cache_tag_key.len", amount=len(result))
 
         if group is None:
             ctor = TagKey
@@ -435,12 +451,12 @@ def get_tag_keys_for_projects(
         # We want to disable FINAL in the snuba query to reduce load.
         optimize_kwargs = {"turbo": True}
 
-        # Add static sample amount to the query. Turbo will sample at 10% by
-        # default, but organizations with many events still get timeouts. A
-        # static sample creates more consistent performance.
         organization_id = get_organization_id_from_project_ids(projects)
         organization = Organization.objects.get_from_cache(id=organization_id)
         if features.has("organizations:tag-key-sample-n", organization):
+            # Add static sample amount to the query. Turbo will sample at 10% by
+            # default, but organizations with many events still get timeouts. A
+            # static sample creates more consistent performance.
             optimize_kwargs["sample"] = options.get("visibility.tag-key-sample-size")
 
         # If we are fetching less than max_unsampled_projects, then disable
@@ -449,7 +465,7 @@ def get_tag_keys_for_projects(
         # that we don't cause performance issues for Snuba.
         # We also see issues with long timeranges in large projects,
         # So only disable sampling if the timerange is short enough.
-        if len(projects) <= max_unsampled_projects and end - start <= timedelta(days=14):
+        elif len(projects) <= max_unsampled_projects and end - start <= timedelta(days=14):
             optimize_kwargs["sample"] = 1
 
         # Replays doesn't support sampling.
diff --git a/src/sentry/tasks/derive_code_mappings.py b/src/sentry/tasks/derive_code_mappings.py
index 009d8793bb83d1..ca79f41e311a65 100644
--- a/src/sentry/tasks/derive_code_mappings.py
+++ b/src/sentry/tasks/derive_code_mappings.py
@@ -2,6 +2,7 @@
 
 import logging
 from collections.abc import Mapping
+from enum import StrEnum
 from typing import TYPE_CHECKING, Any
 
 from sentry_sdk import set_tag, set_user
@@ -9,8 +10,13 @@
 from sentry import features
 from sentry.constants import ObjectStatus
 from sentry.db.models.fields.node import NodeData
+from sentry.integrations.github.integration import GitHubIntegration
 from sentry.integrations.models.repository_project_path_config import RepositoryProjectPathConfig
 from sentry.integrations.services.integration import RpcOrganizationIntegration, integration_service
+from sentry.integrations.source_code_management.metrics import (
+    SCMIntegrationInteractionEvent,
+    SCMIntegrationInteractionType,
+)
 from sentry.integrations.utils.code_mapping import CodeMapping, CodeMappingTreesHelper
 from sentry.locks import locks
 from sentry.models.organization import Organization
@@ -29,6 +35,12 @@
     from sentry.integrations.base import IntegrationInstallation
 
 
+class DeriveCodeMappingsErrorReason(StrEnum):
+    UNEXPECTED_ERROR = "Unexpected error type while calling `get_trees_for_org()`."
+    LOCK_FAILED = "Failed to acquire lock"
+    EMPTY_TREES = "The trees are empty."
+
+
 def process_error(error: ApiError, extra: dict[str, str]) -> None:
     """Log known issues and report unknown ones"""
     if error.json:
@@ -115,24 +127,30 @@ def derive_code_mappings(
     # Acquire the lock for a maximum of 10 minutes
     lock = locks.get(key=f"get_trees_for_org:{org.slug}", duration=60 * 10, name="process_pending")
 
-    try:
-        with lock.acquire():
-            # This method is specific to the GithubIntegration
-            trees = installation.get_trees_for_org()  # type: ignore[attr-defined]
-    except ApiError as error:
-        process_error(error, extra)
-        return
-    except UnableToAcquireLock as error:
-        extra["error"] = error
-        logger.warning("derive_code_mappings.getting_lock_failed", extra=extra)
-        return
-    except Exception:
-        logger.exception("Unexpected error type while calling `get_trees_for_org()`.", extra=extra)
-        return
+    with SCMIntegrationInteractionEvent(
+        SCMIntegrationInteractionType.DERIVE_CODEMAPPINGS, provider_key=installation.model.provider
+    ).capture() as lifecycle:
+        try:
+            with lock.acquire():
+                # This method is specific to the GithubIntegration
+                if not isinstance(installation, GitHubIntegration):
+                    return
+                trees = installation.get_trees_for_org()
+        except ApiError as error:
+            process_error(error, extra)
+            lifecycle.record_halt(error, extra)
+            return
+        except UnableToAcquireLock as error:
+            extra["error"] = error
+            lifecycle.record_failure(error, extra)
+            return
+        except Exception:
+            lifecycle.record_failure(DeriveCodeMappingsErrorReason.UNEXPECTED_ERROR, extra=extra)
+            return
 
-    if not trees:
-        logger.warning("The trees are empty.", extra=extra)
-        return
+        if not trees:
+            lifecycle.record_halt(DeriveCodeMappingsErrorReason.EMPTY_TREES, extra=extra)
+            return
 
     trees_helper = CodeMappingTreesHelper(trees)
     code_mappings = trees_helper.generate_code_mappings(stacktrace_paths)
diff --git a/src/sentry/tasks/embeddings_grouping/utils.py b/src/sentry/tasks/embeddings_grouping/utils.py
index 7dd7b95c129981..b4606837d64c9e 100644
--- a/src/sentry/tasks/embeddings_grouping/utils.py
+++ b/src/sentry/tasks/embeddings_grouping/utils.py
@@ -32,9 +32,10 @@
     SimilarHashNotFoundError,
 )
 from sentry.seer.similarity.utils import (
+    ReferrerOptions,
     event_content_has_stacktrace,
     filter_null_from_string,
-    get_stacktrace_string,
+    get_stacktrace_string_with_metrics,
 )
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.referrer import Referrer
@@ -355,8 +356,10 @@ def get_events_from_nodestore(
         event._project_cache = project
         if event and event.data and event_content_has_stacktrace(event):
             grouping_info = get_grouping_info(None, project=project, event=event)
-            stacktrace_string = get_stacktrace_string(grouping_info)
-            if stacktrace_string == "":
+            stacktrace_string = get_stacktrace_string_with_metrics(
+                grouping_info, event.platform, ReferrerOptions.BACKFILL
+            )
+            if not stacktrace_string:
                 invalid_event_group_ids.append(group_id)
                 continue
             primary_hash = event.get_primary_hash()
diff --git a/src/sentry/tasks/post_process.py b/src/sentry/tasks/post_process.py
index dc0cf1bf94794c..e5b0cfc2c320e5 100644
--- a/src/sentry/tasks/post_process.py
+++ b/src/sentry/tasks/post_process.py
@@ -13,9 +13,10 @@
 from django.utils import timezone
 from google.api_core.exceptions import ServiceUnavailable
 
-from sentry import features, projectoptions
+from sentry import features, options, projectoptions
 from sentry.eventstream.types import EventStreamEventType
 from sentry.exceptions import PluginError
+from sentry.features.rollout import in_rollout_group
 from sentry.issues.grouptype import GroupCategory
 from sentry.issues.issue_occurrence import IssueOccurrence
 from sentry.killswitches import killswitch_matches_context
@@ -30,6 +31,7 @@
 from sentry.utils import json, metrics
 from sentry.utils.cache import cache
 from sentry.utils.event_frames import get_sdk_name
+from sentry.utils.event_tracker import TransactionStageStatus, track_sampled_event
 from sentry.utils.locking import UnableToAcquireLock
 from sentry.utils.locking.backends import LockBackend
 from sentry.utils.locking.manager import LockManager
@@ -480,6 +482,17 @@ def should_update_escalating_metrics(event: Event, is_transaction_event: bool) -
     )
 
 
+def _get_event_id_from_cache_key(cache_key: str) -> str | None:
+    """
+    format is "e:{}:{}",event_id,project_id
+    """
+
+    try:
+        return cache_key.split(":")[1]
+    except IndexError:
+        return None
+
+
 @instrumented_task(
     name="sentry.tasks.post_process.post_process_group",
     time_limit=120,
@@ -501,6 +514,7 @@ def post_process_group(
     """
     Fires post processing hooks for a group.
     """
+    from sentry.ingest.types import ConsumerType
     from sentry.utils import snuba
 
     with snuba.options_override({"consistent": True}):
@@ -527,6 +541,18 @@ def post_process_group(
             # need to rewind history.
             data = processing_store.get(cache_key)
             if not data:
+                event_id = _get_event_id_from_cache_key(cache_key)
+                if event_id:
+                    if in_rollout_group(
+                        "transactions.do_post_process_in_save",
+                        event_id,
+                    ):
+                        # if we're doing the work for transactions in save_event_transaction
+                        # instead of here, this is expected, so simply increment a metric
+                        # instead of logging
+                        metrics.incr("post_process.skipped_do_post_process_in_save")
+                        return
+
                 logger.info(
                     "post_process.skipped",
                     extra={"cache_key": cache_key, "reason": "missing_cache"},
@@ -534,7 +560,12 @@ def post_process_group(
                 return
             with metrics.timer("tasks.post_process.delete_event_cache"):
                 processing_store.delete_by_key(cache_key)
-
+            if eventstream_type == EventStreamEventType.Transaction.value:
+                track_sampled_event(
+                    data["event_id"],
+                    ConsumerType.Transactions,
+                    TransactionStageStatus.REDIS_DELETED,
+                )
             occurrence = None
             event = process_event(data, group_id)
         else:
@@ -619,6 +650,11 @@ def get_event_raise_exception() -> Event:
                     project=event.project,
                     event=event,
                 )
+            track_sampled_event(
+                event.event_id,
+                ConsumerType.Transactions,
+                TransactionStageStatus.POST_PROCESS_FINISHED,
+            )
 
         metric_tags = {}
         if group_id:
@@ -1205,8 +1241,10 @@ def process_plugins(job: PostProcessJob) -> None:
 
 
 def process_similarity(job: PostProcessJob) -> None:
-    if job["is_reprocessed"] or features.has(
-        "projects:similarity-embeddings", job["event"].group.project
+    if not options.get("sentry.similarity.indexing.enabled"):
+        return
+    if job["is_reprocessed"] or job["event"].group.project.get_option(
+        "sentry:similarity_backfill_completed"
     ):
         return
 
diff --git a/src/sentry/tasks/relocation.py b/src/sentry/tasks/relocation.py
index 545ec775a1f14a..96ca59b860b630 100644
--- a/src/sentry/tasks/relocation.py
+++ b/src/sentry/tasks/relocation.py
@@ -24,6 +24,7 @@
 from sentry.api.helpers.slugs import validate_sentry_slug
 from sentry.api.serializers.rest_framework.base import camel_to_snake_case, convert_dict_key_case
 from sentry.backup.crypto import (
+    EncryptorDecryptorPair,
     GCPKMSDecryptor,
     GCPKMSEncryptor,
     LocalFileEncryptor,
@@ -72,6 +73,7 @@
     TASK_TO_STEP,
     LoggingPrinter,
     OrderedTask,
+    StorageBackedCheckpointExporter,
     create_cloudbuild_yaml,
     fail_relocation,
     get_relocations_bucket_name,
@@ -306,12 +308,12 @@ def uploading_start(uuid: UUID, replying_region_name: str | None, org_slug: str
     max_retries=4,
     retry_backoff=30,
     retry_backoff_jitter=True,
-    # Setting `acks_late` + `task_reject_on_worker_lost` here allows us to retry the potentially
+    # Setting `acks_late` + `reject_on_worker_lost` here allows us to retry the potentially
     # long-lived task if the k8s pod of the worker received SIGKILL/TERM/QUIT (or we ran out of some
     # other resource, leading to the same outcome). We have a timeout check at the very start of the
     # task itself to make sure it does not loop indefinitely.
     acks_late=True,
-    task_reject_on_worker_lost=True,
+    reject_on_worker_lost=True,
     # 10 minutes per try.
     soft_time_limit=60 * 10,
     silo_mode=SiloMode.REGION,
@@ -376,6 +378,16 @@ def fulfill_cross_region_export_request(
         encryptor=LocalFileEncryptor(BytesIO(encrypt_with_public_key)),
         org_filter={org_slug},
         printer=LoggingPrinter(uuid),
+        checkpointer=StorageBackedCheckpointExporter(
+            crypto=EncryptorDecryptorPair(
+                encryptor=GCPKMSEncryptor.from_crypto_key_version(get_default_crypto_key_version()),
+                decryptor=GCPKMSDecryptor.from_bytes(
+                    json.dumps(get_default_crypto_key_version()).encode("utf-8")
+                ),
+            ),
+            uuid=uuid,
+            storage=relocation_storage,
+        ),
     )
     logger.info(
         "fulfill_cross_region_export_request: exported",
diff --git a/src/sentry/tasks/statistical_detectors.py b/src/sentry/tasks/statistical_detectors.py
index 3390242d43441c..acc63ab4a7a6d6 100644
--- a/src/sentry/tasks/statistical_detectors.py
+++ b/src/sentry/tasks/statistical_detectors.py
@@ -587,6 +587,9 @@ def emit_function_regression_issue(
             }
         )
 
+    if not payloads:
+        return 0
+
     response = get_from_profiling_service(method="POST", path="/regressed", json_data=payloads)
     if response.status != 200:
         return 0
diff --git a/src/sentry/tasks/store.py b/src/sentry/tasks/store.py
index 64e030b597bb0f..fa110fa856b386 100644
--- a/src/sentry/tasks/store.py
+++ b/src/sentry/tasks/store.py
@@ -16,6 +16,7 @@
 from sentry.constants import DEFAULT_STORE_NORMALIZER_ARGS
 from sentry.datascrubbing import scrub_data
 from sentry.eventstore import processing
+from sentry.features.rollout import in_rollout_group
 from sentry.feedback.usecases.create_feedback import FeedbackCreationSource, create_feedback_issue
 from sentry.ingest.types import ConsumerType
 from sentry.killswitches import killswitch_matches_context
@@ -26,6 +27,7 @@
 from sentry.stacktraces.processing import process_stacktraces, should_process_for_stacktraces
 from sentry.tasks.base import instrumented_task
 from sentry.utils import metrics
+from sentry.utils.event_tracker import TransactionStageStatus, track_sampled_event
 from sentry.utils.safe import safe_execute
 from sentry.utils.sdk import set_current_event_project
 
@@ -582,6 +584,16 @@ def _do_save_event(
             raise
 
         finally:
+            if (
+                consumer_type == ConsumerType.Transactions
+                and event_id
+                and in_rollout_group("transactions.do_post_process_in_save", event_id)
+            ):
+                # we won't use the transaction data in post_process
+                # so we can delete it from the cache now.
+                if cache_key:
+                    processing_store.delete_by_key(cache_key)
+
             reprocessing2.mark_event_reprocessed(data)
             if cache_key and has_attachments:
                 attachment_cache.delete(cache_key)
@@ -639,6 +651,10 @@ def save_event_transaction(
     project_id: int | None = None,
     **kwargs: Any,
 ) -> None:
+    if event_id:
+        track_sampled_event(
+            event_id, ConsumerType.Transactions, TransactionStageStatus.SAVE_TXN_STARTED
+        )
     _do_save_event(
         cache_key,
         data,
@@ -648,6 +664,10 @@ def save_event_transaction(
         consumer_type=ConsumerType.Transactions,
         **kwargs,
     )
+    if event_id:
+        track_sampled_event(
+            event_id, ConsumerType.Transactions, TransactionStageStatus.SAVE_TXN_FINISHED
+        )
 
 
 @instrumented_task(
diff --git a/src/sentry/tasks/symbolication.py b/src/sentry/tasks/symbolication.py
index 7060b18de49a4f..24f66936734649 100644
--- a/src/sentry/tasks/symbolication.py
+++ b/src/sentry/tasks/symbolication.py
@@ -58,7 +58,7 @@ def get_symbolication_platforms(
 
     platforms = []
 
-    if is_jvm_event(data):
+    if is_jvm_event(data, stacktraces):
         platforms.append(SymbolicatorPlatform.jvm)
     if is_js_event(data, stacktraces):
         platforms.append(SymbolicatorPlatform.js)
diff --git a/src/sentry/taskworker/client.py b/src/sentry/taskworker/client.py
new file mode 100644
index 00000000000000..bb1549d4d3aa4a
--- /dev/null
+++ b/src/sentry/taskworker/client.py
@@ -0,0 +1,65 @@
+import logging
+
+import grpc
+from sentry_protos.sentry.v1.taskworker_pb2 import (
+    GetTaskRequest,
+    SetTaskStatusRequest,
+    TaskActivation,
+    TaskActivationStatus,
+)
+from sentry_protos.sentry.v1.taskworker_pb2_grpc import ConsumerServiceStub
+
+logger = logging.getLogger("sentry.taskworker.client")
+
+
+class TaskworkerClient:
+    """
+    Taskworker RPC client wrapper
+    """
+
+    def __init__(self, host: str) -> None:
+        self._host = host
+
+        # TODO(taskworker) Need to support xds bootstrap file
+        self._channel = grpc.insecure_channel(self._host)
+        self._stub = ConsumerServiceStub(self._channel)
+
+    def get_task(self) -> TaskActivation | None:
+        """
+        Fetch a pending task
+
+        Will return None when there are no tasks to fetch
+        """
+        request = GetTaskRequest()
+        try:
+            response = self._stub.GetTask(request)
+        except grpc.RpcError as err:
+            if err.code() == grpc.StatusCode.NOT_FOUND:
+                return None
+            raise
+        if response.HasField("task"):
+            return response.task
+        return None
+
+    def update_task(
+        self, task_id: str, status: TaskActivationStatus.ValueType, fetch_next: bool = True
+    ) -> TaskActivation | None:
+        """
+        Update the status for a given task activation.
+
+        The return value is the next task that should be executed.
+        """
+        request = SetTaskStatusRequest(
+            id=task_id,
+            status=status,
+            fetch_next=fetch_next,
+        )
+        try:
+            response = self._stub.SetTaskStatus(request)
+        except grpc.RpcError as err:
+            if err.code() == grpc.StatusCode.NOT_FOUND:
+                return None
+            raise
+        if response.HasField("task"):
+            return response.task
+        return None
diff --git a/src/sentry/taskworker/registry.py b/src/sentry/taskworker/registry.py
index 1765b39ca570ee..33423dbf2f3150 100644
--- a/src/sentry/taskworker/registry.py
+++ b/src/sentry/taskworker/registry.py
@@ -16,6 +16,7 @@
 from sentry.taskworker.retry import Retry
 from sentry.taskworker.router import TaskRouter
 from sentry.taskworker.task import P, R, Task
+from sentry.utils import metrics
 from sentry.utils.imports import import_string
 from sentry.utils.kafka_config import get_kafka_producer_cluster_options, get_topic_definition
 
@@ -70,19 +71,44 @@ def register(
         retry: Retry | None = None,
         expires: int | datetime.timedelta | None = None,
         processing_deadline_duration: int | datetime.timedelta | None = None,
+        at_most_once: bool = False,
     ) -> Callable[[Callable[P, R]], Task[P, R]]:
-        """register a task, used as a decorator"""
+        """
+        Register a task.
+
+        Applied as a decorator to functions to enable them to be run
+        asynchronously via taskworkers.
+
+        Parameters
+
+        name: str
+            The name of the task. This is serialized and must be stable across deploys.
+        retry: Retry | None
+            The retry policy for the task. If none and at_most_once is not enabled
+            the Task namespace default retry policy will be used.
+        expires: int | datetime.timedelta
+            The number of seconds a task activation is valid for. After this
+            duration the activation will be discarded and not executed.
+        at_most_once : bool
+            Enable at-most-once execution. Tasks with `at_most_once` cannot
+            define retry policies, and use a worker side idempotency key to
+            prevent processing deadline based retries.
+        """
 
         def wrapped(func: Callable[P, R]) -> Task[P, R]:
+            task_retry = retry
+            if not at_most_once:
+                task_retry = retry or self.default_retry
             task = Task(
                 name=name,
                 func=func,
                 namespace=self,
-                retry=retry or self.default_retry,
+                retry=task_retry,
                 expires=expires or self.default_expires,
                 processing_deadline_duration=(
                     processing_deadline_duration or self.default_processing_deadline_duration
                 ),
+                at_most_once=at_most_once,
             )
             # TODO(taskworker) tasks should be registered into the registry
             # so that we can ensure task names are globally unique
@@ -92,6 +118,7 @@ def wrapped(func: Callable[P, R]) -> Task[P, R]:
         return wrapped
 
     def send_task(self, activation: TaskActivation) -> None:
+        metrics.incr("taskworker.registry.send_task", tags={"namespace": activation.namespace})
         # TODO(taskworker) producer callback handling
         self.producer.produce(
             ArroyoTopic(name=self.topic.value),
diff --git a/src/sentry/taskworker/retry.py b/src/sentry/taskworker/retry.py
index 7915d09ebaad65..d9e80bfb3f5016 100644
--- a/src/sentry/taskworker/retry.py
+++ b/src/sentry/taskworker/retry.py
@@ -35,8 +35,10 @@ def __init__(
         self._times_exceeded = times_exceeded
 
     def should_retry(self, state: RetryState, exc: Exception) -> bool:
-        # No more attempts left
-        if state.attempts >= self._times:
+        # No more attempts left.
+        # We subtract one, as attempts starts at 0, but `times`
+        # starts at 1.
+        if state.attempts >= (self._times - 1):
             return False
 
         # Explicit RetryError with attempts left.
diff --git a/src/sentry/taskworker/service/client.py b/src/sentry/taskworker/service/client.py
deleted file mode 100644
index c8099084ea0d75..00000000000000
--- a/src/sentry/taskworker/service/client.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import logging
-
-from sentry_protos.sentry.v1.taskworker_pb2 import TaskActivation, TaskActivationStatus
-
-logger = logging.getLogger("sentry.taskworker.client")
-
-
-class TaskClient:
-    """
-    Taskworker RPC client wrapper
-
-    TODO(taskworker): Implement gRPC client logic.
-    """
-
-    def __init__(self, host: str) -> None:
-        self._host = host
-
-    def get_task(self) -> TaskActivation | None:
-        return None
-
-    def update_task(
-        self, task_id: str, status: TaskActivationStatus.ValueType
-    ) -> TaskActivation | None:
-        """
-        Update the status for a given task activation.
-
-        The return value is the next task that should be executed.
-        """
-        return None
diff --git a/src/sentry/taskworker/task.py b/src/sentry/taskworker/task.py
index 0d60884d850406..9b7525b0205046 100644
--- a/src/sentry/taskworker/task.py
+++ b/src/sentry/taskworker/task.py
@@ -32,16 +32,25 @@ def __init__(
         retry: Retry | None = None,
         expires: int | datetime.timedelta | None = None,
         processing_deadline_duration: int | datetime.timedelta | None = None,
+        at_most_once: bool = False,
     ):
-        # TODO(taskworker) Implement task execution deadlines
         self.name = name
         self._func = func
         self._namespace = namespace
-        self._retry = retry
         self._expires = expires
         self._processing_deadline_duration = (
             processing_deadline_duration or DEFAULT_PROCESSING_DEADLINE
         )
+        if at_most_once and retry:
+            raise AssertionError(
+                """
+                You cannot enable at_most_once and have retries defined.
+                Having retries enabled means that a task supports being executed
+                multiple times and thus cannot be idempotent.
+                """
+            )
+        self._retry = retry
+        self.at_most_once = at_most_once
         update_wrapper(self, func)
 
     @property
@@ -85,13 +94,15 @@ def create_activation(self, *args: P.args, **kwargs: P.kwargs) -> TaskActivation
 
     def _create_retry_state(self) -> RetryState:
         retry = self.retry or self._namespace.default_retry or None
-        if not retry:
+        if not retry or self.at_most_once:
             # If the task and namespace have no retry policy,
-            # make a single attempt and then discard the task.
+            # or can only be attempted once make a single
+            # attempt and then discard the task.
             return RetryState(
                 attempts=0,
                 kind="sentry.taskworker.retry.Retry",
                 discard_after_attempt=1,
+                at_most_once=self.at_most_once,
             )
         return retry.initial_state()
 
diff --git a/src/sentry/taskworker/tasks/examples.py b/src/sentry/taskworker/tasks/examples.py
new file mode 100644
index 00000000000000..2e077d70e9b88b
--- /dev/null
+++ b/src/sentry/taskworker/tasks/examples.py
@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+import logging
+
+from sentry.taskworker.registry import taskregistry
+
+logger = logging.getLogger(__name__)
+exampletasks = taskregistry.create_namespace(name="examples")
+
+
+@exampletasks.register(name="examples.say_hello")
+def say_hello(name: str) -> None:
+    print(f"Hello {name}")  # noqa
diff --git a/src/sentry/taskworker/worker.py b/src/sentry/taskworker/worker.py
index fda5b4055e9def..bef131a61298de 100644
--- a/src/sentry/taskworker/worker.py
+++ b/src/sentry/taskworker/worker.py
@@ -11,6 +11,7 @@
 import grpc
 import orjson
 from django.conf import settings
+from django.core.cache import cache
 from sentry_protos.sentry.v1.taskworker_pb2 import (
     TASK_ACTIVATION_STATUS_COMPLETE,
     TASK_ACTIVATION_STATUS_FAILURE,
@@ -18,8 +19,10 @@
     TaskActivation,
 )
 
+from sentry.taskworker.client import TaskworkerClient
 from sentry.taskworker.registry import taskregistry
-from sentry.taskworker.service.client import TaskClient
+from sentry.taskworker.task import Task
+from sentry.utils import metrics
 
 logger = logging.getLogger("sentry.taskworker.worker")
 
@@ -34,6 +37,14 @@ def _process_activation(
     taskregistry.get(namespace).get(task_name)(*args, **kwargs)
 
 
+AT_MOST_ONCE_TIMEOUT = 60 * 60 * 24  # 1 day
+
+
+def get_at_most_once_key(namespace: str, taskname: str, task_id: str) -> str:
+    # tw:amo -> taskworker:at_most_once
+    return f"tw:amo:{namespace}:{taskname}:{task_id}"
+
+
 class TaskWorker:
     """
     A TaskWorker fetches tasks from a taskworker RPC host and handles executing task activations.
@@ -52,7 +63,7 @@ def __init__(
         self._execution_count = 0
         self._worker_id = uuid4().hex
         self._max_task_count = max_task_count
-        self.client = TaskClient(rpc_host)
+        self.client = TaskworkerClient(rpc_host)
         self._pool: Pool | None = None
         self._build_pool()
 
@@ -89,6 +100,7 @@ def start(self) -> int:
                     task = self.fetch_task()
 
                 if not task:
+                    metrics.incr("taskworker.worker.no_task.pause")
                     time.sleep(1)
                     continue
 
@@ -97,6 +109,10 @@ def start(self) -> int:
                     self._max_task_count is not None
                     and self._max_task_count <= self._execution_count
                 ):
+                    metrics.incr(
+                        "taskworker.worker.max_task_count_reached",
+                        tags={"count": self._execution_count},
+                    )
                     logger.info("Max task execution count reached. Terminating")
                     return 0
 
@@ -110,22 +126,25 @@ def fetch_task(self) -> TaskActivation | None:
         try:
             activation = self.client.get_task()
         except grpc.RpcError:
+            metrics.incr("taskworker.worker.get_task.failed")
             logger.info("get_task failed. Retrying in 1 second")
             return None
 
         if not activation:
+            metrics.incr("taskworker.worker.get_task.not_found")
             logger.info("No task fetched")
             return None
 
+        metrics.incr("taskworker.worker.get_task.success")
         return activation
 
-    def _known_task(self, activation: TaskActivation) -> bool:
+    def _get_known_task(self, activation: TaskActivation) -> Task[Any, Any] | None:
         if not taskregistry.contains(activation.namespace):
             logger.error(
                 "taskworker.invalid_namespace",
                 extra={"namespace": activation.namespace, "taskname": activation.taskname},
             )
-            return False
+            return None
 
         namespace = taskregistry.get(activation.namespace)
         if not namespace.contains(activation.taskname):
@@ -133,19 +152,35 @@ def _known_task(self, activation: TaskActivation) -> bool:
                 "taskworker.invalid_taskname",
                 extra={"namespace": activation.namespace, "taskname": activation.taskname},
             )
-            return False
-        return True
+            return None
+        return namespace.get(activation.taskname)
 
     def process_task(self, activation: TaskActivation) -> TaskActivation | None:
         assert self._pool
-        if not self._known_task(activation):
+        task = self._get_known_task(activation)
+        if not task:
+            metrics.incr(
+                "taskworker.worker.unknown_task",
+                tags={"namespace": activation.namespace, "taskname": activation.taskname},
+            )
             self._execution_count += 1
             return self.client.update_task(
                 task_id=activation.id,
                 status=TASK_ACTIVATION_STATUS_FAILURE,
             )
 
-        # TODO(taskworker): Add at_most_once checks
+        if task.at_most_once:
+            key = get_at_most_once_key(activation.namespace, activation.taskname, activation.id)
+            if cache.add(key, "1", timeout=AT_MOST_ONCE_TIMEOUT):  # The key didn't exist
+                metrics.incr(
+                    "taskworker.task.at_most_once.executed", tags={"task": activation.taskname}
+                )
+            else:
+                metrics.incr(
+                    "taskworker.worker.at_most_once.skipped", tags={"task": activation.taskname}
+                )
+                return None
+
         processing_timeout = activation.processing_deadline_duration
         namespace = taskregistry.get(activation.namespace)
         next_state = TASK_ACTIVATION_STATUS_FAILURE
@@ -193,15 +228,35 @@ def process_task(self, activation: TaskActivation) -> TaskActivation | None:
         self._execution_count += 1
 
         task_added_time = activation.received_at.ToDatetime().timestamp()
+        execution_duration = execution_complete_time - execution_start_time
+        execution_latency = execution_complete_time - task_added_time
         logger.info(
             "taskworker.task_execution",
             extra={
                 "taskname": activation.taskname,
-                "execution_duration": execution_complete_time - execution_start_time,
-                "execution_latency": execution_complete_time - task_added_time,
+                "execution_duration": execution_duration,
+                "execution_latency": execution_latency,
+                "status": next_state,
+            },
+        )
+        metrics.incr(
+            "taskworker.worker.execute_task",
+            tags={
+                "namespace": activation.namespace,
                 "status": next_state,
             },
         )
+        metrics.distribution(
+            "taskworker.worker.execution_duration",
+            execution_duration,
+            tags={"namespace": activation.namespace},
+        )
+        metrics.distribution(
+            "taskworker.worker.execution_latency",
+            execution_latency,
+            tags={"namespace": activation.namespace},
+        )
+
         return self.client.update_task(
             task_id=activation.id,
             status=next_state,
diff --git a/src/sentry/templates/sentry/layout.html b/src/sentry/templates/sentry/layout.html
index 17a2783c12755e..ea15abda02dfa6 100644
--- a/src/sentry/templates/sentry/layout.html
+++ b/src/sentry/templates/sentry/layout.html
@@ -3,7 +3,6 @@
 {% load sentry_assets %}
 {% load sentry_features %}
 {% load sentry_helpers %}
-{% load sentry_react %}
 {% load sentry_status %}
 {% get_sentry_version %}
 <!DOCTYPE html>
@@ -41,7 +40,7 @@
   {% block initial_data %}
     {% script %}
     <script>
-      window.__initialData = {% get_react_config %};
+      window.__initialData = {{ react_config|to_json }};
     </script>
     {% endscript %}
   {% endblock %}
diff --git a/src/sentry/templates/sentry/toolbar/iframe.html b/src/sentry/templates/sentry/toolbar/iframe.html
index 83ecbedba7f457..f35185ab3311a1 100644
--- a/src/sentry/templates/sentry/toolbar/iframe.html
+++ b/src/sentry/templates/sentry/toolbar/iframe.html
@@ -20,7 +20,7 @@
     <script>
       (function() {
         const referrer = '{{ referrer|escapejs }}';
-        const state = '{{ state|escapejs }}';
+        const state = '{{ state|escapejs }}'; // enum of: logged-out, missing-project, invalid-domain, logged-in
         const logging = '{{ logging|escapejs }}';
         const organizationSlug = '{{ organization_slug|escapejs }}';
         const projectIdOrSlug = '{{ project_id_or_slug|escapejs }}';
@@ -43,6 +43,12 @@
           );
         }
 
+        /**
+         * This should only be called on pageload, which is when the server has
+         * checked for auth, project validity, and domain config first.
+         *
+         * Also to be called when we clear auth tokens.
+         */
         function sendStateMessage(state) {
           log('sendStateMessage(state)', { state });
           window.parent.postMessage({
@@ -60,7 +66,7 @@
             log('window.onMessage', messageEvent.data, messageEvent);
             if (messageEvent.data.message === 'did-login') {
               saveAccessToken(messageEvent.data);
-              sendStateMessage('logged-in');
+              window.location.reload();
             }
           });
         }
@@ -163,8 +169,7 @@
 
         setupMessageChannel();
         listenForLoginSuccess();
-        // enum of: logged-out, missing-project, invalid-domain, logged-in
-        sendStateMessage(state === 'success' ? 'logged-in' : state);
+        sendStateMessage(state);
       })();
     </script>
     {% endscript %}
diff --git a/src/sentry/templates/sentry/toolbar/login-success.html b/src/sentry/templates/sentry/toolbar/login-success.html
index f78c1ee5a05660..83af6518d00f51 100644
--- a/src/sentry/templates/sentry/toolbar/login-success.html
+++ b/src/sentry/templates/sentry/toolbar/login-success.html
@@ -1,45 +1,57 @@
-{# Auth redirect template for Dev Toolbar. Returned after successfully logging in to a requested organization. #}
+{% extends "sentry/bases/auth.html" %}
+
 {% load sentry_assets %}
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>Sentry - Login Success</title>
-    <link rel="icon" type="image/png" href="{% absolute_asset_url "sentry" "images/favicon.png" %}">
-  </head>
-  <body>
-    <div>
-      <p>You are logged in!</p>
-      <p>This window will automatically close after {{ delay_sec }} seconds. If not then check the console for errors.</p>
-      <button type="button" id="close-popup">Close Popup</button>
-    </div>
-
-    {% script %}
-    <script>
-      (function() {
-        const delay = {{ delay_ms|escapejs }};
-        const cookie = '{{ cookie|escapejs }}';
-        const token = '{{ token|escapejs }}';
-
-        document.getElementById('close-popup').addEventListener('click', () => {
-          window.close();
-        });
-
-        if (window.opener) {
-          window.opener.postMessage({
-            source: 'sentry-toolbar',
-            message: 'did-login',
-            cookie,
-            token,
-          }, window.location.origin);
-
-          if (delay && typeof delay === 'number') {
-            setTimeout(() => {
-              window.close();
-            }, delay);
-          }
+{% load i18n %}
+
+{% block title %}{% trans "Sentry Toolbar - Login Success" %} | {{ block.super }}{% endblock %}
+
+{% block auth_main %}
+  <div>
+    <h4>You're logged in!</h4>
+    {% if delay_sec %}
+    <p>This window will automatically close after {{ delay_sec }} seconds.</p>
+    <p>If not then check the console for errors.</p>
+    {% endif %}
+    <button type="button" id="close-popup" class="btn btn-primary">Close Popup</button>
+  </div>
+{% endblock %}
+
+{% block scripts_bottom %}
+  {{ block.super }}
+  {% script %}
+  <script>
+    (function() {
+      const orgSlug = '{{ organization_slug|escape }}';
+      const delay = {{ delay_ms|escapejs }};
+      const cookie = '{{ cookie|escapejs }}';
+      const token = '{{ token|escapejs }}';
+
+      if (window.location.origin === 'https://sentry.io') {
+        // User was already logged in and didn't get a redirect to the
+        // subdomained origin. Do that redirect now.
+        window.location.replace(`https://${orgSlug}.sentry.io${window.location.pathname}${window.location.search}`);
+        return;
+      }
+
+      document.getElementById('close-popup').addEventListener('click', () => {
+        window.close();
+      });
+
+      if (window.opener) {
+        window.opener.postMessage({
+          source: 'sentry-toolbar',
+          message: 'did-login',
+          cookie,
+          token,
+        }, window.location.origin);
+
+        if (delay && typeof delay === 'number') {
+          setTimeout(() => {
+            window.close();
+          }, delay);
         }
-      })();
-    </script>
-    {% endscript %}
-  </body>
-</html>
+      }
+    })();
+  </script>
+  {% endscript %}
+{% endblock %}
diff --git a/src/sentry/testutils/asserts.py b/src/sentry/testutils/asserts.py
index baf295c83fb78c..062fd52e90a127 100644
--- a/src/sentry/testutils/asserts.py
+++ b/src/sentry/testutils/asserts.py
@@ -1,5 +1,6 @@
 from django.http import StreamingHttpResponse
 
+from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.auditlogentry import AuditLogEntry
 from sentry.models.commitfilechange import CommitFileChange
 from sentry.silo.base import SiloMode
@@ -60,3 +61,35 @@ def assert_org_audit_log_does_not_exist(**kwargs):
 
 def delete_all_org_audit_logs():
     return AuditLogEntry.objects.all().delete()
+
+
+"""
+Helper functions to assert integration SLO metrics
+"""
+
+
+def assert_halt_metric(mock_record, error_msg):
+    (event_halts,) = (
+        call for call in mock_record.mock_calls if call.args[0] == EventLifecycleOutcome.HALTED
+    )
+    if isinstance(error_msg, Exception):
+        assert isinstance(event_halts.args[1], type(error_msg))
+    else:
+        assert event_halts.args[1] == error_msg
+
+
+def assert_failure_metric(mock_record, error_msg):
+    (event_failures,) = (
+        call for call in mock_record.mock_calls if call.args[0] == EventLifecycleOutcome.FAILURE
+    )
+    if isinstance(error_msg, Exception):
+        assert isinstance(event_failures.args[1], type(error_msg))
+    else:
+        assert event_failures.args[1] == error_msg
+
+
+def assert_success_metric(mock_record):
+    event_success = (
+        call for call in mock_record.mock_calls if call.args[0] == EventLifecycleOutcome.SUCCESS
+    )
+    assert event_success
diff --git a/src/sentry/testutils/cases.py b/src/sentry/testutils/cases.py
index 9275f344ad0f09..5d33c5ccdefab6 100644
--- a/src/sentry/testutils/cases.py
+++ b/src/sentry/testutils/cases.py
@@ -99,8 +99,6 @@
 from sentry.models.environment import Environment
 from sentry.models.files.file import File
 from sentry.models.groupmeta import GroupMeta
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.organization import Organization
 from sentry.models.organizationmember import OrganizationMember
@@ -110,6 +108,8 @@
 from sentry.models.repository import Repository
 from sentry.models.rule import RuleSource
 from sentry.monitors.models import Monitor, MonitorEnvironment, MonitorType, ScheduleType
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.notifications.base import alert_page_needs_org_id
 from sentry.notifications.types import FineTuningAPIKey
 from sentry.organizations.services.organization.serial import serialize_rpc_organization
@@ -124,7 +124,6 @@
     METRIC_SATISFIED_TAG_VALUE,
     METRIC_TOLERATED_TAG_VALUE,
     METRICS_MAP,
-    PROFILE_METRICS_MAP,
     SPAN_METRICS_MAP,
 )
 from sentry.sentry_metrics import indexer
@@ -1407,43 +1406,6 @@ def store_issues(self, issues):
             == 200
         )
 
-    def store_metrics_summary(self, span):
-        common_fields = {
-            "duration_ms": span["duration_ms"],
-            "end_timestamp": (span["start_timestamp_ms"] + span["duration_ms"]) / 1000,
-            "group": span["sentry_tags"].get("group", "0"),
-            "is_segment": span["is_segment"],
-            "project_id": span["project_id"],
-            "received": span["received"],
-            "retention_days": span["retention_days"],
-            "segment_id": span.get("segment_id", "0"),
-            "span_id": span["span_id"],
-            "trace_id": span["trace_id"],
-        }
-        rows = []
-        for mri, summaries in span.get("_metrics_summary", {}).items():
-            for summary in summaries:
-                rows.append(
-                    {
-                        **common_fields,
-                        **{
-                            "count": summary.get("count", 0),
-                            "max": summary.get("max", 0.0),
-                            "mri": mri,
-                            "min": summary.get("min", 0.0),
-                            "sum": summary.get("sum", 0.0),
-                            "tags": summary.get("tags", {}),
-                        },
-                    }
-                )
-        assert (
-            requests.post(
-                settings.SENTRY_SNUBA + "/tests/entities/metrics_summaries/insert",
-                data=json.dumps(rows),
-            ).status_code
-            == 200
-        )
-
     def to_snuba_time_format(self, datetime_value):
         date_format = "%Y-%m-%d %H:%M:%S%z"
         return datetime_value.strftime(date_format)
@@ -1531,7 +1493,6 @@ def store_segment(
         tags: Mapping[str, Any] | None = None,
         measurements: Mapping[str, int | float] | None = None,
         timestamp: datetime | None = None,
-        store_metrics_summary: Mapping[str, Sequence[Mapping[str, Any]]] | None = None,
         sdk_name: str | None = None,
         op: str | None = None,
         status: str | None = None,
@@ -1570,8 +1531,6 @@ def store_segment(
             payload["measurements"] = {
                 measurement: {"value": value} for measurement, value in measurements.items()
             }
-        if store_metrics_summary:
-            payload["_metrics_summary"] = store_metrics_summary
         if parent_span_id:
             payload["parent_span_id"] = parent_span_id
         if sdk_name is not None:
@@ -1583,9 +1542,6 @@ def store_segment(
 
         self.store_span(payload, is_eap=is_eap)
 
-        if "_metrics_summary" in payload:
-            self.store_metrics_summary(payload)
-
     def store_indexed_span(
         self,
         project_id: int,
@@ -1602,7 +1558,6 @@ def store_indexed_span(
         measurements: Mapping[str, int | float] | None = None,
         timestamp: datetime | None = None,
         store_only_summary: bool = False,
-        store_metrics_summary: Mapping[str, Sequence[Mapping[str, Any]]] | None = None,
         group: str = "00",
         category: str | None = None,
         organization_id: int = 1,
@@ -1644,8 +1599,6 @@ def store_indexed_span(
             payload["segment_id"] = transaction_id[:16]
         if profile_id:
             payload["profile_id"] = profile_id
-        if store_metrics_summary:
-            payload["_metrics_summary"] = store_metrics_summary
         if parent_span_id:
             payload["parent_span_id"] = parent_span_id
         if category is not None:
@@ -1656,9 +1609,6 @@ def store_indexed_span(
         if not store_only_summary:
             self.store_span(payload, is_eap=is_eap)
 
-        if "_metrics_summary" in payload:
-            self.store_metrics_summary(payload)
-
 
 class BaseMetricsTestCase(SnubaTestCase):
     ENTITY_SHORTHANDS = {
@@ -2273,49 +2223,6 @@ def store_span_metric(
                 subvalue,
             )
 
-    def store_profile_functions_metric(
-        self,
-        value: dict[str, int] | list[int] | int,
-        metric: str = "function.duration",
-        internal_metric: str | None = None,
-        entity: str | None = None,
-        tags: dict[str, str] | None = None,
-        timestamp: datetime | None = None,
-        project: int | None = None,
-        use_case_id: UseCaseID = UseCaseID.SPANS,
-    ):
-        internal_metric = (
-            PROFILE_METRICS_MAP[metric] if internal_metric is None else internal_metric
-        )
-        entity = self.ENTITY_MAP[metric] if entity is None else entity
-        org_id = self.organization.id
-
-        if tags is None:
-            tags = {}
-
-        if timestamp is None:
-            metric_timestamp = self.DEFAULT_METRIC_TIMESTAMP.timestamp()
-        else:
-            metric_timestamp = timestamp.timestamp()
-
-        if project is None:
-            project = self.project.id
-
-        val_list: list[int | dict[str, int]] = []
-        if not isinstance(value, list):
-            val_list.append(value)
-        else:
-            val_list = value
-        for subvalue in val_list:
-            self.store_metric(
-                org_id,
-                project,
-                internal_metric,
-                tags,
-                int(metric_timestamp),
-                subvalue,
-            )
-
     def wait_for_metric_count(
         self,
         project,
diff --git a/src/sentry/testutils/factories.py b/src/sentry/testutils/factories.py
index 7d19332d0c351a..79c18d3678968c 100644
--- a/src/sentry/testutils/factories.py
+++ b/src/sentry/testutils/factories.py
@@ -54,7 +54,6 @@
     Incident,
     IncidentActivity,
     IncidentProject,
-    IncidentSeen,
     IncidentTrigger,
     IncidentType,
     TriggerStatus,
@@ -99,13 +98,6 @@
 from sentry.models.grouphistory import GroupHistory
 from sentry.models.grouplink import GroupLink
 from sentry.models.grouprelease import GroupRelease
-from sentry.models.notificationaction import (
-    ActionService,
-    ActionTarget,
-    ActionTrigger,
-    NotificationAction,
-)
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.organization import Organization
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmember import OrganizationMember
@@ -127,6 +119,13 @@
 from sentry.models.savedsearch import SavedSearch
 from sentry.models.team import Team
 from sentry.models.userreport import UserReport
+from sentry.notifications.models.notificationaction import (
+    ActionService,
+    ActionTarget,
+    ActionTrigger,
+    NotificationAction,
+)
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.organizations.services.organization import RpcOrganization, RpcUserOrganizationContext
 from sentry.sentry_apps.installations import (
     SentryAppInstallationCreator,
@@ -155,6 +154,7 @@
 from sentry.types.region import Region, get_local_region, get_region_by_name
 from sentry.types.token import AuthTokenType
 from sentry.uptime.models import (
+    IntervalSecondsLiteral,
     ProjectUptimeSubscription,
     ProjectUptimeSubscriptionMode,
     UptimeStatus,
@@ -861,7 +861,9 @@ def create_commit_file_change(commit, filename):
 
     @staticmethod
     @assume_test_silo_mode(SiloMode.CONTROL)
-    def create_user(email=None, is_superuser=False, is_staff=False, is_active=True, **kwargs):
+    def create_user(
+        email=None, is_superuser=False, is_staff=False, is_active=True, **kwargs
+    ) -> User:
         if email is None:
             email = uuid4().hex + "@example.com"
 
@@ -1506,7 +1508,6 @@ def create_incident(
         date_started=None,
         date_detected=None,
         date_closed=None,
-        seen_by=None,
         alert_rule=None,
         subscription=None,
         activation=None,
@@ -1533,11 +1534,7 @@ def create_incident(
         )
         for project in projects:
             IncidentProject.objects.create(incident=incident, project=project)
-        if seen_by:
-            for user in seen_by:
-                IncidentSeen.objects.create(
-                    incident=incident, user_id=user.id, last_seen=timezone.now()
-                )
+
         return incident
 
     @staticmethod
@@ -1799,7 +1796,7 @@ def create_identity_provider(
     @staticmethod
     @assume_test_silo_mode(SiloMode.CONTROL)
     def create_identity(
-        user: Any, identity_provider: IdentityProvider, external_id: str, **kwargs: Any
+        user: User | RpcUser, identity_provider: IdentityProvider, external_id: str, **kwargs: Any
     ) -> Identity:
         return Identity.objects.create(
             external_id=external_id,
@@ -1953,12 +1950,13 @@ def create_uptime_subscription(
         url_domain: str,
         url_domain_suffix: str,
         host_provider_id: str,
-        interval_seconds: int,
+        interval_seconds: IntervalSecondsLiteral,
         timeout_ms: int,
         method,
         headers,
         body,
         date_updated: datetime,
+        trace_sampling: bool = False,
     ):
         return UptimeSubscription.objects.create(
             type=type,
@@ -1974,6 +1972,7 @@ def create_uptime_subscription(
             method=method,
             headers=headers,
             body=body,
+            trace_sampling=trace_sampling,
         )
 
     @staticmethod
@@ -2069,7 +2068,7 @@ def create_workflow(
             organization = Factories.create_organization()
         if name is None:
             name = petname.generate(2, " ", letters=10).title()
-        return Workflow.objects.create(organization=organization, name=name)
+        return Workflow.objects.create(organization=organization, name=name, **kwargs)
 
     @staticmethod
     @assume_test_silo_mode(SiloMode.REGION)
@@ -2097,9 +2096,7 @@ def create_workflow_data_condition_group(
 
     @staticmethod
     @assume_test_silo_mode(SiloMode.REGION)
-    def create_data_condition(
-        **kwargs,
-    ) -> DataCondition:
+    def create_data_condition(**kwargs) -> DataCondition:
         return DataCondition.objects.create(**kwargs)
 
     @staticmethod
@@ -2121,21 +2118,14 @@ def create_data_source(
     @staticmethod
     @assume_test_silo_mode(SiloMode.REGION)
     def create_detector(
-        organization: Organization | None = None,
         name: str | None = None,
-        owner_user_id: int | None = None,
-        owner_team: Team | None = None,
         **kwargs,
     ) -> Detector:
-        if organization is None:
-            organization = Factories.create_organization()
         if name is None:
             name = petname.generate(2, " ", letters=10).title()
+
         return Detector.objects.create(
-            organization=organization,
             name=name,
-            owner_user_id=owner_user_id,
-            owner_team=owner_team,
             **kwargs,
         )
 
diff --git a/src/sentry/testutils/fixtures.py b/src/sentry/testutils/fixtures.py
index e34e2ad32393a5..bff1a03aa1ec3b 100644
--- a/src/sentry/testutils/fixtures.py
+++ b/src/sentry/testutils/fixtures.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Mapping
+from collections.abc import Iterable, Mapping
 from datetime import datetime, timedelta
 from typing import Any
 
@@ -9,8 +9,7 @@
 from django.utils.functional import cached_property
 
 from sentry.eventstore.models import Event
-from sentry.incidents.models.alert_rule import AlertRuleMonitorTypeInt
-from sentry.incidents.models.incident import IncidentActivityType
+from sentry.incidents.models.alert_rule import AlertRule, AlertRuleMonitorTypeInt
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.models.activity import Activity
@@ -26,6 +25,7 @@
 from sentry.monitors.models import Monitor, MonitorType, ScheduleType
 from sentry.organizations.services.organization import RpcOrganization
 from sentry.silo.base import SiloMode
+from sentry.snuba.models import QuerySubscription
 from sentry.testutils.factories import Factories
 from sentry.testutils.helpers.datetime import before_now, iso_format
 from sentry.testutils.silo import assume_test_silo_mode
@@ -44,7 +44,7 @@
 from sentry.users.models.identity import Identity, IdentityProvider
 from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
-from sentry.workflow_engine.models import DataSource, Detector, Workflow
+from sentry.workflow_engine.models import DataSource, Detector, DetectorState, Workflow
 from sentry.workflow_engine.types import DetectorPriorityLevel
 
 
@@ -58,7 +58,7 @@ def projectkey(self):
         return self.create_project_key(project=self.project)
 
     @cached_property
-    def user(self):
+    def user(self) -> User:
         return self.create_user("admin@localhost", is_superuser=True, is_staff=True)
 
     @cached_property
@@ -183,50 +183,27 @@ def create_project_template(self, **kwargs) -> ProjectTemplate:
     def create_project_bookmark(self, project=None, *args, **kwargs):
         if project is None:
             project = self.project
-        return Factories.create_project_bookmark(project=project, *args, **kwargs)
+        return Factories.create_project_bookmark(project, *args, **kwargs)
 
     def create_project_key(self, project=None, *args, **kwargs):
         if project is None:
             project = self.project
-        return Factories.create_project_key(project=project, *args, **kwargs)
+        return Factories.create_project_key(project, *args, **kwargs)
 
-    def create_project_rule(
-        self,
-        project=None,
-        action_match=None,
-        condition_match=None,
-        comparison_interval=None,
-        *args,
-        **kwargs,
-    ) -> Rule:
+    def create_project_rule(self, project=None, *args, **kwargs) -> Rule:
         if project is None:
             project = self.project
-        return Factories.create_project_rule(
-            project=project,
-            action_data=action_match,
-            condition_data=condition_match,
-            *args,
-            **kwargs,
-        )
+        return Factories.create_project_rule(project, *args, **kwargs)
 
-    def create_slack_project_rule(
-        self, project=None, integration_id=None, channel_id=None, channel_name=None, *args, **kwargs
-    ):
+    def create_slack_project_rule(self, project=None, *args, **kwargs):
         if project is None:
             project = self.project
-        return Factories.create_slack_project_rule(
-            project,
-            integration_id=integration_id,
-            channel_id=channel_id,
-            channel_name=channel_name,
-            *args,
-            **kwargs,
-        )
+        return Factories.create_slack_project_rule(project, *args, **kwargs)
 
-    def create_release(self, project=None, user=None, *args, **kwargs):
+    def create_release(self, project=None, *args, **kwargs):
         if project is None:
             project = self.project
-        return Factories.create_release(project=project, user=user, *args, **kwargs)
+        return Factories.create_release(project, *args, **kwargs)
 
     def create_group_release(self, project: Project | None = None, *args, **kwargs) -> GroupRelease:
         if project is None:
@@ -263,7 +240,7 @@ def create_code_mapping(self, project=None, repo=None, organization_integration=
     def create_repo(self, project=None, *args, **kwargs):
         if project is None:
             project = self.project
-        return Factories.create_repo(project=project, *args, **kwargs)
+        return Factories.create_repo(project, *args, **kwargs)
 
     def create_commit(self, *args, **kwargs):
         return Factories.create_commit(*args, **kwargs)
@@ -274,7 +251,7 @@ def create_commit_author(self, *args, **kwargs):
     def create_commit_file_change(self, *args, **kwargs):
         return Factories.create_commit_file_change(*args, **kwargs)
 
-    def create_user(self, *args, **kwargs):
+    def create_user(self, *args, **kwargs) -> User:
         return Factories.create_user(*args, **kwargs)
 
     def create_useremail(self, *args, **kwargs):
@@ -291,7 +268,7 @@ def create_usersocialauth(
         user: User | None = None,
         provider: str | None = None,
         uid: str | None = None,
-        extra_data: Mapping[str, Any] | None = None,
+        extra_data: dict[str, Any] | None = None,
     ):
         if not user:
             user = self.user
@@ -305,7 +282,7 @@ def store_event(self, *args, **kwargs) -> Event:
     def create_group(self, project=None, *args, **kwargs):
         if project is None:
             project = self.project
-        return Factories.create_group(project=project, *args, **kwargs)
+        return Factories.create_group(project, *args, **kwargs)
 
     def create_file(self, **kwargs):
         return Factories.create_file(**kwargs)
@@ -316,12 +293,12 @@ def create_file_from_path(self, *args, **kwargs):
     def create_event_attachment(self, event=None, *args, **kwargs):
         if event is None:
             event = self.event
-        return Factories.create_event_attachment(event=event, *args, **kwargs)
+        return Factories.create_event_attachment(event, *args, **kwargs)
 
-    def create_dif_file(self, project=None, *args, **kwargs):
+    def create_dif_file(self, project: Project | None = None, *args, **kwargs):
         if project is None:
             project = self.project
-        return Factories.create_dif_file(project=project, *args, **kwargs)
+        return Factories.create_dif_file(project, *args, **kwargs)
 
     def create_dif_from_path(self, project=None, *args, **kwargs):
         if project is None:
@@ -385,28 +362,21 @@ def create_integration_external_issue(self, *args, **kwargs):
     def create_integration_external_project(self, *args, **kwargs):
         return Factories.create_integration_external_project(*args, **kwargs)
 
-    def create_incident(self, organization=None, projects=None, subscription=None, *args, **kwargs):
+    def create_incident(self, organization=None, projects=None, *args, **kwargs):
         if not organization:
             organization = self.organization
         if projects is None:
             projects = [self.project]
 
-        return Factories.create_incident(
-            organization=organization, projects=projects, subscription=subscription, *args, **kwargs
-        )
-
-    def create_incident_activity(self, incident, *args, **kwargs):
-        return Factories.create_incident_activity(incident=incident, *args, **kwargs)
+        return Factories.create_incident(organization, projects, *args, **kwargs)
 
-    def create_incident_comment(self, incident, *args, **kwargs):
-        return self.create_incident_activity(
-            incident, type=IncidentActivityType.COMMENT.value, *args, **kwargs
-        )
+    def create_incident_activity(self, *args, **kwargs):
+        return Factories.create_incident_activity(*args, **kwargs)
 
     def create_incident_trigger(self, incident, alert_rule_trigger, status):
         return Factories.create_incident_trigger(incident, alert_rule_trigger, status=status)
 
-    def create_alert_rule(self, organization=None, projects=None, *args, **kwargs):
+    def create_alert_rule(self, organization=None, projects=None, *args, **kwargs) -> AlertRule:
         if not organization:
             organization = self.organization
         if projects is None:
@@ -415,8 +385,8 @@ def create_alert_rule(self, organization=None, projects=None, *args, **kwargs):
 
     def create_alert_rule_activation(
         self,
-        alert_rule=None,
-        query_subscriptions=None,
+        alert_rule: AlertRule | None = None,
+        query_subscriptions: Iterable[QuerySubscription] | None = None,
         project=None,
         monitor_type=AlertRuleMonitorTypeInt.ACTIVATED,
         activator=None,
@@ -425,9 +395,7 @@ def create_alert_rule_activation(
         **kwargs,
     ):
         if not alert_rule:
-            alert_rule = self.create_alert_rule(
-                monitor_type=monitor_type,
-            )
+            alert_rule = self.create_alert_rule(monitor_type=monitor_type)
         if not query_subscriptions:
             projects = [project] if project else [self.project]
             # subscribing an activated alert rule will create an activation
@@ -441,9 +409,7 @@ def create_alert_rule_activation(
         created_activations = []
         for sub in query_subscriptions:
             created_activations.append(
-                Factories.create_alert_rule_activation(
-                    alert_rule=alert_rule, query_subscription=sub, *args, **kwargs
-                )
+                Factories.create_alert_rule_activation(alert_rule, sub, *args, **kwargs)
             )
         return created_activations
 
@@ -536,7 +502,7 @@ def create_slack_integration(
         self,
         organization: Organization,
         external_id: str = "TXXXXXXX1",
-        user: RpcUser | None = None,
+        user: RpcUser | User | None = None,
         identity_external_id: str = "UXXXXXXX1",
         **kwargs: Any,
     ):
@@ -636,9 +602,6 @@ def create_dashboard_widget(self, *args, **kwargs):
     def create_dashboard_widget_query(self, *args, **kwargs):
         return Factories.create_dashboard_widget_query(*args, **kwargs)
 
-    def create_workflow_action(self, *args, **kwargs) -> Workflow:
-        return Factories.create_workflow_action(*args, **kwargs)
-
     def create_workflow(self, *args, **kwargs) -> Workflow:
         return Factories.create_workflow(*args, **kwargs)
 
@@ -652,23 +615,34 @@ def create_data_condition(
         type="",
         condition_result=None,
         condition_group=None,
+        **kwargs,
     ):
         if condition_result is None:
             condition_result = str(DetectorPriorityLevel.HIGH.value)
         if condition_group is None:
             condition_group = self.create_data_condition_group()
+
         return Factories.create_data_condition(
             condition=condition,
             comparison=comparison,
             type=type,
             condition_result=condition_result,
             condition_group=condition_group,
+            **kwargs,
         )
 
-    def create_detector(self, *args, **kwargs) -> Detector:
-        return Factories.create_detector(*args, **kwargs)
+    def create_detector(
+        self,
+        *args,
+        project=None,
+        **kwargs,
+    ) -> Detector:
+        if project is None:
+            project = self.create_project(organization=self.organization)
+
+        return Factories.create_detector(*args, project=project, **kwargs)
 
-    def create_detector_state(self, *args, **kwargs) -> Detector:
+    def create_detector_state(self, *args, **kwargs) -> DetectorState:
         return Factories.create_detector_state(*args, **kwargs)
 
     def create_data_source_detector(self, *args, **kwargs):
@@ -689,7 +663,7 @@ def create_detector_workflow(self, *args, **kwargs):
     def create_workflow_data_condition_group(self, *args, **kwargs):
         return Factories.create_workflow_data_condition_group(*args, **kwargs)
 
-    # workflow_engine action
+    # workflow_engine.models.action
     def create_action(self, *args, **kwargs):
         return Factories.create_action(*args, **kwargs)
 
@@ -708,6 +682,7 @@ def create_uptime_subscription(
         headers=None,
         body=None,
         date_updated: None | datetime = None,
+        trace_sampling: bool = False,
     ) -> UptimeSubscription:
         if date_updated is None:
             date_updated = timezone.now()
@@ -728,6 +703,7 @@ def create_uptime_subscription(
             method=method,
             headers=headers,
             body=body,
+            trace_sampling=trace_sampling,
         )
 
     def create_project_uptime_subscription(
diff --git a/src/sentry/testutils/helpers/backups.py b/src/sentry/testutils/helpers/backups.py
index 928f9beea8a769..d96fc85e62cb0d 100644
--- a/src/sentry/testutils/helpers/backups.py
+++ b/src/sentry/testutils/helpers/backups.py
@@ -31,6 +31,7 @@
     sorted_dependencies,
 )
 from sentry.backup.exports import (
+    ExportCheckpointer,
     export_in_config_scope,
     export_in_global_scope,
     export_in_organization_scope,
@@ -43,15 +44,10 @@
 from sentry.backup.validate import validate
 from sentry.data_secrecy.models import DataSecrecyWaiver
 from sentry.db.models.paranoia import ParanoidModel
-from sentry.incidents.models.alert_rule import (
-    AlertRuleExcludedProjects,
-    AlertRuleMonitorTypeInt,
-    AlertRuleTriggerExclusion,
-)
+from sentry.incidents.models.alert_rule import AlertRuleMonitorTypeInt
 from sentry.incidents.models.incident import (
     IncidentActivity,
     IncidentSnapshot,
-    IncidentSubscription,
     IncidentTrigger,
     PendingIncidentSnapshot,
     TimeSeriesSnapshot,
@@ -68,7 +64,7 @@
 from sentry.models.authidentity import AuthIdentity
 from sentry.models.authprovider import AuthProvider
 from sentry.models.counter import Counter
-from sentry.models.dashboard import Dashboard, DashboardTombstone
+from sentry.models.dashboard import Dashboard, DashboardFavoriteUser, DashboardTombstone
 from sentry.models.dashboard_permissions import DashboardPermissions
 from sentry.models.dashboard_widget import (
     DashboardWidget,
@@ -147,7 +143,12 @@ def __init__(self, info: ComparatorFindings):
         self.info = info
 
 
-def export_to_file(path: Path, scope: ExportScope, filter_by: set[str] | None = None) -> Any:
+def export_to_file(
+    path: Path,
+    scope: ExportScope,
+    filter_by: set[str] | None = None,
+    checkpointer: ExportCheckpointer | None = None,
+) -> Any:
     """
     Helper function that exports the current state of the database to the specified file.
     """
@@ -157,13 +158,31 @@ def export_to_file(path: Path, scope: ExportScope, filter_by: set[str] | None =
         # These functions are just thin wrappers, but its best to exercise them directly anyway in
         # case that ever changes.
         if scope == ExportScope.Global:
-            export_in_global_scope(tmp_file, printer=NOOP_PRINTER)
+            export_in_global_scope(
+                tmp_file,
+                printer=NOOP_PRINTER,
+                checkpointer=checkpointer,
+            )
         elif scope == ExportScope.Config:
-            export_in_config_scope(tmp_file, printer=NOOP_PRINTER)
+            export_in_config_scope(
+                tmp_file,
+                printer=NOOP_PRINTER,
+                checkpointer=checkpointer,
+            )
         elif scope == ExportScope.Organization:
-            export_in_organization_scope(tmp_file, org_filter=filter_by, printer=NOOP_PRINTER)
+            export_in_organization_scope(
+                tmp_file,
+                org_filter=filter_by,
+                printer=NOOP_PRINTER,
+                checkpointer=checkpointer,
+            )
         elif scope == ExportScope.User:
-            export_in_user_scope(tmp_file, user_filter=filter_by, printer=NOOP_PRINTER)
+            export_in_user_scope(
+                tmp_file,
+                user_filter=filter_by,
+                printer=NOOP_PRINTER,
+                checkpointer=checkpointer,
+            )
         else:
             raise AssertionError(f"Unknown `ExportScope`: `{scope.name}`")
 
@@ -193,7 +212,9 @@ def export_to_encrypted_tarball(
     path: Path,
     scope: ExportScope,
     *,
+    rsa_key_pair: tuple[bytes, bytes],
     filter_by: set[str] | None = None,
+    checkpointer: ExportCheckpointer | None = None,
 ) -> Any:
     """
     Helper function that exports the current state of the database to the specified encrypted
@@ -201,7 +222,7 @@ def export_to_encrypted_tarball(
     """
 
     # Generate a public-private key pair.
-    (private_key_pem, public_key_pem) = generate_rsa_key_pair()
+    (private_key_pem, public_key_pem) = rsa_key_pair
     public_key_fp = io.BytesIO(public_key_pem)
 
     # Run the appropriate `export_in_...` command with encryption enabled.
@@ -211,11 +232,17 @@ def export_to_encrypted_tarball(
         # case that ever changes.
         if scope == ExportScope.Global:
             export_in_global_scope(
-                tmp_file, encryptor=LocalFileEncryptor(public_key_fp), printer=NOOP_PRINTER
+                tmp_file,
+                encryptor=LocalFileEncryptor(public_key_fp),
+                printer=NOOP_PRINTER,
+                checkpointer=checkpointer,
             )
         elif scope == ExportScope.Config:
             export_in_config_scope(
-                tmp_file, encryptor=LocalFileEncryptor(public_key_fp), printer=NOOP_PRINTER
+                tmp_file,
+                encryptor=LocalFileEncryptor(public_key_fp),
+                printer=NOOP_PRINTER,
+                checkpointer=checkpointer,
             )
         elif scope == ExportScope.Organization:
             export_in_organization_scope(
@@ -223,6 +250,7 @@ def export_to_encrypted_tarball(
                 encryptor=LocalFileEncryptor(public_key_fp),
                 org_filter=filter_by,
                 printer=NOOP_PRINTER,
+                checkpointer=checkpointer,
             )
         elif scope == ExportScope.User:
             export_in_user_scope(
@@ -230,6 +258,7 @@ def export_to_encrypted_tarball(
                 encryptor=LocalFileEncryptor(public_key_fp),
                 user_filter=filter_by,
                 printer=NOOP_PRINTER,
+                checkpointer=checkpointer,
             )
         else:
             raise AssertionError(f"Unknown `ExportScope`: `{scope.name}`")
@@ -477,19 +506,15 @@ def create_exhaustive_organization(
         )
 
         # AlertRule*
-        other_project = self.create_project(name=f"other-project-{slug}", teams=[team])
         alert = self.create_alert_rule(
             organization=org,
             projects=[project],
             user=owner,
         )
-        AlertRuleExcludedProjects.objects.create(alert_rule=alert, project=other_project)
         alert.user_id = owner_id
         alert.save()
         trigger = self.create_alert_rule_trigger(alert_rule=alert)
-        AlertRuleTriggerExclusion.objects.create(
-            alert_rule_trigger=trigger, query_subscription=alert.snuba_query.subscriptions.first()
-        )
+        assert alert.snuba_query is not None
         self.create_alert_rule_trigger_action(alert_rule_trigger=trigger)
         activated_alert = self.create_alert_rule(
             organization=org,
@@ -526,7 +551,6 @@ def create_exhaustive_organization(
             unique_users=1,
             total_events=1,
         )
-        IncidentSubscription.objects.create(incident=incident, user_id=owner_id)
         IncidentTrigger.objects.create(
             incident=incident,
             alert_rule_trigger=trigger,
@@ -544,6 +568,10 @@ def create_exhaustive_organization(
             created_by_id=owner_id,
             organization=org,
         )
+        DashboardFavoriteUser.objects.create(
+            dashboard=dashboard,
+            user_id=owner.id,
+        )
         permissions = DashboardPermissions.objects.create(
             is_editable_by_everyone=True, dashboard=dashboard
         )
@@ -624,7 +652,7 @@ def create_exhaustive_organization(
 
         # Setup a test 'Issue Rule' and 'Automation'
         workflow = self.create_workflow(organization=org)
-        detector = self.create_detector(organization=org)
+        detector = self.create_detector(project=project)
         self.create_detector_workflow(detector=detector, workflow=workflow)
         self.create_detector_state(detector=detector)
 
@@ -633,7 +661,7 @@ def create_exhaustive_organization(
             organization=org,
         )
 
-        send_notification_action = self.create_action(type=Action.Type.Notification, data="")
+        send_notification_action = self.create_action(type=Action.Type.NOTIFICATION, data="")
         self.create_data_condition_group_action(
             action=send_notification_action,
             condition_group=notification_condition_group,
@@ -661,7 +689,7 @@ def create_exhaustive_organization(
         )
 
         # TODO @saponifi3d: Create or define trigger workflow action type
-        trigger_workflows_action = self.create_action(type=Action.Type.TriggerWorkflow, data="")
+        trigger_workflows_action = self.create_action(type=Action.Type.WEBHOOK, data="")
         self.create_data_condition_group_action(
             action=trigger_workflows_action, condition_group=detector_conditions
         )
diff --git a/src/sentry/testutils/requests.py b/src/sentry/testutils/requests.py
index f2da822ad0d1bb..a7adf1f9ce4b0e 100644
--- a/src/sentry/testutils/requests.py
+++ b/src/sentry/testutils/requests.py
@@ -4,7 +4,7 @@
 from collections.abc import Callable
 from typing import Optional
 
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser
 from django.core.cache import cache
 from django.http import HttpRequest
 
@@ -12,6 +12,7 @@
 from sentry.middleware.auth import AuthenticationMiddleware
 from sentry.middleware.placeholder import placeholder_get_response
 from sentry.testutils.factories import Factories
+from sentry.users.models.user import User
 from sentry.utils.auth import login
 
 RequestFactory = Callable[[], Optional[tuple[HttpRequest, User]]]
diff --git a/src/sentry/toolbar/views/iframe_view.py b/src/sentry/toolbar/views/iframe_view.py
index ba0ff1c5115fd9..58abcb5439cff1 100644
--- a/src/sentry/toolbar/views/iframe_view.py
+++ b/src/sentry/toolbar/views/iframe_view.py
@@ -47,7 +47,7 @@ def get(
         allowed_origins: list[str] = project.get_option("sentry:toolbar_allowed_origins")
 
         if referrer and is_origin_allowed(referrer, allowed_origins):
-            return self._respond_with_state("success")
+            return self._respond_with_state("logged-in")
 
         return self._respond_with_state("invalid-domain")
 
diff --git a/src/sentry/toolbar/views/login_success_view.py b/src/sentry/toolbar/views/login_success_view.py
index 55f37a385f7490..c4d4c256017796 100644
--- a/src/sentry/toolbar/views/login_success_view.py
+++ b/src/sentry/toolbar/views/login_success_view.py
@@ -18,6 +18,7 @@ def get(self, request: HttpRequest, organization, project_id_or_slug):
             TEMPLATE,
             status=200,
             context={
+                "organization_slug": organization.slug,
                 "delay_sec": int(delay_ms / 1000),
                 "delay_ms": delay_ms,
                 "cookie": f"{session_cookie_name}={request.COOKIES.get(session_cookie_name)}",
diff --git a/src/sentry/types/grouphash_metadata.py b/src/sentry/types/grouphash_metadata.py
new file mode 100644
index 00000000000000..2e93e2ffd15372
--- /dev/null
+++ b/src/sentry/types/grouphash_metadata.py
@@ -0,0 +1,159 @@
+from __future__ import annotations
+
+from typing import NotRequired, TypedDict
+
+# NOTE: The structure in these metadata types is intentionaly flat, to make it easier to query in
+# Redash or BigQuery, and they are all merged into a single flat JSON blob (which is then stored in
+# `GroupHashMetadata.hashing_metadata`). Therefore, if entries are added, they should be namespaced
+# according to their corresponding hash basis (so, for example, `fingerprint_source` and
+# `message_source`, rather than just `source`), both for clarity and to avoid collisions.
+
+
+class FingerprintHashingMetadata(TypedDict):
+    """
+    Fingerprint data, gathered both during stand-alone custom/built-in fingerprinting and hybrid
+    fingerprinting involving message, stacktrace, security, or template hashing
+    """
+
+    # The fingerprint value
+    fingerprint: str
+    # Either "client", "server_builtin_rule", or "server_custom_rule". (We don't have a "none of the
+    # above" option here because we only record fingerprint metadata in cases where there's some
+    # sort of custom fingerprint.)
+    fingerprint_source: str
+    # The fingerprint value set in the SDK, if anything other than ["{{ default }}"]. Note that just
+    # because this is set doesn't mean we necessarily used it for grouping, since server-side rules
+    # take precedence over client fingerprints. See `fingerprint_source` above.
+    client_fingerprint: NotRequired[str]
+    # The server-side rule applied, if any
+    matched_fingerprinting_rule: NotRequired[str]
+    # Whether or not a hybrid fingerprint (one involving both the signal value `{{ default }}` and a
+    # custom value) was used. In that case, we group as we normally would, but then split the events
+    # into more granular groups based on the custom value.
+    is_hybrid_fingerprint: bool
+
+
+class MessageHashingMetadata(TypedDict):
+    """
+    Data gathered when an event is grouped by log message or error type and value
+    """
+
+    # Either "message" (from "message" or "logentry") or "exception" (error type and value, in cases
+    # where there's no stacktrace)
+    message_source: str
+    # Whether we've done any parameterization of the message, such as replacing a number with "<int>"
+    message_parameterized: bool
+
+
+class SaltedMessageHashingMetadata(MessageHashingMetadata, FingerprintHashingMetadata):
+    """
+    Data from message-based bybrid fingerprinting
+    """
+
+    pass
+
+
+class StacktraceHashingMetadata(TypedDict):
+    """
+    Data gathered when an event is grouped based on a stacktrace found in an exception, a thread, or
+    diretly in the event
+    """
+
+    # Either "in-app" or "system"
+    stacktrace_type: str
+    # Where in the event data the stacktrace was found - either "exception", "thread", or
+    # "top-level"
+    stacktrace_location: str
+    # The number of stacktraces used for grouping (will be more than 1 in cases of chained
+    # exceptions)
+    num_stacktraces: int
+
+
+class SaltedStacktraceHashingMetadata(StacktraceHashingMetadata, FingerprintHashingMetadata):
+    """
+    Data from stacktrace-based bybrid fingerprinting
+    """
+
+    pass
+
+
+class SecurityHashingMetadata(TypedDict):
+    """
+    Data gathered when grouping browser-based security (Content Security Policy, Certifcate
+    Transparency, Online Certificate Status Protocol Stapling, or HTTP Public Key Pinning) reports
+    """
+
+    # Either "csp", "expect-ct", "expect-staple", or "hpkp"
+    security_report_type: str
+    # Domain name of the blocked address
+    blocked_host: str
+    # The CSP directive which was violated
+    csp_directive: NotRequired[str]
+    # In the case of a local `script-src` violation, whether it's an `unsafe-inline` or an
+    # `unsafe-eval` violation
+    csp_script_violation: NotRequired[str]
+
+
+class SaltedSecurityHashingMetadata(SecurityHashingMetadata, FingerprintHashingMetadata):
+    """
+    Data from security-report-based bybrid fingerprinting
+    """
+
+    pass
+
+
+class TemplateHashingMetadata(TypedDict):
+    """
+    Data gathered when grouping errors generated by Django templates
+    """
+
+    # The name of the template with the invalid template variable
+    template_name: NotRequired[str]
+    # The text of the line in the template containing the invalid variable
+    template_context_line: NotRequired[str]
+
+
+class SaltedTemplateHashingMetadata(TemplateHashingMetadata, FingerprintHashingMetadata):
+    """
+    Data from template-based bybrid fingerprinting
+    """
+
+    pass
+
+
+class ChecksumHashingMetadata(TypedDict):
+    """
+    Data gathered when legacy checksum grouping (wherein a hash is provided directly in the event)
+    is used
+    """
+
+    # The checksum used for grouping
+    checksum: str
+    # The incoming checksum value, if it was something other than a 32-digit hex value and we
+    # therefore had to hash it before using it
+    raw_checksum: NotRequired[str]
+
+
+class FallbackHashingMetadata(TypedDict):
+    """
+    Data gathered when no other grouping method produces results
+    """
+
+    # Whether we landed in the fallback because of a lack of data, because we had a stacktrace but
+    # all frames were ignored, or some other reason
+    fallback_reason: str
+
+
+HashingMetadata = (
+    FingerprintHashingMetadata
+    | MessageHashingMetadata
+    | SaltedMessageHashingMetadata
+    | StacktraceHashingMetadata
+    | SaltedStacktraceHashingMetadata
+    | SecurityHashingMetadata
+    | SaltedSecurityHashingMetadata
+    | TemplateHashingMetadata
+    | SaltedTemplateHashingMetadata
+    | ChecksumHashingMetadata
+    | FallbackHashingMetadata
+)
diff --git a/src/sentry/types/region.py b/src/sentry/types/region.py
index 2fb0c7944804b1..7c16d6fbea23d7 100644
--- a/src/sentry/types/region.py
+++ b/src/sentry/types/region.py
@@ -2,7 +2,7 @@
 
 from collections.abc import Collection, Iterable
 from enum import Enum
-from typing import Any
+from typing import TYPE_CHECKING, Any
 from urllib.parse import urljoin
 
 import sentry_sdk
@@ -16,6 +16,9 @@
 from sentry.utils import json
 from sentry.utils.env import in_test_environment
 
+if TYPE_CHECKING:
+    from sentry.sentry_apps.models.sentry_app import SentryApp
+
 
 class RegionCategory(Enum):
     MULTI_TENANT = "MULTI_TENANT"
@@ -343,6 +346,25 @@ def find_regions_for_user(user_id: int) -> set[str]:
     return find_regions_for_orgs(org_ids)
 
 
+@control_silo_function
+def find_regions_for_sentry_app(sentry_app: SentryApp) -> set[str]:
+    from sentry.models.organizationmapping import OrganizationMapping
+    from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
+
+    if SiloMode.get_current_mode() == SiloMode.MONOLITH:
+        return {settings.SENTRY_MONOLITH_REGION}
+
+    organizations_with_installations = SentryAppInstallation.objects.filter(
+        sentry_app=sentry_app
+    ).values_list("organization_id")
+    regions = (
+        OrganizationMapping.objects.filter(organization_id__in=organizations_with_installations)
+        .distinct("region_name")
+        .values_list("region_name")
+    )
+    return {r[0] for r in regions}
+
+
 def find_all_region_names() -> Iterable[str]:
     return get_global_directory().get_region_names()
 
diff --git a/src/sentry/uptime/endpoints/serializers.py b/src/sentry/uptime/endpoints/serializers.py
index 96bfc573f411b8..a652f31b70df13 100644
--- a/src/sentry/uptime/endpoints/serializers.py
+++ b/src/sentry/uptime/endpoints/serializers.py
@@ -23,6 +23,7 @@ class ProjectUptimeSubscriptionSerializerResponse(TypedDict):
     intervalSeconds: int
     timeoutMs: int
     owner: ActorSerializerResponse
+    traceSampling: bool
 
 
 @register(ProjectUptimeSubscription)
@@ -70,4 +71,5 @@ def serialize(
             "intervalSeconds": obj.uptime_subscription.interval_seconds,
             "timeoutMs": obj.uptime_subscription.timeout_ms,
             "owner": attrs["owner"],
+            "traceSampling": obj.uptime_subscription.trace_sampling,
         }
diff --git a/src/sentry/uptime/endpoints/validators.py b/src/sentry/uptime/endpoints/validators.py
index 9a3634baa3e50e..9d29d964776f97 100644
--- a/src/sentry/uptime/endpoints/validators.py
+++ b/src/sentry/uptime/endpoints/validators.py
@@ -1,5 +1,4 @@
 from collections.abc import Sequence
-from datetime import timedelta
 
 import jsonschema
 from drf_spectacular.utils import extend_schema_serializer
@@ -12,7 +11,11 @@
 from sentry.auth.superuser import is_active_superuser
 from sentry.models.environment import Environment
 from sentry.uptime.detectors.url_extraction import extract_domain_parts
-from sentry.uptime.models import ProjectUptimeSubscription, ProjectUptimeSubscriptionMode
+from sentry.uptime.models import (
+    ProjectUptimeSubscription,
+    ProjectUptimeSubscriptionMode,
+    UptimeSubscription,
+)
 from sentry.uptime.subscriptions.subscriptions import (
     MAX_MANUAL_SUBSCRIPTIONS_PER_ORG,
     MaxManualUptimeSubscriptionsReached,
@@ -33,18 +36,8 @@
 Importantly domains like `vercel.dev` are considered TLDs as defined by the
 public suffix list (PSL). See `extract_domain_parts` fo more details
 """
-SUPPORTED_HTTP_METHODS = ["GET", "POST", "HEAD", "PUT", "DELETE", "PATCH", "OPTIONS"]
 MAX_REQUEST_SIZE_BYTES = 1000
 
-# This matches the jsonschema for the check config
-VALID_INTERVALS = [
-    timedelta(minutes=1),
-    timedelta(minutes=5),
-    timedelta(minutes=10),
-    timedelta(minutes=20),
-    timedelta(minutes=30),
-    timedelta(minutes=60),
-]
 
 HEADERS_LIST_SCHEMA = {
     "type": "array",
@@ -76,7 +69,7 @@ class UptimeMonitorValidator(CamelSnakeSerializer):
     name = serializers.CharField(
         required=True,
         max_length=128,
-        help_text="Name of the uptime monitor",
+        help_text="Name of the uptime monitor.",
     )
     owner = ActorField(
         required=False,
@@ -87,23 +80,40 @@ class UptimeMonitorValidator(CamelSnakeSerializer):
         max_length=64,
         required=False,
         allow_null=True,
-        help_text="Name of the environment",
+        help_text="Name of the environment to create uptime issues in.",
     )
     url = URLField(required=True, max_length=255)
     interval_seconds = serializers.ChoiceField(
-        required=True, choices=[int(i.total_seconds()) for i in VALID_INTERVALS]
+        required=True,
+        choices=UptimeSubscription.IntervalSeconds.choices,
+        help_text="Time in seconds between uptime checks.",
     )
     timeout_ms = serializers.IntegerField(
         required=True,
         min_value=1000,
         max_value=30_000,
+        help_text="The number of milliseconds the request will wait for a response before timing-out.",
     )
     mode = serializers.IntegerField(required=False)
     method = serializers.ChoiceField(
-        required=False, choices=list(zip(SUPPORTED_HTTP_METHODS, SUPPORTED_HTTP_METHODS))
+        required=False,
+        choices=UptimeSubscription.SupportedHTTPMethods.choices,
+        help_text="The HTTP method used to make the check request.",
+    )
+    headers = serializers.JSONField(
+        required=False,
+        help_text="Additional headers to send with the check request.",
+    )
+    trace_sampling = serializers.BooleanField(
+        required=False,
+        default=False,
+        help_text="When enabled allows check requets to be considered for dowstream performance tracing.",
+    )
+    body = serializers.CharField(
+        required=False,
+        allow_null=True,
+        help_text="The body to send with the check request.",
     )
-    headers = serializers.JSONField(required=False)
-    body = serializers.CharField(required=False, allow_null=True)
 
     def validate(self, attrs):
         headers = []
@@ -181,6 +191,7 @@ def create(self, validated_data):
                 name=validated_data["name"],
                 mode=validated_data.get("mode", ProjectUptimeSubscriptionMode.MANUAL),
                 owner=validated_data.get("owner"),
+                trace_sampling=validated_data.get("trace_sampling", False),
                 **method_headers_body,
             )
         except MaxManualUptimeSubscriptionsReached:
@@ -215,6 +226,11 @@ def update(self, instance: ProjectUptimeSubscription, data):
         body = data["body"] if "body" in data else instance.uptime_subscription.body
         name = data["name"] if "name" in data else instance.name
         owner = data["owner"] if "owner" in data else instance.owner
+        trace_sampling = (
+            data["trace_sampling"]
+            if "trace_sampling" in data
+            else instance.uptime_subscription.trace_sampling
+        )
 
         if "environment" in data:
             environment = Environment.get_or_create(
@@ -238,6 +254,7 @@ def update(self, instance: ProjectUptimeSubscription, data):
             body=body,
             name=name,
             owner=owner,
+            trace_sampling=trace_sampling,
         )
         create_audit_entry(
             request=self.context["request"],
diff --git a/src/sentry/uptime/migrations/0002_remove_separate_remote_subscription.py b/src/sentry/uptime/migrations/0002_remove_separate_remote_subscription.py
index bd79fb509bbbc4..cee3dbc032f816 100644
--- a/src/sentry/uptime/migrations/0002_remove_separate_remote_subscription.py
+++ b/src/sentry/uptime/migrations/0002_remove_separate_remote_subscription.py
@@ -22,6 +22,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("uptime", "0001_uptime_subscriptions"),
         ("remote_subscriptions", "0001_remote_subscription"),
diff --git a/src/sentry/uptime/migrations/0003_drop_remote_subscription.py b/src/sentry/uptime/migrations/0003_drop_remote_subscription.py
index 77cf78803a6b1b..baaa9f57d0b69b 100644
--- a/src/sentry/uptime/migrations/0003_drop_remote_subscription.py
+++ b/src/sentry/uptime/migrations/0003_drop_remote_subscription.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("uptime", "0002_remove_separate_remote_subscription"),
     ]
diff --git a/src/sentry/uptime/migrations/0004_projectuptimesubscription_mode.py b/src/sentry/uptime/migrations/0004_projectuptimesubscription_mode.py
index 0dec267cd7a3bc..7c45752c8c0ea7 100644
--- a/src/sentry/uptime/migrations/0004_projectuptimesubscription_mode.py
+++ b/src/sentry/uptime/migrations/0004_projectuptimesubscription_mode.py
@@ -22,6 +22,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0731_add_insight_project_flags"),
         ("uptime", "0003_drop_remote_subscription"),
diff --git a/src/sentry/uptime/migrations/0005_uptime_status.py b/src/sentry/uptime/migrations/0005_uptime_status.py
index b2e5c67d86a5d1..5402acf8352eb2 100644
--- a/src/sentry/uptime/migrations/0005_uptime_status.py
+++ b/src/sentry/uptime/migrations/0005_uptime_status.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("uptime", "0004_projectuptimesubscription_mode"),
     ]
diff --git a/src/sentry/uptime/migrations/0006_projectuptimesubscription_name_owner.py b/src/sentry/uptime/migrations/0006_projectuptimesubscription_name_owner.py
index 700265fef0eb70..61a26021ead98c 100644
--- a/src/sentry/uptime/migrations/0006_projectuptimesubscription_name_owner.py
+++ b/src/sentry/uptime/migrations/0006_projectuptimesubscription_name_owner.py
@@ -23,6 +23,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("sentry", "0742_backfill_alertrule_detection_type"),
         ("uptime", "0005_uptime_status"),
diff --git a/src/sentry/uptime/migrations/0008_uptime_url_suffix.py b/src/sentry/uptime/migrations/0008_uptime_url_suffix.py
index f1ea789154cca2..57ffe779e502ed 100644
--- a/src/sentry/uptime/migrations/0008_uptime_url_suffix.py
+++ b/src/sentry/uptime/migrations/0008_uptime_url_suffix.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("uptime", "0007_update_detected_subscription_interval"),
     ]
diff --git a/src/sentry/uptime/migrations/0011_remove_uptime_whois_columns_db.py b/src/sentry/uptime/migrations/0011_remove_uptime_whois_columns_db.py
index fe4996ed21c1dc..529f7f7731c993 100644
--- a/src/sentry/uptime/migrations/0011_remove_uptime_whois_columns_db.py
+++ b/src/sentry/uptime/migrations/0011_remove_uptime_whois_columns_db.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("uptime", "0010_remove_uptime_whois_columns_state"),
     ]
diff --git a/src/sentry/uptime/migrations/0012_uptime_subscription_request_fields.py b/src/sentry/uptime/migrations/0012_uptime_subscription_request_fields.py
index 87b20132abb29c..882fdca1fe9154 100644
--- a/src/sentry/uptime/migrations/0012_uptime_subscription_request_fields.py
+++ b/src/sentry/uptime/migrations/0012_uptime_subscription_request_fields.py
@@ -20,6 +20,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("uptime", "0011_remove_uptime_whois_columns_db"),
     ]
diff --git a/src/sentry/uptime/migrations/0018_add_trace_sampling_field_to_uptime.py b/src/sentry/uptime/migrations/0018_add_trace_sampling_field_to_uptime.py
new file mode 100644
index 00000000000000..d16374639f1e48
--- /dev/null
+++ b/src/sentry/uptime/migrations/0018_add_trace_sampling_field_to_uptime.py
@@ -0,0 +1,50 @@
+# Generated by Django 5.1.1 on 2024-11-14 16:44
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    allow_run_sql = True
+
+    dependencies = [
+        ("uptime", "0017_unique_on_timeout"),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            database_operations=[
+                migrations.RunSQL(
+                    """
+                    ALTER TABLE "uptime_uptimesubscription" ADD COLUMN IF NOT EXISTS "trace_sampling" boolean NOT NULL DEFAULT false;
+                    """,
+                    reverse_sql="""
+                    ALTER TABLE "uptime_uptimesubscription" DROP COLUMN "trace_sampling";
+                    """,
+                    hints={"tables": ["uptime_uptimesubscription"]},
+                ),
+            ],
+            state_operations=[
+                migrations.AddField(
+                    model_name="uptimesubscription",
+                    name="trace_sampling",
+                    field=models.BooleanField(default=False),
+                ),
+            ],
+        ),
+    ]
diff --git a/src/sentry/uptime/models.py b/src/sentry/uptime/models.py
index 1ed3dc2aa3867f..9f53ee68766cd1 100644
--- a/src/sentry/uptime/models.py
+++ b/src/sentry/uptime/models.py
@@ -1,6 +1,6 @@
 import enum
 from datetime import timedelta
-from typing import ClassVar, Self
+from typing import ClassVar, Literal, Self
 
 from django.conf import settings
 from django.db import models
@@ -29,6 +29,9 @@
     sort_keys=True,
 ).encode
 
+SupportedHTTPMethodsLiteral = Literal["GET", "POST", "HEAD", "PUT", "DELETE", "PATCH", "OPTIONS"]
+IntervalSecondsLiteral = Literal[60, 300, 600, 1200, 1800, 3600]
+
 
 @region_silo_model
 class UptimeSubscription(BaseRemoteSubscription, DefaultFieldsModelExisting):
@@ -36,6 +39,23 @@ class UptimeSubscription(BaseRemoteSubscription, DefaultFieldsModelExisting):
     # any projects/orgs. Will fix this in a later pr
     __relocation_scope__ = RelocationScope.Excluded
 
+    class SupportedHTTPMethods(models.TextChoices):
+        GET = "GET", "GET"
+        POST = "POST", "POST"
+        HEAD = "HEAD", "HEAD"
+        PUT = "PUT", "PUT"
+        DELETE = "DELETE", "DELETE"
+        PATCH = "PATCH", "PATCH"
+        OPTIONS = "OPTIONS", "OPTIONS"
+
+    class IntervalSeconds(models.IntegerChoices):
+        ONE_MINUTE = 60, "1 minute"
+        FIVE_MINUTES = 300, "5 minutes"
+        TEN_MINUTES = 600, "10 minutes"
+        TWENTY_MINUTES = 1200, "20 minutes"
+        THIRTY_MINUTES = 1800, "30 minutes"
+        ONE_HOUR = 3600, "1 hour"
+
     # The url to check
     url = models.CharField(max_length=255)
     # The domain of the url, extracted via TLDExtract
@@ -48,15 +68,22 @@ class UptimeSubscription(BaseRemoteSubscription, DefaultFieldsModelExisting):
     # The name of the provider hosting this domain
     host_provider_name = models.CharField(max_length=255, db_index=True, null=True)
     # How frequently to run the check in seconds
-    interval_seconds = models.IntegerField()
+    interval_seconds: models.IntegerField[IntervalSecondsLiteral, IntervalSecondsLiteral] = (
+        models.IntegerField(choices=IntervalSeconds)
+    )
     # How long to wait for a response from the url before we assume a timeout
     timeout_ms = models.IntegerField()
     # HTTP method to perform the check with
-    method = models.CharField(max_length=20, db_default="GET")
+    method: models.CharField[SupportedHTTPMethodsLiteral, SupportedHTTPMethodsLiteral] = (
+        models.CharField(max_length=20, choices=SupportedHTTPMethods, db_default="GET")
+    )
     # HTTP headers to send when performing the check
     headers = JSONField(json_dumps=headers_json_encoder, db_default=[])
     # HTTP body to send when performing the check
     body = models.TextField(null=True)
+    # How to sample traces for this monitor. Note that we always send a trace_id, so any errors will
+    # be associated, this just controls the span sampling.
+    trace_sampling = models.BooleanField(default=False)
 
     objects: ClassVar[BaseManager[Self]] = BaseManager(
         cache_fields=["pk", "subscription_id"],
@@ -98,6 +125,7 @@ class UptimeStatus(enum.IntEnum):
 class ProjectUptimeSubscription(DefaultFieldsModelExisting):
     # TODO: This should be included in export/import, but right now it has no relation to
     # any projects/orgs. Will fix this in a later pr
+
     __relocation_scope__ = RelocationScope.Excluded
 
     project = FlexibleForeignKey("sentry.Project")
diff --git a/src/sentry/uptime/rdap/__init__.py b/src/sentry/uptime/rdap/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/src/sentry/uptime/subscriptions/subscriptions.py b/src/sentry/uptime/subscriptions/subscriptions.py
index a8d580d1312e2b..2a0e78b7794819 100644
--- a/src/sentry/uptime/subscriptions/subscriptions.py
+++ b/src/sentry/uptime/subscriptions/subscriptions.py
@@ -72,6 +72,7 @@ def get_or_create_uptime_subscription(
     method: str = "GET",
     headers: Sequence[tuple[str, str]] | None = None,
     body: str | None = None,
+    trace_sampling: bool = False,
 ) -> UptimeSubscription:
     """
     Creates a new uptime subscription. This creates the row in postgres, and fires a task that will send the config
@@ -101,6 +102,7 @@ def get_or_create_uptime_subscription(
                 method=method,
                 headers=headers,  # type: ignore[misc]
                 body=body,
+                trace_sampling=trace_sampling,
             )
             created = True
         except IntegrityError:
@@ -157,6 +159,7 @@ def get_or_create_project_uptime_subscription(
     mode: ProjectUptimeSubscriptionMode = ProjectUptimeSubscriptionMode.MANUAL,
     name: str = "",
     owner: Actor | None = None,
+    trace_sampling: bool = False,
 ) -> tuple[ProjectUptimeSubscription, bool]:
     """
     Links a project to an uptime subscription so that it can process results.
@@ -169,7 +172,13 @@ def get_or_create_project_uptime_subscription(
             raise MaxManualUptimeSubscriptionsReached
 
     uptime_subscription = get_or_create_uptime_subscription(
-        url, interval_seconds, timeout_ms, method, headers, body
+        url=url,
+        interval_seconds=interval_seconds,
+        timeout_ms=timeout_ms,
+        method=method,
+        headers=headers,
+        body=body,
+        trace_sampling=trace_sampling,
     )
     owner_user_id = None
     owner_team_id = None
@@ -200,13 +209,20 @@ def update_project_uptime_subscription(
     body: str | None,
     name: str,
     owner: Actor | None,
+    trace_sampling: bool,
 ):
     """
     Links a project to an uptime subscription so that it can process results.
     """
     cur_uptime_subscription = uptime_monitor.uptime_subscription
     new_uptime_subscription = get_or_create_uptime_subscription(
-        url, interval_seconds, timeout_ms, method, headers, body
+        url=url,
+        interval_seconds=interval_seconds,
+        timeout_ms=timeout_ms,
+        method=method,
+        headers=headers,
+        body=body,
+        trace_sampling=trace_sampling,
     )
     updated_subscription = cur_uptime_subscription.id != new_uptime_subscription.id
 
diff --git a/src/sentry/uptime/subscriptions/tasks.py b/src/sentry/uptime/subscriptions/tasks.py
index a31206a5b092c0..c0936b840ddce4 100644
--- a/src/sentry/uptime/subscriptions/tasks.py
+++ b/src/sentry/uptime/subscriptions/tasks.py
@@ -91,10 +91,11 @@ def uptime_subscription_to_check_config(
     config: CheckConfig = {
         "subscription_id": subscription_id,
         "url": subscription.url,
-        "interval_seconds": subscription.interval_seconds,  # type: ignore[typeddict-item]
+        "interval_seconds": subscription.interval_seconds,
         "timeout_ms": subscription.timeout_ms,
-        "request_method": subscription.method,  # type: ignore[typeddict-item]
+        "request_method": subscription.method,
         "request_headers": headers,
+        "trace_sampling": subscription.trace_sampling,
     }
     if subscription.body is not None:
         config["request_body"] = subscription.body
diff --git a/src/sentry/users/api/bases/user.py b/src/sentry/users/api/bases/user.py
index 2e7284d461dc54..3664d649fb3f2d 100644
--- a/src/sentry/users/api/bases/user.py
+++ b/src/sentry/users/api/bases/user.py
@@ -139,7 +139,7 @@ class RegionSiloUserEndpoint(Endpoint):
     permission_classes = (UserPermission,)
 
     def convert_args(
-        self, request: Request, user_id: str | None = None, *args: Any, **kwargs: Any
+        self, request: Request, user_id: int | str | None = None, *args: Any, **kwargs: Any
     ) -> Any:
         user: RpcUser | User | None = None
 
diff --git a/src/sentry/utils/concurrent.py b/src/sentry/utils/concurrent.py
index 88e13294c17ef9..82e1b706d2fa47 100644
--- a/src/sentry/utils/concurrent.py
+++ b/src/sentry/utils/concurrent.py
@@ -9,17 +9,15 @@
 from contextlib import contextmanager
 from queue import Full, PriorityQueue
 from time import time
-from typing import Generic, NamedTuple, TypeVar
+from typing import Any, NamedTuple
 
 import sentry_sdk
 import sentry_sdk.scope
 
 logger = logging.getLogger(__name__)
 
-T = TypeVar("T")
 
-
-def execute(function: Callable[..., T], daemon=True):
+def execute[T](function: Callable[..., T], daemon=True) -> Future[T]:
     future: Future[T] = Future()
 
     def run():
@@ -41,7 +39,7 @@ def run():
 
 
 @functools.total_ordering
-class PriorityTask(NamedTuple, Generic[T]):
+class PriorityTask[T](NamedTuple):
     priority: int
     item: tuple[sentry_sdk.Scope, sentry_sdk.Scope, Callable[[], T], Future[T]]
 
@@ -52,7 +50,7 @@ def __lt__(self, b):
         return self.priority < b.priority
 
 
-class TimedFuture(Future[T]):
+class TimedFuture[T](Future[T]):
     _condition: threading.Condition
     _state: str
 
@@ -124,7 +122,7 @@ def set_exception(self, *args, **kwargs):
             return super().set_exception(*args, **kwargs)
 
 
-class Executor(Generic[T]):
+class Executor:
     """
     This class provides an API for executing tasks in different contexts
     (immediately, or asynchronously.)
@@ -136,9 +134,15 @@ class Executor(Generic[T]):
     to allow controlling whether or not queue insertion should be blocking.
     """
 
-    Future = TimedFuture
-
-    def submit(self, callable, priority=0, block=True, timeout=None) -> TimedFuture[T]:
+    def submit[
+        T
+    ](
+        self,
+        callable: Callable[[], T],
+        priority: int = 0,
+        block: bool = True,
+        timeout=None,
+    ) -> TimedFuture[T]:
         """
         Enqueue a task to be executed, returning a ``TimedFuture``.
 
@@ -149,7 +153,7 @@ def submit(self, callable, priority=0, block=True, timeout=None) -> TimedFuture[
         raise NotImplementedError
 
 
-class SynchronousExecutor(Executor[T]):
+class SynchronousExecutor(Executor):
     """
     This executor synchronously executes callables in the current thread.
 
@@ -160,11 +164,11 @@ class SynchronousExecutor(Executor[T]):
     # TODO: The ``Future`` implementation here could be replaced with a
     # lock-free future for efficiency.
 
-    def submit(self, callable, *args, **kwargs):
+    def submit[T](self, callable: Callable[[], T], *args, **kwargs) -> TimedFuture[T]:
         """
         Immediately execute a callable, returning a ``TimedFuture``.
         """
-        future: Future[T] = self.Future()
+        future: TimedFuture[T] = TimedFuture()
         assert future.set_running_or_notify_cancel()
         try:
             result = callable()
@@ -175,7 +179,7 @@ def submit(self, callable, *args, **kwargs):
         return future
 
 
-class ThreadedExecutor(Executor[T]):
+class ThreadedExecutor(Executor):
     """\
     This executor provides a method of executing callables in a threaded worker
     pool. The number of outstanding requests can be limited by the ``maxsize``
@@ -190,7 +194,7 @@ def __init__(self, worker_count=1, maxsize=0):
         self.__worker_count = worker_count
         self.__workers = set()
         self.__started = False
-        self.__queue: PriorityQueue[PriorityTask[T]] = PriorityQueue(maxsize)
+        self.__queue: PriorityQueue[PriorityTask[Any]] = PriorityQueue(maxsize)
         self.__lock = threading.Lock()
 
     def __worker(self):
@@ -223,7 +227,9 @@ def start(self):
 
             self.__started = True
 
-    def submit(self, callable, priority=0, block=True, timeout=None):
+    def submit[
+        T
+    ](self, callable: Callable[[], T], priority=0, block=True, timeout=None) -> TimedFuture[T]:
         """\
         Enqueue a task to be executed, returning a ``TimedFuture``.
 
@@ -237,7 +243,7 @@ def submit(self, callable, priority=0, block=True, timeout=None):
         if not self.__started:
             self.start()
 
-        future: Future[T] = self.Future()
+        future: TimedFuture[T] = TimedFuture()
         task = PriorityTask(
             priority,
             (
diff --git a/src/sentry/utils/event_tracker.py b/src/sentry/utils/event_tracker.py
new file mode 100644
index 00000000000000..2d7c6a97d2f1ef
--- /dev/null
+++ b/src/sentry/utils/event_tracker.py
@@ -0,0 +1,56 @@
+import logging
+from enum import StrEnum
+
+from sentry import options
+from sentry.ingest.types import ConsumerType
+
+
+class TransactionStageStatus(StrEnum):
+    # the transaction is stored to rc-transactions
+    REDIS_PUT = "redis_put"
+
+    # a save_transactions task is kicked off
+    SAVE_TXN_STARTED = "save_txn_started"
+
+    # a save_transactions task is finished
+    SAVE_TXN_FINISHED = "save_txn_finished"
+
+    # the transaction is published to the `events` topic for snuba/sbc consumers to consume
+    SNUBA_TOPIC_PUT = "snuba_topic_put"
+
+    # the transaction is deleted from rc-transactions
+    REDIS_DELETED = "redis_deleted"
+
+    # a post_process task is finished
+    POST_PROCESS_FINISHED = "post_process_finished"
+
+
+logger = logging.getLogger(__name__)
+
+
+def track_sampled_event(
+    event_id: str, consumer_type: ConsumerType, status: TransactionStageStatus
+) -> None:
+    """
+    Records how far an event has made it through the ingestion pipeline.
+    Each event type will pick up its sampling rate from its registered option.
+    """
+
+    sample_rate = options.get(f"performance.event-tracker.sample-rate.{consumer_type}")
+    if sample_rate == 0:
+        return
+
+    event_float = (int(event_id, 16) % 10000) / 10000
+    if event_float < sample_rate:
+        extra = {
+            "event_id": event_id,
+            "consumer_type": consumer_type,
+            "status": status,
+        }
+        _do_record(extra)
+
+
+def _do_record(extra):
+    # All Python logs will be picked up by Google Cloud Logging.
+    # TODO: make a google Cloud Sink to filter for these EventTracker logs and put them into BigQuery and do data analysis downstream
+    logger.info("EventTracker.recorded", extra=extra)
diff --git a/src/sentry/utils/flag.py b/src/sentry/utils/flag.py
index 335f4147c92987..132e426ed2d8e7 100644
--- a/src/sentry/utils/flag.py
+++ b/src/sentry/utils/flag.py
@@ -1,80 +1,26 @@
-# Thread safe flag tracking wrapper.
-from contextvars import ContextVar
+import logging
 
-flag_manager = ContextVar("flag_manager")  # type: ignore[var-annotated]
+import sentry_sdk
+from sentry_sdk.integrations import Integration
 
+logger = logging.getLogger()
 
-def initialize_flag_manager(capacity: int = 100) -> None:
-    flag_manager.set(FlagManager(capacity=capacity))
 
+class FlagPoleIntegration(Integration):
+    identifier = "flag_pole"
 
-# NOTE: If not properly initialized this function is a no-op.
-def process_flag_result(flag: str, result: bool) -> None:
-    try:
-        _flag_manager = flag_manager.get()
-        _flag_manager.insert(f"feature.{flag}", result)
-    except LookupError:
-        return None
+    @staticmethod
+    def setup_once():
+        scope = sentry_sdk.get_current_scope()
+        scope.add_error_processor(flag_error_processor)
 
 
-# NOTE: If not properly initialized this function is a no-op.
-def get_flags_serialized():
-    try:
-        _flag_manager = flag_manager.get()
-        return _flag_manager.serialize()
-    except LookupError:
-        return []
+def flag_error_processor(event, exc_info):
+    scope = sentry_sdk.get_current_scope()
+    event["contexts"]["flags"] = {"values": scope.flags.get()}
+    return event
 
 
-# Flag tracking implementation.
-import itertools
-from typing import TypedDict
-
-
-class SerializedFlag(TypedDict):
-    flag: str
-    result: bool
-
-
-class Flag:
-    __slots__ = ("flag", "result")
-
-    def __init__(self, flag: str, result: bool) -> None:
-        self.flag = flag
-        self.result = result
-
-    @property
-    def asdict(self) -> SerializedFlag:
-        return {"flag": self.flag, "result": self.result}
-
-
-class FlagManager:
-    # NOTE: Implemented using a ciruclar buffer instead an LRU for ease
-    # of implementation.
-
-    def __init__(self, capacity: int) -> None:
-        assert capacity > 0
-        self.buffer: list[Flag] = []
-        self.capacity = capacity
-        self.ip = 0
-
-    @property
-    def index(self):
-        return self.ip % self.capacity
-
-    def insert(self, flag: str, result: bool) -> None:
-        flag_ = Flag(flag, result)
-
-        if self.ip >= self.capacity:
-            self.buffer[self.index] = flag_
-        else:
-            self.buffer.append(flag_)
-
-        self.ip += 1
-
-    def serialize(self) -> list[SerializedFlag]:
-        if self.ip >= self.capacity:
-            iterator = itertools.chain(range(self.index, self.capacity), range(0, self.index))
-            return [self.buffer[i].asdict for i in iterator]
-        else:
-            return [flag.asdict for flag in self.buffer]
+def flag_pole_hook(flag: str, result: bool):
+    flags = sentry_sdk.get_current_scope().flags
+    flags.set(flag, result)
diff --git a/src/sentry/utils/locking/backends/migration.py b/src/sentry/utils/locking/backends/migration.py
index c7b80c92c01f2c..10fa6329c38460 100644
--- a/src/sentry/utils/locking/backends/migration.py
+++ b/src/sentry/utils/locking/backends/migration.py
@@ -1,6 +1,7 @@
-from collections.abc import Callable, Mapping
-from typing import Any, Optional, Union
+from collections.abc import Callable
+from typing import Optional, Union
 
+from sentry.conf.types.service_options import ServiceOptions
 from sentry.utils.locking.backends import LockBackend
 from sentry.utils.services import build_instance_from_options_of_type, resolve_callable
 
@@ -53,8 +54,8 @@ def selector_func(key, routing_key, backend_new, backend_old):
 
     def __init__(
         self,
-        backend_new_config: Mapping[str, Any],
-        backend_old_config: Mapping[str, Any],
+        backend_new_config: ServiceOptions,
+        backend_old_config: ServiceOptions,
         selector_func_path: str | SelectorFncType | None = None,
     ):
         self.backend_new = build_instance_from_options_of_type(LockBackend, backend_new_config)
diff --git a/src/sentry/utils/prompts.py b/src/sentry/utils/prompts.py
index a5c7814b2ac592..d89886fd24f525 100644
--- a/src/sentry/utils/prompts.py
+++ b/src/sentry/utils/prompts.py
@@ -22,6 +22,8 @@
     "issue_feature_flags_inline_onboarding": {"required_fields": ["organization_id", "project_id"]},
     "issue_feedback_hidden": {"required_fields": ["organization_id", "project_id"]},
     "issue_views_add_view_banner": {"required_fields": ["organization_id"]},
+    "rollback_2024_sidebar": {"required_fields": ["organization_id"]},
+    "rollback_2024_dropdown": {"required_fields": ["organization_id"]},
 }
 
 
diff --git a/src/sentry/utils/relocation.py b/src/sentry/utils/relocation.py
index 0c9d4d2e5ec45e..219a7369a662f0 100644
--- a/src/sentry/utils/relocation.py
+++ b/src/sentry/utils/relocation.py
@@ -5,16 +5,32 @@
 from contextlib import contextmanager
 from enum import Enum, unique
 from functools import lru_cache
+from io import BytesIO
 from string import Template
 from typing import Any
 from uuid import UUID
 
+from django.core.files.storage import Storage
 from django.utils import timezone
+from orjson import JSONDecodeError
 
 from sentry import options
-from sentry.backup.dependencies import dependencies, get_model_name, sorted_dependencies
+from sentry.backup.crypto import (
+    DecryptionError,
+    EncryptorDecryptorPair,
+    create_encrypted_export_tarball,
+    decrypt_encrypted_tarball,
+)
+from sentry.backup.dependencies import (
+    NormalizedModelName,
+    dependencies,
+    get_model_name,
+    sorted_dependencies,
+)
+from sentry.backup.exports import ExportCheckpointer, ExportCheckpointerError
 from sentry.backup.helpers import Printer
 from sentry.backup.scopes import RelocationScope
+from sentry.backup.services.import_export.model import RpcExportOk
 from sentry.http import get_server_hostname
 from sentry.models.files.utils import get_relocation_storage
 from sentry.models.relocation import Relocation, RelocationFile
@@ -308,9 +324,87 @@ class OrderedTask(Enum):
 )
 
 
-# A custom logger that roughly matches the parts of the `click.echo` interface that the
-# `import_*` methods rely on.
+class StorageBackedCheckpointExporter(ExportCheckpointer):
+    """
+    An export checkpointer that uses GCP cloud storage to store encrypted checkpoints for every
+    model we export for a SAAS_TO_SAAS relocation.
+    """
+
+    def __init__(
+        self,
+        *,
+        crypto: EncryptorDecryptorPair,
+        uuid: UUID,
+        storage: Storage,
+    ):
+        self.__crypto = crypto
+        self.__uuid = uuid
+        self.__storage = storage
+
+    def _get_path_name(self, model_name: NormalizedModelName) -> str:
+        return f"runs/{self.__uuid}/saas_to_saas_export/_checkpoints/{str(model_name)}.enc.tar"
+
+    def get(self, model_name: NormalizedModelName) -> RpcExportOk | None:
+        logger_data: dict[str, Any] = {"uuid": str(self.__uuid), "model": str(model_name)}
+        path_name = self._get_path_name(model_name)
+        if not self.__storage.exists(path_name):
+            logger.info(
+                "Export checkpointer: miss",
+                extra=logger_data,
+            )
+            return None
+
+        try:
+            with self.__storage.open(path_name, "rb") as fp:
+                logger_data["encrypted_contents_size"] = fp.tell()
+                json_data = decrypt_encrypted_tarball(fp, self.__crypto.decryptor)
+                parsed_json = self._parse_cached_json(json_data)
+                if parsed_json is None:
+                    logger.info(
+                        "Export checkpointer: miss",
+                        extra=logger_data,
+                    )
+                else:
+                    logger_data["max_pk"] = parsed_json.max_pk
+                    logger.info(
+                        "Export checkpointer: read",
+                        extra=logger_data,
+                    )
+
+                return parsed_json
+        except (FileNotFoundError, DecryptionError, JSONDecodeError, ExportCheckpointerError):
+            logger.info(
+                "Export checkpointer: miss",
+                extra=logger_data,
+            )
+            return None
+
+    def add(self, model_name: NormalizedModelName, json_export: Any) -> None:
+        logger_data: dict[str, Any] = {"uuid": str(self.__uuid), "model": str(model_name)}
+        path_name = self._get_path_name(model_name)
+        if not isinstance(json_export, list):
+            return None
+
+        out_bytes = create_encrypted_export_tarball(json_export, self.__crypto.encryptor).getvalue()
+        fp = BytesIO()
+        fp.write(out_bytes)
+        fp.seek(0)
+        self.__storage.save(path_name, fp)
+
+        logger_data["encrypted_contents_size"] = fp.tell()
+        logger_data["model_count"] = len(json_export)
+        logger.info(
+            "Export checkpointer: write",
+            extra=logger_data,
+        )
+
+
 class LoggingPrinter(Printer):
+    """
+    A custom logger that roughly matches the parts of the `click.echo` interface that the `import_*`
+    and `export_*` backup methods rely on.
+    """
+
     def __init__(self, uuid: UUID):
         self.uuid = uuid
         super().__init__()
diff --git a/src/sentry/utils/sdk.py b/src/sentry/utils/sdk.py
index 693e64e1772db8..321ed77205607a 100644
--- a/src/sentry/utils/sdk.py
+++ b/src/sentry/utils/sdk.py
@@ -26,7 +26,7 @@
 from sentry.features.rollout import in_random_rollout
 from sentry.utils import metrics
 from sentry.utils.db import DjangoAtomicIntegration
-from sentry.utils.flag import get_flags_serialized
+from sentry.utils.flag import FlagPoleIntegration
 from sentry.utils.rust import RustInfoIntegration
 
 # Can't import models in utils because utils should be the bottom of the food chain
@@ -242,11 +242,6 @@ def before_send(event: Event, _: Hint) -> Event | None:
             event["tags"]["silo_mode"] = str(settings.SILO_MODE)
         if settings.SENTRY_REGION:
             event["tags"]["sentry_region"] = settings.SENTRY_REGION
-
-    if "contexts" not in event:
-        event["contexts"] = {}
-    event["contexts"]["flags"] = {"values": get_flags_serialized()}
-
     return event
 
 
@@ -470,6 +465,7 @@ def flush(
             RustInfoIntegration(),
             RedisIntegration(),
             ThreadingIntegration(propagate_hub=True),
+            FlagPoleIntegration(),
         ],
         **sdk_options,
     )
diff --git a/src/sentry/utils/sdk_crashes/sdk_crash_detection_config.py b/src/sentry/utils/sdk_crashes/sdk_crash_detection_config.py
index 3c7eff019753ea..0053f191a524c8 100644
--- a/src/sentry/utils/sdk_crashes/sdk_crash_detection_config.py
+++ b/src/sentry/utils/sdk_crashes/sdk_crash_detection_config.py
@@ -1,5 +1,5 @@
 from collections.abc import Sequence
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from enum import Enum, unique
 from typing import TypedDict
 
@@ -12,6 +12,14 @@
 )
 
 
+@dataclass
+class FunctionAndPathPattern:
+    """Both the function and path pattern must match for a frame to be considered a SDK frame."""
+
+    function_pattern: str
+    path_pattern: str
+
+
 @dataclass
 class SDKFrameConfig:
     function_patterns: set[str]
@@ -20,6 +28,8 @@ class SDKFrameConfig:
 
     path_replacer: PathReplacer
 
+    function_and_path_patterns: list[FunctionAndPathPattern] = field(default_factory=list)
+
 
 @unique
 class SdkName(Enum):
@@ -42,13 +52,11 @@ class SDKCrashDetectionConfig:
     sample_rate: float
     """The organization allowlist to detect crashes for. If empty, all organizations are allowed. Use the sample_rate to disable the SDK crash detection for all organizations."""
     organization_allowlist: list[int]
-    """The SDK names to detect crashes for. For example, ["sentry.cocoa", "sentry.cocoa.react-native"]."""
-    sdk_names: Sequence[str]
+    """The SDK names including their min versions to detect crashes for. For example, {"sentry.cocoa": "8.2.0", "sentry.cocoa.react-native": "8.2.0"}."""
+    sdk_names: dict[str, str]
     """Whether to report fatal errors. If true, both unhandled and fatal errors are reported.
     If false, only unhandled errors are reported."""
     report_fatal_errors: bool
-    """The minimum SDK version to detect crashes for. For example, "8.2.0"."""
-    min_sdk_version: str
     """The system library path patterns to detect system frames. For example, `System/Library/*` """
     system_library_path_patterns: set[str]
     """The configuration for detecting SDK frames."""
@@ -69,26 +77,28 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
     cocoa_options = _get_options(sdk_name=SdkName.Cocoa, has_organization_allowlist=False)
 
     if cocoa_options:
+        # Since changing the debug image type to macho (https://github.com/getsentry/sentry-cocoa/pull/2701)
+        # released in sentry-cocoa 8.2.0 (https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#820),
+        # the frames contain the full paths required for detecting system frames in is_system_library_frame.
+        # Therefore, we require at least sentry-cocoa 8.2.0.
+
+        cocoa_min_sdk_version = "8.2.0"
+
         cocoa_config = SDKCrashDetectionConfig(
             sdk_name=SdkName.Cocoa,
             project_id=cocoa_options["project_id"],
             sample_rate=cocoa_options["sample_rate"],
             organization_allowlist=cocoa_options["organization_allowlist"],
-            sdk_names=[
-                "sentry.cocoa",
-                "sentry.cocoa.capacitor",
-                "sentry.cocoa.react-native",
-                "sentry.cocoa.dotnet",
-                "sentry.cocoa.flutter",
-                "sentry.cocoa.kmp",
-                "sentry.cocoa.unity",
-                "sentry.cocoa.unreal",
-            ],
-            # Since changing the debug image type to macho (https://github.com/getsentry/sentry-cocoa/pull/2701)
-            # released in sentry-cocoa 8.2.0 (https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#820),
-            # the frames contain the full paths required for detecting system frames in is_system_library_frame.
-            # Therefore, we require at least sentry-cocoa 8.2.0.
-            min_sdk_version="8.2.0",
+            sdk_names={
+                "sentry.cocoa": cocoa_min_sdk_version,
+                "sentry.cocoa.capacitor": cocoa_min_sdk_version,
+                "sentry.cocoa.react-native": cocoa_min_sdk_version,
+                "sentry.cocoa.dotnet": cocoa_min_sdk_version,
+                "sentry.cocoa.flutter": cocoa_min_sdk_version,
+                "sentry.cocoa.kmp": cocoa_min_sdk_version,
+                "sentry.cocoa.unity": cocoa_min_sdk_version,
+                "sentry.cocoa.unreal": cocoa_min_sdk_version,
+            },
             report_fatal_errors=False,
             system_library_path_patterns={r"/System/Library/**", r"/usr/lib/**"},
             sdk_frame_config=SDKFrameConfig(
@@ -116,12 +126,11 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
             project_id=react_native_options["project_id"],
             sample_rate=react_native_options["sample_rate"],
             organization_allowlist=react_native_options["organization_allowlist"],
-            sdk_names=[
-                "sentry.javascript.react-native",
-            ],
             # 4.0.0 was released in June 2022, see https://github.com/getsentry/sentry-react-native/releases/tag/4.0.0.
             # We require at least sentry-react-native 4.0.0 to only detect SDK crashes for not too old versions.
-            min_sdk_version="4.0.0",
+            sdk_names={
+                "sentry.javascript.react-native": "4.0.0",
+            },
             report_fatal_errors=False,
             system_library_path_patterns={
                 r"**/react-native/Libraries/**",
@@ -157,36 +166,43 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
         )
         configs.append(react_native_config)
 
+    # 0.6.0 was released in Feb 2023, see https://github.com/getsentry/sentry-native/releases/tag/0.6.0.
+    native_min_sdk_version = "0.6.0"
+
     java_options = _get_options(sdk_name=SdkName.Java, has_organization_allowlist=True)
     if java_options:
+        # The sentry-java SDK sends SDK frames for uncaught exceptions since 7.0.0, which is required for detecting SDK crashes.
+        # 7.0.0 was released in Nov 2023, see https://github.com/getsentry/sentry-java/releases/tag/7.0.0
+        java_min_sdk_version = "7.0.0"
+
         java_config = SDKCrashDetectionConfig(
             sdk_name=SdkName.Java,
             project_id=java_options["project_id"],
             sample_rate=java_options["sample_rate"],
             organization_allowlist=java_options["organization_allowlist"],
-            sdk_names=[
-                "sentry.java.android",
-                "sentry.java.android.capacitor",
-                "sentry.java.android.dotnet",
-                "sentry.java.android.flutter",
-                "sentry.java.android.kmp",
-                "sentry.java.android.react-native",
-                "sentry.java.android.timber",
-                "sentry.java.android.unity",
-                "sentry.java.android.unreal",
-                "sentry.java.jul",
-                "sentry.java.kmp",
-                "sentry.java.log4j2",
-                "sentry.java.logback",
-                "sentry.java.opentelemetry.agent",
-                "sentry.java.spring",
-                "sentry.java.spring-boot",
-                "sentry.java.spring-boot.jakarta",
-                "sentry.java.spring.jakarta",
-            ],
-            # The sentry-java SDK sends SDK frames for uncaught exceptions since 7.0.0, which is required for detecting SDK crashes.
-            # 7.0.0 was released in Nov 2023, see https://github.com/getsentry/sentry-java/releases/tag/7.0.0
-            min_sdk_version="7.0.0",
+            sdk_names={
+                "sentry.java.android": java_min_sdk_version,
+                "sentry.java.android.capacitor": java_min_sdk_version,
+                "sentry.java.android.dotnet": java_min_sdk_version,
+                "sentry.java.android.flutter": java_min_sdk_version,
+                "sentry.java.android.kmp": java_min_sdk_version,
+                "sentry.java.android.react-native": java_min_sdk_version,
+                "sentry.java.android.timber": java_min_sdk_version,
+                "sentry.java.android.unity": java_min_sdk_version,
+                "sentry.java.android.unreal": java_min_sdk_version,
+                "sentry.java.jul": java_min_sdk_version,
+                "sentry.java.kmp": java_min_sdk_version,
+                "sentry.java.log4j2": java_min_sdk_version,
+                "sentry.java.logback": java_min_sdk_version,
+                "sentry.java.opentelemetry.agent": java_min_sdk_version,
+                "sentry.java.spring": java_min_sdk_version,
+                "sentry.java.spring-boot": java_min_sdk_version,
+                "sentry.java.spring-boot.jakarta": java_min_sdk_version,
+                "sentry.java.spring.jakarta": java_min_sdk_version,
+                # Required for getting Android Runtime Tracer crashes.
+                # This is the same as for the native SDK Crash Detection Config
+                "sentry.native.android": native_min_sdk_version,
+            },
             report_fatal_errors=False,
             system_library_path_patterns={
                 r"java.**",
@@ -196,13 +212,33 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
                 r"com.android.internal.**",
                 r"kotlin.**",
                 r"dalvik.**",
+                r"/apex/com.android.*/lib*/**",
             },
             sdk_frame_config=SDKFrameConfig(
                 function_patterns=set(),
                 path_patterns={
                     r"io.sentry.**",
                 },
-                path_replacer=KeepFieldPathReplacer(fields={"module", "filename"}),
+                # The Android Runtime Tracer can crash when users enable profiling in the
+                # Sentry Android SDK. While the Sentry Android SDK doesn't directly cause
+                # these crashes, we must know when they occur. As Sentry doesn't appear in
+                # the stacktrace, we filter for the following specific methods in the
+                # specified Android apex packages.
+                function_and_path_patterns=[
+                    FunctionAndPathPattern(
+                        function_pattern=r"*pthread_getcpuclockid*",
+                        path_pattern=r"/apex/com.android.art/lib64/bionic/libc.so",
+                    ),
+                    FunctionAndPathPattern(
+                        function_pattern=r"*art::Trace::StopTracing*",
+                        path_pattern=r"/apex/com.android.art/lib64/libart.so",
+                    ),
+                    FunctionAndPathPattern(
+                        function_pattern=r"*art::Thread::DumpState*",
+                        path_pattern=r"/apex/com.android.art/lib64/libart.so",
+                    ),
+                ],
+                path_replacer=KeepFieldPathReplacer(fields={"module", "filename", "package"}),
             ),
             sdk_crash_ignore_functions_matchers=set(),
         )
@@ -216,20 +252,18 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
             project_id=native_options["project_id"],
             sample_rate=native_options["sample_rate"],
             organization_allowlist=native_options["organization_allowlist"],
-            sdk_names=[
-                "sentry.native",
-                "sentry.native.android",
-                "sentry.native.android.capacitor",
-                "sentry.native.android.flutter",
-                "sentry.native.android.react-native",
-                "sentry.native.android.unity",
-                "sentry.native.android.unreal",
-                "sentry.native.dotnet",
-                "sentry.native.unity",
-                "sentry.native.unreal",
-            ],
-            # 0.6.0 was released in Feb 2023, see https://github.com/getsentry/sentry-native/releases/tag/0.6.0.
-            min_sdk_version="0.6.0",
+            sdk_names={
+                "sentry.native": native_min_sdk_version,
+                "sentry.native.android": native_min_sdk_version,
+                "sentry.native.android.capacitor": native_min_sdk_version,
+                "sentry.native.android.flutter": native_min_sdk_version,
+                "sentry.native.android.react-native": native_min_sdk_version,
+                "sentry.native.android.unity": native_min_sdk_version,
+                "sentry.native.android.unreal": native_min_sdk_version,
+                "sentry.native.dotnet": native_min_sdk_version,
+                "sentry.native.unity": native_min_sdk_version,
+                "sentry.native.unreal": native_min_sdk_version,
+            },
             report_fatal_errors=False,
             system_library_path_patterns={
                 # well known locations for unix paths
@@ -267,15 +301,19 @@ def build_sdk_crash_detection_configs() -> Sequence[SDKCrashDetectionConfig]:
     dart_options = _get_options(sdk_name=SdkName.Dart, has_organization_allowlist=True)
 
     if dart_options:
+        # Since 8.2.0 the Dart SDK sends SDK frames, which is required;
+        # see https://github.com/getsentry/sentry-dart/releases/tag/8.2.0
+        dart_min_sdk_version = "8.2.1"
+
         dart_config = SDKCrashDetectionConfig(
             sdk_name=SdkName.Dart,
             project_id=dart_options["project_id"],
             sample_rate=dart_options["sample_rate"],
             organization_allowlist=dart_options["organization_allowlist"],
-            sdk_names=["sentry.dart", "sentry.dart.flutter"],
-            # Since 8.2.0 the Dart SDK sends SDK frames, which is required;
-            # see https://github.com/getsentry/sentry-dart/releases/tag/8.2.0
-            min_sdk_version="8.2.1",
+            sdk_names={
+                "sentry.dart": dart_min_sdk_version,
+                "sentry.dart.flutter": dart_min_sdk_version,
+            },
             report_fatal_errors=True,
             system_library_path_patterns={
                 # Dart
diff --git a/src/sentry/utils/sdk_crashes/sdk_crash_detector.py b/src/sentry/utils/sdk_crashes/sdk_crash_detector.py
index 700b2c2eaac5af..83f9d9834c7636 100644
--- a/src/sentry/utils/sdk_crashes/sdk_crash_detector.py
+++ b/src/sentry/utils/sdk_crashes/sdk_crash_detector.py
@@ -28,11 +28,12 @@ def is_sdk_supported(
         sdk_name: str,
         sdk_version: str,
     ) -> bool:
-        if sdk_name not in self.config.sdk_names:
+        minimum_sdk_version_string = self.config.sdk_names.get(sdk_name)
+        if not minimum_sdk_version_string:
             return False
 
         try:
-            minimum_sdk_version = Version(self.config.min_sdk_version)
+            minimum_sdk_version = Version(minimum_sdk_version_string)
             actual_sdk_version = Version(sdk_version)
 
             if actual_sdk_version < minimum_sdk_version:
@@ -103,6 +104,18 @@ def is_sdk_frame(self, frame: Mapping[str, Any]) -> bool:
 
         function = frame.get("function")
         if function:
+            for (
+                function_and_path_pattern
+            ) in self.config.sdk_frame_config.function_and_path_patterns:
+                function_pattern = function_and_path_pattern.function_pattern
+                path_pattern = function_and_path_pattern.path_pattern
+
+                function_matches = glob_match(function, function_pattern, ignorecase=True)
+                path_matches = self._path_patters_match_frame({path_pattern}, frame)
+
+                if function_matches and path_matches:
+                    return True
+
             for patterns in self.config.sdk_frame_config.function_patterns:
                 if glob_match(function, patterns, ignorecase=True):
                     return True
diff --git a/src/sentry/utils/services.py b/src/sentry/utils/services.py
index 5a21d7c6318d70..b959b0f7984a82 100644
--- a/src/sentry/utils/services.py
+++ b/src/sentry/utils/services.py
@@ -6,11 +6,12 @@
 import logging
 import threading
 from collections.abc import Callable, Mapping, Sequence
-from typing import Any, TypeVar
+from typing import Any
 
-from rest_framework.request import Request
+from django.http.request import HttpRequest
 
 from sentry import options
+from sentry.conf.types.service_options import ServiceOptions
 from sentry.utils.concurrent import Executor, FutureSet, ThreadedExecutor, TimedFuture
 
 # TODO: adjust modules to import from new location -- the weird `as` syntax is for mypy
@@ -18,26 +19,21 @@
 from sentry.utils.lazy_service_wrapper import Service as Service
 
 from .imports import import_string
-from .types import AnyCallable
 
 logger = logging.getLogger(__name__)
 
-T = TypeVar("T")
 
-CallableT = TypeVar("CallableT", bound=Callable[..., object])
-
-
-def resolve_callable(value: str | CallableT) -> CallableT:
-    if callable(value):
-        return value
-    elif isinstance(value, str):
+def resolve_callable[CallableT: Callable[..., object]](value: str | CallableT) -> CallableT:
+    if isinstance(value, str):
         return import_string(value)
+    elif callable(value):
+        return value
     else:
         raise TypeError("Expected callable or string")
 
 
 class Context:
-    def __init__(self, request: Request, backends: dict[type[Service | None], Service]):
+    def __init__(self, request: HttpRequest | None, backends: dict[type[Service | None], Service]):
         self.request = request
         self.backends = backends
 
@@ -51,7 +47,7 @@ def copy(self) -> Context:
 ]
 
 Callback = Callable[
-    [Context, str, Mapping[str, Any], Sequence[str], Sequence[TimedFuture]],
+    [Context, str, Mapping[str, Any], Sequence[str], Sequence[TimedFuture[Any] | None]],
     None,
 ]
 
@@ -253,7 +249,7 @@ def call_backend_method(context: Context, backend: Service, is_primary: bool) ->
             # executed before the primary request is queued.  This is such a
             # strange usage pattern that I don't think it's worth optimizing
             # for.)
-            results = [None] * len(selected_backend_names)
+            results: list[TimedFuture[Any] | None] = [None] * len(selected_backend_names)
             for i, backend_name in enumerate(selected_backend_names[1:], 1):
                 try:
                     backend, executor = self.backends[backend_name]
@@ -276,7 +272,7 @@ def call_backend_method(context: Context, backend: Service, is_primary: bool) ->
             # calling thread. (We don't have to protect this from ``KeyError``
             # since we already ensured that the primary backend exists.)
             backend, executor = self.backends[selected_backend_names[0]]
-            results[0] = executor.submit(
+            result = results[0] = executor.submit(
                 functools.partial(call_backend_method, context.copy(), backend, is_primary=True),
                 priority=0,
                 block=True,
@@ -289,14 +285,13 @@ def call_backend_method(context: Context, backend: Service, is_primary: bool) ->
                     )
                 )
 
-            result: TimedFuture = results[0]
             return result.result()
 
         return execute
 
 
 def build_instance_from_options(
-    options: Mapping[str, object],
+    options: ServiceOptions,
     *,
     default_constructor: Callable[..., object] | None = None,
 ) -> object:
@@ -313,9 +308,11 @@ def build_instance_from_options(
     return constructor(**options.get("options", {}))
 
 
-def build_instance_from_options_of_type(
+def build_instance_from_options_of_type[
+    T
+](
     tp: type[T],
-    options: Mapping[str, object],
+    options: ServiceOptions,
     *,
     default_constructor: Callable[..., T] | None = None,
 ) -> T:
@@ -364,17 +361,17 @@ class ServiceDelegator(Delegator, Service):
     def __init__(
         self,
         backend_base: str,
-        backends: Mapping[str, Mapping[str, Any]],
-        selector_func: str | AnyCallable,
-        callback_func: str | AnyCallable | None = None,
+        backends: Mapping[str, ServiceOptions],
+        selector_func: str | Selector,
+        callback_func: str | Callback | None = None,
     ):
         super().__init__(
             import_string(backend_base),
             {
                 name: (
-                    build_instance_from_options(options),
-                    build_instance_from_options(
-                        options.get("executor", {}), default_constructor=ThreadedExecutor
+                    build_instance_from_options_of_type(Service, options),
+                    build_instance_from_options_of_type(
+                        Executor, options.get("executor", {}), default_constructor=ThreadedExecutor
                     ),
                 )
                 for name, options in backends.items()
@@ -435,9 +432,7 @@ def selector(context: Context, method: str, callargs: Mapping[str, Any]) -> list
         else:
             intkey = key
 
-        if not isinstance(intkey, int):
-            logger.error("make_writebehind_selector.invalid", extra={"received_type": type(intkey)})
-            return [move_from]
+        assert isinstance(intkey, int), intkey
 
         if rollout_rate < 0:
             if (intkey % 10000) / 10000 < rollout_rate * -1.0:
diff --git a/src/sentry/utils/snuba.py b/src/sentry/utils/snuba.py
index 0b7bfb116ec057..8e61baf6addd9b 100644
--- a/src/sentry/utils/snuba.py
+++ b/src/sentry/utils/snuba.py
@@ -3,6 +3,7 @@
 import dataclasses
 import functools
 import logging
+import math
 import os
 import re
 import time
@@ -165,6 +166,7 @@ def log_snuba_info(content):
     "origin.transaction": "sentry_tags[transaction]",
     "is_transaction": "is_segment",
     "sdk.name": "sentry_tags[sdk.name]",
+    "sdk.version": "sentry_tags[sdk.version]",
     "trace.status": "sentry_tags[trace.status]",
     "messaging.destination.name": "sentry_tags[messaging.destination.name]",
     "messaging.message.id": "sentry_tags[messaging.message.id]",
@@ -201,6 +203,7 @@ def log_snuba_info(content):
     "timestamp": "timestamp",
     "trace": "trace_id",
     "transaction": "segment_name",
+    "transaction.op": "attr_str[sentry.transaction.op]",
     # `transaction.id` and `segment.id` is going to be replaced by `transaction.span_id` please do not use
     # transaction.id is "wrong", its pointing to segment_id to return something for the transistion, but represents the
     # txn event id(32 char uuid). EAP will no longer be storing this.
@@ -215,6 +218,7 @@ def log_snuba_info(content):
     "messaging.destination.name": "attr_str[sentry.messaging.destination.name]",
     "messaging.message.id": "attr_str[sentry.messaging.message.id]",
     "span.status_code": "attr_str[sentry.status_code]",
+    "profile.id": "attr_str[sentry.profile_id]",
     "replay.id": "attr_str[sentry.replay_id]",
     "span.ai.pipeline.group": "attr_str[sentry.ai_pipeline_group]",
     "trace.status": "attr_str[sentry.trace.status]",
@@ -222,7 +226,9 @@ def log_snuba_info(content):
     "ai.total_tokens.used": "attr_num[ai_total_tokens_used]",
     "ai.total_cost": "attr_num[ai_total_cost]",
     "sdk.name": "attr_str[sentry.sdk.name]",
+    "sdk.version": "attr_str[sentry.sdk.version]",
     "release": "attr_str[sentry.release]",
+    "environment": "attr_str[sentry.environment]",
     "user": "attr_str[sentry.user]",
     "user.id": "attr_str[sentry.user.id]",
     "user.email": "attr_str[sentry.user.email]",
@@ -230,22 +236,9 @@ def log_snuba_info(content):
     "user.ip": "attr_str[sentry.user.ip]",
     "user.geo.subregion": "attr_str[sentry.user.geo.subregion]",
     "user.geo.country_code": "attr_str[sentry.user.geo.country_code]",
-}
-
-METRICS_SUMMARIES_COLUMN_MAP = {
-    "project": "project_id",
-    "project.id": "project_id",
-    "id": "span_id",
-    "trace": "trace_id",
-    "metric": "metric_mri",
-    "timestamp": "end_timestamp",
-    "segment.id": "segment_id",
-    "span.duration": "duration_ms",
-    "span.group": "group",
-    "min_metric": "min",
-    "max_metric": "max",
-    "sum_metric": "sum",
-    "count_metric": "count",
+    "http.decoded_response_content_length": "attr_num[http.decoded_response_content_length]",
+    "http.response_content_length": "attr_num[http.response_content_length]",
+    "http.response_transfer_size": "attr_num[http.response_transfer_size]",
 }
 
 SPAN_COLUMN_MAP.update(
@@ -298,7 +291,6 @@ def log_snuba_info(content):
     Dataset.Discover: DISCOVER_COLUMN_MAP,
     Dataset.Sessions: SESSIONS_SNUBA_MAP,
     Dataset.Metrics: METRICS_COLUMN_MAP,
-    Dataset.MetricsSummaries: METRICS_SUMMARIES_COLUMN_MAP,
     Dataset.PerformanceMetrics: METRICS_COLUMN_MAP,
     Dataset.SpansIndexed: SPAN_COLUMN_MAP,
     Dataset.EventsAnalyticsPlatform: SPAN_EAP_COLUMN_MAP,
@@ -317,7 +309,6 @@ def log_snuba_info(content):
     Dataset.IssuePlatform: list(ISSUE_PLATFORM_MAP.values()),
     Dataset.SpansIndexed: list(SPAN_COLUMN_MAP.values()),
     Dataset.EventsAnalyticsPlatform: list(SPAN_EAP_COLUMN_MAP.values()),
-    Dataset.MetricsSummaries: list(METRICS_SUMMARIES_COLUMN_MAP.values()),
 }
 
 SNUBA_OR = "or"
@@ -497,7 +488,13 @@ class RetrySkipTimeout(urllib3.Retry):
     """
 
     def increment(
-        self, method=None, url=None, response=None, error=None, _pool=None, _stacktrace=None
+        self,
+        method=None,
+        url=None,
+        response=None,
+        error=None,
+        _pool=None,
+        _stacktrace=None,
     ):
         """
         Just rely on the parent class unless we have a read timeout. In that case
@@ -636,7 +633,9 @@ def get_organization_id_from_project_ids(project_ids: Sequence[int]) -> int:
     return organization_id
 
 
-def infer_project_ids_from_related_models(filter_keys: Mapping[str, Sequence[int]]) -> list[int]:
+def infer_project_ids_from_related_models(
+    filter_keys: Mapping[str, Sequence[int]],
+) -> list[int]:
     ids = [set(get_related_project_ids(k, filter_keys[k])) for k in filter_keys]
     return list(set.union(*ids))
 
@@ -956,7 +955,10 @@ def raw_snql_query(
     # other functions do here. It does not add any automatic conditions, format
     # results, nothing. Use at your own risk.
     return bulk_snuba_queries(
-        requests=[request], referrer=referrer, use_cache=use_cache, query_source=query_source
+        requests=[request],
+        referrer=referrer,
+        use_cache=use_cache,
+        query_source=query_source,
     )[0]
 
 
@@ -1095,7 +1097,9 @@ def _apply_cache_and_build_results(
         for result, (query_pos, _, opt_cache_key) in zip(query_results, to_query):
             if opt_cache_key:
                 cache.set(
-                    opt_cache_key, json.dumps(result), settings.SENTRY_SNUBA_CACHE_TTL_SECONDS
+                    opt_cache_key,
+                    json.dumps(result),
+                    settings.SENTRY_SNUBA_CACHE_TTL_SECONDS,
                 )
             results.append((query_pos, result))
 
@@ -1164,7 +1168,8 @@ def _bulk_snuba_query(snuba_requests: Sequence[SnubaRequest]) -> ResultSet:
             except ValueError:
                 if response.status != 200:
                     logger.exception(
-                        "snuba.query.invalid-json", extra={"response.data": response.data}
+                        "snuba.query.invalid-json",
+                        extra={"response.data": response.data},
                     )
                     raise SnubaError("Failed to parse snuba error response")
                 raise UnexpectedResponseError(f"Could not decode JSON response: {response.data!r}")
@@ -1441,7 +1446,6 @@ def _resolve_column(col):
 
         # Some dataset specific logic:
         if dataset == Dataset.Discover:
-
             if isinstance(col, (list, tuple)) or col in ("project_id", "group_id"):
                 return col
         elif dataset == Dataset.EventsAnalyticsPlatform:
@@ -1674,6 +1678,9 @@ def resolve_complex_column(col, resolve_func, ignored):
     "UInt16": "integer",
     "UInt32": "integer",
     "UInt64": "integer",
+    "Int16": "integer",
+    "Int32": "integer",
+    "Int64": "integer",
     "Float32": "number",
     "Float64": "number",
     "DateTime": "date",
@@ -1821,7 +1828,11 @@ def replace(d, key, val):
     reverse = compose(
         reverse,
         lambda row: (
-            replace(row, "bucketed_end", int(parse_datetime(row["bucketed_end"]).timestamp()))
+            replace(
+                row,
+                "bucketed_end",
+                int(parse_datetime(row["bucketed_end"]).timestamp()),
+            )
             if "bucketed_end" in row
             else row
         ),
@@ -1922,8 +1933,6 @@ def is_duration_measurement(key):
         "measurements.fid",
         "measurements.ttfb",
         "measurements.ttfb.requesttime",
-        "measurements.time_to_initial_display",
-        "measurements.time_to_full_display",
         "measurements.app_start_cold",
         "measurements.app_start_warm",
         "measurements.time_to_full_display",
@@ -1985,3 +1994,21 @@ def get_array_column_field(array_column, internal_key):
     if array_column == "span_op_breakdowns":
         return get_span_op_breakdown_key_name(internal_key)
     return internal_key
+
+
+def process_value(value: None | str | int | float | list[str] | list[int] | list[float]):
+    if isinstance(value, float):
+        # 0 for nan, and none for inf were chosen arbitrarily, nan and inf are
+        # invalid json so needed to pick something valid to use instead
+        if math.isnan(value):
+            value = 0
+        elif math.isinf(value):
+            value = None
+
+    if isinstance(value, list):
+        for i, v in enumerate(value):
+            if isinstance(v, float):
+                value[i] = process_value(v)
+        return value
+
+    return value
diff --git a/src/sentry/utils/snuba_rpc.py b/src/sentry/utils/snuba_rpc.py
index 073e765e953c69..afdb03b9b2e031 100644
--- a/src/sentry/utils/snuba_rpc.py
+++ b/src/sentry/utils/snuba_rpc.py
@@ -11,6 +11,13 @@
     CreateSubscriptionRequest,
     CreateSubscriptionResponse,
 )
+from sentry_protos.snuba.v1.endpoint_time_series_pb2 import TimeSeriesRequest, TimeSeriesResponse
+from sentry_protos.snuba.v1.endpoint_trace_item_attributes_pb2 import (
+    TraceItemAttributeNamesRequest,
+    TraceItemAttributeNamesResponse,
+    TraceItemAttributeValuesRequest,
+    TraceItemAttributeValuesResponse,
+)
 from sentry_protos.snuba.v1.endpoint_trace_item_table_pb2 import (
     TraceItemTableRequest,
     TraceItemTableResponse,
@@ -55,12 +62,33 @@ def meta(
 
 
 def table_rpc(req: TraceItemTableRequest) -> TraceItemTableResponse:
-    resp = _make_rpc_request("EndpointTraceItemTable", "v1", req)
+    resp = _make_rpc_request("EndpointTraceItemTable", "v1", req.meta.referrer, req)
     response = TraceItemTableResponse()
     response.ParseFromString(resp.data)
     return response
 
 
+def timeseries_rpc(req: TimeSeriesRequest) -> TimeSeriesResponse:
+    resp = _make_rpc_request("EndpointTimeSeries", "v1", req.meta.referrer, req)
+    response = TimeSeriesResponse()
+    response.ParseFromString(resp.data)
+    return response
+
+
+def attribute_names_rpc(req: TraceItemAttributeNamesRequest) -> TraceItemAttributeNamesResponse:
+    resp = _make_rpc_request("EndpointTraceItemAttributeNames", "v1", req.meta.referrer, req)
+    response = TraceItemAttributeNamesResponse()
+    response.ParseFromString(resp.data)
+    return response
+
+
+def attribute_values_rpc(req: TraceItemAttributeValuesRequest) -> TraceItemAttributeValuesResponse:
+    resp = _make_rpc_request("AttributeValuesRequest", "v1", req.meta.referrer, req)
+    response = TraceItemAttributeValuesResponse()
+    response.ParseFromString(resp.data)
+    return response
+
+
 def rpc(
     req: SnubaRPCRequest,
     resp_type: type[RPCResponseType],
@@ -99,7 +127,7 @@ def rpc(
     cls = req.__class__
     endpoint_name = cls.__name__
     class_version = cls.__module__.split(".", 3)[2]
-    http_resp = _make_rpc_request(endpoint_name, class_version, req)
+    http_resp = _make_rpc_request(endpoint_name, class_version, req.meta.referrer, req)
     resp = resp_type()
     resp.ParseFromString(http_resp.data)
     return resp
@@ -108,9 +136,9 @@ def rpc(
 def _make_rpc_request(
     endpoint_name: str,
     class_version: str,
+    referrer: str | None,
     req: SnubaRPCRequest | CreateSubscriptionRequest,
 ) -> BaseHTTPResponse:
-    referrer = req.meta.referrer if hasattr(req, "meta") else None
     if SNUBA_INFO:
         from google.protobuf.json_format import MessageToJson
 
@@ -143,7 +171,7 @@ def create_subscription(req: CreateSubscriptionRequest) -> CreateSubscriptionRes
     cls = req.__class__
     endpoint_name = cls.__name__
     class_version = cls.__module__.split(".", 3)[2]
-    http_resp = _make_rpc_request(endpoint_name, class_version, req)
+    http_resp = _make_rpc_request(endpoint_name, class_version, None, req)
     resp = CreateSubscriptionResponse()
     resp.ParseFromString(http_resp.data)
     return resp
diff --git a/src/sentry/web/debug_urls.py b/src/sentry/web/debug_urls.py
index 200e13f9954eac..5afc8bcdb669a3 100644
--- a/src/sentry/web/debug_urls.py
+++ b/src/sentry/web/debug_urls.py
@@ -21,7 +21,6 @@
 from sentry.web.frontend.debug.debug_error_embed import DebugErrorPageEmbedView
 from sentry.web.frontend.debug.debug_feedback_issue import DebugFeedbackIssueEmailView
 from sentry.web.frontend.debug.debug_generic_issue import DebugGenericIssueEmailView
-from sentry.web.frontend.debug.debug_incident_activity_email import DebugIncidentActivityEmailView
 from sentry.web.frontend.debug.debug_incident_trigger_email import DebugIncidentTriggerEmailView
 from sentry.web.frontend.debug.debug_incident_trigger_email_activated_alert import (
     DebugIncidentActivatedAlertTriggerEmailView,
@@ -148,7 +147,6 @@
     re_path(
         r"^debug/mail/sso-unlinked/no-password/$", DebugSsoUnlinkedNoPasswordEmailView.as_view()
     ),
-    re_path(r"^debug/mail/incident-activity/$", DebugIncidentActivityEmailView.as_view()),
     re_path(r"^debug/mail/incident-trigger/$", DebugIncidentTriggerEmailView.as_view()),
     re_path(
         r"^debug/mail/activated-incident-trigger/$",
diff --git a/src/sentry/web/frontend/auth_login.py b/src/sentry/web/frontend/auth_login.py
index 592b1dba1a7bfc..4fb8f4eb2fdbde 100644
--- a/src/sentry/web/frontend/auth_login.py
+++ b/src/sentry/web/frontend/auth_login.py
@@ -95,7 +95,7 @@ def handle(self, request: HttpRequest, *args, **kwargs) -> HttpResponseBase:
         Hooks in to the django view dispatch which delegates request to GET/POST/PUT/DELETE.
         Base view overwrites dispatch to include functionality for csrf, superuser, customer domains, etc.
         """
-        return super().handle(request=request, *args, **kwargs)
+        return super().handle(request, *args, **kwargs)
 
     def get(self, request: Request, **kwargs) -> HttpResponseBase:
         next_uri = self.get_next_uri(request=request)
diff --git a/src/sentry/web/frontend/base.py b/src/sentry/web/frontend/base.py
index 7eb53b1c374ac9..d8474a83ca9d8d 100644
--- a/src/sentry/web/frontend/base.py
+++ b/src/sentry/web/frontend/base.py
@@ -467,8 +467,7 @@ def get_not_2fa_compliant_url(self, request: HttpRequest, *args: Any, **kwargs:
         return reverse("sentry-account-settings-security")
 
     def get_context_data(self, request: HttpRequest, **kwargs: Any) -> dict[str, Any]:
-        context = csrf(request)
-        return context
+        return csrf(request)
 
     def respond(
         self, template: str, context: dict[str, Any] | None = None, status: int = 200
diff --git a/src/sentry/web/frontend/debug/debug_incident_activity_email.py b/src/sentry/web/frontend/debug/debug_incident_activity_email.py
deleted file mode 100644
index 926376b9378c75..00000000000000
--- a/src/sentry/web/frontend/debug/debug_incident_activity_email.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from django.http import HttpRequest, HttpResponse
-from django.views.generic import View
-
-from sentry.incidents.models.incident import Incident, IncidentActivity, IncidentActivityType
-from sentry.incidents.tasks import generate_incident_activity_email
-from sentry.models.organization import Organization
-from sentry.users.models.user import User
-
-from .mail import MailPreview
-
-
-class DebugIncidentActivityEmailView(View):
-    def get(self, request: HttpRequest) -> HttpResponse:
-        organization = Organization(slug="myorg")
-        user = User(id=1235, name="Hello There")
-        incident = Incident(
-            id=2, identifier=123, organization=organization, title="Something broke"
-        )
-        activity = IncidentActivity(
-            incident=incident,
-            user_id=user.id,
-            type=IncidentActivityType.COMMENT.value,
-            comment="hi",
-        )
-        email = generate_incident_activity_email(activity, user)
-        return MailPreview(
-            html_template=email.html_template, text_template=email.template, context=email.context
-        ).render(request)
diff --git a/src/sentry/web/frontend/js_sdk_loader.py b/src/sentry/web/frontend/js_sdk_loader.py
index acc1ae6f66c25b..ad99e0ebc2333c 100644
--- a/src/sentry/web/frontend/js_sdk_loader.py
+++ b/src/sentry/web/frontend/js_sdk_loader.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import time
-from typing import NotRequired, TypedDict
+from typing import Any, NotRequired, TypedDict
 
 from django.conf import settings
 from django.http import HttpRequest, HttpResponse
@@ -55,6 +55,10 @@ class JavaScriptSdkLoader(BaseView):
     def determine_active_organization(self, request: HttpRequest, organization_slug=None) -> None:
         pass
 
+    # Same as above
+    def get_context_data(self, request: HttpRequest, **kwargs) -> dict[str, Any]:
+        return {}
+
     def _get_loader_config(
         self, key: ProjectKey | None, sdk_version: Version | None
     ) -> LoaderInternalConfig:
diff --git a/src/sentry/web/frontend/oauth_authorize.py b/src/sentry/web/frontend/oauth_authorize.py
index 8617bdbd5a465f..e9ed3e3543fc99 100644
--- a/src/sentry/web/frontend/oauth_authorize.py
+++ b/src/sentry/web/frontend/oauth_authorize.py
@@ -127,17 +127,25 @@ def get(self, request: HttpRequest, **kwargs) -> HttpResponseBase:
                 err_response="client_id",
             )
 
-        # TODO (athena): Clean up this so scopes are always coming from the model
-        # This change is temporarily needed before we migrate existing applications
-        # to have the correct scopes
-        if application.requires_org_level_access:
-            scopes = application.scopes
+        scopes = request.GET.get("scope")
+        if scopes:
+            scopes = scopes.split(" ")
         else:
-            scopes = request.GET.get("scope")
-            if scopes:
-                scopes = scopes.split(" ")
-            else:
-                scopes = []
+            scopes = []
+        if application.requires_org_level_access:
+            # Applications that require org level access have a maximum scope limit set
+            # in admin that should not pass
+            max_scopes = application.scopes
+            for scope in scopes:
+                if scope not in max_scopes:
+                    return self.error(
+                        request=request,
+                        client_id=client_id,
+                        response_type=response_type,
+                        redirect_uri=redirect_uri,
+                        name="invalid_scope",
+                        state=state,
+                    )
 
         for scope in scopes:
             if scope not in settings.SENTRY_SCOPES:
@@ -163,7 +171,9 @@ def get(self, request: HttpRequest, **kwargs) -> HttpResponseBase:
         if not request.user.is_authenticated:
             return super().get(request, application=application)
 
-        if not force_prompt:
+        # If the application expects org level access, we need to prompt the user to choose which
+        # organization they want to give access to every time. We should not presume the user intention
+        if not (force_prompt or application.requires_org_level_access):
             try:
                 existing_auth = ApiAuthorization.objects.get(
                     user_id=request.user.id, application=application
diff --git a/src/sentry/web/frontend/react_page.py b/src/sentry/web/frontend/react_page.py
index a849caa248dffd..81e5c4d26b8051 100644
--- a/src/sentry/web/frontend/react_page.py
+++ b/src/sentry/web/frontend/react_page.py
@@ -22,6 +22,7 @@
 )
 from sentry.users.services.user.model import RpcUser
 from sentry.utils.http import is_using_customer_domain, query_string
+from sentry.web.client_config import get_client_config
 from sentry.web.frontend.base import BaseView, ControlSiloOrganizationView
 from sentry.web.helpers import render_to_response
 
@@ -55,13 +56,13 @@ def resolve_redirect_url(request: HttpRequest | Request, org_slug: str, user_id=
 def resolve_activeorg_redirect_url(request: HttpRequest | Request) -> str | None:
     user: AnonymousUser | RpcUser | None = getattr(request, "user", None)
     if not user or isinstance(user, AnonymousUser):
-        return
+        return None
     session = request.session
     if not session:
-        return
+        return None
     last_active_org = session.get("activeorg", None)
     if not last_active_org:
-        return
+        return None
     return resolve_redirect_url(request=request, org_slug=last_active_org, user_id=user.id)
 
 
@@ -86,6 +87,7 @@ def dns_prefetch(self) -> list[str]:
         return domains
 
     def handle_react(self, request: Request, **kwargs) -> HttpResponse:
+        org_context = getattr(self, "active_organization", None)
         context = {
             "CSRF_COOKIE_NAME": settings.CSRF_COOKIE_NAME,
             "meta_tags": [
@@ -97,7 +99,8 @@ def handle_react(self, request: Request, **kwargs) -> HttpResponse:
             # Rendering the layout requires serializing the active organization.
             # Since we already have it here from the OrganizationMixin, we can
             # save some work and render it faster.
-            "org_context": getattr(self, "active_organization", None),
+            "org_context": org_context,
+            "react_config": get_client_config(request, org_context),
         }
 
         # Force a new CSRF token to be generated and set in user's
diff --git a/src/sentry/workflow_engine/apps.py b/src/sentry/workflow_engine/apps.py
index 44d4741e9cd977..abdb88a6e562d9 100644
--- a/src/sentry/workflow_engine/apps.py
+++ b/src/sentry/workflow_engine/apps.py
@@ -5,4 +5,6 @@ class Config(AppConfig):
     name = "sentry.workflow_engine"
 
     def ready(self):
+        # Import our base DataConditionHandlers for the workflow engine platform
+        import sentry.workflow_engine.handlers  # NOQA
         from sentry.workflow_engine.endpoints import serializers  # NOQA
diff --git a/src/sentry/workflow_engine/endpoints/project_detector_index.py b/src/sentry/workflow_engine/endpoints/project_detector_index.py
new file mode 100644
index 00000000000000..5e4ca73e560438
--- /dev/null
+++ b/src/sentry/workflow_engine/endpoints/project_detector_index.py
@@ -0,0 +1,126 @@
+from drf_spectacular.utils import PolymorphicProxySerializer, extend_schema
+from rest_framework import status
+from rest_framework.exceptions import ValidationError
+from rest_framework.response import Response
+
+from sentry.api.api_owners import ApiOwner
+from sentry.api.api_publish_status import ApiPublishStatus
+from sentry.api.base import region_silo_endpoint
+from sentry.api.bases import ProjectAlertRulePermission, ProjectEndpoint
+from sentry.api.serializers import serialize
+from sentry.apidocs.constants import (
+    RESPONSE_BAD_REQUEST,
+    RESPONSE_FORBIDDEN,
+    RESPONSE_NOT_FOUND,
+    RESPONSE_UNAUTHORIZED,
+)
+from sentry.apidocs.parameters import GlobalParams
+from sentry.issues import grouptype
+from sentry.workflow_engine.endpoints.serializers import DetectorSerializer
+from sentry.workflow_engine.models import Detector
+
+
+@region_silo_endpoint
+@extend_schema(tags=["Workflows"])
+class ProjectDetectorIndexEndpoint(ProjectEndpoint):
+    publish_status = {
+        "POST": ApiPublishStatus.EXPERIMENTAL,
+        "GET": ApiPublishStatus.EXPERIMENTAL,
+    }
+    owner = ApiOwner.ISSUES
+
+    # TODO: We probably need a specific permission for detectors. Possibly specific detectors have different perms
+    # too?
+    permission_classes = (ProjectAlertRulePermission,)
+
+    def _get_validator(self, request, project, group_type_slug):
+        detector_type = grouptype.registry.get_by_slug(group_type_slug)
+        if detector_type is None:
+            raise ValidationError({"groupType": ["Unknown group type"]})
+
+        if detector_type.detector_validator is None:
+            raise ValidationError({"groupType": ["Group type not compatible with detectors"]})
+
+        return detector_type.detector_validator(
+            context={
+                "project": project,
+                "organization": project.organization,
+                "request": request,
+                "access": request.access,
+            },
+            data=request.data,
+        )
+
+    @extend_schema(
+        operation_id="Fetch a Detector",
+        parameters=[
+            GlobalParams.ORG_ID_OR_SLUG,
+            GlobalParams.PROJECT_ID_OR_SLUG,
+        ],
+        responses={
+            201: DetectorSerializer,
+            400: RESPONSE_BAD_REQUEST,
+            401: RESPONSE_UNAUTHORIZED,
+            403: RESPONSE_FORBIDDEN,
+            404: RESPONSE_NOT_FOUND,
+        },
+    )
+    def get(self, request, project):
+        """
+        List a Project's Detectors
+        `````````````````````````
+        Return a list of detectors for a given project.
+        """
+        queryset = Detector.objects.filter(
+            organization_id=project.organization_id,
+        ).order_by("id")
+
+        return self.paginate(
+            request=request,
+            queryset=queryset,
+            order_by="id",
+            on_results=lambda x: serialize(x, request.user),
+        )
+
+    @extend_schema(
+        operation_id="Create a Detector",
+        parameters=[
+            GlobalParams.ORG_ID_OR_SLUG,
+            GlobalParams.PROJECT_ID_OR_SLUG,
+        ],
+        request=PolymorphicProxySerializer(
+            "GenericDetectorSerializer",
+            serializers=[
+                gt.detector_validator for gt in grouptype.registry.all() if gt.detector_validator
+            ],
+            resource_type_field_name=None,
+        ),
+        responses={
+            201: DetectorSerializer,
+            400: RESPONSE_BAD_REQUEST,
+            401: RESPONSE_UNAUTHORIZED,
+            403: RESPONSE_FORBIDDEN,
+            404: RESPONSE_NOT_FOUND,
+        },
+    )
+    def post(self, request, project):
+        """
+        Create a Detector
+        ````````````````
+        Create a new detector for a project.
+
+        :param string name: The name of the detector
+        :param string group_type: The type of detector to create
+        :param object data_source: Configuration for the data source
+        :param array data_conditions: List of conditions to trigger the detector
+        """
+        group_type = request.data.get("group_type")
+        if not group_type:
+            raise ValidationError({"groupType": ["This field is required."]})
+
+        validator = self._get_validator(request, project, group_type)
+        if not validator.is_valid():
+            return Response(validator.errors, status=status.HTTP_400_BAD_REQUEST)
+
+        detector = validator.save()
+        return Response(serialize(detector, request.user), status=status.HTTP_201_CREATED)
diff --git a/src/sentry/workflow_engine/endpoints/urls.py b/src/sentry/workflow_engine/endpoints/urls.py
new file mode 100644
index 00000000000000..be4d46ce9083b1
--- /dev/null
+++ b/src/sentry/workflow_engine/endpoints/urls.py
@@ -0,0 +1,11 @@
+from django.urls import re_path
+
+from .project_detector_index import ProjectDetectorIndexEndpoint
+
+urlpatterns = [
+    re_path(
+        r"^(?P<organization_id_or_slug>[^\/]+)/(?P<project_id_or_slug>[^\/]+)/detectors/$",
+        ProjectDetectorIndexEndpoint.as_view(),
+        name="sentry-api-0-project-detector-index",
+    ),
+]
diff --git a/src/sentry/workflow_engine/handlers/__init__.py b/src/sentry/workflow_engine/handlers/__init__.py
new file mode 100644
index 00000000000000..4fc3428a0ce1e4
--- /dev/null
+++ b/src/sentry/workflow_engine/handlers/__init__.py
@@ -0,0 +1,5 @@
+# Export any handlers we want to include into the registry
+__all__ = ["NotificationActionHandler", "GroupEventConditionHandler"]
+
+from .action import NotificationActionHandler
+from .condition import GroupEventConditionHandler
diff --git a/src/sentry/workflow_engine/handlers/action/__init__.py b/src/sentry/workflow_engine/handlers/action/__init__.py
new file mode 100644
index 00000000000000..1251be1906e9b6
--- /dev/null
+++ b/src/sentry/workflow_engine/handlers/action/__init__.py
@@ -0,0 +1,5 @@
+__all__ = [
+    "NotificationActionHandler",
+]
+
+from .notification import NotificationActionHandler
diff --git a/src/sentry/workflow_engine/handlers/action/notification.py b/src/sentry/workflow_engine/handlers/action/notification.py
new file mode 100644
index 00000000000000..97e8cf84f39818
--- /dev/null
+++ b/src/sentry/workflow_engine/handlers/action/notification.py
@@ -0,0 +1,16 @@
+from sentry.eventstore.models import GroupEvent
+from sentry.workflow_engine.models import Action, Detector
+from sentry.workflow_engine.registry import action_handler_registry
+from sentry.workflow_engine.types import ActionHandler
+
+
+@action_handler_registry.register(Action.Type.NOTIFICATION)
+class NotificationActionHandler(ActionHandler):
+    @staticmethod
+    def execute(
+        evt: GroupEvent,
+        action: Action,
+        detector: Detector,
+    ) -> None:
+        # TODO: Implment this in milestone 2
+        pass
diff --git a/src/sentry/workflow_engine/handlers/condition/__init__.py b/src/sentry/workflow_engine/handlers/condition/__init__.py
new file mode 100644
index 00000000000000..85a4596d38b75e
--- /dev/null
+++ b/src/sentry/workflow_engine/handlers/condition/__init__.py
@@ -0,0 +1,5 @@
+__all__ = [
+    "GroupEventConditionHandler",
+]
+
+from .group_event import GroupEventConditionHandler
diff --git a/src/sentry/workflow_engine/handlers/condition/group_event.py b/src/sentry/workflow_engine/handlers/condition/group_event.py
new file mode 100644
index 00000000000000..e392db084cfdd9
--- /dev/null
+++ b/src/sentry/workflow_engine/handlers/condition/group_event.py
@@ -0,0 +1,29 @@
+from typing import Any
+
+from sentry.eventstore.models import GroupEvent
+from sentry.workflow_engine.models.data_condition import Condition
+from sentry.workflow_engine.registry import condition_handler_registry
+from sentry.workflow_engine.types import DataConditionHandler
+
+
+def get_nested_value(data: Any, path: str, default: Any = None) -> Any | None:
+    try:
+        value = data
+        for part in path.split("."):
+            if hasattr(value, part):
+                value = getattr(value, part)
+            elif hasattr(value, "get"):
+                value = value.get(part)
+            else:
+                return default
+        return value
+    except Exception:
+        return default
+
+
+@condition_handler_registry.register(Condition.GROUP_EVENT_ATTR_COMPARISON)
+class GroupEventConditionHandler(DataConditionHandler[GroupEvent]):
+    @staticmethod
+    def evaluate_value(data: GroupEvent, comparison: Any, data_filter: str) -> bool:
+        event_value = get_nested_value(data, data_filter)
+        return event_value == comparison
diff --git a/src/sentry/workflow_engine/handlers/detector/__init__.py b/src/sentry/workflow_engine/handlers/detector/__init__.py
new file mode 100644
index 00000000000000..dbe4b9ce3d1441
--- /dev/null
+++ b/src/sentry/workflow_engine/handlers/detector/__init__.py
@@ -0,0 +1,9 @@
+__all__ = [
+    "DetectorHandler",
+    "DetectorEvaluationResult",
+    "DetectorStateData",
+    "StatefulDetectorHandler",
+]
+
+from .base import DetectorEvaluationResult, DetectorHandler, DetectorStateData
+from .stateful import StatefulDetectorHandler
diff --git a/src/sentry/workflow_engine/handlers/detector/base.py b/src/sentry/workflow_engine/handlers/detector/base.py
new file mode 100644
index 00000000000000..d0bbc183da0439
--- /dev/null
+++ b/src/sentry/workflow_engine/handlers/detector/base.py
@@ -0,0 +1,69 @@
+import abc
+import dataclasses
+import logging
+from typing import Any, Generic, TypeVar
+
+from sentry.issues.issue_occurrence import IssueOccurrence
+from sentry.issues.status_change_message import StatusChangeMessage
+from sentry.workflow_engine.models import DataConditionGroup, DataPacket, Detector
+from sentry.workflow_engine.types import DetectorGroupKey, DetectorPriorityLevel
+
+logger = logging.getLogger(__name__)
+T = TypeVar("T")
+
+
+@dataclasses.dataclass(frozen=True)
+class DetectorEvaluationResult:
+    group_key: DetectorGroupKey
+    # TODO: Are these actually necessary? We're going to produce the occurrence in the detector, so we probably don't
+    # need to know the other results externally
+    is_active: bool
+    priority: DetectorPriorityLevel
+    # TODO: This is only temporarily optional. We should always have a value here if returning a result
+    result: IssueOccurrence | StatusChangeMessage | None = None
+    # Event data to supplement the `IssueOccurrence`, if passed.
+    event_data: dict[str, Any] | None = None
+
+
+@dataclasses.dataclass(frozen=True)
+class DetectorStateData:
+    group_key: DetectorGroupKey
+    active: bool
+    status: DetectorPriorityLevel
+    # Stateful detectors always process data packets in order. Once we confirm that a data packet has been fully
+    # processed and all workflows have been done, this value will be used by the stateful detector to prevent
+    # reprocessing
+    dedupe_value: int
+    # Stateful detectors allow various counts to be tracked. We need to update these after we process workflows, so
+    # include the updates in the state.
+    # This dictionary is in the format {counter_name: counter_value, ...}
+    # If a counter value is `None` it means to unset the value
+    counter_updates: dict[str, int | None]
+
+
+class DetectorHandler(abc.ABC, Generic[T]):
+    def __init__(self, detector: Detector):
+        self.detector = detector
+        if detector.workflow_condition_group_id is not None:
+            try:
+                group = DataConditionGroup.objects.get_from_cache(
+                    id=detector.workflow_condition_group_id
+                )
+                self.condition_group: DataConditionGroup | None = group
+            except DataConditionGroup.DoesNotExist:
+                logger.exception(
+                    "Failed to find the data condition group for detector",
+                    extra={"detector_id": detector.id},
+                )
+                self.condition_group = None
+        else:
+            self.condition_group = None
+
+    @abc.abstractmethod
+    def evaluate(
+        self, data_packet: DataPacket[T]
+    ) -> dict[DetectorGroupKey, DetectorEvaluationResult]:
+        pass
+
+    def commit_state_updates(self):
+        pass
diff --git a/src/sentry/workflow_engine/handlers/detector/stateful.py b/src/sentry/workflow_engine/handlers/detector/stateful.py
new file mode 100644
index 00000000000000..8171787ad38d46
--- /dev/null
+++ b/src/sentry/workflow_engine/handlers/detector/stateful.py
@@ -0,0 +1,312 @@
+import abc
+from datetime import timedelta
+from typing import Any, TypeVar
+
+from django.conf import settings
+from django.db.models import Q
+from sentry_redis_tools.retrying_cluster import RetryingRedisCluster
+
+from sentry.issues.issue_occurrence import IssueOccurrence
+from sentry.issues.status_change_message import StatusChangeMessage
+from sentry.models.group import GroupStatus
+from sentry.types.group import PriorityLevel
+from sentry.utils import metrics, redis
+from sentry.utils.iterators import chunked
+from sentry.workflow_engine.handlers.detector.base import (
+    DetectorEvaluationResult,
+    DetectorHandler,
+    DetectorStateData,
+)
+from sentry.workflow_engine.models import DataPacket, Detector, DetectorState
+from sentry.workflow_engine.processors.data_condition_group import evaluate_condition_group
+from sentry.workflow_engine.types import DetectorGroupKey, DetectorPriorityLevel
+
+T = TypeVar("T")
+REDIS_TTL = int(timedelta(days=7).total_seconds())
+
+
+def get_redis_client() -> RetryingRedisCluster:
+    cluster_key = settings.SENTRY_WORKFLOW_ENGINE_REDIS_CLUSTER
+    return redis.redis_clusters.get(cluster_key)  # type: ignore[return-value]
+
+
+class StatefulDetectorHandler(DetectorHandler[T], abc.ABC):
+    def __init__(self, detector: Detector):
+        super().__init__(detector)
+        self.dedupe_updates: dict[DetectorGroupKey, int] = {}
+        self.counter_updates: dict[DetectorGroupKey, dict[str, int | None]] = {}
+        self.state_updates: dict[DetectorGroupKey, tuple[bool, DetectorPriorityLevel]] = {}
+
+    @property
+    @abc.abstractmethod
+    def counter_names(self) -> list[str]:
+        """
+        The names of counters that this detector is going to keep track of.
+        """
+        pass
+
+    @abc.abstractmethod
+    def get_dedupe_value(self, data_packet: DataPacket[T]) -> int:
+        """
+        Extracts the deduplication value from a passed data packet.
+        TODO: This might belong on the `DataPacket` instead.
+        """
+        pass
+
+    @abc.abstractmethod
+    def get_group_key_values(self, data_packet: DataPacket[T]) -> dict[str, int]:
+        """
+        Extracts the values for all the group keys that exist in the given data packet,
+        and returns then as a dict keyed by group_key.
+        """
+        pass
+
+    @abc.abstractmethod
+    def build_occurrence_and_event_data(
+        self, group_key: DetectorGroupKey, value: int, new_status: PriorityLevel
+    ) -> tuple[IssueOccurrence, dict[str, Any]]:
+        pass
+
+    def build_fingerprint(self, group_key) -> list[str]:
+        """
+        Builds a fingerprint to uniquely identify a detected issue
+        """
+        return [f"{self.detector.id}{':' + group_key if group_key is not None else ''}"]
+
+    def get_state_data(
+        self, group_keys: list[DetectorGroupKey]
+    ) -> dict[DetectorGroupKey, DetectorStateData]:
+        """
+        Fetches state data associated with this detector for the associated `group_keys`.
+        Returns a dict keyed by each group_key with the fetched `DetectorStateData`.
+        If data isn't currently stored, falls back to default values.
+        """
+        group_key_detectors = self.bulk_get_detector_state(group_keys)
+        dedupe_keys = [self.build_dedupe_value_key(gk) for gk in group_keys]
+        pipeline = get_redis_client().pipeline()
+        for dk in dedupe_keys:
+            pipeline.get(dk)
+        group_key_dedupe_values = {
+            gk: int(dv) if dv else 0 for gk, dv in zip(group_keys, pipeline.execute())
+        }
+        pipeline.reset()
+        counter_updates = {}
+        if self.counter_names:
+            counter_keys = [
+                self.build_counter_value_key(gk, name)
+                for gk in group_keys
+                for name in self.counter_names
+            ]
+            for ck in counter_keys:
+                pipeline.get(ck)
+            vals = [int(val) if val is not None else val for val in pipeline.execute()]
+            counter_updates = {
+                gk: dict(zip(self.counter_names, values))
+                for gk, values in zip(group_keys, chunked(vals, len(self.counter_names)))
+            }
+
+        results = {}
+        for gk in group_keys:
+            detector_state = group_key_detectors.get(gk)
+            results[gk] = DetectorStateData(
+                group_key=gk,
+                active=detector_state.active if detector_state else False,
+                status=(
+                    DetectorPriorityLevel(int(detector_state.state))
+                    if detector_state
+                    else DetectorPriorityLevel.OK
+                ),
+                dedupe_value=group_key_dedupe_values[gk],
+                counter_updates=counter_updates[gk],
+            )
+        return results
+
+    def evaluate(
+        self, data_packet: DataPacket[T]
+    ) -> dict[DetectorGroupKey, DetectorEvaluationResult]:
+        """
+        Evaluates a given data packet and returns a list of `DetectorEvaluationResult`.
+        There will be one result for each group key result in the packet, unless the
+        evaluation is skipped due to various rules.
+        """
+        dedupe_value = self.get_dedupe_value(data_packet)
+        group_values = self.get_group_key_values(data_packet)
+        all_state_data = self.get_state_data(list(group_values.keys()))
+        results = {}
+        for group_key, group_value in group_values.items():
+            result = self.evaluate_group_key_value(
+                group_key, group_value, all_state_data[group_key], dedupe_value
+            )
+            if result:
+                results[result.group_key] = result
+        return results
+
+    def evaluate_group_key_value(
+        self,
+        group_key: DetectorGroupKey,
+        value: int,
+        state_data: DetectorStateData,
+        dedupe_value: int,
+    ) -> DetectorEvaluationResult | None:
+        """
+        Evaluates a value associated with a given `group_key` and returns a `DetectorEvaluationResult` with the results
+        and any state changes that need to be made.
+
+        Checks that we haven't already processed this datapacket for this group_key, and skips evaluation if we have.
+        """
+        if dedupe_value <= state_data.dedupe_value:
+            # TODO: Does it actually make more sense to just do this at the data packet level rather than the group
+            # key level?
+            metrics.incr("workflow_engine.detector.skipping_already_processed_update")
+            return None
+
+        self.enqueue_dedupe_update(group_key, dedupe_value)
+
+        if not self.condition_group:
+            metrics.incr("workflow_engine.detector.skipping_invalid_condition_group")
+            return None
+
+        # TODO: We need to handle tracking consecutive evaluations before emitting a result here. We're able to
+        # store these in `DetectorStateData.counter_updates`, but we don't have anywhere to set the required
+        # thresholds at the moment. Probably should be a field on the Detector? Could also be on the condition
+        # level, but usually we want to set this at a higher level.
+        new_status = DetectorPriorityLevel.OK
+        is_group_condition_met, condition_results = evaluate_condition_group(
+            self.condition_group, value
+        )
+
+        if is_group_condition_met:
+            validated_condition_results: list[DetectorPriorityLevel] = [
+                result
+                for result in condition_results
+                if result is not None and isinstance(result, DetectorPriorityLevel)
+            ]
+
+            new_status = max(new_status, *validated_condition_results)
+
+        # TODO: We'll increment and change these later, but for now they don't change so just pass an empty dict
+        self.enqueue_counter_update(group_key, {})
+
+        if state_data.status != new_status:
+            is_active = new_status != DetectorPriorityLevel.OK
+            self.enqueue_state_update(group_key, is_active, new_status)
+            event_data = None
+            result: StatusChangeMessage | IssueOccurrence
+            if new_status == DetectorPriorityLevel.OK:
+                # If we've determined that we're now ok, we just want to resolve the issue
+                result = StatusChangeMessage(
+                    fingerprint=self.build_fingerprint(group_key),
+                    project_id=self.detector.project_id,
+                    new_status=GroupStatus.RESOLVED,
+                    new_substatus=None,
+                )
+            else:
+                result, event_data = self.build_occurrence_and_event_data(
+                    group_key, value, PriorityLevel(new_status)
+                )
+            return DetectorEvaluationResult(
+                group_key=group_key,
+                is_active=is_active,
+                priority=new_status,
+                result=result,
+                event_data=event_data,
+            )
+        return None
+
+    def enqueue_dedupe_update(self, group_key: DetectorGroupKey, dedupe_value: int):
+        self.dedupe_updates[group_key] = dedupe_value
+
+    def enqueue_counter_update(
+        self, group_key: DetectorGroupKey, counter_updates: dict[str, int | None]
+    ):
+        self.counter_updates[group_key] = counter_updates
+
+    def enqueue_state_update(
+        self, group_key: DetectorGroupKey, is_active: bool, priority: DetectorPriorityLevel
+    ):
+        self.state_updates[group_key] = (is_active, priority)
+
+    def build_dedupe_value_key(self, group_key: DetectorGroupKey) -> str:
+        if group_key is None:
+            group_key = ""
+        return f"{self.detector.id}:{group_key}:dedupe_value"
+
+    def build_counter_value_key(self, group_key: DetectorGroupKey, counter_name: str) -> str:
+        if group_key is None:
+            group_key = ""
+        return f"{self.detector.id}:{group_key}:{counter_name}"
+
+    def bulk_get_detector_state(
+        self, group_keys: list[DetectorGroupKey]
+    ) -> dict[DetectorGroupKey, DetectorState]:
+        """
+        Bulk fetches detector state for the passed `group_keys`. Returns a dict keyed by each
+        `group_key` with the fetched `DetectorStateData`.
+
+        If there's no `DetectorState` row for a `detector`/`group_key` pair then we'll exclude
+        the group_key from the returned dict.
+        """
+        # TODO: Cache this query (or individual fetches, then bulk fetch anything missing)
+        query_filter = Q(
+            detector_group_key__in=[group_key for group_key in group_keys if group_key is not None]
+        )
+        if None in group_keys:
+            query_filter |= Q(detector_group_key__isnull=True)
+
+        return {
+            detector_state.detector_group_key: detector_state
+            for detector_state in self.detector.detectorstate_set.filter(query_filter)
+        }
+
+    def commit_state_updates(self):
+        self._bulk_commit_detector_state()
+        self._bulk_commit_redis_state()
+
+    def _bulk_commit_redis_state(self):
+        pipeline = get_redis_client().pipeline()
+        if self.dedupe_updates:
+            for group_key, dedupe_value in self.dedupe_updates.items():
+                pipeline.set(self.build_dedupe_value_key(group_key), dedupe_value, ex=REDIS_TTL)
+
+        if self.counter_updates:
+            for group_key, counter_updates in self.counter_updates.items():
+                for counter_name, counter_value in counter_updates.items():
+                    key_name = self.build_counter_value_key(group_key, counter_name)
+                    if counter_value is None:
+                        pipeline.delete(key_name)
+                    else:
+                        pipeline.set(key_name, counter_value, ex=REDIS_TTL)
+
+        pipeline.execute()
+        self.dedupe_updates.clear()
+        self.counter_updates.clear()
+
+    def _bulk_commit_detector_state(self):
+        # TODO: We should already have these loaded from earlier, figure out how to cache and reuse
+        detector_state_lookup = self.bulk_get_detector_state(
+            [update for update in self.state_updates.keys()]
+        )
+        created_detector_states = []
+        updated_detector_states = []
+        for group_key, (active, priority) in self.state_updates.items():
+            detector_state = detector_state_lookup.get(group_key)
+            if not detector_state:
+                created_detector_states.append(
+                    DetectorState(
+                        detector_group_key=group_key,
+                        detector=self.detector,
+                        active=active,
+                        state=priority,
+                    )
+                )
+            elif active != detector_state.active or priority != detector_state.state:
+                detector_state.active = active
+                detector_state.state = priority
+                updated_detector_states.append(detector_state)
+
+        if created_detector_states:
+            DetectorState.objects.bulk_create(created_detector_states)
+
+        if updated_detector_states:
+            DetectorState.objects.bulk_update(updated_detector_states, ["active", "state"])
+        self.state_updates.clear()
diff --git a/src/sentry/workflow_engine/migrations/0010_detector_state_unique_group.py b/src/sentry/workflow_engine/migrations/0010_detector_state_unique_group.py
index 51288a9ed8f74e..8d5a41873bbe77 100644
--- a/src/sentry/workflow_engine/migrations/0010_detector_state_unique_group.py
+++ b/src/sentry/workflow_engine/migrations/0010_detector_state_unique_group.py
@@ -21,6 +21,8 @@ class Migration(CheckedMigration):
 
     is_post_deployment = False
 
+    allow_run_sql = True
+
     dependencies = [
         ("workflow_engine", "0009_detector_type"),
     ]
diff --git a/src/sentry/workflow_engine/migrations/0013_related_name_conditions_on_dcg.py b/src/sentry/workflow_engine/migrations/0013_related_name_conditions_on_dcg.py
new file mode 100644
index 00000000000000..90c205e701e213
--- /dev/null
+++ b/src/sentry/workflow_engine/migrations/0013_related_name_conditions_on_dcg.py
@@ -0,0 +1,38 @@
+# Generated by Django 5.1.1 on 2024-11-15 03:05
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("workflow_engine", "0012_data_source_type_change"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="datacondition",
+            name="condition_group",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="conditions",
+                to="workflow_engine.dataconditiongroup",
+            ),
+        ),
+    ]
diff --git a/src/sentry/workflow_engine/migrations/0014_model_additions_for_milestones.py b/src/sentry/workflow_engine/migrations/0014_model_additions_for_milestones.py
new file mode 100644
index 00000000000000..00ab4ba74e3098
--- /dev/null
+++ b/src/sentry/workflow_engine/migrations/0014_model_additions_for_milestones.py
@@ -0,0 +1,120 @@
+# Generated by Django 5.1.1 on 2024-11-21 21:05
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import sentry.db.models.fields.foreignkey
+import sentry.db.models.fields.hybrid_cloud_foreign_key
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "0792_add_unique_index_apiauthorization"),
+        ("workflow_engine", "0013_related_name_conditions_on_dcg"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="detector",
+            name="config",
+            field=models.JSONField(db_default={}),
+        ),
+        migrations.AddField(
+            model_name="detector",
+            name="created_by_id",
+            field=sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                "sentry.User", db_index=True, null=True, on_delete="SET_NULL"
+            ),
+        ),
+        migrations.AddField(
+            model_name="detector",
+            name="description",
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name="detector",
+            name="enabled",
+            field=models.BooleanField(db_default=True),
+        ),
+        migrations.AddField(
+            model_name="detector",
+            name="project",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, to="sentry.project"
+            ),
+        ),
+        migrations.AddField(
+            model_name="workflow",
+            name="config",
+            field=models.JSONField(db_default={}),
+        ),
+        migrations.AddField(
+            model_name="workflow",
+            name="created_by_id",
+            field=sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                "sentry.User", db_index=True, null=True, on_delete="SET_NULL"
+            ),
+        ),
+        migrations.AddField(
+            model_name="workflow",
+            name="enabled",
+            field=models.BooleanField(db_default=True),
+        ),
+        migrations.AddField(
+            model_name="workflow",
+            name="environment",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, to="sentry.environment"
+            ),
+        ),
+        migrations.AddField(
+            model_name="workflow",
+            name="owner_team",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, to="sentry.team"
+            ),
+        ),
+        migrations.AddField(
+            model_name="workflow",
+            name="owner_user_id",
+            field=sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                "sentry.User", db_index=True, null=True, on_delete="SET_NULL"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="action",
+            name="required",
+            field=models.BooleanField(default=False, null=True),
+        ),
+        migrations.AlterField(
+            model_name="detector",
+            name="organization",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, to="sentry.organization"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="workflow",
+            name="when_condition_group",
+            field=sentry.db.models.fields.foreignkey.FlexibleForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="workflow_engine.dataconditiongroup",
+            ),
+        ),
+    ]
diff --git a/src/sentry/workflow_engine/models/action.py b/src/sentry/workflow_engine/models/action.py
index bd2e5e3694daf3..027ef5cf11c933 100644
--- a/src/sentry/workflow_engine/models/action.py
+++ b/src/sentry/workflow_engine/models/action.py
@@ -1,9 +1,19 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from django.db import models
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import DefaultFieldsModel, region_silo_model, sane_repr
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
-from sentry.models.notificationaction import ActionTarget
+from sentry.eventstore.models import GroupEvent
+from sentry.notifications.models.notificationaction import ActionTarget
+from sentry.workflow_engine.registry import action_handler_registry
+from sentry.workflow_engine.types import ActionHandler
+
+if TYPE_CHECKING:
+    from sentry.workflow_engine.models import Detector
 
 
 @region_silo_model
@@ -17,24 +27,19 @@ class Action(DefaultFieldsModel):
     """
 
     __relocation_scope__ = RelocationScope.Excluded
-    __repr__ = sane_repr("workflow_id", "type")
+    __repr__ = sane_repr("id", "type")
 
-    # TODO (@saponifi3d): Don't hardcode these values, and these are incomplete values
     class Type(models.TextChoices):
-        Notification = "SendNotificationAction"
-        TriggerWorkflow = "TriggerWorkflowAction"
-
-    """
-    Required actions cannot be disabled by the user, and will not be displayed in the UI.
-    These actions will be used internally, to trigger other aspects of the system.
-    For example, creating a new issue in the Issue Platform or a detector emitting an event.
-    """
-    required = models.BooleanField(default=False)
+        NOTIFICATION = "notification"
+        WEBHOOK = "webhook"
 
     # The type field is used to denote the type of action we want to trigger
     type = models.TextField(choices=Type.choices)
     data = models.JSONField(default=dict)
 
+    # TODO - finish removing this field
+    required = models.BooleanField(default=False, null=True)
+
     # LEGACY: The integration_id is used to map the integration_id found in the AlertRuleTriggerAction
     # This allows us to map the way we're saving the notification channels to the action.
     integration_id = HybridCloudForeignKey(
@@ -49,3 +54,12 @@ class Type(models.TextChoices):
 
     # LEGACY: This is used to denote if the Notification is going to a user, team, sentry app, etc
     target_type = models.SmallIntegerField(choices=ActionTarget.as_choices(), null=True)
+
+    def get_handler(self) -> ActionHandler:
+        action_type = Action.Type(self.type)
+        return action_handler_registry.get(action_type)
+
+    def trigger(self, evt: GroupEvent, detector: Detector) -> None:
+        # get the handler for the action type
+        handler = self.get_handler()
+        handler.execute(evt, self, detector)
diff --git a/src/sentry/workflow_engine/models/data_condition.py b/src/sentry/workflow_engine/models/data_condition.py
index a39ddc5d41646a..9ed3efc66c5c55 100644
--- a/src/sentry/workflow_engine/models/data_condition.py
+++ b/src/sentry/workflow_engine/models/data_condition.py
@@ -1,13 +1,20 @@
 import logging
 import operator
+from collections.abc import Callable
 from enum import StrEnum
+from typing import Any, TypeVar, cast
 
 from django.db import models
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import DefaultFieldsModel, region_silo_model, sane_repr
-from sentry.workflow_engine.models.data_condition_group import DataConditionGroup
-from sentry.workflow_engine.types import DataConditionResult, DetectorPriorityLevel
+from sentry.utils.registry import NoRegistrationExistsError
+from sentry.workflow_engine.registry import condition_handler_registry
+from sentry.workflow_engine.types import (
+    DataConditionHandler,
+    DataConditionResult,
+    DetectorPriorityLevel,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -19,6 +26,7 @@ class Condition(StrEnum):
     LESS_OR_EQUAL = "lte"
     LESS = "lt"
     NOT_EQUAL = "ne"
+    GROUP_EVENT_ATTR_COMPARISON = "group_event_attr_comparison"
 
 
 condition_ops = {
@@ -30,6 +38,8 @@ class Condition(StrEnum):
     Condition.NOT_EQUAL: operator.ne,
 }
 
+T = TypeVar("T")
+
 
 @region_silo_model
 class DataCondition(DefaultFieldsModel):
@@ -38,7 +48,7 @@ class DataCondition(DefaultFieldsModel):
     """
 
     __relocation_scope__ = RelocationScope.Organization
-    __repr__ = sane_repr("type", "condition")
+    __repr__ = sane_repr("type", "condition", "condition_group")
 
     # The condition is the logic condition that needs to be met, gt, lt, eq, etc.
     condition = models.CharField(max_length=200)
@@ -53,7 +63,8 @@ class DataCondition(DefaultFieldsModel):
     type = models.CharField(max_length=200)
 
     condition_group = models.ForeignKey(
-        DataConditionGroup,
+        "workflow_engine.DataConditionGroup",
+        related_name="conditions",
         on_delete=models.CASCADE,
     )
 
@@ -74,32 +85,44 @@ def get_condition_result(self) -> DataConditionResult:
 
         return None
 
-    def evaluate_value(self, value: float | int) -> DataConditionResult:
-        # TODO: This logic should be in a condition class that we get from `self.type`
-        # TODO: This evaluation logic should probably go into the condition class, and we just produce a condition
-        # class from this model
+    def get_condition_handler(self) -> DataConditionHandler[T] | None:
         try:
-            condition = Condition(self.condition)
+            condition_type = Condition(self.type)
         except ValueError:
-            logger.exception(
-                "Invalid condition", extra={"condition": self.condition, "id": self.id}
-            )
-            return None
+            # If the type isn't in the condition, then it won't be in the registry either.
+            raise NoRegistrationExistsError(f"No registration exists for {self.type}")
 
-        op = condition_ops.get(condition)
-        if op is None:
-            logger.error("Invalid condition", extra={"condition": self.condition, "id": self.id})
-            return None
+        return condition_handler_registry.get(condition_type)
+
+    def evaluate_value(self, value: T) -> DataConditionResult:
+        condition_handler: DataConditionHandler[T] | None = None
+        op: Callable | None = None
 
         try:
-            comparison = float(self.comparison)
-        except ValueError:
-            logger.exception(
-                "Invalid comparison value", extra={"comparison": self.comparison, "id": self.id}
+            # Use a custom hanler
+            condition_handler = self.get_condition_handler()
+        except NoRegistrationExistsError:
+            # If it's not a custom handler, use the default operators
+            condition = Condition(self.condition)
+            op = condition_ops.get(condition, None)
+
+        if condition_handler is not None:
+            result = condition_handler.evaluate_value(value, self.comparison, self.condition)
+        elif op is not None:
+            result = op(cast(Any, value), self.comparison)
+        else:
+            logger.error(
+                "Invalid Data Condition Evaluation",
+                extra={
+                    "id": self.id,
+                    "type": self.type,
+                    "condition": self.condition,
+                },
             )
+
             return None
 
-        if op(value, comparison):
+        if result:
             return self.get_condition_result()
 
         return None
diff --git a/src/sentry/workflow_engine/models/data_condition_group.py b/src/sentry/workflow_engine/models/data_condition_group.py
index 3e29aca4b5e69e..78c3177cffd2ad 100644
--- a/src/sentry/workflow_engine/models/data_condition_group.py
+++ b/src/sentry/workflow_engine/models/data_condition_group.py
@@ -1,7 +1,10 @@
+from typing import ClassVar, Self
+
 from django.db import models
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import DefaultFieldsModel, region_silo_model, sane_repr
+from sentry.db.models.manager.base import BaseManager
 
 
 @region_silo_model
@@ -10,12 +13,22 @@ class DataConditionGroup(DefaultFieldsModel):
     A data group is a way to specify a group of conditions that must be met for a workflow action to execute
     """
 
+    objects: ClassVar[BaseManager[Self]] = BaseManager(cache_fields=["id"])
+
     __relocation_scope__ = RelocationScope.Organization
     __repr__ = sane_repr("logic_type")
 
     class Type(models.TextChoices):
+        # ANY will evaluate all conditions, and return true if any of those are met
         ANY = "any"
+
+        # ANY_SHORT_CIRCUIT will stop evaluating conditions as soon as one is met
+        ANY_SHORT_CIRCUIT = "any-short"
+
+        # ALL will evaluate all conditions, and return true if all of those are met
         ALL = "all"
+
+        # NONE will return true if none of the conditions are met, will return false immediately if any are met
         NONE = "none"
 
     logic_type = models.CharField(max_length=200, choices=Type.choices, default=Type.ANY)
diff --git a/src/sentry/workflow_engine/models/detector.py b/src/sentry/workflow_engine/models/detector.py
index 8a17ee38e8ea56..c11a3851b608ce 100644
--- a/src/sentry/workflow_engine/models/detector.py
+++ b/src/sentry/workflow_engine/models/detector.py
@@ -4,26 +4,33 @@
 import logging
 from typing import TYPE_CHECKING, Any
 
+from django.conf import settings
 from django.db import models
 from django.db.models import UniqueConstraint
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import DefaultFieldsModel, FlexibleForeignKey, region_silo_model
+from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
 from sentry.issues import grouptype
 from sentry.issues.grouptype import GroupType
 from sentry.models.owner_base import OwnerModel
 
+from .json_config import JSONConfigBase
+
 if TYPE_CHECKING:
-    from sentry.workflow_engine.processors.detector import DetectorHandler
+    from sentry.workflow_engine.handlers.detector import DetectorHandler
 
 logger = logging.getLogger(__name__)
 
 
 @region_silo_model
-class Detector(DefaultFieldsModel, OwnerModel):
+class Detector(DefaultFieldsModel, OwnerModel, JSONConfigBase):
     __relocation_scope__ = RelocationScope.Organization
 
-    organization = FlexibleForeignKey("sentry.Organization")
+    # TODO - Finish removing this field
+    organization = FlexibleForeignKey("sentry.Organization", on_delete=models.CASCADE, null=True)
+
+    project = FlexibleForeignKey("sentry.Project", on_delete=models.CASCADE, null=True)
     name = models.CharField(max_length=200)
 
     # The data sources that the detector is watching
@@ -31,7 +38,12 @@ class Detector(DefaultFieldsModel, OwnerModel):
         "workflow_engine.DataSource", through="workflow_engine.DataSourceDetector"
     )
 
-    # The conditions that must be met for the detector to be considered 'active'
+    # If the detector is not enabled, it will not be evaluated. This is how we "snooze" a detector
+    enabled = models.BooleanField(db_default=True)
+
+    # Optionally set a description of the detector, this will be used in notifications
+    description = models.TextField(null=True)
+
     # This will emit an event for the workflow to process
     workflow_condition_group = FlexibleForeignKey(
         "workflow_engine.DataConditionGroup",
@@ -40,8 +52,18 @@ class Detector(DefaultFieldsModel, OwnerModel):
         unique=True,
         on_delete=models.SET_NULL,
     )
+
+    # The type of detector that is being used, this is used to determine the class
+    # to load for the detector
     type = models.CharField(max_length=200)
 
+    # The user that created the detector
+    created_by_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete="SET_NULL")
+
+    @property
+    def CONFIG_SCHEMA(self) -> dict[str, Any]:
+        raise NotImplementedError('Subclasses must define a "CONFIG_SCHEMA" attribute')
+
     class Meta(OwnerModel.Meta):
         constraints = OwnerModel.Meta.constraints + [
             UniqueConstraint(
@@ -50,11 +72,6 @@ class Meta(OwnerModel.Meta):
             )
         ]
 
-    @property
-    def project_id(self):
-        # XXX: Temporary property until we add `project_id` to the model.
-        return 1
-
     @property
     def group_type(self) -> builtins.type[GroupType] | None:
         return grouptype.registry.get_by_slug(self.type)
diff --git a/src/sentry/workflow_engine/models/json_config.py b/src/sentry/workflow_engine/models/json_config.py
new file mode 100644
index 00000000000000..1b353ccf18cbcb
--- /dev/null
+++ b/src/sentry/workflow_engine/models/json_config.py
@@ -0,0 +1,22 @@
+from abc import abstractproperty
+from typing import Any
+
+from django.db import models
+from jsonschema import ValidationError, validate
+
+
+class JSONConfigBase(models.Model):
+    config = models.JSONField(db_default={})
+
+    @abstractproperty
+    def CONFIG_SCHEMA(self) -> dict[str, Any]:
+        pass
+
+    def validate_config(self) -> None:
+        try:
+            validate(self.config, self.CONFIG_SCHEMA)
+        except ValidationError as e:
+            raise ValidationError(f"Invalid config: {e.message}")
+
+    class Meta:
+        abstract = True
diff --git a/src/sentry/workflow_engine/models/workflow.py b/src/sentry/workflow_engine/models/workflow.py
index 4cb8fde6721cf4..13483e258f1532 100644
--- a/src/sentry/workflow_engine/models/workflow.py
+++ b/src/sentry/workflow_engine/models/workflow.py
@@ -1,13 +1,20 @@
+from typing import Any
+
+from django.conf import settings
 from django.db import models
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import DefaultFieldsModel, FlexibleForeignKey, region_silo_model, sane_repr
+from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.eventstore.models import GroupEvent
+from sentry.models.owner_base import OwnerModel
+from sentry.workflow_engine.processors.data_condition_group import evaluate_condition_group
 
-from .data_condition_group import DataConditionGroup
+from .json_config import JSONConfigBase
 
 
 @region_silo_model
-class Workflow(DefaultFieldsModel):
+class Workflow(DefaultFieldsModel, OwnerModel, JSONConfigBase):
     """
     A workflow is a way to execute actions in a specified order.
     Workflows are initiated after detectors have been processed, driven by changes to their state.
@@ -17,8 +24,19 @@ class Workflow(DefaultFieldsModel):
     name = models.CharField(max_length=200)
     organization = FlexibleForeignKey("sentry.Organization")
 
+    # If the workflow is not enabled, it will not be evaluated / invoke actions. This is how we "snooze" a workflow
+    enabled = models.BooleanField(db_default=True)
+
     # Required as the 'when' condition for the workflow, this evalutes states emitted from the detectors
-    when_condition_group = FlexibleForeignKey(DataConditionGroup, blank=True, null=True)
+    when_condition_group = FlexibleForeignKey("workflow_engine.DataConditionGroup", null=True)
+
+    environment = FlexibleForeignKey("sentry.Environment", null=True)
+
+    created_by_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete="SET_NULL")
+
+    @property
+    def CONFIG_SCHEMA(self) -> dict[str, Any]:
+        raise NotImplementedError('Subclasses must define a "CONFIG_SCHEMA" attribute')
 
     __repr__ = sane_repr("name", "organization_id")
 
@@ -31,3 +49,14 @@ class Meta:
                 fields=["name", "organization"], name="unique_workflow_name_per_org"
             )
         ]
+
+    def evaluate_trigger_conditions(self, evt: GroupEvent) -> bool:
+        """
+        Evaluate the conditions for the workflow trigger and return if the evaluation was successful.
+        If there aren't any workflow trigger conditions, the workflow is considered triggered.
+        """
+        if self.when_condition_group is None:
+            return True
+
+        evaluation, _ = evaluate_condition_group(self.when_condition_group, evt)
+        return evaluation
diff --git a/src/sentry/workflow_engine/processors/action.py b/src/sentry/workflow_engine/processors/action.py
new file mode 100644
index 00000000000000..0e57ee44441aea
--- /dev/null
+++ b/src/sentry/workflow_engine/processors/action.py
@@ -0,0 +1,28 @@
+from sentry.db.models.manager.base_query_set import BaseQuerySet
+from sentry.eventstore.models import GroupEvent
+from sentry.workflow_engine.models import Action, DataConditionGroup, Workflow
+from sentry.workflow_engine.processors.data_condition_group import evaluate_condition_group
+
+
+def evaluate_workflow_action_filters(
+    workflows: set[Workflow], evt: GroupEvent
+) -> BaseQuerySet[Action]:
+    filtered_action_groups: set[DataConditionGroup] = set()
+
+    # gets the list of the workflow ids, and then get the workflow_data_condition_groups for those workflows
+    workflow_ids = {workflow.id for workflow in workflows}
+
+    action_conditions = DataConditionGroup.objects.filter(
+        workflowdataconditiongroup__workflow_id__in=workflow_ids
+    ).distinct()
+
+    for action_condition in action_conditions:
+        evaluation, result = evaluate_condition_group(action_condition, evt)
+
+        if evaluation:
+            filtered_action_groups.add(action_condition)
+
+    # get the actions for any of the triggered data condition groups
+    return Action.objects.filter(
+        dataconditiongroupaction__condition_group__in=filtered_action_groups
+    ).distinct()
diff --git a/src/sentry/workflow_engine/processors/data_condition_group.py b/src/sentry/workflow_engine/processors/data_condition_group.py
new file mode 100644
index 00000000000000..637e91c5a6b34d
--- /dev/null
+++ b/src/sentry/workflow_engine/processors/data_condition_group.py
@@ -0,0 +1,87 @@
+import logging
+from typing import Any, TypeVar
+
+from sentry.utils.function_cache import cache_func_for_models
+from sentry.workflow_engine.models import DataCondition, DataConditionGroup
+from sentry.workflow_engine.types import ProcessedDataConditionResult
+
+logger = logging.getLogger(__name__)
+
+T = TypeVar("T")
+
+
+@cache_func_for_models(
+    [(DataCondition, lambda condition: (condition.condition_group_id,))],
+    recalculate=False,
+)
+def get_data_conditions_for_group(data_condition_group_id: int) -> list[DataCondition]:
+    return list(DataCondition.objects.filter(condition_group_id=data_condition_group_id))
+
+
+def evaluate_condition_group(
+    data_condition_group: DataConditionGroup,
+    value: T,
+) -> ProcessedDataConditionResult:
+    """
+    Evaluate the conditions for a given group and value.
+    """
+    results = []
+    conditions = get_data_conditions_for_group(data_condition_group.id)
+
+    # TODO - @saponifi3d
+    # Split the conditions into fast and slow conditions
+    # Evaluate the fast conditions first, if any are met, return early
+    # Enqueue the slow conditions to be evaluated later
+
+    if len(conditions) == 0:
+        # if we don't have any conditions, always return True
+        return True, []
+
+    for condition in conditions:
+        evaluation_result = condition.evaluate_value(value)
+        is_condition_triggered = evaluation_result is not None
+
+        if is_condition_triggered:
+            # Check for short-circuiting evaluations
+            if data_condition_group.logic_type == data_condition_group.Type.ANY_SHORT_CIRCUIT:
+                return is_condition_triggered, [evaluation_result]
+
+            if data_condition_group.logic_type == data_condition_group.Type.NONE:
+                return False, []
+
+        results.append((is_condition_triggered, evaluation_result))
+
+    if data_condition_group.logic_type == data_condition_group.Type.NONE:
+        # if we get to this point, no conditions were met
+        return True, []
+    elif data_condition_group.logic_type == data_condition_group.Type.ANY:
+        is_any_condition_met = any([result[0] for result in results])
+
+        if is_any_condition_met:
+            condition_results = [result[1] for result in results if result[0]]
+            return is_any_condition_met, condition_results
+    elif data_condition_group.logic_type == data_condition_group.Type.ALL:
+        conditions_met = [result[0] for result in results]
+        is_all_conditions_met = all(conditions_met)
+
+        if is_all_conditions_met:
+            condition_results = [result[1] for result in results if result[0]]
+            return is_all_conditions_met, condition_results
+
+    return False, []
+
+
+def process_data_condition_group(
+    data_condition_group_id: int,
+    value: Any,
+) -> ProcessedDataConditionResult:
+    try:
+        group = DataConditionGroup.objects.get_from_cache(id=data_condition_group_id)
+    except DataConditionGroup.DoesNotExist:
+        logger.exception(
+            "DataConditionGroup does not exist",
+            extra={"id": data_condition_group_id},
+        )
+        return False, []
+
+    return evaluate_condition_group(group, value)
diff --git a/src/sentry/workflow_engine/processors/detector.py b/src/sentry/workflow_engine/processors/detector.py
index 995d31a949c185..60bb85e0988190 100644
--- a/src/sentry/workflow_engine/processors/detector.py
+++ b/src/sentry/workflow_engine/processors/detector.py
@@ -1,73 +1,27 @@
 from __future__ import annotations
 
-import abc
-import dataclasses
 import logging
-from datetime import timedelta
-from typing import Any, Generic, TypeVar
-
-from django.conf import settings
-from django.db.models import Q
-from sentry_redis_tools.retrying_cluster import RetryingRedisCluster
 
+from sentry.eventstore.models import GroupEvent
 from sentry.issues.issue_occurrence import IssueOccurrence
 from sentry.issues.producer import PayloadType, produce_occurrence_to_kafka
-from sentry.issues.status_change_message import StatusChangeMessage
-from sentry.models.group import GroupStatus
-from sentry.types.group import PriorityLevel
-from sentry.utils import metrics, redis
-from sentry.utils.function_cache import cache_func_for_models
-from sentry.utils.iterators import chunked
-from sentry.workflow_engine.models import (
-    DataCondition,
-    DataConditionGroup,
-    DataPacket,
-    Detector,
-    DetectorState,
-)
-from sentry.workflow_engine.types import DetectorGroupKey, DetectorPriorityLevel
+from sentry.workflow_engine.handlers.detector import DetectorEvaluationResult
+from sentry.workflow_engine.models import DataPacket, Detector
+from sentry.workflow_engine.types import DetectorGroupKey, DetectorType
 
 logger = logging.getLogger(__name__)
-REDIS_TTL = int(timedelta(days=7).total_seconds())
-
-
-@dataclasses.dataclass(frozen=True)
-class DetectorEvaluationResult:
-    group_key: DetectorGroupKey
-    # TODO: Are these actually necessary? We're going to produce the occurrence in the detector, so we probably don't
-    # need to know the other results externally
-    is_active: bool
-    priority: DetectorPriorityLevel
-    # TODO: This is only temporarily optional. We should always have a value here if returning a result
-    result: IssueOccurrence | StatusChangeMessage | None = None
-    # Event data to supplement the `IssueOccurrence`, if passed.
-    event_data: dict[str, Any] | None = None
-
-
-def process_detectors(
-    data_packet: DataPacket, detectors: list[Detector]
-) -> list[tuple[Detector, dict[DetectorGroupKey, DetectorEvaluationResult]]]:
-    results = []
-
-    for detector in detectors:
-        handler = detector.detector_handler
-
-        if not handler:
-            continue
 
-        detector_results = handler.evaluate(data_packet)
-
-        for result in detector_results.values():
-            if result.result is not None:
-                create_issue_occurrence_from_result(result)
 
-        if detector_results:
-            results.append((detector, detector_results))
+# TODO - cache these by evt.group_id? :thinking:
+def get_detector_by_event(evt: GroupEvent) -> Detector:
+    issue_occurrence = evt.occurrence
 
-        # Now that we've processed all results for this detector, commit any state changes
-        handler.commit_state_updates()
+    if issue_occurrence is None:
+        detector = Detector.objects.get(project_id=evt.project_id, type=DetectorType.ERROR)
+    else:
+        detector = Detector.objects.get(id=issue_occurrence.evidence_data.get("detector_id", None))
 
-    return results
+    return detector
 
 
 def create_issue_occurrence_from_result(result: DetectorEvaluationResult):
@@ -87,344 +41,30 @@ def create_issue_occurrence_from_result(result: DetectorEvaluationResult):
     )
 
 
-def get_redis_client() -> RetryingRedisCluster:
-    cluster_key = settings.SENTRY_WORKFLOW_ENGINE_REDIS_CLUSTER
-    return redis.redis_clusters.get(cluster_key)  # type: ignore[return-value]
-
-
-@dataclasses.dataclass(frozen=True)
-class DetectorStateData:
-    group_key: DetectorGroupKey
-    active: bool
-    status: DetectorPriorityLevel
-    # Stateful detectors always process data packets in order. Once we confirm that a data packet has been fully
-    # processed and all workflows have been done, this value will be used by the stateful detector to prevent
-    # reprocessing
-    dedupe_value: int
-    # Stateful detectors allow various counts to be tracked. We need to update these after we process workflows, so
-    # include the updates in the state.
-    # This dictionary is in the format {counter_name: counter_value, ...}
-    # If a counter value is `None` it means to unset the value
-    counter_updates: dict[str, int | None]
-
-
-T = TypeVar("T")
-
-
-class DetectorHandler(abc.ABC, Generic[T]):
-    def __init__(self, detector: Detector):
-        self.detector = detector
-        if detector.workflow_condition_group_id is not None:
-            results = get_data_group_conditions_and_group(detector.workflow_condition_group_id)
-            self.condition_group: DataConditionGroup | None = results[0]
-            self.conditions: list[DataCondition] = results[1]
-        else:
-            self.condition_group = None
-            self.conditions = []
-
-    @abc.abstractmethod
-    def evaluate(
-        self, data_packet: DataPacket[T]
-    ) -> dict[DetectorGroupKey, DetectorEvaluationResult]:
-        pass
-
-    def commit_state_updates(self):
-        pass
-
-
-class StatefulDetectorHandler(DetectorHandler[T], abc.ABC):
-    def __init__(self, detector: Detector):
-        super().__init__(detector)
-        self.dedupe_updates: dict[DetectorGroupKey, int] = {}
-        self.counter_updates: dict[DetectorGroupKey, dict[str, int | None]] = {}
-        self.state_updates: dict[DetectorGroupKey, tuple[bool, DetectorPriorityLevel]] = {}
-
-    @property
-    @abc.abstractmethod
-    def counter_names(self) -> list[str]:
-        """
-        The names of counters that this detector is going to keep track of.
-        """
-        pass
-
-    @abc.abstractmethod
-    def get_dedupe_value(self, data_packet: DataPacket[T]) -> int:
-        """
-        Extracts the deduplication value from a passed data packet.
-        TODO: This might belong on the `DataPacket` instead.
-        """
-        pass
-
-    @abc.abstractmethod
-    def get_group_key_values(self, data_packet: DataPacket[T]) -> dict[str, int]:
-        """
-        Extracts the values for all the group keys that exist in the given data packet,
-        and returns then as a dict keyed by group_key.
-        """
-        pass
-
-    @abc.abstractmethod
-    def build_occurrence_and_event_data(
-        self, group_key: DetectorGroupKey, value: int, new_status: PriorityLevel
-    ) -> tuple[IssueOccurrence, dict[str, Any]]:
-        pass
-
-    def build_fingerprint(self, group_key) -> list[str]:
-        """
-        Builds a fingerprint to uniquely identify a detected issue
-        """
-        return [f"{self.detector.id}{':' + group_key if group_key is not None else ''}"]
-
-    def get_state_data(
-        self, group_keys: list[DetectorGroupKey]
-    ) -> dict[DetectorGroupKey, DetectorStateData]:
-        """
-        Fetches state data associated with this detector for the associated `group_keys`.
-        Returns a dict keyed by each group_key with the fetched `DetectorStateData`.
-        If data isn't currently stored, falls back to default values.
-        """
-        group_key_detectors = self.bulk_get_detector_state(group_keys)
-        dedupe_keys = [self.build_dedupe_value_key(gk) for gk in group_keys]
-        pipeline = get_redis_client().pipeline()
-        for dk in dedupe_keys:
-            pipeline.get(dk)
-        group_key_dedupe_values = {
-            gk: int(dv) if dv else 0 for gk, dv in zip(group_keys, pipeline.execute())
-        }
-        pipeline.reset()
-        counter_updates = {}
-        if self.counter_names:
-            counter_keys = [
-                self.build_counter_value_key(gk, name)
-                for gk in group_keys
-                for name in self.counter_names
-            ]
-            for ck in counter_keys:
-                pipeline.get(ck)
-            vals = [int(val) if val is not None else val for val in pipeline.execute()]
-            counter_updates = {
-                gk: dict(zip(self.counter_names, values))
-                for gk, values in zip(group_keys, chunked(vals, len(self.counter_names)))
-            }
-
-        results = {}
-        for gk in group_keys:
-            detector_state = group_key_detectors.get(gk)
-            results[gk] = DetectorStateData(
-                group_key=gk,
-                active=detector_state.active if detector_state else False,
-                status=(
-                    DetectorPriorityLevel(int(detector_state.state))
-                    if detector_state
-                    else DetectorPriorityLevel.OK
-                ),
-                dedupe_value=group_key_dedupe_values[gk],
-                counter_updates=counter_updates[gk],
-            )
-        return results
-
-    def evaluate(
-        self, data_packet: DataPacket[T]
-    ) -> dict[DetectorGroupKey, DetectorEvaluationResult]:
-        """
-        Evaluates a given data packet and returns a list of `DetectorEvaluationResult`.
-        There will be one result for each group key result in the packet, unless the
-        evaluation is skipped due to various rules.
-        """
-        dedupe_value = self.get_dedupe_value(data_packet)
-        group_values = self.get_group_key_values(data_packet)
-        all_state_data = self.get_state_data(list(group_values.keys()))
-        results = {}
-        for group_key, group_value in group_values.items():
-            result = self.evaluate_group_key_value(
-                group_key, group_value, all_state_data[group_key], dedupe_value
-            )
-            if result:
-                results[result.group_key] = result
-        return results
-
-    def evaluate_group_key_value(
-        self,
-        group_key: DetectorGroupKey,
-        value: int,
-        state_data: DetectorStateData,
-        dedupe_value: int,
-    ) -> DetectorEvaluationResult | None:
-        """
-        Evaluates a value associated with a given `group_key` and returns a `DetectorEvaluationResult` with the results
-        and any state changes that need to be made.
-
-        Checks that we haven't already processed this datapacket for this group_key, and skips evaluation if we have.
-        """
-        if dedupe_value <= state_data.dedupe_value:
-            # TODO: Does it actually make more sense to just do this at the data packet level rather than the group
-            # key level?
-            metrics.incr("workflow_engine.detector.skipping_already_processed_update")
-            return None
-
-        self.enqueue_dedupe_update(group_key, dedupe_value)
-
-        if not self.condition_group:
-            metrics.incr("workflow_engine.detector.skipping_invalid_condition_group")
-            return None
-
-        new_status = DetectorPriorityLevel.OK
-
-        for condition in self.conditions:
-            # TODO: We need to handle tracking consecutive evaluations before emitting a result here. We're able to
-            # store these in `DetectorStateData.counter_updates`, but we don't have anywhere to set the required
-            # thresholds at the moment. Probably should be a field on the Detector? Could also be on the condition
-            # level, but usually we want to set this at a higher level.
-            evaluation = condition.evaluate_value(value)
-
-            # ensures that the result is a DetectorPriorityLevel, and then uses the highest priority
-            if isinstance(evaluation, DetectorPriorityLevel):
-                new_status = max(new_status, evaluation)
-
-        # TODO: We'll increment and change these later, but for now they don't change so just pass an empty dict
-        self.enqueue_counter_update(group_key, {})
-
-        if state_data.status != new_status:
-            is_active = new_status != DetectorPriorityLevel.OK
-            self.enqueue_state_update(group_key, is_active, new_status)
-            event_data = None
-            result: StatusChangeMessage | IssueOccurrence
-            if new_status == DetectorPriorityLevel.OK:
-                # If we've determined that we're now ok, we just want to resolve the issue
-                result = StatusChangeMessage(
-                    fingerprint=self.build_fingerprint(group_key),
-                    project_id=self.detector.project_id,
-                    new_status=GroupStatus.RESOLVED,
-                    new_substatus=None,
-                )
-            else:
-                result, event_data = self.build_occurrence_and_event_data(
-                    group_key, value, PriorityLevel(new_status)
-                )
-            return DetectorEvaluationResult(
-                group_key=group_key,
-                is_active=is_active,
-                priority=new_status,
-                result=result,
-                event_data=event_data,
-            )
-        return None
-
-    def enqueue_dedupe_update(self, group_key: DetectorGroupKey, dedupe_value: int):
-        self.dedupe_updates[group_key] = dedupe_value
-
-    def enqueue_counter_update(
-        self, group_key: DetectorGroupKey, counter_updates: dict[str, int | None]
-    ):
-        self.counter_updates[group_key] = counter_updates
-
-    def enqueue_state_update(
-        self, group_key: DetectorGroupKey, is_active: bool, priority: DetectorPriorityLevel
-    ):
-        self.state_updates[group_key] = (is_active, priority)
-
-    def build_dedupe_value_key(self, group_key: DetectorGroupKey) -> str:
-        if group_key is None:
-            group_key = ""
-        return f"{self.detector.id}:{group_key}:dedupe_value"
-
-    def build_counter_value_key(self, group_key: DetectorGroupKey, counter_name: str) -> str:
-        if group_key is None:
-            group_key = ""
-        return f"{self.detector.id}:{group_key}:{counter_name}"
-
-    def bulk_get_detector_state(
-        self, group_keys: list[DetectorGroupKey]
-    ) -> dict[DetectorGroupKey, DetectorState]:
-        """
-        Bulk fetches detector state for the passed `group_keys`. Returns a dict keyed by each
-        `group_key` with the fetched `DetectorStateData`.
-
-        If there's no `DetectorState` row for a `detector`/`group_key` pair then we'll exclude
-        the group_key from the returned dict.
-        """
-        # TODO: Cache this query (or individual fetches, then bulk fetch anything missing)
-        query_filter = Q(
-            detector_group_key__in=[group_key for group_key in group_keys if group_key is not None]
-        )
-        if None in group_keys:
-            query_filter |= Q(detector_group_key__isnull=True)
-
-        return {
-            detector_state.detector_group_key: detector_state
-            for detector_state in self.detector.detectorstate_set.filter(query_filter)
-        }
-
-    def commit_state_updates(self):
-        self._bulk_commit_detector_state()
-        self._bulk_commit_redis_state()
-
-    def _bulk_commit_redis_state(self):
-        pipeline = get_redis_client().pipeline()
-        if self.dedupe_updates:
-            for group_key, dedupe_value in self.dedupe_updates.items():
-                pipeline.set(self.build_dedupe_value_key(group_key), dedupe_value, ex=REDIS_TTL)
+# TODO - Add metrics / logging here
+def process_detectors(
+    data_packet: DataPacket, detectors: list[Detector]
+) -> list[tuple[Detector, dict[DetectorGroupKey, DetectorEvaluationResult]]]:
+    results = []
 
-        if self.counter_updates:
-            for group_key, counter_updates in self.counter_updates.items():
-                for counter_name, counter_value in counter_updates.items():
-                    key_name = self.build_counter_value_key(group_key, counter_name)
-                    if counter_value is None:
-                        pipeline.delete(key_name)
-                    else:
-                        pipeline.set(key_name, counter_value, ex=REDIS_TTL)
+    for detector in detectors:
+        handler = detector.detector_handler
 
-        pipeline.execute()
-        self.dedupe_updates.clear()
-        self.counter_updates.clear()
+        if not handler:
+            continue
 
-    def _bulk_commit_detector_state(self):
-        # TODO: We should already have these loaded from earlier, figure out how to cache and reuse
-        detector_state_lookup = self.bulk_get_detector_state(
-            [update for update in self.state_updates.keys()]
-        )
-        created_detector_states = []
-        updated_detector_states = []
-        for group_key, (active, priority) in self.state_updates.items():
-            detector_state = detector_state_lookup.get(group_key)
-            if not detector_state:
-                created_detector_states.append(
-                    DetectorState(
-                        detector_group_key=group_key,
-                        detector=self.detector,
-                        active=active,
-                        state=priority,
-                    )
-                )
-            elif active != detector_state.active or priority != detector_state.state:
-                detector_state.active = active
-                detector_state.state = priority
-                updated_detector_states.append(detector_state)
+        # TODO add metric here for detector processing
+        detector_results = handler.evaluate(data_packet)
 
-        if created_detector_states:
-            DetectorState.objects.bulk_create(created_detector_states)
+        for result in detector_results.values():
+            if result.result is not None:
+                create_issue_occurrence_from_result(result)
 
-        if updated_detector_states:
-            DetectorState.objects.bulk_update(updated_detector_states, ["active", "state"])
-        self.state_updates.clear()
+        if detector_results:
+            # TODO - Add metrics / logging here for successful result
+            results.append((detector, detector_results))
 
+        # Now that we've processed all results for this detector, commit any state changes
+        handler.commit_state_updates()
 
-@cache_func_for_models(
-    [
-        (DataConditionGroup, lambda group: (group.id,)),
-        (DataCondition, lambda condition: (condition.condition_group_id,)),
-    ],
-    # There shouldn't be stampedes to fetch this data, and we might update multiple `DataConditionGroup`s at the same
-    # time, so we'd prefer to avoid re-fetching this many times. Just bust the cache and re-fetch lazily.
-    recalculate=False,
-)
-def get_data_group_conditions_and_group(
-    data_condition_group_id: int,
-) -> tuple[DataConditionGroup | None, list[DataCondition]]:
-    try:
-        group = DataConditionGroup.objects.get(id=data_condition_group_id)
-        conditions = list(group.datacondition_set.all())
-    except DataConditionGroup.DoesNotExist:
-        group = None
-        conditions = []
-    return group, conditions
+    return results
diff --git a/src/sentry/workflow_engine/processors/workflow.py b/src/sentry/workflow_engine/processors/workflow.py
new file mode 100644
index 00000000000000..effc18173780a6
--- /dev/null
+++ b/src/sentry/workflow_engine/processors/workflow.py
@@ -0,0 +1,49 @@
+import logging
+
+import sentry_sdk
+
+from sentry.eventstore.models import GroupEvent
+from sentry.utils import metrics
+from sentry.workflow_engine.models import Detector, Workflow
+from sentry.workflow_engine.processors.action import evaluate_workflow_action_filters
+from sentry.workflow_engine.processors.detector import get_detector_by_event
+
+logger = logging.getLogger(__name__)
+
+
+def evaluate_workflow_triggers(workflows: set[Workflow], evt: GroupEvent) -> set[Workflow]:
+    triggered_workflows: set[Workflow] = set()
+
+    for workflow in workflows:
+        if workflow.evaluate_trigger_conditions(evt):
+            triggered_workflows.add(workflow)
+
+    return triggered_workflows
+
+
+def process_workflows(evt: GroupEvent) -> set[Workflow]:
+    """
+    This method will get the detector based on the event, and then gather the associated workflows.
+    Next, it will evaluate the "when" (or trigger) conditions for each workflow, if the conditions are met,
+    the workflow will be added to a unique list of triggered workflows.
+
+    Finally, each of the triggered workflows will have their actions evaluated and executed.
+    """
+    # Check to see if the GroupEvent has an issue occurrence
+    try:
+        detector = get_detector_by_event(evt)
+    except Detector.DoesNotExist:
+        metrics.incr("workflow_engine.process_workflows.error")
+        logger.exception("Detector not found for event", extra={"event_id": evt.event_id})
+        return set()
+
+    # Get the workflows, evaluate the when_condition_group, finally evaluate the actions for workflows that are triggered
+    workflows = set(Workflow.objects.filter(detectorworkflow__detector_id=detector.id).distinct())
+    triggered_workflows = evaluate_workflow_triggers(workflows, evt)
+    actions = evaluate_workflow_action_filters(triggered_workflows, evt)
+
+    with sentry_sdk.start_span(op="workflow_engine.process_workflows.trigger_actions"):
+        for action in actions:
+            action.trigger(evt, detector)
+
+    return triggered_workflows
diff --git a/src/sentry/workflow_engine/registry.py b/src/sentry/workflow_engine/registry.py
index 6b9a490ccde13f..2af6b070a1bcf8 100644
--- a/src/sentry/workflow_engine/registry.py
+++ b/src/sentry/workflow_engine/registry.py
@@ -1,4 +1,8 @@
+from typing import Any
+
 from sentry.utils.registry import Registry
-from sentry.workflow_engine.types import DataSourceTypeHandler
+from sentry.workflow_engine.types import ActionHandler, DataConditionHandler, DataSourceTypeHandler
 
 data_source_type_registry = Registry[type[DataSourceTypeHandler]]()
+condition_handler_registry = Registry[DataConditionHandler[Any]]()
+action_handler_registry = Registry[ActionHandler]()
diff --git a/src/sentry/workflow_engine/types.py b/src/sentry/workflow_engine/types.py
index bb41d772427e7e..50dc15a7010f22 100644
--- a/src/sentry/workflow_engine/types.py
+++ b/src/sentry/workflow_engine/types.py
@@ -1,10 +1,14 @@
 from __future__ import annotations
 
-from enum import IntEnum
-from typing import Generic, TypeVar
+from enum import IntEnum, StrEnum
+from typing import TYPE_CHECKING, Any, Generic, TypeVar
 
 from sentry.types.group import PriorityLevel
 
+if TYPE_CHECKING:
+    from sentry.eventstore.models import GroupEvent
+    from sentry.workflow_engine.models import Action, Detector
+
 T = TypeVar("T")
 
 
@@ -21,9 +25,26 @@ class DetectorPriorityLevel(IntEnum):
 DetectorGroupKey = str | None
 
 DataConditionResult = DetectorPriorityLevel | int | float | bool | None
+ProcessedDataConditionResult = tuple[bool, list[DataConditionResult]]
+
+
+class ActionHandler:
+    @staticmethod
+    def execute(group_event: GroupEvent, action: Action, detector: Detector) -> None:
+        raise NotImplementedError
 
 
 class DataSourceTypeHandler(Generic[T]):
     @staticmethod
     def bulk_get_query_object(data_sources) -> dict[int, T | None]:
         raise NotImplementedError
+
+
+class DataConditionHandler(Generic[T]):
+    @staticmethod
+    def evaluate_value(value: T, comparison: Any, condition: str) -> DataConditionResult:
+        raise NotImplementedError
+
+
+class DetectorType(StrEnum):
+    ERROR = "ErrorDetector"
diff --git a/static/app/actionCreators/dashboards.tsx b/static/app/actionCreators/dashboards.tsx
index 091381e7ac1b12..845fe1c8227db6 100644
--- a/static/app/actionCreators/dashboards.tsx
+++ b/static/app/actionCreators/dashboards.tsx
@@ -97,6 +97,36 @@ export function updateDashboardVisit(
   return promise;
 }
 
+export async function updateDashboardFavorite(
+  api: Client,
+  orgId: string,
+  dashboardId: string | string[],
+  isFavorited: boolean
+): Promise<void> {
+  try {
+    await api.requestPromise(
+      `/organizations/${orgId}/dashboards/${dashboardId}/favorite/`,
+      {
+        method: 'PUT',
+        data: {
+          isFavorited,
+        },
+      }
+    );
+  } catch (response) {
+    const errorResponse = response?.responseJSON ?? null;
+    if (errorResponse) {
+      const errors = flattenErrors(errorResponse, {});
+      addErrorMessage(errors[Object.keys(errors)[0]] as string);
+    } else if (isFavorited) {
+      addErrorMessage(t('Unable to favorite dashboard'));
+    } else {
+      addErrorMessage(t('Unable to unfavorite dashboard'));
+    }
+    throw response;
+  }
+}
+
 export function fetchDashboard(
   api: Client,
   orgId: string,
@@ -220,7 +250,7 @@ export function validateWidgetRequest(
 export function updateDashboardPermissions(
   api: Client,
   orgId: string,
-  dashboard: DashboardDetails
+  dashboard: DashboardDetails | DashboardListItem
 ): Promise<DashboardDetails> {
   const {permissions} = dashboard;
   const data = {
diff --git a/static/app/actionCreators/events.spec.tsx b/static/app/actionCreators/events.spec.tsx
index cc8123d8ae7e7e..54150c082eda5c 100644
--- a/static/app/actionCreators/events.spec.tsx
+++ b/static/app/actionCreators/events.spec.tsx
@@ -52,6 +52,27 @@ describe('Events ActionCreator', function () {
     );
   });
 
+  it('sets useRpc param', function () {
+    doEventsRequest(api, {
+      ...opts,
+      includePrevious: false,
+      period: '7d',
+      partial: true,
+      useRpc: true,
+    });
+
+    expect(mock).toHaveBeenLastCalledWith(
+      '/organizations/org-slug/events-stats/',
+      expect.objectContaining({
+        query: expect.objectContaining({
+          project: [parseInt(project.id, 10)],
+          environment: [],
+          statsPeriod: '7d',
+        }),
+      })
+    );
+  });
+
   it('requests events stats with relative period including previous period', function () {
     doEventsRequest(api, {
       ...opts,
diff --git a/static/app/actionCreators/events.tsx b/static/app/actionCreators/events.tsx
index 07c6961908909f..8f514dc09f7146 100644
--- a/static/app/actionCreators/events.tsx
+++ b/static/app/actionCreators/events.tsx
@@ -56,6 +56,7 @@ type Options = {
   start?: DateString;
   team?: Readonly<string | string[]>;
   topEvents?: number;
+  useRpc?: boolean;
   withoutZerofill?: boolean;
   yAxis?: string | string[];
 };
@@ -109,6 +110,7 @@ export const doEventsRequest = <IncludeAllArgsType extends boolean = false>(
     excludeOther,
     includeAllArgs,
     dataset,
+    useRpc,
   }: EventsStatsOptions<IncludeAllArgsType>
 ): IncludeAllArgsType extends true
   ? Promise<
@@ -137,6 +139,7 @@ export const doEventsRequest = <IncludeAllArgsType extends boolean = false>(
       referrer: referrer ? referrer : 'api.organization-event-stats',
       excludeOther: excludeOther ? '1' : undefined,
       dataset,
+      useRpc: useRpc ? '1' : undefined,
     }).filter(([, value]) => typeof value !== 'undefined')
   );
 
@@ -175,6 +178,7 @@ export type EventQuery = {
   referrer?: string;
   sort?: string | string[];
   team?: string | string[];
+  useRpc?: '1';
 };
 
 export type TagSegment = {
diff --git a/static/app/actionCreators/prompts.tsx b/static/app/actionCreators/prompts.tsx
index 081bf8377453d5..51a16f12459a65 100644
--- a/static/app/actionCreators/prompts.tsx
+++ b/static/app/actionCreators/prompts.tsx
@@ -2,6 +2,7 @@ import {useCallback} from 'react';
 
 import type {Client} from 'sentry/api';
 import type {Organization, OrganizationSummary} from 'sentry/types/organization';
+import {defined} from 'sentry/utils';
 import {promptIsDismissed} from 'sentry/utils/promptIsDismissed';
 import type {ApiQueryKey, UseApiQueryOptions} from 'sentry/utils/queryClient';
 import {setApiQueryData, useApiQuery, useQueryClient} from 'sentry/utils/queryClient';
@@ -41,7 +42,7 @@ type PromptCheckParams = {
    * The prompt feature name
    */
   feature: string | string[];
-  organization: OrganizationSummary;
+  organization: OrganizationSummary | null;
   /**
    * The numeric project ID as a string
    */
@@ -89,10 +90,10 @@ export async function promptsCheck(
 ): Promise<PromptData> {
   const query = {
     feature: params.feature,
-    organization_id: params.organization.id,
+    organization_id: params.organization?.id,
     ...(params.projectId === undefined ? {} : {project_id: params.projectId}),
   };
-  const url = `/organizations/${params.organization.slug}/prompts-activity/`;
+  const url = `/organizations/${params.organization?.slug}/prompts-activity/`;
   const response: PromptResponse = await api.requestPromise(url, {
     query,
   });
@@ -112,22 +113,23 @@ export const makePromptsCheckQueryKey = ({
   organization,
   projectId,
 }: PromptCheckParams): ApiQueryKey => {
-  const url = `/organizations/${organization.slug}/prompts-activity/`;
+  const url = `/organizations/${organization?.slug}/prompts-activity/`;
   return [
     url,
-    {query: {feature, organization_id: organization.id, project_id: projectId}},
+    {query: {feature, organization_id: organization?.id, project_id: projectId}},
   ];
 };
 
 export function usePromptsCheck(
   {feature, organization, projectId}: PromptCheckParams,
-  options: Partial<UseApiQueryOptions<PromptResponse>> = {}
+  {enabled = true, ...options}: Partial<UseApiQueryOptions<PromptResponse>> = {}
 ) {
   return useApiQuery<PromptResponse>(
     makePromptsCheckQueryKey({feature, organization, projectId}),
     {
       staleTime: 120000,
       retry: false,
+      enabled: defined(organization) && enabled,
       ...options,
     }
   );
@@ -141,7 +143,7 @@ export function usePrompt({
   options,
 }: {
   feature: string;
-  organization: Organization;
+  organization: Organization | null;
   daysToSnooze?: number;
   options?: Partial<UseApiQueryOptions<PromptResponse>>;
   projectId?: string;
@@ -150,18 +152,20 @@ export function usePrompt({
   const prompt = usePromptsCheck({feature, organization, projectId}, options);
   const queryClient = useQueryClient();
 
-  const isPromptDismissed =
-    prompt.isSuccess && prompt.data.data
-      ? promptIsDismissed(
-          {
-            dismissedTime: prompt.data.data.dismissed_ts,
-            snoozedTime: prompt.data.data.snoozed_ts,
-          },
-          daysToSnooze
-        )
-      : undefined;
+  const isPromptDismissed = prompt.isSuccess
+    ? promptIsDismissed(
+        {
+          dismissedTime: prompt.data?.data?.dismissed_ts,
+          snoozedTime: prompt.data?.data?.snoozed_ts,
+        },
+        daysToSnooze
+      )
+    : undefined;
 
   const dismissPrompt = useCallback(() => {
+    if (!organization) {
+      return;
+    }
     promptsUpdate(api, {
       organization,
       projectId,
@@ -189,6 +193,9 @@ export function usePrompt({
   }, [api, feature, organization, projectId, queryClient]);
 
   const snoozePrompt = useCallback(() => {
+    if (!organization) {
+      return;
+    }
     promptsUpdate(api, {
       organization,
       projectId,
@@ -216,6 +223,9 @@ export function usePrompt({
   }, [api, feature, organization, projectId, queryClient]);
 
   const showPrompt = useCallback(() => {
+    if (!organization) {
+      return;
+    }
     promptsUpdate(api, {
       organization,
       projectId,
diff --git a/static/app/actionCreators/release.spec.tsx b/static/app/actionCreators/release.spec.tsx
deleted file mode 100644
index e24d7511146729..00000000000000
--- a/static/app/actionCreators/release.spec.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import {getProjectRelease, getReleaseDeploys} from 'sentry/actionCreators/release';
-import ReleaseStore, {getReleaseStoreKey} from 'sentry/stores/releaseStore';
-
-describe('ReleaseActionCreator', function () {
-  const orgSlug = 'myOrg';
-  const projectSlug = 'myProject';
-  const releaseVersion = 'myRelease';
-  const releaseKey = getReleaseStoreKey(projectSlug, releaseVersion);
-
-  const api = new MockApiClient();
-  const mockData = {id: '1'};
-  let mockResponse: jest.Mock;
-
-  describe('getProjectRelease', () => {
-    const releaseUrl = `/projects/${orgSlug}/${projectSlug}/releases/${encodeURIComponent(
-      releaseVersion
-    )}/`;
-
-    beforeEach(() => {
-      MockApiClient.clearMockResponses();
-      mockResponse = MockApiClient.addMockResponse({
-        url: releaseUrl,
-        body: mockData,
-      });
-
-      ReleaseStore.reset();
-
-      jest.restoreAllMocks();
-      jest.spyOn(ReleaseStore, 'loadRelease');
-      jest.spyOn(ReleaseStore, 'loadReleaseSuccess');
-
-      // XXX(leedongwei): We cannot spy on ReleaseStore at all
-      // See repositories.spec.jsx beforeEach method for the reason
-    });
-
-    it('fetches a Release and emits actions', async () => {
-      getProjectRelease(api, {orgSlug, projectSlug, releaseVersion});
-      expect(ReleaseStore.loadRelease).toHaveBeenCalledWith(
-        orgSlug,
-        projectSlug,
-        releaseVersion
-      );
-      expect(ReleaseStore.loadReleaseSuccess).not.toHaveBeenCalled();
-
-      await tick(); // Run Store.loadRelease and fire Action.loadReleaseSuccess
-      await tick(); // Run Store.loadReleaseSuccess
-
-      expect(mockResponse).toHaveBeenCalledWith(releaseUrl, expect.anything());
-      expect(ReleaseStore.loadReleaseSuccess).toHaveBeenCalledWith(
-        projectSlug,
-        releaseVersion,
-        mockData
-      );
-
-      expect(ReleaseStore.state.release[releaseKey]).toEqual(mockData);
-      expect(ReleaseStore.state.releaseLoading[releaseKey]).toEqual(false);
-      expect(ReleaseStore.state.releaseError[releaseKey]).toEqual(undefined);
-    });
-
-    it('short-circuits the JS event loop when fetching Release', () => {
-      expect(ReleaseStore.state.releaseLoading[releaseKey]).toEqual(undefined);
-
-      getProjectRelease(api, {orgSlug, projectSlug, releaseVersion});
-      expect(ReleaseStore.loadRelease).toHaveBeenCalled();
-      // expect(ReleaseStore.loadRelease).not.toHaveBeenCalled(); // See above for comment on ReleaseStore
-      expect(ReleaseStore.state.releaseLoading[releaseKey]).toEqual(true);
-    });
-  });
-
-  describe('getReleaseDeploys', () => {
-    const deploysUrl = `/organizations/${orgSlug}/releases/${encodeURIComponent(
-      releaseVersion
-    )}/deploys/`;
-
-    beforeEach(() => {
-      MockApiClient.clearMockResponses();
-      mockResponse = MockApiClient.addMockResponse({
-        url: deploysUrl,
-        body: [mockData],
-      });
-
-      ReleaseStore.reset();
-
-      jest.restoreAllMocks();
-      jest.spyOn(ReleaseStore, 'loadDeploys');
-      jest.spyOn(ReleaseStore, 'loadDeploysSuccess');
-    });
-
-    it('fetch Deploys and emit an action', async () => {
-      getReleaseDeploys(api, {orgSlug, projectSlug, releaseVersion});
-      expect(ReleaseStore.loadDeploys).toHaveBeenCalledWith(
-        orgSlug,
-        projectSlug,
-        releaseVersion
-      );
-      expect(ReleaseStore.loadDeploysSuccess).not.toHaveBeenCalled();
-
-      await tick(); // Run Store.loadDeploys and fire Action.loadDeploysSuccess
-      await tick(); // Run Store.loadDeploysSuccess
-
-      expect(mockResponse).toHaveBeenCalledWith(deploysUrl, expect.anything());
-      expect(ReleaseStore.loadDeploysSuccess).toHaveBeenCalledWith(
-        projectSlug,
-        releaseVersion,
-        [mockData]
-      );
-
-      expect(ReleaseStore.state.deploys[releaseKey]).toEqual([mockData]);
-      expect(ReleaseStore.state.deploysLoading[releaseKey]).toEqual(false);
-      expect(ReleaseStore.state.deploysError[releaseKey]).toEqual(undefined);
-    });
-
-    it('short-circuits the JS event loop when fetching Deploys', () => {
-      expect(ReleaseStore.state.deploysLoading[releaseKey]).toEqual(undefined);
-
-      getReleaseDeploys(api, {orgSlug, projectSlug, releaseVersion});
-      expect(ReleaseStore.loadDeploys).toHaveBeenCalled();
-      // expect(ReleaseStore.loadDeploys).not.toHaveBeenCalled(); // See above for comment on ReleaseStore
-      expect(ReleaseStore.state.deploysLoading[releaseKey]).toEqual(true);
-    });
-  });
-});
diff --git a/static/app/actionCreators/release.tsx b/static/app/actionCreators/release.tsx
index d0974d6e5e43be..86d2839e4001c4 100644
--- a/static/app/actionCreators/release.tsx
+++ b/static/app/actionCreators/release.tsx
@@ -1,5 +1,3 @@
-import * as Sentry from '@sentry/react';
-
 import {
   addErrorMessage,
   addLoadingMessage,
@@ -7,8 +5,6 @@ import {
 } from 'sentry/actionCreators/indicator';
 import type {Client} from 'sentry/api';
 import {t} from 'sentry/locale';
-import ReleaseStore, {getReleaseStoreKey} from 'sentry/stores/releaseStore';
-import type {Deploy, Release} from 'sentry/types/release';
 import {ReleaseStatus} from 'sentry/types/release';
 
 type ParamsGet = {
@@ -17,80 +13,9 @@ type ParamsGet = {
   releaseVersion: string;
 };
 
-export function getProjectRelease(api: Client, params: ParamsGet) {
-  const {orgSlug, projectSlug, releaseVersion} = params;
-  const path = `/projects/${orgSlug}/${projectSlug}/releases/${encodeURIComponent(
-    releaseVersion
-  )}/`;
-  // HACK(leedongwei): Actions fired by the ActionCreators are queued to
-  // the back of the event loop, allowing another getRelease for the same
-  // release to be fired before the loading state is updated in store.
-  // This hack short-circuits that and update the state immediately.
-  ReleaseStore.state.releaseLoading[getReleaseStoreKey(projectSlug, releaseVersion)] =
-    true;
-  ReleaseStore.loadRelease(orgSlug, projectSlug, releaseVersion);
-
-  return api
-    .requestPromise(path, {
-      method: 'GET',
-    })
-    .then((res: Release) => {
-      ReleaseStore.loadReleaseSuccess(projectSlug, releaseVersion, res);
-    })
-    .catch(err => {
-      // This happens when a Project is not linked to a specific Release
-      if (err.status === 404) {
-        ReleaseStore.loadReleaseSuccess(projectSlug, releaseVersion, null);
-        return;
-      }
-
-      ReleaseStore.loadReleaseError(projectSlug, releaseVersion, err);
-      Sentry.withScope(scope => {
-        scope.setLevel('warning');
-        scope.setFingerprint(['getRelease-action-creator']);
-        Sentry.captureException(err);
-      });
-    });
-}
-
-export function getReleaseDeploys(api: Client, params: ParamsGet) {
-  const {orgSlug, projectSlug, releaseVersion} = params;
-  const path = `/organizations/${orgSlug}/releases/${encodeURIComponent(
-    releaseVersion
-  )}/deploys/`;
-
-  // HACK(leedongwei): Same as above
-  ReleaseStore.state.deploysLoading[getReleaseStoreKey(projectSlug, releaseVersion)] =
-    true;
-  ReleaseStore.loadDeploys(orgSlug, projectSlug, releaseVersion);
-
-  return api
-    .requestPromise(path, {
-      method: 'GET',
-    })
-    .then((res: Deploy[]) => {
-      ReleaseStore.loadDeploysSuccess(projectSlug, releaseVersion, res);
-    })
-    .catch(err => {
-      // This happens when a Project is not linked to a specific Release
-      if (err.status === 404) {
-        ReleaseStore.loadDeploysSuccess(projectSlug, releaseVersion, null);
-        return;
-      }
-
-      ReleaseStore.loadDeploysError(projectSlug, releaseVersion, err);
-      Sentry.withScope(scope => {
-        scope.setLevel('warning');
-        scope.setFingerprint(['getReleaseDeploys-action-creator']);
-        Sentry.captureException(err);
-      });
-    });
-}
-
 export function archiveRelease(api: Client, params: ParamsGet) {
-  const {orgSlug, projectSlug, releaseVersion} = params;
+  const {orgSlug, releaseVersion} = params;
 
-  ReleaseStore.loadRelease(orgSlug, projectSlug, releaseVersion);
   addLoadingMessage(t('Archiving Release\u2026'));
 
   return api
@@ -102,12 +27,10 @@ export function archiveRelease(api: Client, params: ParamsGet) {
         version: releaseVersion,
       },
     })
-    .then((release: Release) => {
-      ReleaseStore.loadReleaseSuccess(projectSlug, releaseVersion, release);
+    .then(() => {
       addSuccessMessage(t('Release was successfully archived.'));
     })
     .catch(error => {
-      ReleaseStore.loadReleaseError(projectSlug, releaseVersion, error);
       addErrorMessage(
         error.responseJSON?.detail ?? t('Release could not be be archived.')
       );
@@ -116,9 +39,8 @@ export function archiveRelease(api: Client, params: ParamsGet) {
 }
 
 export function restoreRelease(api: Client, params: ParamsGet) {
-  const {orgSlug, projectSlug, releaseVersion} = params;
+  const {orgSlug, releaseVersion} = params;
 
-  ReleaseStore.loadRelease(orgSlug, projectSlug, releaseVersion);
   addLoadingMessage(t('Restoring Release\u2026'));
 
   return api
@@ -130,12 +52,10 @@ export function restoreRelease(api: Client, params: ParamsGet) {
         version: releaseVersion,
       },
     })
-    .then((release: Release) => {
-      ReleaseStore.loadReleaseSuccess(projectSlug, releaseVersion, release);
+    .then(() => {
       addSuccessMessage(t('Release was successfully restored.'));
     })
     .catch(error => {
-      ReleaseStore.loadReleaseError(projectSlug, releaseVersion, error);
       addErrorMessage(
         error.responseJSON?.detail ?? t('Release could not be be restored.')
       );
diff --git a/static/app/bootstrap/processInitQueue.tsx b/static/app/bootstrap/processInitQueue.tsx
index dd793d47fd4c6a..f85212d1803d12 100644
--- a/static/app/bootstrap/processInitQueue.tsx
+++ b/static/app/bootstrap/processInitQueue.tsx
@@ -1,3 +1,6 @@
+import {createRoot} from 'react-dom/client';
+import throttle from 'lodash/throttle';
+
 import {exportedGlobals} from 'sentry/bootstrap/exportGlobals';
 import type {OnSentryInitConfiguration} from 'sentry/types/system';
 import {SentryInitRenderReactComponent} from 'sentry/types/system';
@@ -32,15 +35,23 @@ async function processItem(initConfig: OnSentryInitConfiguration) {
     if (!input || !element) {
       return;
     }
+    const inputElem = document.querySelector(input);
+    const rootEl = document.querySelector(element);
+    if (!inputElem || !rootEl) {
+      return;
+    }
 
-    const passwordStrength = await import(
+    const {PasswordStrength} = await import(
       /* webpackChunkName: "PasswordStrength" */ 'sentry/components/passwordStrength'
     );
 
-    passwordStrength.attachTo({
-      input: document.querySelector(input),
-      element: document.querySelector(element),
-    });
+    const root = createRoot(rootEl);
+    inputElem.addEventListener(
+      'input',
+      throttle(e => {
+        root.render(<PasswordStrength value={e.target.value} />);
+      })
+    );
 
     return;
   }
diff --git a/static/app/components/activity/note/inputWithStorage.tsx b/static/app/components/activity/note/inputWithStorage.tsx
index b828e14b03ec8e..cef5b960a8eb1c 100644
--- a/static/app/components/activity/note/inputWithStorage.tsx
+++ b/static/app/components/activity/note/inputWithStorage.tsx
@@ -6,7 +6,7 @@ import {NoteInput} from 'sentry/components/activity/note/input';
 import type {MentionChangeEvent} from 'sentry/components/activity/note/types';
 import type {NoteType} from 'sentry/types/alerts';
 import localStorage from 'sentry/utils/localStorage';
-import {StreamlinedNoteInput} from 'sentry/views/issueDetails/streamline/note';
+import {StreamlinedNoteInput} from 'sentry/views/issueDetails/streamline/sidebar/note';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
 type InputProps = React.ComponentProps<typeof NoteInput>;
@@ -14,6 +14,7 @@ type InputProps = React.ComponentProps<typeof NoteInput>;
 type Props = {
   itemKey: string;
   storageKey: string;
+  onCancel?: () => void;
   onLoad?: (data: string) => string;
   onSave?: (data: string) => string;
   source?: string;
@@ -145,6 +146,7 @@ function NoteInputWithStorage({
         placeholder={props.placeholder}
         noteId={props.noteId}
         onUpdate={props.onUpdate}
+        onCancel={props.onCancel}
       />
     );
   }
diff --git a/static/app/components/ai/SeerIcon.tsx b/static/app/components/ai/SeerIcon.tsx
new file mode 100644
index 00000000000000..13f272ec4355cd
--- /dev/null
+++ b/static/app/components/ai/SeerIcon.tsx
@@ -0,0 +1,35 @@
+import {forwardRef} from 'react';
+import styled from '@emotion/styled';
+
+import type {SVGIconProps} from 'sentry/icons/svgIcon';
+import {SvgIcon} from 'sentry/icons/svgIcon';
+
+const SeerIcon = forwardRef<SVGSVGElement, SVGIconProps>((props, ref) => {
+  return (
+    <SvgIcon {...props} ref={ref} viewBox="0 0 30 30">
+      <StyledPath d="M14.0407,3.1458L3.5742,17.0376c-.2989.3967-.2327.9584.1501,1.2748l10.4917,8.6705c.3436.284.8405.2838,1.1839-.0005l10.4717-8.6691c.3827-.3169.4483-.8788.1488-1.2753L15.5235,3.1448c-.3719-.4922-1.1115-.4917-1.4828.001Z" />
+      <StyledPath d="M14.1483,12.3135l-5.1122,4.0552c-.3332.2643-.314.6812.0426.9278l5.1121,3.5339c.3337.2307.8482.2312,1.1828.0012l5.1412-3.534c.359-.2468.3782-.6657.0427-.9303l-5.1411-4.0551c-.3449-.272-.9243-.2714-1.2682.0013Z" />
+      <StyledLine x1="14.7558" y1="15.9343" x2="14.7558" y2="17.2053" />
+    </SvgIcon>
+  );
+});
+
+SeerIcon.displayName = 'SeerIcon';
+
+export {SeerIcon};
+
+const StyledPath = styled('path')`
+  fill: none;
+  stroke: currentColor;
+  stroke-linecap: round;
+  stroke-linejoin: round;
+  stroke-width: 2.25px;
+`;
+
+const StyledLine = styled('line')`
+  fill: none;
+  stroke: currentColor;
+  stroke-linecap: round;
+  stroke-linejoin: round;
+  stroke-width: 2.25px;
+`;
diff --git a/static/app/components/assigneeSelectorDropdown.tsx b/static/app/components/assigneeSelectorDropdown.tsx
index 476271fb237d55..62ccdd19f9a339 100644
--- a/static/app/components/assigneeSelectorDropdown.tsx
+++ b/static/app/components/assigneeSelectorDropdown.tsx
@@ -68,6 +68,10 @@ export interface AssigneeSelectorDropdownProps {
    * If true, there will be a loading indicator in the menu header.
    */
   loading: boolean;
+  /**
+   * Additional items to render in the menu footer
+   */
+  additionalMenuFooterItems?: React.ReactNode;
   /**
    * Additional styles to apply to the dropdown
    */
@@ -213,6 +217,7 @@ export default function AssigneeSelectorDropdown({
   owners,
   sizeLimit = 150,
   trigger,
+  additionalMenuFooterItems,
 }: AssigneeSelectorDropdownProps) {
   const memberLists = useLegacyStore(MemberListStore);
   const sessionUser = useUser();
@@ -536,18 +541,21 @@ export default function AssigneeSelectorDropdown({
   };
 
   const footerInviteButton = (
-    <Button
-      size="xs"
-      aria-label={t('Invite Member')}
-      disabled={loading}
-      onClick={(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
-        event.preventDefault();
-        openInviteMembersModal({source: 'assignee_selector'});
-      }}
-      icon={<IconAdd isCircled />}
-    >
-      {t('Invite Member')}
-    </Button>
+    <FooterWrapper>
+      <Button
+        size="xs"
+        aria-label={t('Invite Member')}
+        disabled={loading}
+        onClick={(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
+          event.preventDefault();
+          openInviteMembersModal({source: 'assignee_selector'});
+        }}
+        icon={<IconAdd isCircled />}
+      >
+        {t('Invite Member')}
+      </Button>
+      {additionalMenuFooterItems}
+    </FooterWrapper>
   );
 
   return (
@@ -611,3 +619,9 @@ const TooltipSubExternalLink = styled(ExternalLink)`
 const TooltipSubtext = styled('div')`
   color: ${p => p.theme.subText};
 `;
+
+const FooterWrapper = styled('div')`
+  display: flex;
+  gap: ${space(1)};
+  align-items: center;
+`;
diff --git a/static/app/components/assistant/getGuidesContent.tsx b/static/app/components/assistant/getGuidesContent.tsx
index 63d10fb873058c..a49fadbc6f25d0 100644
--- a/static/app/components/assistant/getGuidesContent.tsx
+++ b/static/app/components/assistant/getGuidesContent.tsx
@@ -359,7 +359,7 @@ function getDemoModeGuides(): GuidesContent {
       requiredTargets: ['release_version'],
       steps: [
         {
-          title: t('Release-specfic trends'),
+          title: t('Release-specific trends'),
           target: 'release_version',
           description: t(
             `Select the latest release to review new and regressed issues, and business critical metrics like crash rate, and user adoption.`
diff --git a/static/app/components/avatar/avatarList.tsx b/static/app/components/avatar/avatarList.tsx
index e397f51a9927c6..df9932016668b3 100644
--- a/static/app/components/avatar/avatarList.tsx
+++ b/static/app/components/avatar/avatarList.tsx
@@ -1,11 +1,12 @@
 import {forwardRef} from 'react';
-import {css} from '@emotion/react';
+import {css, type Theme} from '@emotion/react';
 import styled from '@emotion/styled';
 
 import TeamAvatar from 'sentry/components/avatar/teamAvatar';
 import UserAvatar from 'sentry/components/avatar/userAvatar';
 import {Tooltip} from 'sentry/components/tooltip';
 import {space} from 'sentry/styles/space';
+import type {Actor} from 'sentry/types/core';
 import type {Team} from 'sentry/types/organization';
 import type {AvatarUser} from 'sentry/types/user';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
@@ -17,10 +18,11 @@ type Props = {
   className?: string;
   maxVisibleAvatars?: number;
   renderTooltip?: UserAvatarProps['renderTooltip'];
+  renderUsersFirst?: boolean;
   teams?: Team[];
   tooltipOptions?: UserAvatarProps['tooltipOptions'];
   typeAvatars?: string;
-  users?: AvatarUser[];
+  users?: Array<Actor | AvatarUser>;
 };
 
 const CollapsedAvatars = forwardRef(function CollapsedAvatars(
@@ -51,6 +53,7 @@ function AvatarList({
   className,
   users = [],
   teams = [],
+  renderUsersFirst = false,
   renderTooltip,
 }: Props) {
   const numTeams = teams.length;
@@ -87,25 +90,48 @@ function AvatarList({
           </CollapsedAvatars>
         </Tooltip>
       )}
-      {visibleUserAvatars.map(user => (
-        <StyledUserAvatar
-          key={`${user.id}-${user.email}`}
-          user={user}
-          size={avatarSize}
-          renderTooltip={renderTooltip}
-          tooltipOptions={tooltipOptions}
-          hasTooltip
-        />
-      ))}
-      {visibleTeamAvatars.map(team => (
-        <StyledTeamAvatar
-          key={`${team.id}-${team.name}`}
-          team={team}
-          size={avatarSize}
-          tooltipOptions={tooltipOptions}
-          hasTooltip
-        />
-      ))}
+
+      {renderUsersFirst
+        ? visibleTeamAvatars.map(team => (
+            <StyledTeamAvatar
+              key={`${team.id}-${team.name}`}
+              team={team}
+              size={avatarSize}
+              tooltipOptions={tooltipOptions}
+              hasTooltip
+            />
+          ))
+        : visibleUserAvatars.map(user => (
+            <StyledUserAvatar
+              key={user.id}
+              user={user}
+              size={avatarSize}
+              tooltipOptions={tooltipOptions}
+              renderTooltip={renderTooltip}
+              hasTooltip
+            />
+          ))}
+
+      {!renderUsersFirst
+        ? visibleTeamAvatars.map(team => (
+            <StyledTeamAvatar
+              key={`${team.id}-${team.name}`}
+              team={team}
+              size={avatarSize}
+              tooltipOptions={tooltipOptions}
+              hasTooltip
+            />
+          ))
+        : visibleUserAvatars.map(user => (
+            <StyledUserAvatar
+              key={user.id}
+              user={user}
+              size={avatarSize}
+              tooltipOptions={tooltipOptions}
+              renderTooltip={renderTooltip}
+              hasTooltip
+            />
+          ))}
     </AvatarListWrapper>
   );
 }
@@ -119,7 +145,7 @@ export const AvatarListWrapper = styled('div')`
   flex-direction: row-reverse;
 `;
 
-const AvatarStyle = p => css`
+const AvatarStyle = (p: {theme: Theme}) => css`
   border: 2px solid ${p.theme.background};
   margin-left: -8px;
   cursor: default;
diff --git a/static/app/components/avatar/baseAvatar.tsx b/static/app/components/avatar/baseAvatar.tsx
index 0b73327b1a4fd0..22d015700cb4b0 100644
--- a/static/app/components/avatar/baseAvatar.tsx
+++ b/static/app/components/avatar/baseAvatar.tsx
@@ -130,6 +130,7 @@ function BaseAvatar({
       suggested={!!suggested}
       style={{...sizeStyle, ...style}}
       title={title}
+      hasTooltip={hasTooltip}
       {...props}
     >
       {hasError ? backup : imageAvatar}
@@ -150,6 +151,7 @@ export {BaseAvatar, type BaseAvatarProps};
 // Note: Avatar will not always be a child of a flex layout, but this seems like a
 // sensible default.
 const StyledBaseAvatar = styled('span')<{
+  hasTooltip: boolean;
   round: boolean;
   suggested: boolean;
 }>`
@@ -157,6 +159,9 @@ const StyledBaseAvatar = styled('span')<{
   border-radius: ${p => (p.round ? '50%' : '3px')};
   border: ${p => (p.suggested ? `1px dashed ${p.theme.subText}` : 'none')};
   background-color: ${p => (p.suggested ? p.theme.background : 'none')};
+  :hover {
+    pointer-events: ${p => (p.hasTooltip ? 'none' : 'auto')};
+  }
 `;
 
 const ImageAvatar = styled('img')<ImageStyleProps>`
diff --git a/static/app/components/badge/deployBadge.spec.tsx b/static/app/components/badge/deployBadge.spec.tsx
index 59eb59631ed1ac..74178731e69f5e 100644
--- a/static/app/components/badge/deployBadge.spec.tsx
+++ b/static/app/components/badge/deployBadge.spec.tsx
@@ -1,19 +1,12 @@
+import {DeployFixture} from 'sentry-fixture/deploy';
+
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import DeployBadge from 'sentry/components/badge/deployBadge';
-import type {Deploy} from 'sentry/types/release';
-
-const deploy: Deploy = {
-  name: '85fedddce5a61a58b160fa6b3d6a1a8451e94eb9 to prod',
-  url: '',
-  environment: 'production',
-  dateStarted: '2020-05-11T18:12:00.025928Z',
-  dateFinished: '2020-05-11T18:12:00.025928Z',
-  version: '4.2.0',
-  id: '6348842',
-};
 
 describe('DeployBadge', () => {
+  const deploy = DeployFixture();
+
   it('renders with link', () => {
     const projectId = 1;
     render(
diff --git a/static/app/components/charts/eventsRequest.spec.tsx b/static/app/components/charts/eventsRequest.spec.tsx
index 9449e67436ac81..b21207bdc9455c 100644
--- a/static/app/components/charts/eventsRequest.spec.tsx
+++ b/static/app/components/charts/eventsRequest.spec.tsx
@@ -72,6 +72,21 @@ describe('EventsRequest', function () {
       expect(doEventsRequest).toHaveBeenCalled();
     });
 
+    it('sets use RPC param', async function () {
+      render(
+        <EventsRequest {...DEFAULTS} useRpc>
+          {mock}
+        </EventsRequest>
+      );
+      await waitFor(() => expect(doEventsRequest).toHaveBeenCalledTimes(1));
+      expect(doEventsRequest).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          useRpc: true,
+        })
+      );
+    });
+
     it('makes a new request if projects prop changes', async function () {
       const {rerender} = render(<EventsRequest {...DEFAULTS}>{mock}</EventsRequest>);
       (doEventsRequest as jest.Mock).mockClear();
diff --git a/static/app/components/charts/eventsRequest.tsx b/static/app/components/charts/eventsRequest.tsx
index 581123181cad71..2462b5251c5793 100644
--- a/static/app/components/charts/eventsRequest.tsx
+++ b/static/app/components/charts/eventsRequest.tsx
@@ -216,6 +216,10 @@ type EventsRequestPartialProps = {
    * This is a temporary flag to allow us to test on demand metrics
    */
   useOnDemandMetrics?: boolean;
+  /**
+   * Whether or not to use RPCs instead of SnQL requests in the backend.
+   */
+  useRpc?: boolean;
   /**
    * Whether or not to zerofill results
    */
diff --git a/static/app/components/devtoolbar/components/featureFlags/customOverride.tsx b/static/app/components/devtoolbar/components/featureFlags/customOverride.tsx
index 6b60507f2efa2e..8b06cf74e6d3dd 100644
--- a/static/app/components/devtoolbar/components/featureFlags/customOverride.tsx
+++ b/static/app/components/devtoolbar/components/featureFlags/customOverride.tsx
@@ -1,6 +1,7 @@
 import {useContext, useState} from 'react';
+import {css} from '@emotion/react';
 
-import {Button} from 'sentry/components/button';
+import {resetButtonCss} from 'sentry/components/devtoolbar/styles/reset';
 import Input from 'sentry/components/input';
 import Switch from 'sentry/components/switchButton';
 import {IconAdd} from 'sentry/icons';
@@ -59,9 +60,18 @@ export default function CustomOverride({
         }}
         css={{background: 'white'}}
       />
-      <Button size="xs" type="submit" css={{width: '28px'}} disabled={!name.length}>
+      <button
+        type="submit"
+        css={[
+          resetButtonCss,
+          css`
+            width: 28px;
+          `,
+        ]}
+        disabled={!name.length}
+      >
         <IconAdd />
-      </Button>
+      </button>
     </form>
   );
 }
diff --git a/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx b/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx
index 234a0d20432b3c..205425bcfb35ab 100644
--- a/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx
+++ b/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx
@@ -1,6 +1,6 @@
 import {type Dispatch, Fragment, type SetStateAction, useState} from 'react';
+import {css} from '@emotion/react';
 
-import {Button} from 'sentry/components/button';
 import {resetButtonCss, resetFlexRowCss} from 'sentry/components/devtoolbar/styles/reset';
 import Input from 'sentry/components/input';
 import {PanelTable} from 'sentry/components/panels/panelTable';
@@ -203,9 +203,13 @@ function FlagTable({prefilter, searchTerm}: {prefilter: Prefilter; searchTerm: s
             {display: 'block', textAlign: 'center'},
           ]}
         >
-          <Button
-            size="xs"
-            css={{width: '100%'}}
+          <button
+            css={[
+              resetButtonCss,
+              css`
+                width: 100%;
+              `,
+            ]}
             onClick={() => {
               clearOverrides();
             }}
@@ -222,7 +226,7 @@ function FlagTable({prefilter, searchTerm}: {prefilter: Prefilter; searchTerm: s
             >
               <IconClose isCircled size="xs" /> Remove All
             </span>
-          </Button>
+          </button>
         </div>
       )}
     </span>
diff --git a/static/app/components/events/aiSuggestedSolution/banner.tsx b/static/app/components/events/aiSuggestedSolution/banner.tsx
deleted file mode 100644
index c1b2818e29ea46..00000000000000
--- a/static/app/components/events/aiSuggestedSolution/banner.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import styled from '@emotion/styled';
-
-import bannerBackground from 'sentry-images/spot/ai-suggestion-banner-background.svg';
-import bannerSentaur from 'sentry-images/spot/ai-suggestion-banner-sentaur.svg';
-import bannerStars from 'sentry-images/spot/ai-suggestion-banner-stars.svg';
-
-import {Button} from 'sentry/components/button';
-import ExternalLink from 'sentry/components/links/externalLink';
-import Panel from 'sentry/components/panels/panel';
-import PanelBody from 'sentry/components/panels/panelBody';
-import QuestionTooltip from 'sentry/components/questionTooltip';
-import {t, tct} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import TextBlock from 'sentry/views/settings/components/text/textBlock';
-
-import {ExperimentalFeatureBadge} from './experimentalFeatureBadge';
-
-type Props = {
-  onViewSuggestion: () => void;
-};
-
-export function Banner({onViewSuggestion}: Props) {
-  return (
-    <Wrapper>
-      <Body withPadding>
-        <div>
-          <Title>
-            {t('AI Solutions')}
-            <MoreInfoTooltip
-              isHoverable
-              size="sm"
-              title={tct(
-                'This is an OpenAI generated solution that suggests a fix for this issue. Be aware that this may not be accurate. [learnMore:Learn more]',
-                {
-                  learnMore: (
-                    <ExternalLink href="https://docs.sentry.io/product/issues/issue-details/ai-suggested-solution/" />
-                  ),
-                }
-              )}
-            />
-            <ExperimentalFeatureBadge />
-          </Title>
-          <Description>
-            {t('You might get lucky, but again, maybe not\u2026')}
-          </Description>
-        </div>
-        <Action>
-          <Background src={bannerBackground} />
-          <Stars src={bannerStars} />
-          <Sentaur src={bannerSentaur} />
-          <ViewSuggestionButton size="xs" onClick={onViewSuggestion}>
-            {t('View Suggestion')}
-          </ViewSuggestionButton>
-        </Action>
-      </Body>
-    </Wrapper>
-  );
-}
-
-const Wrapper = styled(Panel)`
-  margin-bottom: 0;
-  @media (min-width: ${p => p.theme.breakpoints.xlarge}) {
-    height: 80px;
-  }
-`;
-
-const Body = styled(PanelBody)`
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: ${space(1)};
-
-  > *:first-child {
-    flex: 1;
-  }
-
-  @media (min-width: ${p => p.theme.breakpoints.xlarge}) {
-    display: grid;
-    grid-template-columns: 42% 1fr;
-  }
-`;
-
-const Title = styled('div')`
-  font-size: ${p => p.theme.fontSizeSmall};
-  text-transform: uppercase;
-  color: ${p => p.theme.gray300};
-  display: flex;
-  align-items: center;
-  /* to be consistent with the feature badge size */
-  height: ${space(2)};
-  line-height: ${space(2)};
-  white-space: nowrap;
-`;
-
-const Description = styled(TextBlock)`
-  margin: ${space(1)} 0 0 0;
-`;
-
-const Action = styled('div')`
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-`;
-
-const Sentaur = styled('img')`
-  display: none;
-  @media (min-width: ${p => p.theme.breakpoints.xlarge}) {
-    display: block;
-    height: 8.563rem;
-    position: absolute;
-    bottom: 0;
-    right: 6.608rem;
-    object-fit: cover;
-    z-index: 1;
-    pointer-events: none;
-  }
-`;
-
-const Background = styled('img')`
-  display: none;
-  @media (min-width: ${p => p.theme.breakpoints.xlarge}) {
-    display: block;
-    position: absolute;
-    top: 0;
-    right: 0;
-    object-fit: cover;
-    max-width: 100%;
-    height: 100%;
-    border-radius: ${p => p.theme.panelBorderRadius};
-  }
-`;
-
-const Stars = styled('img')`
-  display: none;
-  @media (min-width: ${p => p.theme.breakpoints.xlarge}) {
-    display: block;
-    height: 8.563rem;
-    position: absolute;
-    right: -1rem;
-    bottom: -0.125rem;
-    object-fit: cover;
-    /* workaround to remove a  extra svg on the bottom right */
-    border-radius: ${p => p.theme.panelBorderRadius};
-  }
-`;
-
-const ViewSuggestionButton = styled(Button)`
-  @media (min-width: ${p => p.theme.breakpoints.xlarge}) {
-    position: absolute;
-    right: 1rem;
-    top: 1.5rem;
-  }
-`;
-
-const MoreInfoTooltip = styled(QuestionTooltip)`
-  margin-left: ${space(0.5)};
-`;
diff --git a/static/app/components/events/aiSuggestedSolution/experimentalFeatureBadge.tsx b/static/app/components/events/aiSuggestedSolution/experimentalFeatureBadge.tsx
deleted file mode 100644
index 02833aeef3d376..00000000000000
--- a/static/app/components/events/aiSuggestedSolution/experimentalFeatureBadge.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import styled from '@emotion/styled';
-
-import FeatureBadge from 'sentry/components/badge/featureBadge';
-import {space} from 'sentry/styles/space';
-
-export function ExperimentalFeatureBadge() {
-  return <CenteredFeatureBadge tooltipProps={{disabled: true}} type="experimental" />;
-}
-
-const CenteredFeatureBadge = styled(FeatureBadge)`
-  height: ${space(2)};
-`;
diff --git a/static/app/components/events/aiSuggestedSolution/index.tsx b/static/app/components/events/aiSuggestedSolution/index.tsx
deleted file mode 100644
index a50c084eae7794..00000000000000
--- a/static/app/components/events/aiSuggestedSolution/index.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import {useState} from 'react';
-
-import type {Event} from 'sentry/types/event';
-import type {Project} from 'sentry/types/project';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {getAnalyticsDataForEvent} from 'sentry/utils/events';
-import useOrganization from 'sentry/utils/useOrganization';
-
-import {Banner} from './banner';
-import {Suggestion} from './suggestion';
-
-type Props = {
-  event: Event;
-  projectSlug: Project['slug'];
-};
-
-export function AiSuggestedSolution({projectSlug, event}: Props) {
-  const organization = useOrganization();
-
-  const [openSuggestion, setOpenSuggestion] = useState(false);
-
-  return (
-    <div>
-      {!openSuggestion ? (
-        <Banner
-          onViewSuggestion={() => {
-            trackAnalytics('ai_suggested_solution.view_suggestion_button_clicked', {
-              organization,
-              project_id: event.projectID,
-              group_id: event.groupID,
-              ...getAnalyticsDataForEvent(event),
-            });
-            setOpenSuggestion(true);
-          }}
-        />
-      ) : (
-        <Suggestion
-          projectSlug={projectSlug}
-          event={event}
-          onHideSuggestion={() => {
-            trackAnalytics('ai_suggested_solution.hide_suggestion_button_clicked', {
-              organization,
-              project_id: event.projectID,
-              group_id: event.groupID,
-              ...getAnalyticsDataForEvent(event),
-            });
-            setOpenSuggestion(false);
-          }}
-        />
-      )}
-    </div>
-  );
-}
diff --git a/static/app/components/events/aiSuggestedSolution/suggestion.tsx b/static/app/components/events/aiSuggestedSolution/suggestion.tsx
deleted file mode 100644
index 66d8bf583cdd07..00000000000000
--- a/static/app/components/events/aiSuggestedSolution/suggestion.tsx
+++ /dev/null
@@ -1,320 +0,0 @@
-import {useCallback, useState} from 'react';
-import styled from '@emotion/styled';
-
-import {addSuccessMessage} from 'sentry/actionCreators/indicator';
-import {Button, LinkButton} from 'sentry/components/button';
-import ButtonBar from 'sentry/components/buttonBar';
-import EmptyMessage from 'sentry/components/emptyMessage';
-import LoadingError from 'sentry/components/loadingError';
-import Panel from 'sentry/components/panels/panel';
-import PanelBody from 'sentry/components/panels/panelBody';
-import PanelFooter from 'sentry/components/panels/panelFooter';
-import PanelHeader from 'sentry/components/panels/panelHeader';
-import {IconFile, IconFlag, IconHappy, IconMeh, IconSad} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {Event} from 'sentry/types/event';
-import type {Project} from 'sentry/types/project';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {getAnalyticsDataForEvent} from 'sentry/utils/events';
-import {isActiveSuperuser} from 'sentry/utils/isActiveSuperuser';
-import {limitedMarked} from 'sentry/utils/marked';
-import {useApiQuery} from 'sentry/utils/queryClient';
-import {useIsSentryEmployee} from 'sentry/utils/useIsSentryEmployee';
-import useOrganization from 'sentry/utils/useOrganization';
-
-import {ExperimentalFeatureBadge} from './experimentalFeatureBadge';
-import {SuggestionLoaderMessage} from './suggestionLoaderMessage';
-import {useOpenAISuggestionLocalStorage} from './useOpenAISuggestionLocalStorage';
-
-type Props = {
-  event: Event;
-  onHideSuggestion: () => void;
-  projectSlug: Project['slug'];
-};
-
-function ErrorDescription({
-  restriction,
-  organizationSlug,
-  onRefetch,
-  onSetIndividualConsent,
-  onHideSuggestion,
-}: {
-  onHideSuggestion: () => void;
-  onRefetch: () => void;
-  onSetIndividualConsent: (consent: boolean) => void;
-  organizationSlug: string;
-  restriction?: 'subprocessor' | 'individual_consent';
-}) {
-  if (restriction === 'subprocessor') {
-    return (
-      <EmptyMessage
-        icon={<IconFile size="xl" />}
-        title={t('OpenAI Subprocessor Acknowledgment')}
-        description={t(
-          'In order to use this feature, your organization needs to accept the OpenAI Subprocessor Acknowledgment.'
-        )}
-        action={
-          <ButtonBar gap={2}>
-            <Button onClick={onHideSuggestion}>{t('Dismiss')}</Button>
-            <LinkButton priority="primary" to={`/settings/${organizationSlug}/legal/`}>
-              {t('Accept in Settings')}
-            </LinkButton>
-          </ButtonBar>
-        }
-      />
-    );
-  }
-
-  if (restriction === 'individual_consent') {
-    const activeSuperUser = isActiveSuperuser();
-    return (
-      <EmptyMessage
-        icon={<IconFlag size="xl" />}
-        title={t('We need your consent')}
-        description={t(
-          'By using this feature, you agree that OpenAI is a subprocessor and may process the data that you’ve chosen to submit. Sentry makes no guarantees as to the accuracy of the feature’s AI-generated recommendations.'
-        )}
-        action={
-          <ButtonBar gap={2}>
-            <Button onClick={onHideSuggestion}>{t('Dismiss')}</Button>
-            <Button
-              priority="primary"
-              onClick={() => {
-                onSetIndividualConsent(true);
-                onRefetch();
-              }}
-              disabled={activeSuperUser}
-              title={
-                activeSuperUser ? t("Superusers can't consent to policies") : undefined
-              }
-            >
-              {t('Confirm')}
-            </Button>
-          </ButtonBar>
-        }
-      />
-    );
-  }
-
-  return <SuggestionLoadingError onRetry={onRefetch} />;
-}
-
-export function Suggestion({onHideSuggestion, projectSlug, event}: Props) {
-  const organization = useOrganization();
-  const [suggestedSolutionLocalConfig, setSuggestedSolutionLocalConfig] =
-    useOpenAISuggestionLocalStorage();
-  const [piiCertified, setPiiCertified] = useState(false);
-  const [feedbackProvided, setFeedbackProvided] = useState(false);
-  const isSentryEmployee = useIsSentryEmployee();
-
-  const {
-    data,
-    isPending: dataIsLoading,
-    isError: dataIsError,
-    refetch: dataRefetch,
-    error,
-  } = useApiQuery<{suggestion: string}>(
-    [
-      `/projects/${organization.slug}/${projectSlug}/events/${event.eventID}/ai-fix-suggest/`,
-      {
-        query: {
-          consent: suggestedSolutionLocalConfig.individualConsent ? 'yes' : undefined,
-          pii_certified: isSentryEmployee ? (piiCertified ? 'yes' : 'no') : undefined,
-        },
-      },
-    ],
-    {
-      enabled: isSentryEmployee ? (piiCertified ? true : false) : true,
-      staleTime: Infinity,
-      retry: false,
-    }
-  );
-
-  const handleFeedbackClick = useCallback(() => {
-    addSuccessMessage('Thank you for your feedback!');
-    setFeedbackProvided(true);
-  }, []);
-
-  if (isSentryEmployee && !piiCertified) {
-    return (
-      <EmptyMessage
-        icon={<IconFlag size="xl" />}
-        title={t('PII Certification Required')}
-        description={t(
-          'Before using this feature, please confirm that there is no personally identifiable information in this event.'
-        )}
-        action={
-          <ButtonBar gap={2}>
-            <Button priority="primary" onClick={() => setPiiCertified(true)}>
-              {t('Certify No PII')}
-            </Button>
-          </ButtonBar>
-        }
-      />
-    );
-  }
-
-  return (
-    <Panel>
-      <Header>
-        <Title>
-          {t('AI Solution')}
-          <ExperimentalFeatureBadge />
-        </Title>
-        <Button size="xs" onClick={onHideSuggestion}>
-          {t('Hide Suggestion')}
-        </Button>
-      </Header>
-      <PanelBody>
-        {dataIsLoading ? (
-          <LoaderWrapper>
-            <div className="ai-suggestion-wheel-of-fortune" />
-            <SuggestionLoaderMessage />
-          </LoaderWrapper>
-        ) : dataIsError ? (
-          <ErrorDescription
-            onRefetch={dataRefetch}
-            organizationSlug={organization.slug}
-            onSetIndividualConsent={() =>
-              setSuggestedSolutionLocalConfig({individualConsent: true})
-            }
-            restriction={error?.responseJSON?.restriction as any}
-            onHideSuggestion={onHideSuggestion}
-          />
-        ) : (
-          <Content
-            dangerouslySetInnerHTML={{
-              __html: limitedMarked(data.suggestion, {
-                gfm: true,
-                breaks: true,
-              }),
-            }}
-          />
-        )}
-      </PanelBody>
-      {!dataIsLoading && !dataIsError && !feedbackProvided && (
-        <PanelFooter>
-          <Feedback>
-            <strong>{t('Was this helpful?')}</strong>
-            <ButtonBar gap={1}>
-              <Button
-                icon={<IconSad color="red300" />}
-                size="xs"
-                onClick={() => {
-                  trackAnalytics(
-                    'ai_suggested_solution.feedback_helpful_nope_button_clicked',
-                    {
-                      organization,
-                      project_id: event.projectID,
-                      group_id: event.groupID,
-                      ...getAnalyticsDataForEvent(event),
-                    }
-                  );
-
-                  handleFeedbackClick();
-                }}
-              >
-                {t('Nope')}
-              </Button>
-              <Button
-                icon={<IconMeh color="yellow300" />}
-                size="xs"
-                onClick={() => {
-                  trackAnalytics(
-                    'ai_suggested_solution.feedback_helpful_kinda_button_clicked',
-                    {
-                      organization,
-                      project_id: event.projectID,
-                      group_id: event.groupID,
-                      ...getAnalyticsDataForEvent(event),
-                    }
-                  );
-
-                  handleFeedbackClick();
-                }}
-              >
-                {t('Kinda')}
-              </Button>
-              <Button
-                icon={<IconHappy color="green300" />}
-                size="xs"
-                onClick={() => {
-                  trackAnalytics(
-                    'ai_suggested_solution.feedback_helpful_yes_button_clicked',
-                    {
-                      organization,
-                      project_id: event.projectID,
-                      group_id: event.groupID,
-                      ...getAnalyticsDataForEvent(event),
-                    }
-                  );
-
-                  handleFeedbackClick();
-                }}
-              >
-                {t('Yes, Surprisingly\u2026')}
-              </Button>
-            </ButtonBar>
-          </Feedback>
-        </PanelFooter>
-      )}
-    </Panel>
-  );
-}
-
-const Header = styled(PanelHeader)`
-  background: transparent;
-  padding: ${space(1)} ${space(2)};
-  align-items: center;
-  color: ${p => p.theme.gray300};
-`;
-
-const Feedback = styled('div')`
-  padding: ${space(1)} ${space(2)};
-  display: grid;
-  grid-template-columns: 1fr;
-  align-items: center;
-  text-align: left;
-  gap: ${space(1)};
-  font-size: ${p => p.theme.fontSizeSmall};
-  @media (min-width: ${p => p.theme.breakpoints.small}) {
-    grid-template-columns: 1fr max-content;
-    text-align: right;
-    gap: ${space(2)};
-  }
-`;
-
-const SuggestionLoadingError = styled(LoadingError)`
-  margin-bottom: 0;
-  border: none;
-  /* This is just to be consitent with other */
-  /* padding-top and padding-bottom we are using in the empty state component */
-  padding-top: ${space(4)};
-  padding-bottom: ${space(4)};
-`;
-
-const LoaderWrapper = styled('div')`
-  padding: ${space(4)} 0;
-  text-align: center;
-  gap: ${space(2)};
-  display: flex;
-  flex-direction: column;
-`;
-
-const Content = styled('div')`
-  padding: ${space(2)};
-  /* hack until we update backend to send us other heading */
-  h4 {
-    font-size: ${p => p.theme.fontSizeExtraLarge};
-    margin-bottom: ${space(1)};
-  }
-`;
-
-const Title = styled('div')`
-  /* to be consistent with the feature badge size */
-  height: ${space(2)};
-  line-height: ${space(2)};
-  display: flex;
-  align-items: center;
-`;
diff --git a/static/app/components/events/aiSuggestedSolution/suggestionLoaderMessage.tsx b/static/app/components/events/aiSuggestedSolution/suggestionLoaderMessage.tsx
deleted file mode 100644
index aa63118f819bb7..00000000000000
--- a/static/app/components/events/aiSuggestedSolution/suggestionLoaderMessage.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import {useEffect, useState} from 'react';
-import styled from '@emotion/styled';
-import shuffle from 'lodash/shuffle';
-
-import {t} from 'sentry/locale';
-
-const LOADING_MESSAGES = [
-  t('Heating up them GPUs'),
-  t('Engineering a prompt'),
-  t('Demonstrating value'),
-  t('Moving the needle'),
-  t('Preventing prompt injection attacks'),
-  t('Remove traces of depression from answers'),
-  t('Reticulating splines or whatever'),
-  t('Loading marketing material'),
-  t('Wiping node_modules'),
-  t('Installing dependencies'),
-  t('Searching StackOverflow'),
-  t('Googling for solutions'),
-  t('Running spell checker'),
-  t('Searching for the perfect emoji'),
-  t('Adding trace amounts of human touch'),
-  t("Don't be like Sydney, don't be like Sydney"),
-  t('Initiating quantum leap'),
-  t('Charging flux capacitors'),
-  t('Summoning a demon'),
-];
-
-export function SuggestionLoaderMessage() {
-  const [messages] = useState(() => shuffle(LOADING_MESSAGES));
-  const [messageIndex, setMessageIndex] = useState(0);
-
-  useEffect(() => {
-    const id = setInterval(
-      () => {
-        if (messageIndex < messages.length - 1) {
-          setMessageIndex(messageIndex + 1);
-        }
-      },
-      Math.random() * 700 + 800
-    );
-    return () => clearInterval(id);
-  });
-
-  return (
-    <div>
-      <Message>{`${messages[messageIndex]}\u2026`}</Message>
-    </div>
-  );
-}
-
-const Message = styled('div')`
-  color: ${p => p.theme.gray300};
-  font-size: ${p => p.theme.fontSizeLarge};
-`;
diff --git a/static/app/components/events/aiSuggestedSolution/useOpenAISuggestionLocalStorage.tsx b/static/app/components/events/aiSuggestedSolution/useOpenAISuggestionLocalStorage.tsx
deleted file mode 100644
index 96b7bc66486db7..00000000000000
--- a/static/app/components/events/aiSuggestedSolution/useOpenAISuggestionLocalStorage.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import {useCallback} from 'react';
-
-import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
-import {useUser} from 'sentry/utils/useUser';
-
-type LocalState = {
-  individualConsent: boolean;
-};
-
-export function useOpenAISuggestionLocalStorage(): [
-  LocalState,
-  (newState: Partial<LocalState>) => void,
-] {
-  const user = useUser();
-
-  const [localStorageState, setLocalStorageState] = useLocalStorageState<LocalState>(
-    `open-ai-suggestion:${user.id}`,
-    {
-      // agree forward data to OpenAI
-      individualConsent: false,
-    }
-  );
-
-  const setSuggestedSolutionLocalConfig = useCallback(
-    (newState: Partial<LocalState>) => {
-      setLocalStorageState({...localStorageState, ...newState});
-    },
-    [localStorageState, setLocalStorageState]
-  );
-
-  return [localStorageState, setSuggestedSolutionLocalConfig];
-}
diff --git a/static/app/components/events/autofix/autofixDiff.tsx b/static/app/components/events/autofix/autofixDiff.tsx
index 26e7c6ce442579..c076e645adeed3 100644
--- a/static/app/components/events/autofix/autofixDiff.tsx
+++ b/static/app/components/events/autofix/autofixDiff.tsx
@@ -9,12 +9,13 @@ import {
   DiffLineType,
   type FilePatch,
 } from 'sentry/components/events/autofix/types';
+import {makeAutofixQueryKey} from 'sentry/components/events/autofix/useAutofix';
 import TextArea from 'sentry/components/forms/controls/textarea';
 import InteractionStateLayer from 'sentry/components/interactionStateLayer';
 import {IconChevron, IconClose, IconDelete, IconEdit} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {useMutation} from 'sentry/utils/queryClient';
+import {useMutation, useQueryClient} from 'sentry/utils/queryClient';
 import useApi from 'sentry/utils/useApi';
 
 type AutofixDiffProps = {
@@ -101,7 +102,7 @@ function HunkHeader({lines, sectionHeader}: {lines: DiffLine[]; sectionHeader: s
 
 function useUpdateHunk({groupId, runId}: {groupId: string; runId: string}) {
   const api = useApi({persistInFlight: true});
-
+  const queryClient = useQueryClient();
   return useMutation({
     mutationFn: (params: {
       fileName: string;
@@ -123,6 +124,9 @@ function useUpdateHunk({groupId, runId}: {groupId: string; runId: string}) {
         },
       });
     },
+    onSuccess: _ => {
+      queryClient.invalidateQueries({queryKey: makeAutofixQueryKey(groupId)});
+    },
     onError: () => {
       addErrorMessage(t('Something went wrong when updating changes.'));
     },
diff --git a/static/app/components/events/autofix/autofixInsightCards.spec.tsx b/static/app/components/events/autofix/autofixInsightCards.spec.tsx
index 7a464c32667dd6..864c4f89462e14 100644
--- a/static/app/components/events/autofix/autofixInsightCards.spec.tsx
+++ b/static/app/components/events/autofix/autofixInsightCards.spec.tsx
@@ -164,17 +164,29 @@ describe('AutofixInsightCards', () => {
     renderComponent();
     const rethinkButton = screen.getByRole('button', {name: 'Rethink from here'});
     await userEvent.click(rethinkButton);
-    expect(screen.getByPlaceholderText('Say something...')).toBeInTheDocument();
+    expect(
+      screen.getByPlaceholderText(
+        'You should know X... Dive deeper into Y... Look at Z...'
+      )
+    ).toBeInTheDocument();
   });
 
   it('hides rethink input overlay when clicked outside', async () => {
     renderComponent();
     const rethinkButton = screen.getByRole('button', {name: 'Rethink from here'});
     await userEvent.click(rethinkButton);
-    expect(screen.getByPlaceholderText('Say something...')).toBeInTheDocument();
+    expect(
+      screen.getByPlaceholderText(
+        'You should know X... Dive deeper into Y... Look at Z...'
+      )
+    ).toBeInTheDocument();
 
     await userEvent.click(document.body);
-    expect(screen.queryByPlaceholderText('Say something...')).not.toBeInTheDocument();
+    expect(
+      screen.queryByPlaceholderText(
+        'You should know X... Dive deeper into Y... Look at Z...'
+      )
+    ).not.toBeInTheDocument();
   });
 
   it('submits rethink request when form is submitted', async () => {
@@ -187,7 +199,9 @@ describe('AutofixInsightCards', () => {
     const rethinkButton = screen.getByRole('button', {name: 'Rethink from here'});
     await userEvent.click(rethinkButton);
 
-    const input = screen.getByPlaceholderText('Say something...');
+    const input = screen.getByPlaceholderText(
+      'You should know X... Dive deeper into Y... Look at Z...'
+    );
     await userEvent.type(input, 'Rethink this part');
 
     const submitButton = screen.getByLabelText(
@@ -222,7 +236,9 @@ describe('AutofixInsightCards', () => {
     const rethinkButton = screen.getByRole('button', {name: 'Rethink from here'});
     await userEvent.click(rethinkButton);
 
-    const input = screen.getByPlaceholderText('Say something...');
+    const input = screen.getByPlaceholderText(
+      'You should know X... Dive deeper into Y... Look at Z...'
+    );
     await userEvent.type(input, 'Rethink this part');
 
     const submitButton = screen.getByLabelText(
@@ -246,7 +262,9 @@ describe('AutofixInsightCards', () => {
     const rethinkButton = screen.getByRole('button', {name: 'Rethink from here'});
     await userEvent.click(rethinkButton);
 
-    const input = screen.getByPlaceholderText('Say something...');
+    const input = screen.getByPlaceholderText(
+      'You should know X... Dive deeper into Y... Look at Z...'
+    );
     await userEvent.type(input, 'Rethink this part');
 
     const submitButton = screen.getByLabelText(
diff --git a/static/app/components/events/autofix/autofixInsightCards.tsx b/static/app/components/events/autofix/autofixInsightCards.tsx
index 63858a9b96c318..52a896e384f74a 100644
--- a/static/app/components/events/autofix/autofixInsightCards.tsx
+++ b/static/app/components/events/autofix/autofixInsightCards.tsx
@@ -1,4 +1,6 @@
-import {useEffect, useRef, useState} from 'react';
+import {useCallback, useEffect, useState} from 'react';
+import {createPortal} from 'react-dom';
+import {usePopper} from 'react-popper';
 import styled from '@emotion/styled';
 import {AnimatePresence, type AnimationProps, motion} from 'framer-motion';
 
@@ -13,6 +15,7 @@ import type {
   AutofixRepository,
   BreadcrumbContext,
 } from 'sentry/components/events/autofix/types';
+import {makeAutofixQueryKey} from 'sentry/components/events/autofix/useAutofix';
 import BreadcrumbItemContent from 'sentry/components/events/breadcrumbs/breadcrumbItemContent';
 import {
   BreadcrumbIcon,
@@ -27,7 +30,6 @@ import {
   IconArrow,
   IconChevron,
   IconCode,
-  IconEdit,
   IconFire,
   IconRefresh,
   IconSpan,
@@ -37,7 +39,7 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {BreadcrumbLevelType, BreadcrumbType} from 'sentry/types/breadcrumbs';
 import {singleLineRenderer} from 'sentry/utils/marked';
-import {useMutation} from 'sentry/utils/queryClient';
+import {useMutation, useQueryClient} from 'sentry/utils/queryClient';
 import testableTransition from 'sentry/utils/testableTransition';
 import useApi from 'sentry/utils/useApi';
 
@@ -84,13 +86,15 @@ export function ExpandableInsightContext({
   title,
   icon,
   rounded,
+  expandByDefault = false,
 }: {
   children: React.ReactNode;
   title: string;
+  expandByDefault?: boolean;
   icon?: React.ReactNode;
   rounded?: boolean;
 }) {
-  const [expanded, setExpanded] = useState(false);
+  const [expanded, setExpanded] = useState(expandByDefault);
 
   const toggleExpand = () => {
     setExpanded(oldState => !oldState);
@@ -134,6 +138,8 @@ interface AutofixInsightCardProps {
   repos: AutofixRepository[];
   runId: string;
   stepIndex: number;
+  isLastInsightInStep?: boolean;
+  shouldHighlightRethink?: boolean;
 }
 
 function AutofixInsightCard({
@@ -145,6 +151,8 @@ function AutofixInsightCard({
   stepIndex,
   groupId,
   runId,
+  shouldHighlightRethink,
+  isLastInsightInStep,
 }: AutofixInsightCardProps) {
   const isUserMessage = insight.justification === 'USER';
 
@@ -164,6 +172,7 @@ function AutofixInsightCard({
               stepIndex={stepIndex}
               groupId={groupId}
               runId={runId}
+              isHighlighted={shouldHighlightRethink}
             />
           )}
           {!isUserMessage && (
@@ -287,6 +296,8 @@ function AutofixInsightCard({
               stepIndex={stepIndex}
               groupId={groupId}
               runId={runId}
+              isHighlighted={shouldHighlightRethink}
+              isLastCard={isLastInsightInStep}
             />
           )}
         </AnimationWrapper>
@@ -303,6 +314,7 @@ interface AutofixInsightCardsProps {
   repos: AutofixRepository[];
   runId: string;
   stepIndex: number;
+  shouldHighlightRethink?: boolean;
 }
 
 function AutofixInsightCards({
@@ -313,6 +325,7 @@ function AutofixInsightCards({
   stepIndex,
   groupId,
   runId,
+  shouldHighlightRethink,
 }: AutofixInsightCardsProps) {
   return (
     <InsightsContainer>
@@ -329,6 +342,8 @@ function AutofixInsightCards({
               stepIndex={stepIndex}
               groupId={groupId}
               runId={runId}
+              isLastInsightInStep={index === insights.length - 1}
+              shouldHighlightRethink={shouldHighlightRethink}
             />
           )
         )
@@ -343,12 +358,16 @@ function AutofixInsightCards({
           </p>
         </NoInsightsYet>
       ) : hasStepBelow ? (
-        <ChainLink
-          insightCardAboveIndex={null}
-          stepIndex={stepIndex}
-          groupId={groupId}
-          runId={runId}
-        />
+        <EmptyResultsContainer>
+          <ChainLink
+            insightCardAboveIndex={null}
+            stepIndex={stepIndex}
+            groupId={groupId}
+            runId={runId}
+            isHighlighted={shouldHighlightRethink}
+            isLastCard
+          />
+        </EmptyResultsContainer>
       ) : null}
     </InsightsContainer>
   );
@@ -356,6 +375,7 @@ function AutofixInsightCards({
 
 export function useUpdateInsightCard({groupId, runId}: {groupId: string; runId: string}) {
   const api = useApi({persistInFlight: true});
+  const queryClient = useQueryClient();
 
   return useMutation({
     mutationFn: (params: {
@@ -377,6 +397,7 @@ export function useUpdateInsightCard({groupId, runId}: {groupId: string; runId:
       });
     },
     onSuccess: _ => {
+      queryClient.invalidateQueries({queryKey: makeAutofixQueryKey(groupId)});
       addSuccessMessage(t('Thanks, rethinking this...'));
     },
     onError: () => {
@@ -390,22 +411,54 @@ function ChainLink({
   runId,
   stepIndex,
   insightCardAboveIndex,
+  isHighlighted,
+  isLastCard,
 }: {
   groupId: string;
   insightCardAboveIndex: number | null;
   runId: string;
   stepIndex: number;
+  isHighlighted?: boolean;
+  isLastCard?: boolean;
 }) {
   const [showOverlay, setShowOverlay] = useState(false);
-  const overlayRef = useRef<HTMLDivElement | null>(null);
+  const [referenceElement, setReferenceElement] = useState<
+    HTMLAnchorElement | HTMLButtonElement | null
+  >(null);
+  const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
   const [comment, setComment] = useState('');
   const {mutate: send} = useUpdateInsightCard({groupId, runId});
 
-  const handleClickOutside = event => {
-    if (overlayRef.current && !overlayRef.current.contains(event.target)) {
+  const {styles, attributes} = usePopper(referenceElement, popperElement, {
+    placement: 'left-start',
+    modifiers: [
+      {
+        name: 'offset',
+        options: {
+          offset: [-16, 8],
+        },
+      },
+      {
+        name: 'flip',
+        options: {
+          fallbackPlacements: ['right-start', 'bottom-start'],
+        },
+      },
+    ],
+  });
+
+  const handleClickOutside = useCallback(
+    (event: MouseEvent) => {
+      if (
+        referenceElement?.contains(event.target as Node) ||
+        popperElement?.contains(event.target as Node)
+      ) {
+        return;
+      }
       setShowOverlay(false);
-    }
-  };
+    },
+    [popperElement, referenceElement]
+  );
 
   useEffect(() => {
     if (showOverlay) {
@@ -416,57 +469,82 @@ function ChainLink({
     return () => {
       document.removeEventListener('mousedown', handleClickOutside);
     };
-  }, [showOverlay]);
-
-  // Determine if this is the first chain link (before first insight)
-  const isFirstLink = insightCardAboveIndex === null || insightCardAboveIndex < 0;
+  }, [showOverlay, handleClickOutside]);
 
   return (
     <ArrowContainer>
       <IconArrow direction={'down'} className="arrow-icon" />
-      <RethinkButton
-        icon={<IconEdit size="xs" />}
-        size="zero"
-        className="rethink-button"
-        title={t('Rethink from here')}
-        aria-label={t('Rethink from here')}
-        onClick={() => setShowOverlay(true)}
-      />
-
-      {showOverlay && (
-        <RethinkInput $isFirstLink={isFirstLink} ref={overlayRef}>
-          <form
-            onSubmit={e => {
-              e.preventDefault();
-              setShowOverlay(false);
-              setComment('');
-              send({
-                message: comment,
-                step_index: stepIndex,
-                retain_insight_card_index: insightCardAboveIndex,
-              });
-            }}
-            className="row-form"
+      <RethinkButtonContainer className="rethink-button-container">
+        <AnimatePresence>
+          {isLastCard && isHighlighted && (
+            <RethinkMessage
+              initial={{opacity: 0, x: 20}}
+              animate={{opacity: 1, x: 0}}
+              exit={{opacity: 0, x: 20}}
+              transition={{duration: 0.4}}
+            >
+              Not satisfied?
+            </RethinkMessage>
+          )}
+        </AnimatePresence>
+        <RethinkButton
+          ref={setReferenceElement}
+          icon={<IconRefresh size="xs" />}
+          size="zero"
+          className="rethink-button"
+          title={t('Rethink from here')}
+          aria-label={t('Rethink from here')}
+          onClick={() => setShowOverlay(true)}
+          isHighlighted={isHighlighted}
+        />
+      </RethinkButtonContainer>
+
+      {showOverlay &&
+        createPortal(
+          <RethinkInput
+            ref={setPopperElement}
+            style={styles.popper}
+            {...attributes.popper}
+            id="autofix-rethink-input"
           >
-            <Input
-              type="text"
-              placeholder="Say something..."
-              value={comment}
-              onChange={e => setComment(e.target.value)}
-              size="md"
-              autoFocus
-            />
-            <Button
-              type="submit"
-              icon={<IconRefresh />}
-              title="Restart analysis from this point in the chain"
-              aria-label="Restart analysis from this point in the chain"
-              priority="primary"
-              size="md"
-            />
-          </form>
-        </RethinkInput>
-      )}
+            <form
+              onSubmit={e => {
+                e.preventDefault();
+                e.stopPropagation();
+                setShowOverlay(false);
+                setComment('');
+                send({
+                  message: comment,
+                  step_index: stepIndex,
+                  retain_insight_card_index: insightCardAboveIndex,
+                });
+              }}
+              className="row-form"
+              onClick={e => e.stopPropagation()}
+              id="autofix-rethink-input"
+            >
+              <Input
+                type="text"
+                placeholder="You should know X... Dive deeper into Y... Look at Z..."
+                value={comment}
+                onChange={e => setComment(e.target.value)}
+                size="md"
+                autoFocus
+                id="autofix-rethink-input"
+              />
+              <Button
+                type="submit"
+                icon={<IconRefresh />}
+                title="Restart analysis from this point in the chain"
+                aria-label="Restart analysis from this point in the chain"
+                priority="primary"
+                size="md"
+                id="autofix-rethink-input"
+              />
+            </form>
+          </RethinkInput>,
+          document.querySelector('.solutions-drawer-container') ?? document.body
+        )}
     </ArrowContainer>
   );
 }
@@ -505,6 +583,7 @@ const UserMessageContainer = styled('div')`
 const UserMessage = styled('div')`
   margin-left: ${space(2)};
   flex-shrink: 100;
+  word-break: break-word;
 `;
 
 const NoInsightsYet = styled('div')`
@@ -518,6 +597,11 @@ const NoInsightsYet = styled('div')`
   padding-top: ${space(4)};
 `;
 
+const EmptyResultsContainer = styled('div')`
+  position: relative;
+  bottom: -${space(1)};
+`;
+
 const InsightsContainer = styled('div')``;
 
 const InsightContainer = styled(motion.div)`
@@ -545,38 +629,66 @@ const ArrowContainer = styled('div')`
     align-self: center;
   }
 
-  .rethink-button {
+  .rethink-button-container {
     grid-column: 3 / 4;
     justify-self: end;
     align-self: center;
+    position: relative;
   }
+`;
 
-  &:hover {
-    .rethink-button {
-      color: ${p => p.theme.subText};
-    }
-  }
+const RethinkButtonContainer = styled('div')`
+  position: relative;
 `;
 
-const RethinkButton = styled(Button)`
+const RethinkMessage = styled(motion.div)`
+  color: ${p => p.theme.active};
+  font-size: ${p => p.theme.fontSizeSmall};
+  position: absolute;
+  right: calc(100% + ${space(1)});
+  margin-top: 1px;
+  white-space: nowrap;
+`;
+
+const RethinkButton = styled(Button)<{isHighlighted?: boolean}>`
   font-weight: normal;
   font-size: small;
   border: none;
   color: ${p => p.theme.subText};
-  transition: color 0.2s ease-in-out;
+  transition: all 0.4s ease-in-out;
+  position: relative;
+
+  ${p =>
+    p.isHighlighted &&
+    `
+    color: ${p.theme.button.primary.backgroundActive};
+    background: ${p.theme.purple100};
+    border-radius: ${p.theme.borderRadius};
+
+    &:hover {
+      color: ${p.theme.activeHover};
+      background: ${p.theme.purple200};
+    }
+  `}
+
+  &:hover {
+    transform: scale(1.05);
+  }
+
+  &:active {
+    transform: scale(0.95);
+  }
 `;
 
-const RethinkInput = styled('div')<{$isFirstLink: boolean}>`
-  position: absolute;
+const RethinkInput = styled('div')`
+  position: fixed;
   box-shadow: ${p => p.theme.dropShadowHeavy};
   border: 1px solid ${p => p.theme.border};
-  width: 95%;
+  width: 90%;
   background: ${p => p.theme.backgroundElevated};
   padding: ${space(0.5)};
   border-radius: ${p => p.theme.borderRadius};
-  margin: 0 ${space(1.5)} 0 ${space(1.5)};
-  z-index: 10000;
-  transform: translateY(${p => (p.$isFirstLink ? '25%' : '-25%')});
+  z-index: ${p => p.theme.zIndex.tooltip};
 
   .row-form {
     display: flex;
@@ -621,6 +733,7 @@ const MiniHeader = styled('p')`
   padding-right: ${space(2)};
   padding-left: ${space(2)};
   width: 95%;
+  word-break: break-word;
 `;
 
 const ExpandableContext = styled('div')<{isRounded?: boolean}>`
diff --git a/static/app/components/events/autofix/autofixMessageBox.analytics.spec.tsx b/static/app/components/events/autofix/autofixMessageBox.analytics.spec.tsx
new file mode 100644
index 00000000000000..54d1ed27006d71
--- /dev/null
+++ b/static/app/components/events/autofix/autofixMessageBox.analytics.spec.tsx
@@ -0,0 +1,175 @@
+import {AutofixCodebaseChangeData} from 'sentry-fixture/autofixCodebaseChangeData';
+import {AutofixStepFixture} from 'sentry-fixture/autofixStep';
+
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import {Button} from 'sentry/components/button';
+import AutofixMessageBox from 'sentry/components/events/autofix/autofixMessageBox';
+import {AutofixStepType} from 'sentry/components/events/autofix/types';
+
+jest.mock('sentry/components/button', () => ({
+  Button: jest.fn(props => {
+    // Forward the click handler while allowing us to inspect props
+    return <button onClick={props.onClick}>{props.children}</button>;
+  }),
+  LinkButton: jest.fn(props => {
+    return <a href={props.href}>{props.children}</a>;
+  }),
+}));
+
+const mockButton = Button as jest.MockedFunction<typeof Button>;
+
+describe('AutofixMessageBox Analytics', () => {
+  const defaultProps = {
+    displayText: 'Test display text',
+    groupId: '123',
+    runId: '456',
+    actionText: 'Send',
+    allowEmptyMessage: false,
+    responseRequired: false,
+    step: null,
+    onSend: null,
+  };
+
+  const changesStepProps = {
+    ...defaultProps,
+    isChangesStep: true,
+    step: AutofixStepFixture({
+      type: AutofixStepType.CHANGES,
+      changes: [AutofixCodebaseChangeData()],
+    }),
+  };
+
+  beforeEach(() => {
+    MockApiClient.clearMockResponses();
+    mockButton.mockClear();
+  });
+
+  it('passes correct analytics props for suggested root cause without instructions', () => {
+    const onSendMock = jest.fn();
+    render(
+      <AutofixMessageBox {...defaultProps} onSend={onSendMock} isRootCauseSelectionStep />
+    );
+
+    expect(mockButton).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        analyticsEventKey: 'autofix.create_fix_clicked',
+        analyticsEventName: 'Autofix: Create Fix Clicked',
+        analyticsParams: {
+          group_id: '123',
+          type: 'suggested',
+        },
+      }),
+      expect.anything()
+    );
+  });
+
+  it('passes correct analytics props for suggested root cause with instructions', async () => {
+    const onSendMock = jest.fn();
+    render(
+      <AutofixMessageBox {...defaultProps} onSend={onSendMock} isRootCauseSelectionStep />
+    );
+
+    const input = screen.getByPlaceholderText(
+      '(Optional) Provide any instructions for the fix...'
+    );
+    await userEvent.type(input, 'Some instructions');
+
+    expect(mockButton).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        analyticsEventKey: 'autofix.create_fix_clicked',
+        analyticsEventName: 'Autofix: Create Fix Clicked',
+        analyticsParams: {
+          group_id: '123',
+          type: 'suggested_with_instructions',
+        },
+      }),
+      expect.anything()
+    );
+  });
+
+  it('passes correct analytics props for custom root cause', async () => {
+    const onSendMock = jest.fn();
+    render(
+      <AutofixMessageBox {...defaultProps} onSend={onSendMock} isRootCauseSelectionStep />
+    );
+
+    await userEvent.click(screen.getAllByText('Propose your own root cause')[0]);
+    const customInput = screen.getByPlaceholderText('Propose your own root cause...');
+    await userEvent.type(customInput, 'Custom root cause');
+
+    expect(mockButton).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        analyticsEventKey: 'autofix.create_fix_clicked',
+        analyticsEventName: 'Autofix: Create Fix Clicked',
+        analyticsParams: {
+          group_id: '123',
+          type: 'custom',
+        },
+      }),
+      expect.anything()
+    );
+  });
+
+  it('passes correct analytics props for Create PR button', async () => {
+    MockApiClient.addMockResponse({
+      url: '/issues/123/autofix/setup/?check_write_access=true',
+      method: 'GET',
+      body: {
+        genAIConsent: {ok: true},
+        integration: {ok: true},
+        githubWriteIntegration: {
+          repos: [{ok: true, owner: 'owner', name: 'hello-world', id: 100}],
+        },
+      },
+    });
+
+    render(<AutofixMessageBox {...changesStepProps} />);
+
+    await userEvent.click(screen.getByRole('radio', {name: 'Approve changes'}));
+
+    // Find the last call to Button that matches our Create PR button
+    const createPRButtonCall = mockButton.mock.calls.find(
+      call => call[0]?.analyticsEventKey === 'autofix.create_pr_clicked'
+    );
+    expect(createPRButtonCall?.[0]).toEqual(
+      expect.objectContaining({
+        analyticsEventKey: 'autofix.create_pr_clicked',
+        analyticsEventName: 'Autofix: Create PR Clicked',
+        analyticsParams: {group_id: '123'},
+      })
+    );
+  });
+
+  it('passes correct analytics props for Create PR Setup button', async () => {
+    MockApiClient.addMockResponse({
+      url: '/issues/123/autofix/setup/?check_write_access=true',
+      method: 'GET',
+      body: {
+        genAIConsent: {ok: true},
+        integration: {ok: true},
+        githubWriteIntegration: {
+          repos: [{ok: false, owner: 'owner', name: 'hello-world', id: 100}],
+        },
+      },
+    });
+
+    render(<AutofixMessageBox {...changesStepProps} />);
+
+    await userEvent.click(screen.getByRole('radio', {name: 'Approve changes'}));
+
+    // Find the last call to Button that matches our Setup button
+    const setupButtonCall = mockButton.mock.calls.find(
+      call => call[0].children === 'Create PRs'
+    );
+    expect(setupButtonCall?.[0]).toEqual(
+      expect.objectContaining({
+        analyticsEventKey: 'autofix.create_pr_setup_clicked',
+        analyticsEventName: 'Autofix: Create PR Setup Clicked',
+        analyticsParams: {
+          group_id: '123',
+        },
+      })
+    );
+  });
+});
diff --git a/static/app/components/events/autofix/autofixMessageBox.spec.tsx b/static/app/components/events/autofix/autofixMessageBox.spec.tsx
index 2fbed4f245bbd7..1954cd41683551 100644
--- a/static/app/components/events/autofix/autofixMessageBox.spec.tsx
+++ b/static/app/components/events/autofix/autofixMessageBox.spec.tsx
@@ -12,7 +12,7 @@ import {
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import AutofixMessageBox from 'sentry/components/events/autofix/autofixMessageBox';
-import {AutofixStepType} from 'sentry/components/events/autofix/types';
+import {AutofixStatus, AutofixStepType} from 'sentry/components/events/autofix/types';
 
 jest.mock('sentry/actionCreators/indicator');
 
@@ -41,7 +41,7 @@ describe('AutofixMessageBox', () => {
     ...changesStepProps,
     step: AutofixStepFixture({
       type: AutofixStepType.CHANGES,
-      status: 'COMPLETED',
+      status: AutofixStatus.COMPLETED,
       changes: [AutofixCodebaseChangeData()],
     }),
   };
@@ -50,7 +50,7 @@ describe('AutofixMessageBox', () => {
     ...changesStepProps,
     step: AutofixStepFixture({
       type: AutofixStepType.CHANGES,
-      status: 'COMPLETED',
+      status: AutofixStatus.COMPLETED,
       changes: [
         AutofixCodebaseChangeData({
           repo_name: 'example/repo1',
@@ -80,7 +80,9 @@ describe('AutofixMessageBox', () => {
     render(<AutofixMessageBox {...defaultProps} />);
 
     expect(screen.getByText('Test display text')).toBeInTheDocument();
-    expect(screen.getByPlaceholderText('Say something...')).toBeInTheDocument();
+    expect(
+      screen.getByPlaceholderText('Share helpful context or feedback...')
+    ).toBeInTheDocument();
     expect(screen.getByRole('button', {name: 'Send'})).toBeInTheDocument();
   });
 
@@ -88,7 +90,7 @@ describe('AutofixMessageBox', () => {
     const onSendMock = jest.fn();
     render(<AutofixMessageBox {...defaultProps} onSend={onSendMock} />);
 
-    const input = screen.getByPlaceholderText('Say something...');
+    const input = screen.getByPlaceholderText('Share helpful context or feedback...');
     await userEvent.type(input, 'Test message');
     await userEvent.click(screen.getByRole('button', {name: 'Send'}));
 
@@ -104,7 +106,7 @@ describe('AutofixMessageBox', () => {
 
     render(<AutofixMessageBox {...defaultProps} />);
 
-    const input = screen.getByPlaceholderText('Say something...');
+    const input = screen.getByPlaceholderText('Share helpful context or feedback...');
     await userEvent.type(input, 'Test message');
     await userEvent.click(screen.getByRole('button', {name: 'Send'}));
 
@@ -125,7 +127,7 @@ describe('AutofixMessageBox', () => {
 
     render(<AutofixMessageBox {...defaultProps} />);
 
-    const input = screen.getByPlaceholderText('Say something...');
+    const input = screen.getByPlaceholderText('Share helpful context or feedback...');
     await userEvent.type(input, 'Test message');
     await userEvent.click(screen.getByRole('button', {name: 'Send'}));
 
@@ -196,17 +198,18 @@ describe('AutofixMessageBox', () => {
   it('shows feedback input when "Give feedback" is selected', () => {
     render(<AutofixMessageBox {...changesStepProps} />);
 
-    expect(screen.getByPlaceholderText('Say something...')).toBeInTheDocument();
+    expect(
+      screen.getByPlaceholderText('Share helpful context or feedback...')
+    ).toBeInTheDocument();
     expect(screen.getByRole('button', {name: 'Send'})).toBeInTheDocument();
   });
 
   it('shows "Create PR" button when "Approve changes" is selected', async () => {
     MockApiClient.addMockResponse({
-      url: '/issues/123/autofix/setup/',
+      url: '/issues/123/autofix/setup/?check_write_access=true',
       method: 'GET',
       body: {
         genAIConsent: {ok: true},
-        codebaseIndexing: {ok: true},
         integration: {ok: true},
         githubWriteIntegration: {
           repos: [{ok: true, owner: 'owner', name: 'hello-world', id: 100}],
@@ -226,11 +229,10 @@ describe('AutofixMessageBox', () => {
 
   it('shows "Create PRs" button with correct text for multiple changes', async () => {
     MockApiClient.addMockResponse({
-      url: '/issues/123/autofix/setup/',
+      url: '/issues/123/autofix/setup/?check_write_access=true',
       method: 'GET',
       body: {
         genAIConsent: {ok: true},
-        codebaseIndexing: {ok: true},
         integration: {ok: true},
         githubWriteIntegration: {
           repos: [{ok: true, owner: 'owner', name: 'hello-world', id: 100}],
@@ -283,11 +285,10 @@ describe('AutofixMessageBox', () => {
 
   it('shows "Create PRs" button that opens setup modal when setup is incomplete', async () => {
     MockApiClient.addMockResponse({
-      url: '/issues/123/autofix/setup/',
+      url: '/issues/123/autofix/setup/?check_write_access=true',
       method: 'GET',
       body: {
         genAIConsent: {ok: true},
-        codebaseIndexing: {ok: true},
         integration: {ok: true},
         githubWriteIntegration: {
           repos: [
@@ -296,6 +297,14 @@ describe('AutofixMessageBox', () => {
         },
       },
     });
+    MockApiClient.addMockResponse({
+      url: '/issues/123/autofix/setup/',
+      method: 'GET',
+      body: {
+        genAIConsent: {ok: true},
+        integration: {ok: true},
+      },
+    });
 
     render(<AutofixMessageBox {...changesStepProps} />);
 
diff --git a/static/app/components/events/autofix/autofixMessageBox.tsx b/static/app/components/events/autofix/autofixMessageBox.tsx
index 238092cf7f0b4f..4f2f77958f41e1 100644
--- a/static/app/components/events/autofix/autofixMessageBox.tsx
+++ b/static/app/components/events/autofix/autofixMessageBox.tsx
@@ -8,11 +8,11 @@ import {Button, LinkButton} from 'sentry/components/button';
 import {AutofixSetupWriteAccessModal} from 'sentry/components/events/autofix/autofixSetupWriteAccessModal';
 import {
   type AutofixCodebaseChange,
+  AutofixStatus,
   type AutofixStep,
   AutofixStepType,
 } from 'sentry/components/events/autofix/types';
 import {
-  type AutofixResponse,
   makeAutofixQueryKey,
   useAutofixData,
 } from 'sentry/components/events/autofix/useAutofix';
@@ -33,12 +33,13 @@ import {
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {singleLineRenderer} from 'sentry/utils/marked';
-import {setApiQueryData, useMutation, useQueryClient} from 'sentry/utils/queryClient';
+import {useMutation, useQueryClient} from 'sentry/utils/queryClient';
 import testableTransition from 'sentry/utils/testableTransition';
 import useApi from 'sentry/utils/useApi';
 
 function useSendMessage({groupId, runId}: {groupId: string; runId: string}) {
   const api = useApi({persistInFlight: true});
+  const queryClient = useQueryClient();
 
   return useMutation({
     mutationFn: (params: {message: string}) => {
@@ -54,6 +55,7 @@ function useSendMessage({groupId, runId}: {groupId: string; runId: string}) {
       });
     },
     onSuccess: _ => {
+      queryClient.invalidateQueries({queryKey: makeAutofixQueryKey(groupId)});
       addSuccessMessage('Thanks for the input.');
     },
     onError: () => {
@@ -113,23 +115,7 @@ function CreatePRsButton({
     },
     onSuccess: () => {
       addSuccessMessage(t('Created pull requests.'));
-      setApiQueryData<AutofixResponse>(
-        queryClient,
-        makeAutofixQueryKey(groupId),
-        data => {
-          if (!data || !data.autofix) {
-            return data;
-          }
-
-          return {
-            ...data,
-            autofix: {
-              ...data.autofix,
-              status: 'PROCESSING',
-            },
-          };
-        }
-      );
+      queryClient.invalidateQueries({queryKey: makeAutofixQueryKey(groupId)});
     },
     onError: () => {
       setHasClickedCreatePr(false);
@@ -161,7 +147,7 @@ function SetupAndCreatePRsButton({
   changes: AutofixCodebaseChange[];
   groupId: string;
 }) {
-  const {data: setupData} = useAutofixSetup({groupId});
+  const {data: setupData} = useAutofixSetup({groupId, checkWriteAccess: true});
 
   if (
     !changes.every(
@@ -190,6 +176,102 @@ function SetupAndCreatePRsButton({
   return <CreatePRsButton changes={changes} groupId={groupId} />;
 }
 
+interface RootCauseAndFeedbackInputAreaProps {
+  actionText: string;
+  changesMode: 'give_feedback' | 'add_tests' | 'create_prs';
+  groupId: string;
+  handleSend: (e: FormEvent<HTMLFormElement>) => void;
+  isRootCauseSelectionStep: boolean;
+  message: string;
+  primaryAction: boolean;
+  responseRequired: boolean;
+  rootCauseMode: 'suggested_root_cause' | 'custom_root_cause';
+  setMessage: (message: string) => void;
+}
+
+function RootCauseAndFeedbackInputArea({
+  handleSend,
+  isRootCauseSelectionStep,
+  message,
+  rootCauseMode,
+  responseRequired,
+  setMessage,
+  groupId,
+  actionText,
+  primaryAction,
+  changesMode,
+}: RootCauseAndFeedbackInputAreaProps) {
+  return (
+    <form onSubmit={handleSend}>
+      <InputArea>
+        {!responseRequired ? (
+          <Fragment>
+            <NormalInput
+              type="text"
+              value={message}
+              onChange={e => setMessage(e.target.value)}
+              placeholder={
+                !isRootCauseSelectionStep
+                  ? 'Share helpful context or feedback...'
+                  : rootCauseMode === 'suggested_root_cause'
+                    ? '(Optional) Provide any instructions for the fix...'
+                    : 'Propose your own root cause...'
+              }
+            />
+            {isRootCauseSelectionStep ? (
+              <Button
+                type="submit"
+                priority={primaryAction ? 'primary' : 'default'}
+                analyticsEventKey="autofix.create_fix_clicked"
+                analyticsEventName="Autofix: Create Fix Clicked"
+                analyticsParams={{
+                  group_id: groupId,
+                  type:
+                    rootCauseMode === 'suggested_root_cause'
+                      ? message
+                        ? 'suggested_with_instructions'
+                        : 'suggested'
+                      : 'custom',
+                }}
+              >
+                {actionText}
+              </Button>
+            ) : (
+              <Button
+                type="submit"
+                priority={primaryAction ? 'primary' : 'default'}
+                analyticsEventKey="autofix.feedback_provided"
+                analyticsEventName="Autofix: Feedback Provided"
+                analyticsParams={{
+                  group_id: groupId,
+                  type:
+                    changesMode === 'give_feedback'
+                      ? 'feedback_for_changes'
+                      : 'interjection',
+                }}
+              >
+                {actionText}
+              </Button>
+            )}
+          </Fragment>
+        ) : (
+          <Fragment>
+            <RequiredInput
+              type="text"
+              value={message}
+              onChange={e => setMessage(e.target.value)}
+              placeholder={'Please answer to continue...'}
+            />
+            <Button type="submit" priority={'primary'}>
+              {actionText}
+            </Button>
+          </Fragment>
+        )}
+      </InputArea>
+    </form>
+  );
+}
+
 function StepIcon({step}: {step: AutofixStep}) {
   if (step.type === AutofixStepType.CHANGES) {
     if (step.changes?.length === 0) {
@@ -213,15 +295,15 @@ function StepIcon({step}: {step: AutofixStep}) {
   }
 
   switch (step.status) {
-    case 'WAITING_FOR_USER_RESPONSE':
+    case AutofixStatus.WAITING_FOR_USER_RESPONSE:
       return <IconFocus size="sm" color="gray300" />;
-    case 'PROCESSING':
+    case AutofixStatus.PROCESSING:
       return <ProcessingStatusIndicator size={14} mini hideMessage />;
-    case 'CANCELLED':
+    case AutofixStatus.CANCELLED:
       return <IconClose size="sm" isCircled color="gray300" />;
-    case 'ERROR':
+    case AutofixStatus.ERROR:
       return <IconFatal size="sm" color="red300" />;
-    case 'COMPLETED':
+    case AutofixStatus.COMPLETED:
       return <IconCheckmark size="sm" color="green300" isCircled />;
     default:
       return null;
@@ -266,12 +348,12 @@ function AutofixMessageBox({
   const changes =
     isChangesStep && step?.type === AutofixStepType.CHANGES ? step.changes : [];
   const prsMade =
-    step?.status === 'COMPLETED' &&
+    step?.status === AutofixStatus.COMPLETED &&
     changes.length >= 1 &&
     changes.every(change => change.pull_request);
 
   const isDisabled =
-    step?.status === 'ERROR' ||
+    step?.status === AutofixStatus.ERROR ||
     (step?.type === AutofixStepType.ROOT_CAUSE_ANALYSIS && step.causes?.length === 0);
 
   useEffect(() => {
@@ -297,7 +379,7 @@ function AutofixMessageBox({
     let text = message;
     if (isChangesStep && changesMode === 'add_tests') {
       text =
-        'Please write a unit test that reproduces the issue to make sure it is fixed.';
+        'Please write a unit test that reproduces the issue to make sure it is fixed. Put it in the appropriate test file in the codebase. If there is none, create one.';
     }
 
     if (text.trim() !== '' || allowEmptyMessage) {
@@ -399,44 +481,18 @@ function AutofixMessageBox({
         {(!isChangesStep || changesMode === 'give_feedback') &&
           !prsMade &&
           !isDisabled && (
-            <form onSubmit={handleSend}>
-              <InputArea>
-                {!responseRequired ? (
-                  <Fragment>
-                    <NormalInput
-                      type="text"
-                      value={message}
-                      onChange={e => setMessage(e.target.value)}
-                      placeholder={
-                        !isRootCauseSelectionStep
-                          ? 'Say something...'
-                          : rootCauseMode === 'suggested_root_cause'
-                            ? '(Optional) Provide any instructions for the fix...'
-                            : 'Propose your own root cause...'
-                      }
-                    />
-                    <Button
-                      type="submit"
-                      priority={primaryAction ? 'primary' : 'default'}
-                    >
-                      {actionText}
-                    </Button>
-                  </Fragment>
-                ) : (
-                  <Fragment>
-                    <RequiredInput
-                      type="text"
-                      value={message}
-                      onChange={e => setMessage(e.target.value)}
-                      placeholder={'Please answer to continue...'}
-                    />
-                    <Button type="submit" priority={'primary'}>
-                      {actionText}
-                    </Button>
-                  </Fragment>
-                )}
-              </InputArea>
-            </form>
+            <RootCauseAndFeedbackInputArea
+              handleSend={handleSend}
+              isRootCauseSelectionStep={isRootCauseSelectionStep}
+              message={message}
+              rootCauseMode={rootCauseMode}
+              responseRequired={responseRequired}
+              setMessage={setMessage}
+              actionText={actionText}
+              primaryAction={primaryAction}
+              changesMode={changesMode}
+              groupId={groupId}
+            />
           )}
         {isChangesStep && changesMode === 'add_tests' && !prsMade && (
           <form onSubmit={handleSend}>
diff --git a/static/app/components/events/autofix/autofixRootCause.spec.tsx b/static/app/components/events/autofix/autofixRootCause.spec.tsx
index 045d0209ee9655..96c376b83d814f 100644
--- a/static/app/components/events/autofix/autofixRootCause.spec.tsx
+++ b/static/app/components/events/autofix/autofixRootCause.spec.tsx
@@ -13,7 +13,7 @@ describe('AutofixRootCause', function () {
     repos: [],
   };
 
-  it('can view a relevant code snippet', async function () {
+  it('can view a relevant code snippet', function () {
     render(<AutofixRootCause {...defaultProps} />);
 
     // Displays all root cause and code context info
@@ -23,11 +23,6 @@ describe('AutofixRootCause', function () {
       screen.getByText('This is the description of a root cause.')
     ).toBeInTheDocument();
 
-    await userEvent.click(
-      screen.getByRole('button', {
-        name: 'Relevant code',
-      })
-    );
     expect(
       screen.getByText('Snippet #1: This is the title of a relevant code snippet.')
     ).toBeInTheDocument();
@@ -53,7 +48,7 @@ describe('AutofixRootCause', function () {
     ).toBeInTheDocument();
   });
 
-  it('shows hyperlink when matching GitHub repo available', async function () {
+  it('shows hyperlink when matching GitHub repo available', function () {
     render(
       <AutofixRootCause
         {...{
@@ -71,12 +66,6 @@ describe('AutofixRootCause', function () {
       />
     );
 
-    await userEvent.click(
-      screen.getByRole('button', {
-        name: 'Relevant code',
-      })
-    );
-
     expect(screen.queryByRole('link', {name: 'GitHub'})).toBeInTheDocument();
     expect(screen.queryByRole('link', {name: 'GitHub'})).toHaveAttribute(
       'href',
diff --git a/static/app/components/events/autofix/autofixRootCause.tsx b/static/app/components/events/autofix/autofixRootCause.tsx
index 637ff995070ec4..2a301cef677d0f 100644
--- a/static/app/components/events/autofix/autofixRootCause.tsx
+++ b/static/app/components/events/autofix/autofixRootCause.tsx
@@ -15,6 +15,7 @@ import {
   type AutofixRootCauseCodeContext,
   type AutofixRootCauseData,
   type AutofixRootCauseSelection,
+  AutofixStatus,
   AutofixStepType,
   type CodeSnippetContext,
 } from 'sentry/components/events/autofix/types';
@@ -101,7 +102,7 @@ export function useSelectCause({groupId, runId}: {groupId: string; runId: string
             ...data,
             autofix: {
               ...data.autofix,
-              status: 'PROCESSING',
+              status: AutofixStatus.PROCESSING,
               steps: data.autofix.steps?.map(step => {
                 if (step.type !== AutofixStepType.ROOT_CAUSE_ANALYSIS) {
                   return step;
@@ -229,6 +230,7 @@ function RootCauseContext({
           icon={<IconCode size="sm" color="subText" />}
           title={'Relevant code'}
           rounded
+          expandByDefault
         >
           <AutofixRootCauseCodeContexts codeContext={cause.code_context} repos={repos} />
         </ExpandableInsightContext>
@@ -278,7 +280,11 @@ export function SuggestedFixSnippet({
     if (!repo) {
       return undefined;
     }
-    return `${repo.url}/blob/${repo.default_branch}/${snippet.file_path}`;
+    return `${repo.url}/blob/${repo.default_branch}/${snippet.file_path}${
+      snippet.start_line && snippet.end_line
+        ? `#L${snippet.start_line}-L${snippet.end_line}`
+        : ''
+    }`;
   }
   const extension = getFileExtension(snippet.file_path);
   const language = extension ? getPrismLanguage(extension) : undefined;
@@ -297,7 +303,7 @@ export function SuggestedFixSnippet({
       </StyledCodeSnippet>
       {sourceLink && (
         <CodeLinkWrapper>
-          <Tooltip title={t('Open this file in GitHub')} skipWrapper>
+          <Tooltip title={t('Open in GitHub')} skipWrapper>
             <OpenInLink href={sourceLink} openInNewTab aria-label={t('GitHub')}>
               <StyledIconWrapper>{getIntegrationIcon('github', 'sm')}</StyledIconWrapper>
             </OpenInLink>
diff --git a/static/app/components/events/autofix/autofixSetupModal.spec.tsx b/static/app/components/events/autofix/autofixSetupModal.spec.tsx
index b64f03d837e04c..a845bfeefde222 100644
--- a/static/app/components/events/autofix/autofixSetupModal.spec.tsx
+++ b/static/app/components/events/autofix/autofixSetupModal.spec.tsx
@@ -1,6 +1,6 @@
 import {ProjectFixture} from 'sentry-fixture/project';
 
-import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import {AutofixSetupContent} from 'sentry/components/events/autofix/autofixSetupModal';
 import {AutofixCodebaseIndexingStatus} from 'sentry/components/events/autofix/types';
@@ -40,22 +40,23 @@ describe('AutofixSetupContent', function () {
       },
     });
 
-    const onComplete = jest.fn();
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/integrations/?provider_key=github&includeConfig=0',
+      body: [],
+    });
 
-    render(<AutofixSetupContent groupId="1" projectId="1" onComplete={onComplete} />);
+    render(<AutofixSetupContent groupId="1" projectId="1" />);
 
     expect(await screen.findByText('Install the GitHub Integration')).toBeInTheDocument();
-    expect(
-      screen.getByText(/Install the GitHub integration by navigating to/)
-    ).toBeInTheDocument();
+    expect(screen.getByText(/Install the GitHub integration/)).toBeInTheDocument();
   });
 
-  it('displays successful integration text when it is installed', async function () {
+  it('renders the code mappings instructions', async function () {
     MockApiClient.addMockResponse({
       url: '/issues/1/autofix/setup/',
       body: {
-        genAIConsent: {ok: false},
-        integration: {ok: true},
+        genAIConsent: {ok: true},
+        integration: {ok: false, reason: 'integration_no_code_mappings'},
         githubWriteIntegration: {
           ok: false,
           repos: [
@@ -71,25 +72,34 @@ describe('AutofixSetupContent', function () {
       },
     });
 
-    const onComplete = jest.fn();
-
-    render(<AutofixSetupContent groupId="1" projectId="1" onComplete={onComplete} />);
-
-    await screen.findByText('Install the GitHub Integration');
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/integrations/?provider_key=github&includeConfig=0',
+      body: [
+        {
+          id: '123',
+        },
+      ],
+    });
 
-    await userEvent.click(screen.getByRole('button', {name: 'Back'}));
+    render(<AutofixSetupContent groupId="1" projectId="1" />);
 
+    expect(await screen.findByText('Set up Code Mappings')).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        /Set up code mappings for the Github repositories you want to run Autofix on/
+      )
+    ).toBeInTheDocument();
     expect(
-      await screen.findByText(/The GitHub integration is already installed/)
+      screen.getByRole('button', {name: 'Configure Code Mappings'})
     ).toBeInTheDocument();
   });
 
-  it('displays pending repos for github app text', async function () {
+  it('renders the code mappings with fallback if no integration is configured', async function () {
     MockApiClient.addMockResponse({
       url: '/issues/1/autofix/setup/',
       body: {
-        genAIConsent: {ok: false},
-        integration: {ok: true},
+        genAIConsent: {ok: true},
+        integration: {ok: false, reason: 'integration_no_code_mappings'},
         githubWriteIntegration: {
           ok: false,
           repos: [
@@ -98,13 +108,6 @@ describe('AutofixSetupContent', function () {
               owner: 'getsentry',
               name: 'sentry',
               external_id: '123',
-              ok: true,
-            },
-            {
-              provider: 'integrations:github',
-              owner: 'getsentry',
-              name: 'seer',
-              external_id: '235',
               ok: false,
             },
           ],
@@ -112,52 +115,21 @@ describe('AutofixSetupContent', function () {
       },
     });
 
-    const onComplete = jest.fn();
-
-    render(<AutofixSetupContent groupId="1" projectId="1" onComplete={onComplete} />);
-
-    expect(await screen.findByText('getsentry/sentry')).toBeInTheDocument();
-    expect(await screen.findByText('getsentry/seer')).toBeInTheDocument();
-  });
-
-  it('displays success repos for github app text', async function () {
     MockApiClient.addMockResponse({
-      url: '/issues/1/autofix/setup/',
-      body: {
-        genAIConsent: {ok: false},
-        integration: {ok: true},
-        githubWriteIntegration: {
-          ok: false,
-          repos: [
-            {
-              provider: 'integrations:github',
-              owner: 'getsentry',
-              name: 'sentry',
-              external_id: '123',
-              ok: true,
-            },
-            {
-              provider: 'integrations:github',
-              owner: 'getsentry',
-              name: 'seer',
-              external_id: '235',
-              ok: false,
-            },
-          ],
-        },
-      },
+      url: '/organizations/org-slug/integrations/?provider_key=github&includeConfig=0',
+      body: [],
     });
 
-    const onComplete = jest.fn();
-
-    render(<AutofixSetupContent groupId="1" projectId="1" onComplete={onComplete} />);
-
-    await screen.findByText('Allow Autofix to Make Pull Requests');
+    render(<AutofixSetupContent groupId="1" projectId="1" />);
 
+    expect(await screen.findByText('Set up Code Mappings')).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        /Set up code mappings for the Github repositories you want to run Autofix on/
+      )
+    ).toBeInTheDocument();
     expect(
-      await screen.findByText(/for the following repositories:/)
+      screen.getByRole('button', {name: 'Configure Integration'})
     ).toBeInTheDocument();
-    expect(await screen.findByText('getsentry/sentry')).toBeInTheDocument();
-    expect(await screen.findByText('getsentry/seer')).toBeInTheDocument();
   });
 });
diff --git a/static/app/components/events/autofix/autofixSetupModal.tsx b/static/app/components/events/autofix/autofixSetupModal.tsx
index d8ba9cd5e3a3fa..50bfcd8719ee90 100644
--- a/static/app/components/events/autofix/autofixSetupModal.tsx
+++ b/static/app/components/events/autofix/autofixSetupModal.tsx
@@ -1,4 +1,4 @@
-import {Fragment, useEffect, useMemo} from 'react';
+import {Fragment, useEffect} from 'react';
 import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/button';
@@ -8,21 +8,17 @@ import {
   useAutofixSetup,
 } from 'sentry/components/events/autofix/useAutofixSetup';
 import {GuidedSteps} from 'sentry/components/guidedSteps/guidedSteps';
-import HookOrDefault from 'sentry/components/hookOrDefault';
 import ExternalLink from 'sentry/components/links/externalLink';
 import LoadingError from 'sentry/components/loadingError';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {IconCheckmark, IconGithub} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import type {Integration} from 'sentry/types/integrations';
 import {trackAnalytics} from 'sentry/utils/analytics';
+import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
 
-const ConsentStep = HookOrDefault({
-  hookName: 'component:autofix-setup-step-consent',
-  defaultComponent: null,
-});
-
 function AutofixIntegrationStep({autofixSetup}: {autofixSetup: AutofixSetupResponse}) {
   if (autofixSetup.integration.ok) {
     return (
@@ -30,7 +26,9 @@ function AutofixIntegrationStep({autofixSetup}: {autofixSetup: AutofixSetupRespo
         {tct('The GitHub integration is already installed, [link: view in settings].', {
           link: <ExternalLink href={`/settings/integrations/github/`} />,
         })}
-        <GuidedSteps.StepButtons />
+        <GuidedSteps.ButtonWrapper>
+          <GuidedSteps.NextButton />
+        </GuidedSteps.ButtonWrapper>
       </Fragment>
     );
   }
@@ -56,33 +54,14 @@ function AutofixIntegrationStep({autofixSetup}: {autofixSetup: AutofixSetupRespo
             }
           )}
         </p>
-        <GuidedSteps.StepButtons />
-      </Fragment>
-    );
-  }
-
-  if (autofixSetup.integration.reason === 'integration_no_code_mappings') {
-    return (
-      <Fragment>
-        <p>
-          {tct(
-            'You have an active GitHub installation, but no code mappings for this project. Add code mappings by visiting the [link:integration settings page] and editing your configuration.',
-            {
-              link: <ExternalLink href={`/settings/integrations/github/`} />,
-            }
-          )}
-        </p>
-        <p>
-          {tct(
-            'Once added, come back to this page. For more information related to installing the GitHub integration, read the [link:documentation].',
-            {
-              link: (
-                <ExternalLink href="https://docs.sentry.io/product/integrations/source-code-mgmt/github/" />
-              ),
-            }
-          )}
-        </p>
-        <GuidedSteps.StepButtons />
+        <GuidedSteps.ButtonWrapper>
+          <ExternalLink href="/settings/integrations/github/">
+            <Button size="sm" priority="primary">
+              {t('Set up Integration')}
+            </Button>
+          </ExternalLink>
+          <GuidedSteps.NextButton />
+        </GuidedSteps.ButtonWrapper>
       </Fragment>
     );
   }
@@ -90,11 +69,8 @@ function AutofixIntegrationStep({autofixSetup}: {autofixSetup: AutofixSetupRespo
   return (
     <Fragment>
       <p>
-        {tct(
-          'Install the GitHub integration by navigating to the [link:integration settings page] and clicking the "Install" button. Follow the steps provided.',
-          {
-            link: <ExternalLink href={`/settings/integrations/github/`} />,
-          }
+        {t(
+          'Install the GitHub integration on the integration settings page and clicking the "Install" button. Follow the steps provided.'
         )}
       </p>
       <p>
@@ -107,7 +83,47 @@ function AutofixIntegrationStep({autofixSetup}: {autofixSetup: AutofixSetupRespo
           }
         )}
       </p>
-      <GuidedSteps.StepButtons />
+      <GuidedSteps.ButtonWrapper>
+        <ExternalLink href="/settings/integrations/github/">
+          <Button size="sm" priority="primary">
+            {t('Set up Integration')}
+          </Button>
+        </ExternalLink>
+        <GuidedSteps.NextButton />
+      </GuidedSteps.ButtonWrapper>
+    </Fragment>
+  );
+}
+
+function AutofixCodeMappingStep() {
+  const organization = useOrganization();
+  const {data: integrationConfigurations} = useApiQuery<Integration[]>(
+    [
+      `/organizations/${organization.slug}/integrations/?provider_key=github&includeConfig=0`,
+    ],
+    {
+      staleTime: Infinity,
+    }
+  );
+
+  const configurationId = integrationConfigurations?.at(0)?.id;
+  const url = `/settings/integrations/github/${configurationId ? configurationId + '/?tab=codeMappings' : ''}`;
+
+  return (
+    <Fragment>
+      <p>
+        {t(
+          'Set up code mappings for the Github repositories you want to run Autofix on for this project.'
+        )}
+      </p>
+      <GuidedSteps.ButtonWrapper>
+        <GuidedSteps.BackButton />
+        <ExternalLink href={url}>
+          <Button size="sm" priority="primary">
+            {configurationId ? t('Configure Code Mappings') : t('Configure Integration')}
+          </Button>
+        </ExternalLink>
+      </GuidedSteps.ButtonWrapper>
     </Fragment>
   );
 }
@@ -134,175 +150,25 @@ export function GitRepoLink({repo}: {repo: AutofixSetupRepoDefinition}) {
   );
 }
 
-function AutofixGithubIntegrationStep({
-  autofixSetup,
-  canStartAutofix,
-  onComplete,
-  isLastStep,
-}: {
-  autofixSetup: AutofixSetupResponse;
-  canStartAutofix: boolean;
-  isLastStep?: boolean;
-  onComplete?: () => void;
-}) {
-  const handleClose = () => {
-    onComplete?.();
-  };
-
-  const sortedRepos = useMemo(
-    () =>
-      autofixSetup.githubWriteIntegration.repos.toSorted((a, b) => {
-        if (a.ok === b.ok) {
-          return `${a.owner}/${a.name}`.localeCompare(`${b.owner}/${b.name}`);
-        }
-        return a.ok ? -1 : 1;
-      }),
-    [autofixSetup.githubWriteIntegration.repos]
-  );
-
-  if (autofixSetup.githubWriteIntegration.ok) {
-    return (
-      <Fragment>
-        <p>
-          {tct(
-            'The [link:Sentry Autofix GitHub App] has been installed on all required repositories:',
-            {
-              link: (
-                <ExternalLink href="https://github.com/apps/sentry-autofix-experimental" />
-              ),
-            }
-          )}
-        </p>
-        <RepoLinkUl>
-          {sortedRepos.map(repo => (
-            <GitRepoLink key={`${repo.owner}/${repo.name}`} repo={repo} />
-          ))}
-        </RepoLinkUl>
-        <GuidedSteps.StepButtons>
-          {isLastStep && (
-            <Button
-              priority="primary"
-              size="sm"
-              disabled={!canStartAutofix}
-              onClick={handleClose}
-            >
-              {t("Let's Go!")}
-            </Button>
-          )}
-        </GuidedSteps.StepButtons>
-      </Fragment>
-    );
-  }
-
-  if (autofixSetup.githubWriteIntegration.repos.length > 0) {
-    return (
-      <Fragment>
-        <p>
-          {tct(
-            'Install and grant write access to the [link:Sentry Autofix Github App] for the following repositories:',
-            {
-              link: (
-                <ExternalLink
-                  href={`https://github.com/apps/sentry-autofix/installations/new`}
-                />
-              ),
-            }
-          )}
-        </p>
-        <RepoLinkUl>
-          {sortedRepos.map(repo => (
-            <GitRepoLink key={`${repo.owner}/${repo.name}`} repo={repo} />
-          ))}
-        </RepoLinkUl>
-        <p>
-          {t(
-            'Without this, Autofix can still provide root analysis and suggested code changes.'
-          )}
-        </p>
-        <GuidedSteps.StepButtons>
-          {isLastStep && (
-            <Button
-              priority="primary"
-              size="sm"
-              disabled={!canStartAutofix}
-              onClick={handleClose}
-            >
-              {t('Skip & Enable Autofix')}
-            </Button>
-          )}
-        </GuidedSteps.StepButtons>
-      </Fragment>
-    );
-  }
-
-  return (
-    <Fragment>
-      <p>
-        {tct(
-          'Install and grant write access to the [link:Sentry Autofix Github App] for the relevant repositories.',
-          {
-            link: (
-              <ExternalLink
-                href={`https://github.com/apps/sentry-autofix/installations/new`}
-              />
-            ),
-          }
-        )}
-      </p>
-      <p>
-        {t(
-          'Without this, Autofix can still provide root analysis and suggested code changes.'
-        )}
-      </p>
-      <GuidedSteps.StepButtons>
-        {isLastStep && (
-          <Button
-            priority="primary"
-            size="sm"
-            disabled={!canStartAutofix}
-            onClick={handleClose}
-          >
-            {t('Skip & Enable Autofix')}
-          </Button>
-        )}
-      </GuidedSteps.StepButtons>
-    </Fragment>
-  );
-}
-
-function AutofixSetupSteps({
-  autofixSetup,
-  canStartAutofix,
-  onComplete,
-}: {
-  autofixSetup: AutofixSetupResponse;
-  canStartAutofix: boolean;
-  groupId: string;
-  projectId: string;
-  onComplete?: () => void;
-}) {
+function AutofixSetupSteps({autofixSetup}: {autofixSetup: AutofixSetupResponse}) {
   return (
     <GuidedSteps>
-      <ConsentStep hasConsented={autofixSetup.genAIConsent.ok} />
       <GuidedSteps.Step
         stepKey="integration"
         title={t('Install the GitHub Integration')}
-        isCompleted={autofixSetup.integration.ok}
+        isCompleted={
+          autofixSetup.integration.ok ||
+          autofixSetup.integration.reason === 'integration_no_code_mappings'
+        }
       >
         <AutofixIntegrationStep autofixSetup={autofixSetup} />
       </GuidedSteps.Step>
       <GuidedSteps.Step
-        stepKey="repoWriteAccess"
-        title={t('Allow Autofix to Make Pull Requests')}
-        isCompleted={autofixSetup.githubWriteIntegration.ok}
-        optional
+        stepKey="codeMappings"
+        title={t('Set up Code Mappings')}
+        isCompleted={autofixSetup.integration.ok}
       >
-        <AutofixGithubIntegrationStep
-          autofixSetup={autofixSetup}
-          canStartAutofix={canStartAutofix}
-          isLastStep
-          onComplete={onComplete}
-        />
+        <AutofixCodeMappingStep />
       </GuidedSteps.Step>
     </GuidedSteps>
   );
@@ -311,14 +177,12 @@ function AutofixSetupSteps({
 export function AutofixSetupContent({
   projectId,
   groupId,
-  onComplete,
 }: {
   groupId: string;
   projectId: string;
-  onComplete?: () => void;
 }) {
   const organization = useOrganization();
-  const {data, canStartAutofix, isPending, isError} = useAutofixSetup(
+  const {data, isPending, isError} = useAutofixSetup(
     {groupId},
     // Want to check setup status whenever the user comes back to the tab
     {refetchOnWindowFocus: true}
@@ -335,7 +199,7 @@ export function AutofixSetupContent({
       organization,
       setup_gen_ai_consent: data.genAIConsent.ok,
       setup_integration: data.integration.ok,
-      setup_write_integration: data.githubWriteIntegration.ok,
+      setup_write_integration: data.githubWriteIntegration?.ok,
     });
   }, [data, groupId, organization, projectId]);
 
@@ -349,19 +213,14 @@ export function AutofixSetupContent({
 
   return (
     <Fragment>
+      <Divider />
       <Header>Set up Autofix</Header>
       <p>
         Sentry's AI-enabled Autofix uses all of the contextual data surrounding this error
         to work with you to find the root cause and create a fix.
       </p>
-      <p>A few additional steps are needed before you can use Autofix.</p>
-      <AutofixSetupSteps
-        groupId={groupId}
-        projectId={projectId}
-        autofixSetup={data}
-        canStartAutofix={canStartAutofix}
-        onComplete={onComplete}
-      />
+      <p>To use Autofix, please follow the instructions below.</p>
+      <AutofixSetupSteps autofixSetup={data} />
     </Fragment>
   );
 }
@@ -383,13 +242,6 @@ const Header = styled('p')`
   margin-top: ${space(2)};
 `;
 
-const RepoLinkUl = styled('ul')`
-  display: flex;
-  flex-direction: column;
-  gap: ${space(0.5)};
-  padding: 0;
-`;
-
 const RepoLinkItem = styled('li')`
   display: flex;
   align-items: center;
@@ -401,3 +253,8 @@ const GithubLink = styled('div')`
   align-items: center;
   gap: ${space(0.5)};
 `;
+
+const Divider = styled('div')`
+  margin: ${space(3)} 0;
+  border-bottom: 2px solid ${p => p.theme.gray100};
+`;
diff --git a/static/app/components/events/autofix/autofixSetupWriteAccessModal.spec.tsx b/static/app/components/events/autofix/autofixSetupWriteAccessModal.spec.tsx
index 3e9957efeddfd4..f4833a8e39212f 100644
--- a/static/app/components/events/autofix/autofixSetupWriteAccessModal.spec.tsx
+++ b/static/app/components/events/autofix/autofixSetupWriteAccessModal.spec.tsx
@@ -6,7 +6,7 @@ import {AutofixSetupWriteAccessModal} from 'sentry/components/events/autofix/aut
 describe('AutofixSetupWriteAccessModal', function () {
   it('displays help text when repos are not all installed', async function () {
     MockApiClient.addMockResponse({
-      url: '/issues/1/autofix/setup/',
+      url: '/issues/1/autofix/setup/?check_write_access=true',
       body: {
         genAIConsent: {ok: false},
         integration: {ok: true},
@@ -29,7 +29,6 @@ describe('AutofixSetupWriteAccessModal', function () {
             },
           ],
         },
-        codebaseIndexing: {ok: false},
       },
     });
 
@@ -57,7 +56,7 @@ describe('AutofixSetupWriteAccessModal', function () {
 
   it('displays success text when installed repos for github app text', async function () {
     MockApiClient.addMockResponse({
-      url: '/issues/1/autofix/setup/',
+      url: '/issues/1/autofix/setup/?check_write_access=true',
       body: {
         genAIConsent: {ok: false},
         integration: {ok: true},
@@ -80,7 +79,6 @@ describe('AutofixSetupWriteAccessModal', function () {
             },
           ],
         },
-        codebaseIndexing: {ok: false},
       },
     });
 
diff --git a/static/app/components/events/autofix/autofixSetupWriteAccessModal.tsx b/static/app/components/events/autofix/autofixSetupWriteAccessModal.tsx
index 697475c35e8704..2b150bc86d0db9 100644
--- a/static/app/components/events/autofix/autofixSetupWriteAccessModal.tsx
+++ b/static/app/components/events/autofix/autofixSetupWriteAccessModal.tsx
@@ -17,13 +17,13 @@ interface AutofixSetupWriteAccessModalProps extends ModalRenderProps {
 
 function Content({groupId, closeModal}: {closeModal: () => void; groupId: string}) {
   const {canCreatePullRequests, data} = useAutofixSetup(
-    {groupId},
+    {groupId, checkWriteAccess: true},
     {refetchOnWindowFocus: true} // We want to check each time the user comes back to the tab
   );
 
   const sortedRepos = useMemo(
     () =>
-      data?.githubWriteIntegration.repos.toSorted((a, b) => {
+      data?.githubWriteIntegration?.repos.toSorted((a, b) => {
         if (a.ok === b.ok) {
           return `${a.owner}/${a.name}`.localeCompare(`${b.owner}/${b.name}`);
         }
@@ -93,10 +93,10 @@ export function AutofixSetupWriteAccessModal({
   groupId,
   closeModal,
 }: AutofixSetupWriteAccessModalProps) {
-  const {canCreatePullRequests} = useAutofixSetup({groupId});
+  const {canCreatePullRequests} = useAutofixSetup({groupId, checkWriteAccess: true});
 
   return (
-    <Fragment>
+    <div id="autofix-write-access-modal">
       <Header closeButton>
         <h3>{t('Allow Autofix to Make Pull Requests')}</h3>
       </Header>
@@ -117,7 +117,7 @@ export function AutofixSetupWriteAccessModal({
           </ButtonBar>
         </Footer>
       )}
-    </Fragment>
+    </div>
   );
 }
 
diff --git a/static/app/components/events/autofix/autofixSteps.spec.tsx b/static/app/components/events/autofix/autofixSteps.spec.tsx
index 74540b1d953cd2..18b0067e8007a5 100644
--- a/static/app/components/events/autofix/autofixSteps.spec.tsx
+++ b/static/app/components/events/autofix/autofixSteps.spec.tsx
@@ -7,7 +7,11 @@ import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrar
 
 import {addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {AutofixSteps} from 'sentry/components/events/autofix/autofixSteps';
-import {type AutofixStep, AutofixStepType} from 'sentry/components/events/autofix/types';
+import {
+  AutofixStatus,
+  type AutofixStep,
+  AutofixStepType,
+} from 'sentry/components/events/autofix/types';
 
 jest.mock('sentry/actionCreators/indicator');
 
@@ -24,14 +28,14 @@ describe('AutofixSteps', () => {
         AutofixStepFixture({
           id: '1',
           type: AutofixStepType.DEFAULT,
-          status: 'COMPLETED',
+          status: AutofixStatus.COMPLETED,
           insights: [],
           progress: [],
         }),
         AutofixStepFixture({
           id: '2',
           type: AutofixStepType.ROOT_CAUSE_ANALYSIS,
-          status: 'COMPLETED',
+          status: AutofixStatus.COMPLETED,
           causes: [
             {
               id: 'cause1',
@@ -47,7 +51,7 @@ describe('AutofixSteps', () => {
       repositories: [],
       created_at: '2023-01-01T00:00:00Z',
       run_id: '1',
-      status: 'PROCESSING',
+      status: AutofixStatus.PROCESSING,
     }),
     groupId: 'group1',
     runId: 'run1',
@@ -126,7 +130,7 @@ describe('AutofixSteps', () => {
           AutofixStepFixture({
             id: '3',
             type: AutofixStepType.DEFAULT,
-            status: 'PROCESSING',
+            status: AutofixStatus.PROCESSING,
             progress: [
               AutofixProgressItemFixture({
                 message: 'Log message',
@@ -149,7 +153,6 @@ describe('AutofixSteps', () => {
       url: '/issues/group1/autofix/setup/',
       body: {
         genAIConsent: {ok: true},
-        codebaseIndexing: {ok: true},
         integration: {ok: true},
         githubWriteIntegration: {
           repos: [],
@@ -173,7 +176,7 @@ describe('AutofixSteps', () => {
           AutofixStepFixture({
             id: '1',
             type: AutofixStepType.DEFAULT,
-            status: 'COMPLETED',
+            status: AutofixStatus.COMPLETED,
             insights: [],
             progress: [],
             index: 0,
@@ -181,7 +184,7 @@ describe('AutofixSteps', () => {
           AutofixStepFixture({
             id: '2',
             type: AutofixStepType.CHANGES,
-            status: 'COMPLETED',
+            status: AutofixStatus.COMPLETED,
             progress: [],
             changes: [changeData],
           }),
@@ -191,7 +194,7 @@ describe('AutofixSteps', () => {
 
     render(<AutofixSteps {...propsWithChanges} />);
 
-    const input = screen.getByPlaceholderText('Say something...');
+    const input = screen.getByPlaceholderText('Share helpful context or feedback...');
     await userEvent.type(input, 'Feedback on changes');
     await userEvent.click(screen.getByRole('button', {name: 'Send'}));
 
diff --git a/static/app/components/events/autofix/autofixSteps.tsx b/static/app/components/events/autofix/autofixSteps.tsx
index 5b4b5bf9d80bb8..37a5879485a631 100644
--- a/static/app/components/events/autofix/autofixSteps.tsx
+++ b/static/app/components/events/autofix/autofixSteps.tsx
@@ -34,6 +34,7 @@ interface StepProps {
   hasStepBelow: boolean;
   repos: AutofixRepository[];
   runId: string;
+  shouldHighlightRethink: boolean;
   step: AutofixStep;
 }
 
@@ -67,6 +68,7 @@ export function Step({
   hasStepBelow,
   hasStepAbove,
   hasErroredStepBefore,
+  shouldHighlightRethink,
 }: StepProps) {
   return (
     <StepCard>
@@ -90,6 +92,7 @@ export function Step({
                   stepIndex={step.index}
                   groupId={groupId}
                   runId={runId}
+                  shouldHighlightRethink={shouldHighlightRethink}
                 />
               )}
               {step.type === AutofixStepType.ROOT_CAUSE_ANALYSIS && (
@@ -244,17 +247,35 @@ export function AutofixSteps({data, groupId, runId}: AutofixStepsProps) {
             (previousStep?.type !== AutofixStepType.DEFAULT ||
               previousStep?.insights.length === 0) &&
             step.type !== AutofixStepType.DEFAULT;
+          const stepBelowProcessingAndEmpty =
+            nextStep?.type === AutofixStepType.DEFAULT &&
+            nextStep?.status === 'PROCESSING' &&
+            nextStep?.insights?.length === 0;
+
+          const isNextStepLastStep = index === steps.length - 2;
+          const shouldHighlightRethink =
+            (nextStep?.type === AutofixStepType.ROOT_CAUSE_ANALYSIS &&
+              isNextStepLastStep) ||
+            (nextStep?.type === AutofixStepType.CHANGES &&
+              nextStep.changes.length > 0 &&
+              !nextStep.changes.every(change => change.pull_request));
+
           return (
             <div ref={el => (stepsRef.current[index] = el)} key={step.id}>
               {twoNonDefaultStepsInARow && <br />}
               <Step
                 step={step}
-                hasStepBelow={index + 1 < steps.length && !twoInsightStepsInARow}
+                hasStepBelow={
+                  index + 1 < steps.length &&
+                  !twoInsightStepsInARow &&
+                  !stepBelowProcessingAndEmpty
+                }
                 hasStepAbove
                 groupId={groupId}
                 runId={runId}
                 repos={repos}
                 hasErroredStepBefore={previousStepErrored}
+                shouldHighlightRethink={shouldHighlightRethink}
               />
             </div>
           );
diff --git a/static/app/components/events/autofix/types.ts b/static/app/components/events/autofix/types.ts
index 0191485b1177a0..1e291accf68f01 100644
--- a/static/app/components/events/autofix/types.ts
+++ b/static/app/components/events/autofix/types.ts
@@ -28,6 +28,15 @@ export enum AutofixCodebaseIndexingStatus {
   ERRORED = 'errored',
 }
 
+export enum AutofixStatus {
+  COMPLETED = 'COMPLETED',
+  ERROR = 'ERROR',
+  PROCESSING = 'PROCESSING',
+  NEED_MORE_INFORMATION = 'NEED_MORE_INFORMATION',
+  CANCELLED = 'CANCELLED',
+  WAITING_FOR_USER_RESPONSE = 'WAITING_FOR_USER_RESPONSE',
+}
+
 export type AutofixPullRequestDetails = {
   pr_number: number;
   pr_url: string;
@@ -49,13 +58,7 @@ export type AutofixData = {
   created_at: string;
   repositories: AutofixRepository[];
   run_id: string;
-  status:
-    | 'PENDING'
-    | 'PROCESSING'
-    | 'COMPLETED'
-    | 'NOFIX'
-    | 'ERROR'
-    | 'NEED_MORE_INFORMATION';
+  status: AutofixStatus;
   actor_ids?: number[];
   codebase_indexing?: {
     status: 'COMPLETED';
@@ -80,13 +83,7 @@ interface BaseStep {
   id: string;
   index: number;
   progress: AutofixProgressItem[];
-  status:
-    | 'PENDING'
-    | 'PROCESSING'
-    | 'COMPLETED'
-    | 'ERROR'
-    | 'CANCELLED'
-    | 'WAITING_FOR_USER_RESPONSE';
+  status: AutofixStatus;
   title: string;
   type: AutofixStepType;
   completedMessage?: string;
@@ -96,6 +93,8 @@ export type CodeSnippetContext = {
   file_path: string;
   repo_name: string;
   snippet: string;
+  end_line?: number;
+  start_line?: number;
 };
 
 export type StacktraceContext = {
diff --git a/static/app/components/events/autofix/useAutofix.tsx b/static/app/components/events/autofix/useAutofix.tsx
index fd4c793a8b8c1c..1af55d87943a48 100644
--- a/static/app/components/events/autofix/useAutofix.tsx
+++ b/static/app/components/events/autofix/useAutofix.tsx
@@ -2,6 +2,7 @@ import {useCallback, useState} from 'react';
 
 import {
   type AutofixData,
+  AutofixStatus,
   AutofixStepType,
   type GroupWithAutofix,
 } from 'sentry/components/events/autofix/types';
@@ -26,14 +27,14 @@ export const makeAutofixQueryKey = (groupId: string): ApiQueryKey => [
 
 const makeInitialAutofixData = (): AutofixResponse => ({
   autofix: {
-    status: 'PROCESSING',
+    status: AutofixStatus.PROCESSING,
     run_id: '',
     steps: [
       {
         type: AutofixStepType.DEFAULT,
         id: '1',
         index: 0,
-        status: 'PROCESSING',
+        status: AutofixStatus.PROCESSING,
         title: 'Starting Autofix...',
         insights: [],
         progress: [],
@@ -48,13 +49,13 @@ const makeErrorAutofixData = (errorMessage: string): AutofixResponse => {
   const data = makeInitialAutofixData();
 
   if (data.autofix) {
-    data.autofix.status = 'ERROR';
+    data.autofix.status = AutofixStatus.ERROR;
     data.autofix.steps = [
       {
         type: AutofixStepType.DEFAULT,
         id: '1',
         index: 0,
-        status: 'ERROR',
+        status: AutofixStatus.ERROR,
         title: 'Something went wrong',
         completedMessage: errorMessage,
         insights: [],
@@ -66,7 +67,12 @@ const makeErrorAutofixData = (errorMessage: string): AutofixResponse => {
   return data;
 };
 
-const isPolling = (autofixData?: AutofixData | null) => autofixData?.status !== 'PENDING';
+/** Will not poll when the autofix is in an error state or has completed */
+const isPolling = (autofixData?: AutofixData | null) =>
+  !autofixData ||
+  ![AutofixStatus.ERROR, AutofixStatus.COMPLETED, AutofixStatus.CANCELLED].includes(
+    autofixData.status
+  );
 
 export const useAutofixData = ({groupId}: {groupId: string}) => {
   const {data} = useApiQuery<AutofixResponse>(makeAutofixQueryKey(groupId), {
diff --git a/static/app/components/events/autofix/useAutofixSetup.tsx b/static/app/components/events/autofix/useAutofixSetup.tsx
index 23dc3204677301..7abf06860111b8 100644
--- a/static/app/components/events/autofix/useAutofixSetup.tsx
+++ b/static/app/components/events/autofix/useAutofixSetup.tsx
@@ -14,39 +14,44 @@ export type AutofixSetupResponse = {
   genAIConsent: {
     ok: boolean;
   };
-  githubWriteIntegration: {
-    ok: boolean;
-    repos: AutofixSetupRepoDefinition[];
-  };
   integration: {
     ok: boolean;
     reason: string | null;
   };
-  subprocessorConsent: {
+  githubWriteIntegration?: {
     ok: boolean;
-  };
+    repos: AutofixSetupRepoDefinition[];
+  } | null;
 };
 
-export function makeAutofixSetupQueryKey(groupId: string): ApiQueryKey {
-  return [`/issues/${groupId}/autofix/setup/`];
+export function makeAutofixSetupQueryKey(
+  groupId: string,
+  checkWriteAccess?: boolean
+): ApiQueryKey {
+  return [
+    `/issues/${groupId}/autofix/setup/${checkWriteAccess ? '?check_write_access=true' : ''}`,
+  ];
 }
 
 export function useAutofixSetup(
-  {groupId}: {groupId: string},
+  {groupId, checkWriteAccess}: {groupId: string; checkWriteAccess?: boolean},
   options: Omit<UseApiQueryOptions<AutofixSetupResponse, RequestError>, 'staleTime'> = {}
 ) {
-  const queryData = useApiQuery<AutofixSetupResponse>(makeAutofixSetupQueryKey(groupId), {
-    enabled: Boolean(groupId),
-    staleTime: 0,
-    retry: false,
-    ...options,
-  });
+  const queryData = useApiQuery<AutofixSetupResponse>(
+    makeAutofixSetupQueryKey(groupId, checkWriteAccess),
+    {
+      enabled: Boolean(groupId),
+      staleTime: 0,
+      retry: false,
+      ...options,
+    }
+  );
 
   return {
     ...queryData,
     canStartAutofix: Boolean(
       queryData.data?.integration.ok && queryData.data?.genAIConsent.ok
     ),
-    canCreatePullRequests: Boolean(queryData.data?.githubWriteIntegration.ok),
+    canCreatePullRequests: Boolean(queryData.data?.githubWriteIntegration?.ok),
   };
 }
diff --git a/static/app/components/events/contexts/contextCard.tsx b/static/app/components/events/contexts/contextCard.tsx
index db6f311641abc2..f3fd784dbfe1c7 100644
--- a/static/app/components/events/contexts/contextCard.tsx
+++ b/static/app/components/events/contexts/contextCard.tsx
@@ -112,7 +112,7 @@ export default function ContextCard({
       title={
         <Title>
           <div>{getContextTitle({alias, type, value})}</div>
-          <div>
+          <div style={{minWidth: 14}}>
             <ErrorBoundary customComponent={null}>
               {getContextIcon({
                 alias,
diff --git a/static/app/components/events/contexts/contextIcon.tsx b/static/app/components/events/contexts/contextIcon.tsx
index 03627b359d6157..2f95643adeffac 100644
--- a/static/app/components/events/contexts/contextIcon.tsx
+++ b/static/app/components/events/contexts/contextIcon.tsx
@@ -12,6 +12,7 @@ import logoAppleWatch from 'sentry-logos/logo-apple-watch.svg';
 import logoArm from 'sentry-logos/logo-arm.svg';
 import logoChrome from 'sentry-logos/logo-chrome.svg';
 import logoChromium from 'sentry-logos/logo-chromium.svg';
+import logoCloudflareWorker from 'sentry-logos/logo-cloudflare-worker.svg';
 import logoCrystal from 'sentry-logos/logo-crystal.svg';
 import logoDeno from 'sentry-logos/logo-deno.svg';
 import logoDotnet from 'sentry-logos/logo-dotnet.svg';
@@ -41,6 +42,7 @@ import logoSamsung from 'sentry-logos/logo-samsung.svg';
 import logoUbuntu from 'sentry-logos/logo-ubuntu.svg';
 import logoUnity from 'sentry-logos/logo-unity.svg';
 import logoUnknown from 'sentry-logos/logo-unknown.svg';
+import logoVercel from 'sentry-logos/logo-vercel.svg';
 import logoWindows from 'sentry-logos/logo-windows.svg';
 
 import ConfigStore from 'sentry/stores/configStore';
@@ -70,6 +72,7 @@ const LOGO_MAPPING = {
   arm: logoArm,
   chrome: logoChrome,
   chromium: logoChromium,
+  cloudflare: logoCloudflareWorker,
   cpython: logoPython,
   crystal: logoCrystal,
   darwin: logoApple,
@@ -100,6 +103,7 @@ const LOGO_MAPPING = {
   samsung: logoSamsung,
   tvos: logoApple,
   ubuntu: logoUbuntu,
+  vercel: logoVercel,
   watch: logoAppleWatch,
   watchos: logoApple,
   windows: logoWindows,
@@ -117,6 +121,7 @@ const INVERT_IN_DARKMODE = [
   'mac',
   'apple',
   'watchos',
+  'vercel',
 ];
 
 const darkCss = css`
diff --git a/static/app/components/events/contexts/default.tsx b/static/app/components/events/contexts/default.tsx
deleted file mode 100644
index 52b93510f2725f..00000000000000
--- a/static/app/components/events/contexts/default.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import ContextBlock from 'sentry/components/events/contexts/contextBlock';
-import type {Event} from 'sentry/types/event';
-
-type Props = {
-  alias: string;
-  data: Record<string, React.ReactNode | undefined>;
-  event: Event;
-};
-
-export function getDefaultContextData(data: Props['data']) {
-  return Object.entries(data)
-    .filter(([k]) => k !== 'type' && k !== 'title')
-    .map(([key, value]) => ({
-      key,
-      subject: key,
-      value,
-    }));
-}
-
-export function DefaultContext({data}: Props) {
-  return <ContextBlock data={getDefaultContextData(data)} />;
-}
diff --git a/static/app/components/events/contexts/device/getDeviceKnownDataDetails.spec.tsx b/static/app/components/events/contexts/device/getDeviceKnownDataDetails.spec.tsx
deleted file mode 100644
index 20d5d4669f158d..00000000000000
--- a/static/app/components/events/contexts/device/getDeviceKnownDataDetails.spec.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import {EventFixture} from 'sentry-fixture/event';
-
-import {
-  deviceKnownDataValues,
-  getDeviceKnownDataDetails,
-} from 'sentry/components/events/contexts/device/getDeviceKnownDataDetails';
-
-import {deviceMockData} from './index.spec';
-
-describe('getDeviceKnownDataDetails', function () {
-  it('returns values and according to the parameters', function () {
-    const allKnownData: ReturnType<typeof getDeviceKnownDataDetails>[] = [];
-
-    for (const type of Object.keys(deviceKnownDataValues)) {
-      const deviceKnownData = getDeviceKnownDataDetails({
-        type: deviceKnownDataValues[type],
-        data: deviceMockData,
-        event: EventFixture(),
-      });
-
-      if (!deviceKnownData) {
-        continue;
-      }
-
-      allKnownData.push(deviceKnownData);
-    }
-
-    expect(allKnownData).toEqual([
-      {subject: 'Architecture', value: 'x86'},
-      {subject: 'Battery Level', value: '100%'},
-      {subject: 'Battery Status', value: undefined},
-      {subject: 'Battery Temperature (°C)', value: 45},
-      expect.objectContaining({subject: 'Boot Time'}),
-      {subject: 'Brand', value: 'google'},
-      {subject: 'Charging', value: true},
-      {subject: 'CPU Description', value: undefined},
-      {subject: 'Device Type', value: undefined},
-      expect.objectContaining({subject: 'External Free Storage'}),
-      expect.objectContaining({subject: 'External Storage Size'}),
-      {subject: 'Family', value: 'Android'},
-      expect.objectContaining({subject: 'Free Memory'}),
-      expect.objectContaining({subject: 'Free Storage'}),
-      {subject: 'Low Memory', value: false},
-      {subject: 'Manufacturer', value: 'Google'},
-      expect.objectContaining({subject: 'Memory Size'}),
-      expect.objectContaining({subject: 'Model'}),
-      {subject: 'Model Id', value: 'NYC'},
-      {subject: 'Name', value: ''},
-      {subject: 'Online', value: true},
-      {subject: 'Orientation', value: 'portrait'},
-      {subject: 'Screen Density', value: 3},
-      {subject: 'Screen DPI', value: 480},
-      {subject: 'Screen Height Pixels', value: 1136},
-      {subject: 'Screen Resolution', value: '1136x768'},
-      {subject: 'Screen Width Pixels', value: 768},
-      {subject: 'Simulator', value: true},
-      expect.objectContaining({subject: 'Storage Size'}),
-      {subject: 'Usable Memory', value: undefined},
-      {subject: 'Memory', value: undefined},
-      {
-        subject: 'Capacity',
-        value:
-          'Total: 779.3 MiB / Free: 485.2 MiB (External Total: 510.0 MiB / Free: 509.9 MiB)',
-      },
-    ]);
-  });
-});
diff --git a/static/app/components/events/contexts/device/getDeviceKnownDataDetails.tsx b/static/app/components/events/contexts/device/getDeviceKnownDataDetails.tsx
deleted file mode 100644
index 096562cc0d0ea1..00000000000000
--- a/static/app/components/events/contexts/device/getDeviceKnownDataDetails.tsx
+++ /dev/null
@@ -1,222 +0,0 @@
-import {DeviceName} from 'sentry/components/deviceName';
-import FileSize from 'sentry/components/fileSize';
-import {t} from 'sentry/locale';
-import type {DeviceContext, Event} from 'sentry/types/event';
-import {DeviceContextKey} from 'sentry/types/event';
-import {defined} from 'sentry/utils';
-
-import {getRelativeTimeFromEventDateCreated, type KnownDataDetails} from '../utils';
-
-import {formatMemory, formatStorage} from './utils';
-
-export const deviceKnownDataValues = [
-  ...Object.values(DeviceContextKey),
-  // Added two general keys here to namespace the values
-  // tracks memory_size, free_memory, usable_memory
-  'memory',
-  // tracks storage_size, free_storage, external_storage_size, external_free_storage
-  'storage',
-];
-
-type Props = {
-  data: DeviceContext;
-  event: Event;
-  type: (typeof deviceKnownDataValues)[number];
-};
-
-export function getDeviceKnownDataDetails({data, event, type}: Props): KnownDataDetails {
-  switch (type) {
-    case DeviceContextKey.NAME:
-      return {
-        subject: t('Name'),
-        value: data.name,
-      };
-    case DeviceContextKey.FAMILY:
-      return {
-        subject: t('Family'),
-        value: data.family,
-      };
-    case DeviceContextKey.MODEL_ID:
-      return {
-        subject: t('Model Id'),
-        value: data.model_id,
-      };
-    case DeviceContextKey.MODEL:
-      return {
-        subject: t('Model'),
-        value:
-          typeof data.model === 'string' ? (
-            <DeviceName
-              value={`${data.model} ${data?.model_id ? `(${data.model_id})` : ''}`}
-            />
-          ) : undefined,
-      };
-    case DeviceContextKey.CPU_DESCRIPTION:
-      return {
-        subject: t('CPU Description'),
-        value: data.cpu_description,
-      };
-    case DeviceContextKey.ARCH:
-      return {
-        subject: t('Architecture'),
-        value: data.arch,
-      };
-    case DeviceContextKey.BATTERY_LEVEL:
-      return {
-        subject: t('Battery Level'),
-        value: defined(data.battery_level) ? `${data.battery_level}%` : undefined,
-      };
-    case DeviceContextKey.BATTERY_STATUS:
-      return {
-        subject: t('Battery Status'),
-        value: data.battery_status,
-      };
-    case DeviceContextKey.BATTERY_TEMPERATURE:
-      return {
-        subject: t('Battery Temperature (°C)'),
-        value: data.battery_temperature,
-      };
-    case DeviceContextKey.ORIENTATION:
-      return {
-        subject: t('Orientation'),
-        value: data.orientation,
-      };
-    case 'memory':
-      const {memory_size, free_memory, usable_memory} = data;
-      return {
-        subject: t('Memory'),
-        value:
-          memory_size && free_memory && usable_memory
-            ? formatMemory(memory_size, free_memory, usable_memory)
-            : undefined,
-      };
-    case 'storage':
-      const {storage_size, free_storage, external_storage_size, external_free_storage} =
-        data;
-      return {
-        subject: t('Capacity'),
-        value:
-          storage_size && free_storage && external_storage_size && external_free_storage
-            ? formatStorage(
-                storage_size,
-                free_storage,
-                external_storage_size,
-                external_free_storage
-              )
-            : undefined,
-      };
-    case DeviceContextKey.FREE_STORAGE: {
-      return {
-        subject: t('Free Storage'),
-        value: data.free_storage ? <FileSize bytes={data.free_storage} /> : undefined,
-      };
-    }
-    case DeviceContextKey.STORAGE_SIZE: {
-      return {
-        subject: t('Storage Size'),
-        value: data.storage_size ? <FileSize bytes={data.storage_size} /> : undefined,
-      };
-    }
-    case DeviceContextKey.EXTERNAL_STORAGE_SIZE: {
-      return {
-        subject: t('External Storage Size'),
-        value: data.external_storage_size ? (
-          <FileSize bytes={data.external_storage_size} />
-        ) : undefined,
-      };
-    }
-    case DeviceContextKey.EXTERNAL_FREE_STORAGE: {
-      return {
-        subject: t('External Free Storage'),
-        value: data.external_free_storage ? (
-          <FileSize bytes={data.external_free_storage} />
-        ) : undefined,
-      };
-    }
-    case DeviceContextKey.SIMULATOR:
-      return {
-        subject: t('Simulator'),
-        value: data.simulator,
-      };
-    case DeviceContextKey.BOOT_TIME:
-      return {
-        subject: t('Boot Time'),
-        value: getRelativeTimeFromEventDateCreated(
-          event.dateCreated ? event.dateCreated : event.dateReceived,
-          data.boot_time
-        ),
-      };
-    case DeviceContextKey.DEVICE_TYPE:
-      return {
-        subject: t('Device Type'),
-        value: data.device_type,
-      };
-    case DeviceContextKey.BRAND:
-      return {
-        subject: t('Brand'),
-        value: data.brand,
-      };
-    case DeviceContextKey.CHARGING:
-      return {
-        subject: t('Charging'),
-        value: data.charging,
-      };
-    case DeviceContextKey.LOW_MEMORY:
-      return {
-        subject: t('Low Memory'),
-        value: data.low_memory,
-      };
-    case DeviceContextKey.FREE_MEMORY:
-      return {
-        subject: t('Free Memory'),
-        value: data.free_memory ? <FileSize bytes={data.free_memory} /> : undefined,
-      };
-    case DeviceContextKey.MEMORY_SIZE:
-      return {
-        subject: t('Memory Size'),
-        value: data.memory_size ? <FileSize bytes={data.memory_size} /> : undefined,
-      };
-    case DeviceContextKey.USABLE_MEMORY:
-      return {
-        subject: t('Usable Memory'),
-        value: data.usable_memory ? <FileSize bytes={data.usable_memory} /> : undefined,
-      };
-    case DeviceContextKey.MANUFACTURER:
-      return {
-        subject: t('Manufacturer'),
-        value: data.manufacturer,
-      };
-    case DeviceContextKey.ONLINE:
-      return {
-        subject: t('Online'),
-        value: data.online,
-      };
-    case DeviceContextKey.SCREEN_DENSITY:
-      return {
-        subject: t('Screen Density'),
-        value: data.screen_density,
-      };
-    case DeviceContextKey.SCREEN_DPI:
-      return {
-        subject: t('Screen DPI'),
-        value: data.screen_dpi,
-      };
-    case DeviceContextKey.SCREEN_HEIGHT_PIXELS:
-      return {
-        subject: t('Screen Height Pixels'),
-        value: data.screen_height_pixels,
-      };
-    case DeviceContextKey.SCREEN_RESOLUTION:
-      return {
-        subject: t('Screen Resolution'),
-        value: data.screen_resolution,
-      };
-    case DeviceContextKey.SCREEN_WIDTH_PIXELS:
-      return {
-        subject: t('Screen Width Pixels'),
-        value: data.screen_width_pixels,
-      };
-    default:
-      return undefined;
-  }
-}
diff --git a/static/app/components/events/contexts/device/index.spec.tsx b/static/app/components/events/contexts/device/index.spec.tsx
deleted file mode 100644
index 03cc66681e9390..00000000000000
--- a/static/app/components/events/contexts/device/index.spec.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import {DataScrubbingRelayPiiConfigFixture} from 'sentry-fixture/dataScrubbingRelayPiiConfig';
-import {EventFixture} from 'sentry-fixture/event';
-
-import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
-import {textWithMarkupMatcher} from 'sentry-test/utils';
-
-import {DeviceEventContext} from 'sentry/components/events/contexts/device';
-import type {DeviceContext} from 'sentry/types/event';
-
-export const deviceMockData: DeviceContext = {
-  screen_resolution: '1136x768',
-  orientation: 'portrait',
-  family: 'Android',
-  battery_level: 100,
-  battery_temperature: 45,
-  screen_dpi: 480,
-  memory_size: 1055186944,
-  timezone: 'America/Los_Angeles',
-  external_storage_size: 534761472,
-  external_free_storage: 534702080,
-  screen_width_pixels: 768,
-  low_memory: false,
-  simulator: true,
-  screen_height_pixels: 1136,
-  free_memory: 658702336,
-  online: true,
-  screen_density: 3,
-  type: 'device',
-  charging: true,
-  model_id: 'NYC',
-  brand: 'google',
-  storage_size: 817143808,
-  boot_time: '2019-12-11T11:38:15Z',
-  arch: 'x86',
-  manufacturer: 'Google',
-  name: '', // redacted
-  free_storage: 508784640,
-  model: 'Android SDK built for x86',
-};
-
-export const deviceContextMetaMockData = {
-  name: {
-    '': {
-      rem: [['organization:0', 's', 0, 0]],
-      len: 25,
-    },
-  },
-};
-
-const event = EventFixture({
-  _meta: {
-    contexts: {
-      device: deviceContextMetaMockData,
-    },
-  },
-});
-
-describe('device event context', function () {
-  it('display redacted data', async function () {
-    render(<DeviceEventContext event={event} data={deviceMockData} />, {
-      organization: {
-        relayPiiConfig: JSON.stringify(DataScrubbingRelayPiiConfigFixture()),
-      },
-    });
-    expect(screen.getByText('Name')).toBeInTheDocument(); // subject
-    expect(screen.getByText(/redacted/)).toBeInTheDocument(); // value
-    await userEvent.hover(screen.getByText(/redacted/));
-    expect(
-      await screen.findByText(
-        textWithMarkupMatcher(
-          "Replaced because of the data scrubbing rule [Replace] [Password fields] with [Scrubbed] from [password] in your organization's settings"
-        )
-      )
-    ).toBeInTheDocument(); // tooltip description
-  });
-});
diff --git a/static/app/components/events/contexts/device/index.tsx b/static/app/components/events/contexts/device/index.tsx
deleted file mode 100644
index 05f803aedb9c89..00000000000000
--- a/static/app/components/events/contexts/device/index.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import {Fragment} from 'react';
-
-import ContextBlock from 'sentry/components/events/contexts/contextBlock';
-import type {DeviceContext, Event} from 'sentry/types/event';
-
-import {
-  getContextMeta,
-  getKnownData,
-  getKnownStructuredData,
-  getUnknownData,
-} from '../utils';
-
-import {
-  deviceKnownDataValues,
-  getDeviceKnownDataDetails,
-} from './getDeviceKnownDataDetails';
-import {getInferredData} from './utils';
-
-type Props = {
-  data: DeviceContext;
-  event: Event;
-  meta?: Record<string, any>;
-};
-
-const deviceIgnoredDataValues = [];
-
-export function getKnownDeviceContextData({data, event, meta}: Props) {
-  const inferredData = getInferredData(data);
-  return getKnownData<DeviceContext, (typeof deviceKnownDataValues)[number]>({
-    data: inferredData,
-    meta,
-    knownDataTypes: deviceKnownDataValues,
-    onGetKnownDataDetails: v => getDeviceKnownDataDetails({...v, event}),
-  }).map(v => ({
-    ...v,
-    subjectDataTestId: `device-context-${v.key.toLowerCase()}-value`,
-  }));
-}
-
-export function getUnknownDeviceContextData({data, meta}: Pick<Props, 'data' | 'meta'>) {
-  const inferredData = getInferredData(data);
-  return getUnknownData({
-    allData: inferredData,
-    knownKeys: [...deviceKnownDataValues, ...deviceIgnoredDataValues],
-    meta,
-  });
-}
-
-export function DeviceEventContext({data, event, meta: propsMeta}: Props) {
-  const meta = propsMeta ?? getContextMeta(event, 'device');
-  const knownData = getKnownDeviceContextData({data, event, meta});
-  const knownStructuredData = getKnownStructuredData(knownData, meta);
-  const unknownData = getUnknownDeviceContextData({data, meta});
-
-  return (
-    <Fragment>
-      <ContextBlock data={knownStructuredData} />
-      <ContextBlock data={unknownData} />
-    </Fragment>
-  );
-}
diff --git a/static/app/components/events/contexts/device/utils.tsx b/static/app/components/events/contexts/device/utils.tsx
deleted file mode 100644
index 480a20be117059..00000000000000
--- a/static/app/components/events/contexts/device/utils.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import type {DeviceContext} from 'sentry/types/event';
-import {DeviceContextKey} from 'sentry/types/event';
-import {defined} from 'sentry/utils';
-import {formatBytesBase2} from 'sentry/utils/bytes/formatBytesBase2';
-
-export function formatMemory(
-  memory_size: number,
-  free_memory: number,
-  usable_memory: number
-) {
-  if (
-    !Number.isInteger(memory_size) ||
-    memory_size <= 0 ||
-    !Number.isInteger(free_memory) ||
-    free_memory <= 0
-  ) {
-    return null;
-  }
-
-  let memory = `Total: ${formatBytesBase2(memory_size)} / Free: ${formatBytesBase2(
-    free_memory
-  )}`;
-  if (Number.isInteger(usable_memory) && usable_memory > 0) {
-    memory = `${memory} / Usable: ${formatBytesBase2(usable_memory)}`;
-  }
-
-  return memory;
-}
-
-export function formatStorage(
-  storage_size: number,
-  free_storage: number,
-  external_storage_size: number,
-  external_free_storage: number
-) {
-  if (!Number.isInteger(storage_size) || storage_size <= 0) {
-    return null;
-  }
-
-  let storage = `Total: ${formatBytesBase2(storage_size)}`;
-  if (Number.isInteger(free_storage) && free_storage > 0) {
-    storage = `${storage} / Free: ${formatBytesBase2(free_storage)}`;
-  }
-
-  if (
-    Number.isInteger(external_storage_size) &&
-    external_storage_size > 0 &&
-    Number.isInteger(external_free_storage) &&
-    external_free_storage > 0
-  ) {
-    storage = `${storage} (External Total: ${formatBytesBase2(
-      external_storage_size
-    )} / Free: ${formatBytesBase2(external_free_storage)})`;
-  }
-
-  return storage;
-}
-
-// List of common display resolutions taken from the source: https://en.wikipedia.org/wiki/Display_resolution#Common_display_resolutions
-export const commonDisplayResolutions = {
-  '640x360': 'nHD',
-  '800x600': 'SVGA',
-  '1024x768': 'XGA',
-  '1280x720': 'WXGA',
-  '1280x800': 'WXGA',
-  '1280x1024': 'SXGA',
-  '1360x768': 'HD',
-  '1366x768': 'HD',
-  '1440x900': 'WXGA+',
-  '1536x864': 'NA',
-  '1600x900': 'HD+',
-  '1680x1050': 'WSXGA+',
-  '1920x1080': 'FHD',
-  '1920x1200': 'WUXGA',
-  '2048x1152': 'QWXGA',
-  '2560x1080': 'N/A',
-  '2560x1440': 'QHD',
-  '3440x1440': 'N/A',
-  '3840x2160': '4K UHD',
-};
-
-export function getInferredData(data: DeviceContext) {
-  const screenResolution = data[DeviceContextKey.SCREEN_RESOLUTION];
-  const screenWidth = data[DeviceContextKey.SCREEN_WIDTH_PIXELS];
-  const screenHeight = data[DeviceContextKey.SCREEN_HEIGHT_PIXELS];
-
-  if (screenResolution) {
-    const displayResolutionDescription = commonDisplayResolutions[screenResolution];
-
-    const commonData = {
-      ...data,
-      [DeviceContextKey.SCREEN_RESOLUTION]: displayResolutionDescription
-        ? `${screenResolution} (${displayResolutionDescription})`
-        : screenResolution,
-    };
-
-    if (!defined(screenWidth) && !defined(screenHeight)) {
-      const [width, height] = screenResolution.split('x');
-
-      if (width && height) {
-        return {
-          ...commonData,
-          [DeviceContextKey.SCREEN_WIDTH_PIXELS]: Number(width),
-          [DeviceContextKey.SCREEN_HEIGHT_PIXELS]: Number(height),
-        };
-      }
-    }
-
-    return commonData;
-  }
-
-  if (defined(screenWidth) && defined(screenHeight)) {
-    const displayResolution = `${screenWidth}x${screenHeight}`;
-    const displayResolutionDescription = commonDisplayResolutions[displayResolution];
-
-    return {
-      ...data,
-      [DeviceContextKey.SCREEN_RESOLUTION]: displayResolutionDescription
-        ? `${displayResolution} (${displayResolutionDescription})`
-        : displayResolution,
-    };
-  }
-
-  return data;
-}
diff --git a/static/app/components/events/contexts/knownContext/app.spec.tsx b/static/app/components/events/contexts/knownContext/app.spec.tsx
index 1c25bb80276b0b..a9f5c0242512ba 100644
--- a/static/app/components/events/contexts/knownContext/app.spec.tsx
+++ b/static/app/components/events/contexts/knownContext/app.spec.tsx
@@ -8,7 +8,7 @@ import {
   getAppContextData,
 } from 'sentry/components/events/contexts/knownContext/app';
 
-export const MOCK_APP_CONTEXT: AppContext = {
+const MOCK_APP_CONTEXT: AppContext = {
   device_app_hash: '2421fae1ac9237a8131e74883e52b0f7034a143f',
   build_type: 'test',
   app_identifier: 'io.sentry.sample.iOS-Swift',
diff --git a/static/app/components/events/contexts/knownContext/device.spec.tsx b/static/app/components/events/contexts/knownContext/device.spec.tsx
new file mode 100644
index 00000000000000..d4eb74485979d9
--- /dev/null
+++ b/static/app/components/events/contexts/knownContext/device.spec.tsx
@@ -0,0 +1,158 @@
+import {EventFixture} from 'sentry-fixture/event';
+
+import {render, screen} from 'sentry-test/reactTestingLibrary';
+
+import ContextCard from 'sentry/components/events/contexts/contextCard';
+import {getDeviceContextData} from 'sentry/components/events/contexts/knownContext/device';
+import type {DeviceContext} from 'sentry/types/event';
+
+const MOCK_DEVICE_CONTEXT: DeviceContext = {
+  name: '', // redacted
+  screen_resolution: '1136x768',
+  orientation: 'portrait',
+  family: 'Android',
+  battery_level: 100,
+  battery_temperature: 45,
+  screen_dpi: 480,
+  memory_size: 1055186944,
+  timezone: 'America/Los_Angeles',
+  external_storage_size: 534761472,
+  external_free_storage: 534702080,
+  screen_width_pixels: 768,
+  low_memory: false,
+  simulator: true,
+  screen_height_pixels: 1136,
+  free_memory: 658702336,
+  online: true,
+  screen_density: 3,
+  type: 'device',
+  charging: true,
+  model_id: 'NYC',
+  brand: 'google',
+  storage_size: 817143808,
+  boot_time: '2019-12-11T11:38:15Z',
+  arch: 'x86',
+  manufacturer: 'Google',
+  free_storage: 508784640,
+  model: 'Android SDK built for x86',
+};
+
+const MOCK_REDACTION = {
+  name: {
+    '': {
+      rem: [['organization:0', 's', 0, 0]],
+      len: 25,
+    },
+  },
+};
+
+describe('DeviceContext', function () {
+  it('returns values and according to the parameters', function () {
+    // We need to use expect.anything() for some fields as they return React components.
+    expect(
+      getDeviceContextData({data: MOCK_DEVICE_CONTEXT, event: EventFixture()})
+    ).toEqual([
+      {key: 'name', subject: 'Name', value: ''},
+      {
+        key: 'screen_resolution',
+        subject: 'Screen Resolution',
+        value: '1136x768',
+      },
+      {key: 'orientation', subject: 'Orientation', value: 'portrait'},
+      {key: 'family', subject: 'Family', value: 'Android'},
+      {key: 'battery_level', subject: 'Battery Level', value: '100%'},
+      {
+        key: 'battery_temperature',
+        subject: 'Battery Temperature (°C)',
+        value: 45,
+      },
+      {key: 'screen_dpi', subject: 'Screen DPI', value: 480},
+      {
+        key: 'memory_size',
+        subject: 'Memory Size',
+        value: expect.anything(),
+      },
+      {
+        key: 'timezone',
+        subject: 'timezone',
+        value: 'America/Los_Angeles',
+        meta: undefined,
+      },
+      {
+        key: 'external_storage_size',
+        subject: 'External Storage Size',
+        value: expect.anything(),
+      },
+      {
+        key: 'external_free_storage',
+        subject: 'External Free Storage',
+        value: expect.anything(),
+      },
+      {
+        key: 'screen_width_pixels',
+        subject: 'Screen Width Pixels',
+        value: 768,
+      },
+      {key: 'low_memory', subject: 'Low Memory', value: false},
+      {key: 'simulator', subject: 'Simulator', value: true},
+      {
+        key: 'screen_height_pixels',
+        subject: 'Screen Height Pixels',
+        value: 1136,
+      },
+      {
+        key: 'free_memory',
+        subject: 'Free Memory',
+        value: expect.anything(),
+      },
+      {key: 'online', subject: 'Online', value: true},
+      {key: 'screen_density', subject: 'Screen Density', value: 3},
+      {key: 'charging', subject: 'Charging', value: true},
+      {key: 'model_id', subject: 'Model Id', value: 'NYC'},
+      {key: 'brand', subject: 'Brand', value: 'google'},
+      {
+        key: 'storage_size',
+        subject: 'Storage Size',
+        value: expect.anything(),
+      },
+      {
+        key: 'boot_time',
+        subject: 'Boot Time',
+        value: expect.anything(),
+      },
+      {key: 'arch', subject: 'Architecture', value: 'x86'},
+      {key: 'manufacturer', subject: 'Manufacturer', value: 'Google'},
+      {
+        key: 'free_storage',
+        subject: 'Free Storage',
+        value: expect.anything(),
+      },
+      {
+        key: 'model',
+        subject: 'Model',
+        value: expect.anything(),
+      },
+    ]);
+  });
+
+  it('renders with meta annotations correctly', function () {
+    const event = EventFixture({
+      _meta: {contexts: {device: MOCK_REDACTION}},
+    });
+
+    render(
+      <ContextCard
+        event={event}
+        type={'device'}
+        alias={'device'}
+        value={{...MOCK_DEVICE_CONTEXT, name: ''}}
+      />
+    );
+
+    expect(screen.getByText('Device')).toBeInTheDocument();
+    expect(screen.getByText('Orientation')).toBeInTheDocument();
+    expect(screen.getByText('portrait')).toBeInTheDocument();
+    expect(screen.getByText('Name')).toBeInTheDocument();
+    expect(screen.getByText(/redacted/)).toBeInTheDocument();
+  });
+});
diff --git a/static/app/components/events/contexts/knownContext/device.tsx b/static/app/components/events/contexts/knownContext/device.tsx
new file mode 100644
index 00000000000000..f25751daa02d09
--- /dev/null
+++ b/static/app/components/events/contexts/knownContext/device.tsx
@@ -0,0 +1,372 @@
+import {DeviceName} from 'sentry/components/deviceName';
+import {
+  getContextKeys,
+  getRelativeTimeFromEventDateCreated,
+} from 'sentry/components/events/contexts/utils';
+import FileSize from 'sentry/components/fileSize';
+import {t} from 'sentry/locale';
+import {type DeviceContext, DeviceContextKey, type Event} from 'sentry/types/event';
+import type {KeyValueListData} from 'sentry/types/group';
+import {defined} from 'sentry/utils';
+import {formatBytesBase2} from 'sentry/utils/bytes/formatBytesBase2';
+
+function formatMemory(memory_size: number, free_memory: number, usable_memory: number) {
+  if (
+    !Number.isInteger(memory_size) ||
+    memory_size <= 0 ||
+    !Number.isInteger(free_memory) ||
+    free_memory <= 0
+  ) {
+    return null;
+  }
+
+  let memory = `Total: ${formatBytesBase2(memory_size)} / Free: ${formatBytesBase2(
+    free_memory
+  )}`;
+  if (Number.isInteger(usable_memory) && usable_memory > 0) {
+    memory = `${memory} / Usable: ${formatBytesBase2(usable_memory)}`;
+  }
+
+  return memory;
+}
+
+function formatStorage(
+  storage_size: number,
+  free_storage: number,
+  external_storage_size: number,
+  external_free_storage: number
+) {
+  if (!Number.isInteger(storage_size) || storage_size <= 0) {
+    return null;
+  }
+
+  let storage = `Total: ${formatBytesBase2(storage_size)}`;
+  if (Number.isInteger(free_storage) && free_storage > 0) {
+    storage = `${storage} / Free: ${formatBytesBase2(free_storage)}`;
+  }
+
+  if (
+    Number.isInteger(external_storage_size) &&
+    external_storage_size > 0 &&
+    Number.isInteger(external_free_storage) &&
+    external_free_storage > 0
+  ) {
+    storage = `${storage} (External Total: ${formatBytesBase2(
+      external_storage_size
+    )} / Free: ${formatBytesBase2(external_free_storage)})`;
+  }
+
+  return storage;
+}
+
+const commonDisplayResolutions = {
+  '640x360': 'nHD',
+  '800x600': 'SVGA',
+  '1024x768': 'XGA',
+  '1280x720': 'WXGA',
+  '1280x800': 'WXGA',
+  '1280x1024': 'SXGA',
+  '1360x768': 'HD',
+  '1366x768': 'HD',
+  '1440x900': 'WXGA+',
+  '1536x864': 'NA',
+  '1600x900': 'HD+',
+  '1680x1050': 'WSXGA+',
+  '1920x1080': 'FHD',
+  '1920x1200': 'WUXGA',
+  '2048x1152': 'QWXGA',
+  '2560x1080': 'N/A',
+  '2560x1440': 'QHD',
+  '3440x1440': 'N/A',
+  '3840x2160': '4K UHD',
+};
+
+function getInferredData(data: DeviceContext) {
+  const screenResolution = data[DeviceContextKey.SCREEN_RESOLUTION];
+  const screenWidth = data[DeviceContextKey.SCREEN_WIDTH_PIXELS];
+  const screenHeight = data[DeviceContextKey.SCREEN_HEIGHT_PIXELS];
+
+  if (screenResolution) {
+    const displayResolutionDescription = commonDisplayResolutions[screenResolution];
+
+    const commonData = {
+      ...data,
+      [DeviceContextKey.SCREEN_RESOLUTION]: displayResolutionDescription
+        ? `${screenResolution} (${displayResolutionDescription})`
+        : screenResolution,
+    };
+
+    if (!defined(screenWidth) && !defined(screenHeight)) {
+      const [width, height] = screenResolution.split('x');
+
+      if (width && height) {
+        return {
+          ...commonData,
+          [DeviceContextKey.SCREEN_WIDTH_PIXELS]: Number(width),
+          [DeviceContextKey.SCREEN_HEIGHT_PIXELS]: Number(height),
+        };
+      }
+    }
+
+    return commonData;
+  }
+
+  if (defined(screenWidth) && defined(screenHeight)) {
+    const displayResolution = `${screenWidth}x${screenHeight}`;
+    const displayResolutionDescription = commonDisplayResolutions[displayResolution];
+
+    return {
+      ...data,
+      [DeviceContextKey.SCREEN_RESOLUTION]: displayResolutionDescription
+        ? `${displayResolution} (${displayResolutionDescription})`
+        : displayResolution,
+    };
+  }
+
+  return data;
+}
+
+export function getDeviceContextData({
+  data,
+  event,
+  meta,
+}: {
+  data: DeviceContext;
+  event: Event;
+  meta?: Record<keyof DeviceContext, any>;
+}): KeyValueListData {
+  return getContextKeys({data: getInferredData(data)}).map(ctxKey => {
+    switch (ctxKey) {
+      case DeviceContextKey.NAME:
+        return {
+          key: ctxKey,
+          subject: t('Name'),
+          value: data.name,
+        };
+      case DeviceContextKey.FAMILY:
+        return {
+          key: ctxKey,
+          subject: t('Family'),
+          value: data.family,
+        };
+      case DeviceContextKey.MODEL_ID:
+        return {
+          key: ctxKey,
+          subject: t('Model Id'),
+          value: data.model_id,
+        };
+      case DeviceContextKey.MODEL:
+        return {
+          key: ctxKey,
+          subject: t('Model'),
+          value:
+            typeof data.model === 'string' ? (
+              <DeviceName
+                value={`${data.model} ${data?.model_id ? `(${data.model_id})` : ''}`}
+              />
+            ) : undefined,
+        };
+      case DeviceContextKey.CPU_DESCRIPTION:
+        return {
+          key: ctxKey,
+          subject: t('CPU Description'),
+          value: data.cpu_description,
+        };
+      case DeviceContextKey.ARCH:
+        return {
+          key: ctxKey,
+          subject: t('Architecture'),
+          value: data.arch,
+        };
+      case DeviceContextKey.BATTERY_LEVEL:
+        return {
+          key: ctxKey,
+          subject: t('Battery Level'),
+          value: defined(data.battery_level) ? `${data.battery_level}%` : undefined,
+        };
+      case DeviceContextKey.BATTERY_STATUS:
+        return {
+          key: ctxKey,
+          subject: t('Battery Status'),
+          value: data.battery_status,
+        };
+      case DeviceContextKey.BATTERY_TEMPERATURE:
+        return {
+          key: ctxKey,
+          subject: t('Battery Temperature (°C)'),
+          value: data.battery_temperature,
+        };
+      case DeviceContextKey.ORIENTATION:
+        return {
+          key: ctxKey,
+          subject: t('Orientation'),
+          value: data.orientation,
+        };
+      case 'memory':
+        const {memory_size, free_memory, usable_memory} = data;
+        return {
+          key: ctxKey,
+          subject: t('Memory'),
+          value:
+            memory_size && free_memory && usable_memory
+              ? formatMemory(memory_size, free_memory, usable_memory)
+              : undefined,
+        };
+      case 'storage':
+        const {storage_size, free_storage, external_storage_size, external_free_storage} =
+          data;
+        return {
+          key: ctxKey,
+          subject: t('Capacity'),
+          value:
+            storage_size && free_storage && external_storage_size && external_free_storage
+              ? formatStorage(
+                  storage_size,
+                  free_storage,
+                  external_storage_size,
+                  external_free_storage
+                )
+              : undefined,
+        };
+      case DeviceContextKey.FREE_STORAGE: {
+        return {
+          key: ctxKey,
+          subject: t('Free Storage'),
+          value: data.free_storage ? <FileSize bytes={data.free_storage} /> : undefined,
+        };
+      }
+      case DeviceContextKey.STORAGE_SIZE: {
+        return {
+          key: ctxKey,
+          subject: t('Storage Size'),
+          value: data.storage_size ? <FileSize bytes={data.storage_size} /> : undefined,
+        };
+      }
+      case DeviceContextKey.EXTERNAL_STORAGE_SIZE: {
+        return {
+          key: ctxKey,
+          subject: t('External Storage Size'),
+          value: data.external_storage_size ? (
+            <FileSize bytes={data.external_storage_size} />
+          ) : undefined,
+        };
+      }
+      case DeviceContextKey.EXTERNAL_FREE_STORAGE: {
+        return {
+          key: ctxKey,
+          subject: t('External Free Storage'),
+          value: data.external_free_storage ? (
+            <FileSize bytes={data.external_free_storage} />
+          ) : undefined,
+        };
+      }
+      case DeviceContextKey.SIMULATOR:
+        return {
+          key: ctxKey,
+          subject: t('Simulator'),
+          value: data.simulator,
+        };
+      case DeviceContextKey.BOOT_TIME:
+        return {
+          key: ctxKey,
+          subject: t('Boot Time'),
+          value: getRelativeTimeFromEventDateCreated(
+            event.dateCreated ? event.dateCreated : event.dateReceived,
+            data.boot_time
+          ),
+        };
+      case DeviceContextKey.DEVICE_TYPE:
+        return {
+          key: ctxKey,
+          subject: t('Device Type'),
+          value: data.device_type,
+        };
+      case DeviceContextKey.BRAND:
+        return {
+          key: ctxKey,
+          subject: t('Brand'),
+          value: data.brand,
+        };
+      case DeviceContextKey.CHARGING:
+        return {
+          key: ctxKey,
+          subject: t('Charging'),
+          value: data.charging,
+        };
+      case DeviceContextKey.LOW_MEMORY:
+        return {
+          key: ctxKey,
+          subject: t('Low Memory'),
+          value: data.low_memory,
+        };
+      case DeviceContextKey.FREE_MEMORY:
+        return {
+          key: ctxKey,
+          subject: t('Free Memory'),
+          value: data.free_memory ? <FileSize bytes={data.free_memory} /> : undefined,
+        };
+      case DeviceContextKey.MEMORY_SIZE:
+        return {
+          key: ctxKey,
+          subject: t('Memory Size'),
+          value: data.memory_size ? <FileSize bytes={data.memory_size} /> : undefined,
+        };
+      case DeviceContextKey.USABLE_MEMORY:
+        return {
+          key: ctxKey,
+          subject: t('Usable Memory'),
+          value: data.usable_memory ? <FileSize bytes={data.usable_memory} /> : undefined,
+        };
+      case DeviceContextKey.MANUFACTURER:
+        return {
+          key: ctxKey,
+          subject: t('Manufacturer'),
+          value: data.manufacturer,
+        };
+      case DeviceContextKey.ONLINE:
+        return {
+          key: ctxKey,
+          subject: t('Online'),
+          value: data.online,
+        };
+      case DeviceContextKey.SCREEN_DENSITY:
+        return {
+          key: ctxKey,
+          subject: t('Screen Density'),
+          value: data.screen_density,
+        };
+      case DeviceContextKey.SCREEN_DPI:
+        return {
+          key: ctxKey,
+          subject: t('Screen DPI'),
+          value: data.screen_dpi,
+        };
+      case DeviceContextKey.SCREEN_HEIGHT_PIXELS:
+        return {
+          key: ctxKey,
+          subject: t('Screen Height Pixels'),
+          value: data.screen_height_pixels,
+        };
+      case DeviceContextKey.SCREEN_RESOLUTION:
+        return {
+          key: ctxKey,
+          subject: t('Screen Resolution'),
+          value: data.screen_resolution,
+        };
+      case DeviceContextKey.SCREEN_WIDTH_PIXELS:
+        return {
+          key: ctxKey,
+          subject: t('Screen Width Pixels'),
+          value: data.screen_width_pixels,
+        };
+
+      default:
+        return {
+          key: ctxKey,
+          subject: ctxKey,
+          value: data[ctxKey],
+          meta: meta?.[ctxKey]?.[''],
+        };
+    }
+  });
+}
diff --git a/static/app/components/events/contexts/knownContext/user.spec.tsx b/static/app/components/events/contexts/knownContext/user.spec.tsx
new file mode 100644
index 00000000000000..8ed1b952ffeb2f
--- /dev/null
+++ b/static/app/components/events/contexts/knownContext/user.spec.tsx
@@ -0,0 +1,93 @@
+import {EventFixture} from 'sentry-fixture/event';
+
+import {render, screen} from 'sentry-test/reactTestingLibrary';
+
+import ContextCard from 'sentry/components/events/contexts/contextCard';
+import {
+  getUserContextData,
+  type UserContext,
+} from 'sentry/components/events/contexts/knownContext/user';
+
+const MOCK_USER_CONTEXT: UserContext = {
+  email: 'leander.rodrigues@sentry.io',
+  ip_address: '127.0.0.1',
+  id: '808',
+  name: 'Leander',
+  username: 'leeandher',
+  geo: {
+    country_code: 'US',
+    city: 'San Francisco',
+    subdivision: 'California',
+    region: 'United States',
+  },
+  // Extra data is still valid and preserved
+  extra_data: 'something',
+  unknown_key: 123,
+};
+
+const MOCK_REDACTION = {
+  name: {
+    '': {
+      rem: [['organization:0', 's', 0, 0]],
+      len: 5,
+    },
+  },
+};
+
+describe('UserContext', function () {
+  it('returns values and according to the parameters', function () {
+    expect(getUserContextData({data: MOCK_USER_CONTEXT})).toEqual([
+      {
+        key: 'email',
+        subject: 'Email',
+        value: 'leander.rodrigues@sentry.io',
+        action: {link: 'mailto:leander.rodrigues@sentry.io'},
+      },
+      {key: 'ip_address', subject: 'IP Address', value: '127.0.0.1'},
+      {key: 'id', subject: 'ID', value: '808'},
+      {key: 'name', subject: 'Name', value: 'Leander'},
+      {key: 'username', subject: 'Username', value: 'leeandher'},
+      {
+        key: 'geo',
+        subject: 'Geography',
+        value: 'San Francisco, California, United States (US)',
+      },
+      {
+        key: 'extra_data',
+        subject: 'extra_data',
+        value: 'something',
+        meta: undefined,
+      },
+      {
+        key: 'unknown_key',
+        subject: 'unknown_key',
+        value: 123,
+        meta: undefined,
+      },
+    ]);
+  });
+
+  it('renders with meta annotations correctly', function () {
+    const event = EventFixture({
+      _meta: {contexts: {user: MOCK_REDACTION}},
+    });
+
+    render(
+      <ContextCard
+        event={event}
+        type={'default'}
+        alias={'user'}
+        value={{...MOCK_USER_CONTEXT, name: ''}}
+      />
+    );
+
+    expect(screen.getByText('User')).toBeInTheDocument();
+    expect(screen.getByText('Email')).toBeInTheDocument();
+    expect(screen.getByText('leander.rodrigues@sentry.io')).toBeInTheDocument();
+    expect(
+      screen.getByRole('link', {name: 'leander.rodrigues@sentry.io'})
+    ).toBeInTheDocument();
+    expect(screen.getByText('Name')).toBeInTheDocument();
+    expect(screen.getByText(/redacted/)).toBeInTheDocument();
+  });
+});
diff --git a/static/app/components/events/contexts/knownContext/user.tsx b/static/app/components/events/contexts/knownContext/user.tsx
new file mode 100644
index 00000000000000..83b6e69055ce7a
--- /dev/null
+++ b/static/app/components/events/contexts/knownContext/user.tsx
@@ -0,0 +1,127 @@
+import {getContextKeys} from 'sentry/components/events/contexts/utils';
+import {t} from 'sentry/locale';
+import type {KeyValueListData} from 'sentry/types/group';
+import {defined} from 'sentry/utils';
+
+enum UserContextKeys {
+  ID = 'id',
+  EMAIL = 'email',
+  USERNAME = 'username',
+  IP_ADDRESS = 'ip_address',
+  NAME = 'name',
+  GEO = 'geo',
+}
+
+export interface UserContext {
+  // Any custom keys users may set
+  [key: string]: any;
+  [UserContextKeys.ID]?: string;
+  [UserContextKeys.EMAIL]?: string;
+  [UserContextKeys.USERNAME]?: string;
+  [UserContextKeys.IP_ADDRESS]?: string;
+  [UserContextKeys.NAME]?: string;
+  [UserContextKeys.GEO]?: Partial<Record<UserContextGeoKeys, string>>;
+}
+
+enum UserContextGeoKeys {
+  CITY = 'city',
+  COUNTRY_CODE = 'country_code',
+  SUBDIVISION = 'subdivision',
+  REGION = 'region',
+}
+
+const EMAIL_REGEX = /[^@]+@[^\.]+\..+/;
+
+function formatGeo(geoData: UserContext['geo'] = {}): string | undefined {
+  if (!geoData) {
+    return undefined;
+  }
+
+  const geoStringArray: string[] = [];
+
+  if (geoData.city) {
+    geoStringArray.push(geoData.city);
+  }
+
+  if (geoData.subdivision) {
+    geoStringArray.push(geoData.subdivision);
+  }
+
+  if (geoData.region) {
+    geoStringArray.push(
+      geoData.country_code
+        ? `${geoData.region} (${geoData.country_code})`
+        : geoData.region
+    );
+  }
+
+  return geoStringArray.join(', ');
+}
+
+export function getUserContextData({
+  data,
+  meta,
+}: {
+  data: UserContext;
+  meta?: Record<keyof UserContext, any>;
+}): KeyValueListData {
+  return (
+    getContextKeys({data})
+      .map(ctxKey => {
+        switch (ctxKey) {
+          case UserContextKeys.NAME:
+            return {
+              key: ctxKey,
+              subject: t('Name'),
+              value: data.name,
+            };
+          case UserContextKeys.USERNAME:
+            return {
+              key: ctxKey,
+              subject: t('Username'),
+              value: data.username,
+            };
+          case UserContextKeys.ID:
+            return {
+              key: ctxKey,
+              subject: t('ID'),
+              value: data.id,
+            };
+          case UserContextKeys.IP_ADDRESS:
+            return {
+              key: ctxKey,
+              subject: t('IP Address'),
+              value: data.ip_address,
+            };
+          case UserContextKeys.EMAIL:
+            return {
+              key: ctxKey,
+              subject: t('Email'),
+              value: data.email,
+              action: {
+                link:
+                  defined(data.email) && EMAIL_REGEX.test(data.email)
+                    ? `mailto:${data.email}`
+                    : undefined,
+              },
+            };
+          case UserContextKeys.GEO:
+            return {
+              key: ctxKey,
+              subject: t('Geography'),
+              value: formatGeo(data.geo),
+            };
+          default:
+            return {
+              key: ctxKey,
+              subject: ctxKey,
+              value: data[ctxKey],
+              meta: meta?.[ctxKey]?.[''],
+            };
+        }
+      })
+      // Since user context is generated separately from the rest, it has all known keys with those
+      // unset appearing as `null`. We want to omit those unless they have annotations.
+      .filter(item => defined(item.value) || defined(meta?.[item.key]))
+  );
+}
diff --git a/static/app/components/events/contexts/platform/index.spec.tsx b/static/app/components/events/contexts/platform/index.spec.tsx
deleted file mode 100644
index 8a701a75a2dd76..00000000000000
--- a/static/app/components/events/contexts/platform/index.spec.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import {EventFixture} from 'sentry-fixture/event';
-import {GroupFixture} from 'sentry-fixture/group';
-import {OrganizationFixture} from 'sentry-fixture/organization';
-import {ProjectFixture} from 'sentry-fixture/project';
-
-import {render, screen} from 'sentry-test/reactTestingLibrary';
-
-import ContextCard from 'sentry/components/events/contexts/contextCard';
-
-describe('platform event context', function () {
-  const platformContexts = {
-    laravel: {
-      type: 'default',
-      some: 'value',
-      number: 123,
-    },
-  };
-  const organization = OrganizationFixture();
-  const event = EventFixture({contexts: platformContexts});
-  const group = GroupFixture();
-  const project = ProjectFixture();
-
-  it('renders laravel context', function () {
-    const alias = 'laravel';
-    render(
-      <ContextCard
-        type={platformContexts[alias].type}
-        alias={alias}
-        value={platformContexts[alias]}
-        event={event}
-        group={group}
-        project={project}
-      />,
-      {organization}
-    );
-
-    expect(screen.getByText('Laravel Context')).toBeInTheDocument();
-    expect(screen.getByTestId(`${alias}-context-icon`)).toBeInTheDocument();
-  });
-});
diff --git a/static/app/components/events/contexts/platform/index.tsx b/static/app/components/events/contexts/platform/index.tsx
deleted file mode 100644
index e24415544fc6eb..00000000000000
--- a/static/app/components/events/contexts/platform/index.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import {PlatformIcon} from 'platformicons';
-
-import {getKnownData, getUnknownData} from 'sentry/components/events/contexts/utils';
-import type {IconSize} from 'sentry/utils/theme';
-
-/**
- * Mapping of platform to known context keys for platform-specific context.
- */
-const KNOWN_PLATFORM_CONTEXT_KEYS: Record<string, string[]> = {
-  laravel: [],
-};
-
-export const KNOWN_PLATFORM_CONTEXTS = new Set(Object.keys(KNOWN_PLATFORM_CONTEXT_KEYS));
-
-interface PlatformContextProps {
-  data: Record<string, any>;
-  platform: string;
-  meta?: Record<string, any>;
-}
-
-enum PlatformContextKeys {}
-
-export function getKnownPlatformContextData({
-  platform,
-  data,
-  meta,
-}: PlatformContextProps) {
-  return getKnownData<PlatformContextProps['data'], PlatformContextKeys>({
-    data,
-    meta,
-    knownDataTypes: KNOWN_PLATFORM_CONTEXT_KEYS[platform] ?? [],
-    onGetKnownDataDetails: () => {
-      switch (platform) {
-        default:
-          return undefined;
-      }
-    },
-  });
-}
-
-export function getUnknownPlatformContextData({
-  platform,
-  data,
-  meta,
-}: PlatformContextProps) {
-  return getUnknownData({
-    allData: data,
-    knownKeys: KNOWN_PLATFORM_CONTEXT_KEYS[platform] ?? [],
-    meta,
-  });
-}
-
-export function getPlatformContextIcon({
-  platform,
-  size = 'sm',
-}: Pick<PlatformContextProps, 'platform'> & {
-  size?: IconSize;
-}) {
-  let platformIconName = '';
-  switch (platform) {
-    case 'laravel':
-      platformIconName = 'php-laravel';
-      break;
-    default:
-      break;
-  }
-
-  if (platformIconName.length === 0) {
-    return null;
-  }
-  return (
-    <PlatformIcon
-      size={size}
-      platform={platformIconName}
-      data-test-id={`${platform}-context-icon`}
-    />
-  );
-}
diff --git a/static/app/components/events/contexts/platformContext/laravel.spec.tsx b/static/app/components/events/contexts/platformContext/laravel.spec.tsx
new file mode 100644
index 00000000000000..a4fc4935c23412
--- /dev/null
+++ b/static/app/components/events/contexts/platformContext/laravel.spec.tsx
@@ -0,0 +1,65 @@
+import {EventFixture} from 'sentry-fixture/event';
+
+import {render, screen} from 'sentry-test/reactTestingLibrary';
+
+import ContextCard from 'sentry/components/events/contexts/contextCard';
+import {
+  getLaravelContextData,
+  type LaravelContext,
+} from 'sentry/components/events/contexts/platformContext/laravel';
+
+const MOCK_LARAVEL_CONTEXT: LaravelContext = {
+  type: 'default',
+  // No known keys, but extra data is still valid and preserved
+  extra_data: 'something',
+  unknown_key: 123,
+};
+
+const MOCK_REDACTION = {
+  extra_data: {
+    '': {
+      rem: [['organization:0', 's', 0, 0]],
+      len: 5,
+    },
+  },
+};
+
+describe('LaravelContext', function () {
+  it('returns values and according to the parameters', function () {
+    expect(getLaravelContextData({data: MOCK_LARAVEL_CONTEXT})).toEqual([
+      {
+        key: 'extra_data',
+        subject: 'extra_data',
+        value: 'something',
+        meta: undefined,
+      },
+      {
+        key: 'unknown_key',
+        subject: 'unknown_key',
+        value: 123,
+        meta: undefined,
+      },
+    ]);
+  });
+
+  it('renders with meta annotations correctly', function () {
+    const event = EventFixture({
+      _meta: {contexts: {laravel: MOCK_REDACTION}},
+    });
+
+    render(
+      <ContextCard
+        event={event}
+        type={'default'}
+        alias={'laravel'}
+        value={{...MOCK_LARAVEL_CONTEXT, extra_data: ''}}
+      />
+    );
+
+    expect(screen.getByText('Laravel Context')).toBeInTheDocument();
+    expect(screen.getByText('unknown_key')).toBeInTheDocument();
+    expect(screen.getByText('123')).toBeInTheDocument();
+    expect(screen.getByText('extra_data')).toBeInTheDocument();
+    expect(screen.getByText(/redacted/)).toBeInTheDocument();
+  });
+});
diff --git a/static/app/components/events/contexts/platformContext/laravel.tsx b/static/app/components/events/contexts/platformContext/laravel.tsx
new file mode 100644
index 00000000000000..7bd120a40def8e
--- /dev/null
+++ b/static/app/components/events/contexts/platformContext/laravel.tsx
@@ -0,0 +1,15 @@
+import {getContextKeys} from 'sentry/components/events/contexts/utils';
+import type {KeyValueListData} from 'sentry/types/group';
+
+export interface LaravelContext {
+  // Any custom keys users may set
+  [key: string]: any;
+}
+
+export function getLaravelContextData({data}: {data: LaravelContext}): KeyValueListData {
+  return getContextKeys({data}).map(ctxKey => ({
+    key: ctxKey,
+    subject: ctxKey,
+    value: data[ctxKey],
+  }));
+}
diff --git a/static/app/components/events/contexts/platformContext/react.spec.tsx b/static/app/components/events/contexts/platformContext/react.spec.tsx
new file mode 100644
index 00000000000000..c82b8872b30fc8
--- /dev/null
+++ b/static/app/components/events/contexts/platformContext/react.spec.tsx
@@ -0,0 +1,71 @@
+import {EventFixture} from 'sentry-fixture/event';
+
+import {render, screen} from 'sentry-test/reactTestingLibrary';
+
+import ContextCard from 'sentry/components/events/contexts/contextCard';
+import {
+  getReactContextData,
+  type ReactContext,
+} from 'sentry/components/events/contexts/platformContext/react';
+
+const MOCK_REACT_CONTEXT: ReactContext = {
+  type: 'default',
+  version: '17.0.2',
+  // Extra data is still valid and preserved
+  extra_data: 'something',
+  unknown_key: 123,
+};
+
+const MOCK_REDACTION = {
+  version: {
+    '': {
+      rem: [['organization:0', 's', 0, 0]],
+      len: 5,
+    },
+  },
+};
+
+describe('ReactContext', function () {
+  it('returns values and according to the parameters', function () {
+    expect(getReactContextData({data: MOCK_REACT_CONTEXT})).toEqual([
+      {
+        key: 'version',
+        subject: 'Version',
+        value: '17.0.2',
+      },
+      {
+        key: 'extra_data',
+        subject: 'extra_data',
+        value: 'something',
+        meta: undefined,
+      },
+      {
+        key: 'unknown_key',
+        subject: 'unknown_key',
+        value: 123,
+        meta: undefined,
+      },
+    ]);
+  });
+
+  it('renders with meta annotations correctly', function () {
+    const event = EventFixture({
+      _meta: {contexts: {react: MOCK_REDACTION}},
+    });
+
+    render(
+      <ContextCard
+        event={event}
+        type={'default'}
+        alias={'react'}
+        value={{...MOCK_REACT_CONTEXT, version: ''}}
+      />
+    );
+
+    expect(screen.getByText('React')).toBeInTheDocument();
+    expect(screen.getByText('unknown_key')).toBeInTheDocument();
+    expect(screen.getByText('123')).toBeInTheDocument();
+    expect(screen.getByText('Version')).toBeInTheDocument();
+    expect(screen.getByText(/redacted/)).toBeInTheDocument();
+  });
+});
diff --git a/static/app/components/events/contexts/platformContext/react.tsx b/static/app/components/events/contexts/platformContext/react.tsx
new file mode 100644
index 00000000000000..0b4d1fa861fee5
--- /dev/null
+++ b/static/app/components/events/contexts/platformContext/react.tsx
@@ -0,0 +1,32 @@
+import {getContextKeys} from 'sentry/components/events/contexts/utils';
+import {t} from 'sentry/locale';
+import type {KeyValueListData} from 'sentry/types/group';
+
+enum ReactContextKeys {
+  VERSION = 'version',
+}
+
+export interface ReactContext {
+  // Any custom keys users may set
+  [key: string]: any;
+  [ReactContextKeys.VERSION]: string;
+}
+
+export function getReactContextData({data}: {data: ReactContext}): KeyValueListData {
+  return getContextKeys({data}).map(ctxKey => {
+    switch (ctxKey) {
+      case ReactContextKeys.VERSION:
+        return {
+          key: ctxKey,
+          subject: t('Version'),
+          value: data.version,
+        };
+      default:
+        return {
+          key: ctxKey,
+          subject: ctxKey,
+          value: data[ctxKey],
+        };
+    }
+  });
+}
diff --git a/static/app/components/events/contexts/platformContext/unity.spec.tsx b/static/app/components/events/contexts/platformContext/unity.spec.tsx
new file mode 100644
index 00000000000000..5ef900a88519ee
--- /dev/null
+++ b/static/app/components/events/contexts/platformContext/unity.spec.tsx
@@ -0,0 +1,77 @@
+import {EventFixture} from 'sentry-fixture/event';
+
+import {render, screen} from 'sentry-test/reactTestingLibrary';
+
+import ContextCard from 'sentry/components/events/contexts/contextCard';
+import {getUnityContextData} from 'sentry/components/events/contexts/platformContext/unity';
+
+export const MOCK_UNITY_CONTEXT = {
+  type: 'unity' as const,
+  copy_texture_support: 'Basic, Copy3D, DifferentTypes, TextureToRT, RTToTexture',
+  editor_version: '2022.1.23f1',
+  install_mode: 'Store',
+  rendering_threading_mode: 'LegacyJobified',
+  target_frame_rate: '-1',
+  // Extra data is still valid and preserved
+  extra_data: 'something',
+  unknown_key: 123,
+};
+
+export const MOCK_REDACTION = {
+  install_mode: {
+    '': {
+      rem: [['organization:0', 'x']],
+    },
+  },
+};
+
+describe('UnityContext', function () {
+  it('returns values and according to the parameters', function () {
+    expect(getUnityContextData({data: MOCK_UNITY_CONTEXT})).toEqual([
+      {
+        key: 'copy_texture_support',
+        subject: 'Copy Texture Support',
+        value: 'Basic, Copy3D, DifferentTypes, TextureToRT, RTToTexture',
+      },
+      {
+        key: 'editor_version',
+        subject: 'Editor Version',
+        value: '2022.1.23f1',
+      },
+      {key: 'install_mode', subject: 'Install Mode', value: 'Store'},
+      {
+        key: 'rendering_threading_mode',
+        subject: 'Rendering Threading Mode',
+        value: 'LegacyJobified',
+      },
+      {
+        key: 'target_frame_rate',
+        subject: 'Target Frame Rate',
+        value: '-1',
+      },
+      {key: 'extra_data', subject: 'extra_data', value: 'something'},
+      {key: 'unknown_key', subject: 'unknown_key', value: 123},
+    ]);
+  });
+
+  it('renders with meta annotations correctly', function () {
+    const event = EventFixture({
+      _meta: {contexts: {unity: MOCK_REDACTION}},
+    });
+
+    render(
+      <ContextCard
+        event={event}
+        type={'unity'}
+        alias={'unity'}
+        value={{...MOCK_UNITY_CONTEXT, install_mode: ''}}
+      />
+    );
+
+    expect(screen.getByText('Unity')).toBeInTheDocument();
+    expect(screen.getByText('Editor Version')).toBeInTheDocument();
+    expect(screen.getByText('2022.1.23f1')).toBeInTheDocument();
+    expect(screen.getByText('Install Mode')).toBeInTheDocument();
+    expect(screen.getByText(/redacted/)).toBeInTheDocument();
+  });
+});
diff --git a/static/app/components/events/contexts/platformContext/unity.tsx b/static/app/components/events/contexts/platformContext/unity.tsx
new file mode 100644
index 00000000000000..99e3efecec03dd
--- /dev/null
+++ b/static/app/components/events/contexts/platformContext/unity.tsx
@@ -0,0 +1,47 @@
+import {getContextKeys} from 'sentry/components/events/contexts/utils';
+import {t} from 'sentry/locale';
+import {type UnityContext, UnityContextKey} from 'sentry/types/event';
+import type {KeyValueListData} from 'sentry/types/group';
+
+export function getUnityContextData({data}: {data: UnityContext}): KeyValueListData {
+  return getContextKeys({data}).map(ctxKey => {
+    switch (ctxKey) {
+      case UnityContextKey.COPY_TEXTURE_SUPPORT:
+        return {
+          key: ctxKey,
+          subject: t('Copy Texture Support'),
+          value: data.copy_texture_support,
+        };
+      case UnityContextKey.EDITOR_VERSION:
+        return {
+          key: ctxKey,
+          subject: t('Editor Version'),
+          value: data.editor_version,
+        };
+      case UnityContextKey.INSTALL_MODE:
+        return {
+          key: ctxKey,
+          subject: t('Install Mode'),
+          value: data.install_mode,
+        };
+      case UnityContextKey.RENDERING_THREADING_MODE:
+        return {
+          key: ctxKey,
+          subject: t('Rendering Threading Mode'),
+          value: data.rendering_threading_mode,
+        };
+      case UnityContextKey.TARGET_FRAME_RATE:
+        return {
+          key: ctxKey,
+          subject: t('Target Frame Rate'),
+          value: data.target_frame_rate,
+        };
+      default:
+        return {
+          key: ctxKey,
+          subject: ctxKey,
+          value: data[ctxKey],
+        };
+    }
+  });
+}
diff --git a/static/app/components/events/contexts/platformContext/utils.tsx b/static/app/components/events/contexts/platformContext/utils.tsx
new file mode 100644
index 00000000000000..32978c4cadd50c
--- /dev/null
+++ b/static/app/components/events/contexts/platformContext/utils.tsx
@@ -0,0 +1,88 @@
+import {PlatformIcon} from 'platformicons';
+
+import {getLaravelContextData} from 'sentry/components/events/contexts/platformContext/laravel';
+import {getReactContextData} from 'sentry/components/events/contexts/platformContext/react';
+import {getUnityContextData} from 'sentry/components/events/contexts/platformContext/unity';
+import {getContextKeys} from 'sentry/components/events/contexts/utils';
+import {t} from 'sentry/locale';
+import type {KeyValueListData} from 'sentry/types/group';
+import type {IconSize} from 'sentry/utils/theme';
+
+export enum PlatformContextKeys {
+  LARAVEL = 'laravel',
+  REACT = 'react',
+  UNITY = 'unity',
+}
+
+export const PLATFORM_CONTEXT_KEYS = new Set<string>(Object.values(PlatformContextKeys));
+
+export function getPlatformContextTitle({platform}: {platform: string}): string {
+  switch (platform) {
+    case PlatformContextKeys.LARAVEL:
+      return t('Laravel Context');
+    case PlatformContextKeys.REACT:
+      return 'React';
+    case PlatformContextKeys.UNITY:
+      return 'Unity';
+    default:
+      return platform;
+  }
+}
+
+export function getPlatformContextIcon({
+  platform,
+  size = 'sm',
+}: {
+  platform: string;
+  size?: IconSize;
+}) {
+  let platformIconName = '';
+  switch (platform) {
+    case PlatformContextKeys.LARAVEL:
+      platformIconName = 'php-laravel';
+      break;
+    case PlatformContextKeys.REACT:
+      platformIconName = 'javascript-react';
+      break;
+    case PlatformContextKeys.UNITY:
+      platformIconName = 'unity';
+      break;
+    default:
+      break;
+  }
+
+  if (platformIconName.length === 0) {
+    return null;
+  }
+
+  return (
+    <PlatformIcon
+      size={size}
+      platform={platformIconName}
+      data-test-id={`${platform}-context-icon`}
+    />
+  );
+}
+
+export function getPlatformContextData({
+  platform,
+  data,
+}: {
+  data: any;
+  platform: string;
+}): KeyValueListData {
+  switch (platform) {
+    case PlatformContextKeys.LARAVEL:
+      return getLaravelContextData({data});
+    case PlatformContextKeys.REACT:
+      return getReactContextData({data});
+    case PlatformContextKeys.UNITY:
+      return getUnityContextData({data});
+    default:
+      return getContextKeys({data}).map(ctxKey => ({
+        key: ctxKey,
+        subject: ctxKey,
+        value: data[ctxKey],
+      }));
+  }
+}
diff --git a/static/app/components/events/contexts/unity/getUnityKnownDataDetails.spec.tsx b/static/app/components/events/contexts/unity/getUnityKnownDataDetails.spec.tsx
deleted file mode 100644
index 1cbfc24ef10343..00000000000000
--- a/static/app/components/events/contexts/unity/getUnityKnownDataDetails.spec.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import {
-  getUnityKnownDataDetails,
-  unityKnownDataValues,
-} from 'sentry/components/events/contexts/unity/getUnityKnownDataDetails';
-
-import {unityMockData} from './index.spec';
-
-describe('getUnityKnownDataDetails', function () {
-  it('returns values and according to the parameters', function () {
-    const allKnownData: ReturnType<typeof getUnityKnownDataDetails>[] = [];
-
-    for (const type of Object.keys(unityKnownDataValues)) {
-      const threadPoolInfoKnownData = getUnityKnownDataDetails({
-        type: unityKnownDataValues[type],
-        data: unityMockData,
-      });
-
-      if (!threadPoolInfoKnownData) {
-        continue;
-      }
-
-      allKnownData.push(threadPoolInfoKnownData);
-    }
-
-    expect(allKnownData).toEqual([
-      {
-        subject: 'Copy Texture Support',
-        value: 'Basic, Copy3D, DifferentTypes, TextureToRT, RTToTexture',
-      },
-      {subject: 'Editor Version', value: '2022.1.23f1'},
-      {subject: 'Install Mode', value: 'Store'},
-      {subject: 'Rendering Threading Mode', value: 'LegacyJobified'},
-      {subject: 'Target Frame Rate', value: '-1'},
-    ]);
-  });
-});
diff --git a/static/app/components/events/contexts/unity/getUnityKnownDataDetails.tsx b/static/app/components/events/contexts/unity/getUnityKnownDataDetails.tsx
deleted file mode 100644
index 7a13abf0e28247..00000000000000
--- a/static/app/components/events/contexts/unity/getUnityKnownDataDetails.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import type {KnownDataDetails} from 'sentry/components/events/contexts/utils';
-import {t} from 'sentry/locale';
-import type {UnityContext} from 'sentry/types/event';
-import {UnityContextKey} from 'sentry/types/event';
-
-export const unityKnownDataValues = Object.values(UnityContextKey);
-
-type Props = {
-  data: UnityContext;
-  type: (typeof unityKnownDataValues)[number];
-};
-
-export function getUnityKnownDataDetails({data, type}: Props): KnownDataDetails {
-  switch (type) {
-    case UnityContextKey.COPY_TEXTURE_SUPPORT:
-      return {
-        subject: t('Copy Texture Support'),
-        value: data.copy_texture_support,
-      };
-    case UnityContextKey.EDITOR_VERSION:
-      return {
-        subject: t('Editor Version'),
-        value: data.editor_version,
-      };
-    case UnityContextKey.INSTALL_MODE:
-      return {
-        subject: t('Install Mode'),
-        value: data.install_mode,
-      };
-    case UnityContextKey.RENDERING_THREADING_MODE:
-      return {
-        subject: t('Rendering Threading Mode'),
-        value: data.rendering_threading_mode,
-      };
-    case UnityContextKey.TARGET_FRAME_RATE:
-      return {
-        subject: t('Target Frame Rate'),
-        value: data.target_frame_rate,
-      };
-    default:
-      return undefined;
-  }
-}
diff --git a/static/app/components/events/contexts/unity/index.spec.tsx b/static/app/components/events/contexts/unity/index.spec.tsx
deleted file mode 100644
index 8ea0c4ba065813..00000000000000
--- a/static/app/components/events/contexts/unity/index.spec.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import {EventFixture} from 'sentry-fixture/event';
-
-import {render, screen} from 'sentry-test/reactTestingLibrary';
-
-import {UnityEventContext} from 'sentry/components/events/contexts/unity';
-import type {UnityContext} from 'sentry/types/event';
-
-export const unityMockData: UnityContext = {
-  copy_texture_support: 'Basic, Copy3D, DifferentTypes, TextureToRT, RTToTexture',
-  editor_version: '2022.1.23f1',
-  install_mode: 'Store',
-  rendering_threading_mode: 'LegacyJobified',
-  target_frame_rate: '-1',
-  type: 'unity',
-};
-
-export const unityMetaMockData = {
-  '': {
-    rem: [['organization:0', 'x']],
-  },
-};
-
-const event = EventFixture({
-  _meta: {
-    contexts: {
-      unity: unityMetaMockData,
-    },
-  },
-});
-
-describe('unity event context', function () {
-  it('display redacted data', function () {
-    render(<UnityEventContext event={event} data={null} />);
-    expect(screen.queryByText('Unity')).not.toBeInTheDocument();
-  });
-});
diff --git a/static/app/components/events/contexts/unity/index.tsx b/static/app/components/events/contexts/unity/index.tsx
deleted file mode 100644
index 3909903d8adbcd..00000000000000
--- a/static/app/components/events/contexts/unity/index.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import {Fragment} from 'react';
-
-import ContextBlock from 'sentry/components/events/contexts/contextBlock';
-import type {Event, UnityContext} from 'sentry/types/event';
-
-import {
-  getContextMeta,
-  getKnownData,
-  getKnownStructuredData,
-  getUnknownData,
-} from '../utils';
-
-import {getUnityKnownDataDetails, unityKnownDataValues} from './getUnityKnownDataDetails';
-
-type Props = {
-  data: UnityContext | null;
-  event: Event;
-  meta?: Record<string, any>;
-};
-
-export function getKnownUnityContextData({data, meta}: Pick<Props, 'data' | 'meta'>) {
-  if (!data) {
-    return [];
-  }
-  return getKnownData<UnityContext, (typeof unityKnownDataValues)[number]>({
-    data,
-    meta,
-    knownDataTypes: unityKnownDataValues,
-    onGetKnownDataDetails: v => getUnityKnownDataDetails(v),
-  });
-}
-
-export function getUnknownUnityContextData({data, meta}: Pick<Props, 'data' | 'meta'>) {
-  if (!data) {
-    return [];
-  }
-  return getUnknownData({
-    allData: data,
-    knownKeys: unityKnownDataValues,
-    meta,
-  });
-}
-
-export function UnityEventContext({data, event, meta: propsMeta}: Props) {
-  if (!data) {
-    return null;
-  }
-  const meta = propsMeta ?? getContextMeta(event, 'unity');
-  const knownData = getKnownUnityContextData({data, meta});
-  const knownStructuredData = getKnownStructuredData(knownData, meta);
-  const unknownData = getUnknownUnityContextData({data, meta});
-
-  return (
-    <Fragment>
-      <ContextBlock data={knownStructuredData} />
-      <ContextBlock data={unknownData} />
-    </Fragment>
-  );
-}
diff --git a/static/app/components/events/contexts/user/getUserKnownDataDetails.spec.tsx b/static/app/components/events/contexts/user/getUserKnownDataDetails.spec.tsx
deleted file mode 100644
index 21de3b75fd4889..00000000000000
--- a/static/app/components/events/contexts/user/getUserKnownDataDetails.spec.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import {userKnownDataValues} from 'sentry/components/events/contexts/user';
-import {getUserKnownDataDetails} from 'sentry/components/events/contexts/user/getUserKnownDataDetails';
-
-import {userMockData} from './index.spec';
-
-describe('getUserKnownDataDetails', function () {
-  it('returns values and according to the parameters', function () {
-    const allKnownData: ReturnType<typeof getUserKnownDataDetails>[] = [];
-
-    for (const type of Object.keys(userKnownDataValues)) {
-      const userKnownData = getUserKnownDataDetails({
-        type: userKnownDataValues[type],
-        data: userMockData,
-      });
-
-      if (!userKnownData) {
-        continue;
-      }
-
-      allKnownData.push(userKnownData);
-    }
-
-    expect(allKnownData).toEqual([
-      {
-        subject: 'ID',
-        value: '',
-      },
-      {
-        subject: 'Email',
-        subjectIcon: false,
-        value: null,
-      },
-      {
-        subject: 'Username',
-        value: null,
-      },
-      {
-        subject: 'IP Address',
-        value: null,
-      },
-      {
-        subject: 'Name',
-        value: null,
-      },
-    ]);
-  });
-});
diff --git a/static/app/components/events/contexts/user/getUserKnownDataDetails.tsx b/static/app/components/events/contexts/user/getUserKnownDataDetails.tsx
deleted file mode 100644
index c9fd144f5b4dba..00000000000000
--- a/static/app/components/events/contexts/user/getUserKnownDataDetails.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import styled from '@emotion/styled';
-
-import type {KnownDataDetails} from 'sentry/components/events/contexts/utils';
-import ExternalLink from 'sentry/components/links/externalLink';
-import {IconMail} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import {defined} from 'sentry/utils';
-
-import type {UserEventContextData} from '.';
-import {UserKnownDataType} from '.';
-
-const EMAIL_REGEX = /[^@]+@[^\.]+\..+/;
-
-type Props = {
-  data: UserEventContextData;
-  type: UserKnownDataType;
-};
-
-export function getUserKnownDataDetails({data, type}: Props): KnownDataDetails {
-  switch (type) {
-    case UserKnownDataType.NAME:
-      return {
-        subject: t('Name'),
-        value: data.name,
-      };
-    case UserKnownDataType.USERNAME:
-      return {
-        subject: t('Username'),
-        value: data.username,
-      };
-    case UserKnownDataType.ID:
-      return {
-        subject: t('ID'),
-        value: data.id,
-      };
-    case UserKnownDataType.IP_ADDRESS:
-      return {
-        subject: t('IP Address'),
-        value: data.ip_address,
-      };
-    case UserKnownDataType.EMAIL:
-      return {
-        subject: t('Email'),
-        value: data.email,
-        subjectIcon: defined(data.email) && EMAIL_REGEX.test(data.email) && (
-          <ExternalLink href={`mailto:${data.email}`} className="external-icon">
-            <StyledIconMail size="xs" />
-          </ExternalLink>
-        ),
-      };
-    default:
-      return undefined;
-  }
-}
-
-const StyledIconMail = styled(IconMail)`
-  vertical-align: middle;
-`;
diff --git a/static/app/components/events/contexts/user/index.spec.tsx b/static/app/components/events/contexts/user/index.spec.tsx
deleted file mode 100644
index 9b81a3aa0c87d9..00000000000000
--- a/static/app/components/events/contexts/user/index.spec.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import {EventFixture} from 'sentry-fixture/event';
-
-import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
-import {textWithMarkupMatcher} from 'sentry-test/utils';
-
-import type {UserEventContextData} from 'sentry/components/events/contexts/user';
-import {UserEventContext} from 'sentry/components/events/contexts/user';
-
-// the values of this mock are correct and the types need to be updated
-export const userMockData = {
-  data: null,
-  email: null,
-  id: '',
-  ip_address: null,
-  name: null,
-  username: null,
-} as unknown as UserEventContextData;
-
-export const userMetaMockData = {
-  id: {
-    '': {
-      chunks: [
-        {
-          remark: 'x',
-          rule_id: 'project:0',
-          text: '',
-          type: 'redaction',
-        },
-      ],
-      len: 9,
-      rem: [['project:0', 'x', 0, 0]],
-    },
-  },
-  ip_address: {
-    '': {
-      err: [
-        [
-          'invalid_data',
-          {
-            reason: 'expected an ip address',
-          },
-        ],
-      ],
-      len: 14,
-      rem: [['project:0', 'x', 0, 0]],
-      val: '',
-    },
-  },
-};
-
-const event = {
-  ...EventFixture(),
-  _meta: {
-    user: userMetaMockData,
-  },
-};
-
-describe('user event context', function () {
-  it('display redacted data', async function () {
-    render(<UserEventContext event={event} data={userMockData} />);
-
-    expect(screen.getByText('ID')).toBeInTheDocument(); // subject
-    expect(screen.getByText(/redacted/)).toBeInTheDocument(); // value
-    await userEvent.hover(screen.getByText(/redacted/));
-    expect(
-      await screen.findByText(
-        textWithMarkupMatcher(
-          "Removed because of a data scrubbing rule in your project's settings"
-        ) // Fall back case
-      )
-    ).toBeInTheDocument(); // tooltip description
-
-    expect(screen.getByText('IP Address')).toBeInTheDocument(); // subject
-    await userEvent.hover(document.body);
-    expect(screen.getByText('null')).toBeInTheDocument(); // value
-    await userEvent.hover(screen.getByText('null'));
-
-    // The content of the first tooltip is not removed from the DOM when it is hidden
-    // therefore we explicitly need to wait for both tooltips to be visible
-    // Fixes race condition that causes flakiness https://sentry.sentry.io/issues/3974475742/?project=4857230
-    await waitFor(() => {
-      const tooltips = screen.getAllByText(
-        textWithMarkupMatcher(
-          "Removed because of a data scrubbing rule in your project's settings"
-        )
-      );
-
-      expect(tooltips).toHaveLength(2);
-      expect(tooltips[1]).toBeInTheDocument();
-      expect(tooltips[1]).toBeInTheDocument();
-    });
-  });
-});
diff --git a/static/app/components/events/contexts/user/index.tsx b/static/app/components/events/contexts/user/index.tsx
deleted file mode 100644
index 64a8668bfd5432..00000000000000
--- a/static/app/components/events/contexts/user/index.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import UserAvatar from 'sentry/components/avatar/userAvatar';
-import ErrorBoundary from 'sentry/components/errorBoundary';
-import ContextBlock from 'sentry/components/events/contexts/contextBlock';
-import KeyValueList from 'sentry/components/events/interfaces/keyValueList';
-import {userContextToActor} from 'sentry/components/events/interfaces/utils';
-import type {Event} from 'sentry/types/event';
-import type {AvatarUser} from 'sentry/types/user';
-import {defined} from 'sentry/utils';
-
-import {
-  getContextMeta,
-  getKnownData,
-  getKnownStructuredData,
-  getUnknownData,
-} from '../utils';
-
-import {getUserKnownDataDetails} from './getUserKnownDataDetails';
-
-export type UserEventContextData = {
-  data: Record<string, string>;
-} & AvatarUser;
-
-type Props = {
-  data: UserEventContextData;
-  event: Event;
-  meta?: Record<string, any>;
-};
-
-export enum UserKnownDataType {
-  ID = 'id',
-  EMAIL = 'email',
-  USERNAME = 'username',
-  IP_ADDRESS = 'ip_address',
-  NAME = 'name',
-}
-
-export enum UserIgnoredDataType {
-  DATA = 'data',
-}
-
-export const userKnownDataValues = [
-  UserKnownDataType.ID,
-  UserKnownDataType.EMAIL,
-  UserKnownDataType.USERNAME,
-  UserKnownDataType.IP_ADDRESS,
-  UserKnownDataType.NAME,
-];
-
-const userIgnoredDataValues = [UserIgnoredDataType.DATA];
-
-export function getKnownUserContextData({data, meta}: Pick<Props, 'data' | 'meta'>) {
-  return getKnownData<UserEventContextData, UserKnownDataType>({
-    data,
-    meta,
-    knownDataTypes: userKnownDataValues,
-    onGetKnownDataDetails: v => getUserKnownDataDetails(v),
-  }).map(v => ({
-    ...v,
-    subjectDataTestId: `user-context-${v.key.toLowerCase()}-value`,
-  }));
-}
-
-export function getUnknownUserContextData({data, meta}: Pick<Props, 'data' | 'meta'>) {
-  return getUnknownData({
-    allData: data,
-    knownKeys: [...userKnownDataValues, ...userIgnoredDataValues],
-    meta,
-  });
-}
-export function UserEventContext({data, event, meta: propsMeta}: Props) {
-  const meta = propsMeta ?? getContextMeta(event, 'user');
-  const knownData = getKnownUserContextData({data, meta});
-  const knownStructuredData = getKnownStructuredData(knownData, meta);
-  const unknownData = getUnknownUserContextData({data, meta});
-
-  return (
-    <div className="user-widget">
-      <div className="pull-left">
-        <UserAvatar user={userContextToActor(data)} size={48} gravatar={false} />
-      </div>
-      <ContextBlock data={knownStructuredData} />
-      <ContextBlock data={unknownData} />
-      {defined(data?.data) && (
-        <ErrorBoundary mini>
-          <KeyValueList
-            data={Object.entries(data.data).map(([key, value]) => ({
-              key,
-              value,
-              subject: key,
-              meta: meta[key]?.[''],
-            }))}
-            isContextData
-          />
-        </ErrorBoundary>
-      )}
-    </div>
-  );
-}
diff --git a/static/app/components/events/contexts/utils.tsx b/static/app/components/events/contexts/utils.tsx
index 79e773fca652f4..8ad210103a7935 100644
--- a/static/app/components/events/contexts/utils.tsx
+++ b/static/app/components/events/contexts/utils.tsx
@@ -15,6 +15,7 @@ import {getAppContextData} from 'sentry/components/events/contexts/knownContext/
 import {getBrowserContextData} from 'sentry/components/events/contexts/knownContext/browser';
 import {getCloudResourceContextData} from 'sentry/components/events/contexts/knownContext/cloudResource';
 import {getCultureContextData} from 'sentry/components/events/contexts/knownContext/culture';
+import {getDeviceContextData} from 'sentry/components/events/contexts/knownContext/device';
 import {getGPUContextData} from 'sentry/components/events/contexts/knownContext/gpu';
 import {getMemoryInfoContext} from 'sentry/components/events/contexts/knownContext/memoryInfo';
 import {getMissingInstrumentationContextData} from 'sentry/components/events/contexts/knownContext/missingInstrumentation';
@@ -25,6 +26,13 @@ import {getRuntimeContextData} from 'sentry/components/events/contexts/knownCont
 import {getStateContextData} from 'sentry/components/events/contexts/knownContext/state';
 import {getThreadPoolInfoContext} from 'sentry/components/events/contexts/knownContext/threadPoolInfo';
 import {getTraceContextData} from 'sentry/components/events/contexts/knownContext/trace';
+import {getUserContextData} from 'sentry/components/events/contexts/knownContext/user';
+import {
+  getPlatformContextData,
+  getPlatformContextIcon,
+  getPlatformContextTitle,
+  PLATFORM_CONTEXT_KEYS,
+} from 'sentry/components/events/contexts/platformContext/utils';
 import {userContextToActor} from 'sentry/components/events/interfaces/utils';
 import StructuredEventData from 'sentry/components/structuredEventData';
 import {t} from 'sentry/locale';
@@ -37,17 +45,6 @@ import type {AvatarUser} from 'sentry/types/user';
 import {defined} from 'sentry/utils';
 import commonTheme from 'sentry/utils/theme';
 
-import {getDefaultContextData} from './default';
-import {getKnownDeviceContextData, getUnknownDeviceContextData} from './device';
-import {
-  getKnownPlatformContextData,
-  getPlatformContextIcon,
-  getUnknownPlatformContextData,
-  KNOWN_PLATFORM_CONTEXTS,
-} from './platform';
-import {getKnownUnityContextData, getUnknownUnityContextData} from './unity';
-import {getKnownUserContextData, getUnknownUserContextData} from './user';
-
 /**
  * Generates the class name used for contexts
  */
@@ -78,6 +75,10 @@ export function generateIconName(
     return 'google';
   }
 
+  if (lowerCaseName.startsWith('vercel')) {
+    return 'vercel';
+  }
+
   const formattedName = name
     .split(/\d/)[0]
     .toLowerCase()
@@ -255,6 +256,10 @@ export function getContextTitle({
 
   const contextType = getContextType({alias, type});
 
+  if (PLATFORM_CONTEXT_KEYS.has(contextType)) {
+    return getPlatformContextTitle({platform: alias});
+  }
+
   switch (contextType) {
     case 'app':
       return t('App');
@@ -333,12 +338,14 @@ export function getContextIcon({
   contextIconProps?: Partial<ContextIconProps>;
   value?: Record<string, any>;
 }): React.ReactNode {
-  if (KNOWN_PLATFORM_CONTEXTS.has(alias)) {
+  const contextType = getContextType({alias, type});
+  if (PLATFORM_CONTEXT_KEYS.has(contextType)) {
     return getPlatformContextIcon({
       platform: alias,
       size: contextIconProps?.size ?? 'xl',
     });
   }
+
   let iconName = '';
   switch (type) {
     case 'device':
@@ -390,21 +397,15 @@ export function getFormattedContextData({
 }): KeyValueListData {
   const meta = getContextMeta(event, contextType);
 
-  if (KNOWN_PLATFORM_CONTEXTS.has(contextType)) {
-    return [
-      ...getKnownPlatformContextData({platform: contextType, data: contextValue, meta}),
-      ...getUnknownPlatformContextData({platform: contextType, data: contextValue, meta}),
-    ];
+  if (PLATFORM_CONTEXT_KEYS.has(contextType)) {
+    return getPlatformContextData({platform: contextType, data: contextValue});
   }
 
   switch (contextType) {
     case 'app':
       return getAppContextData({data: contextValue, event, meta});
     case 'device':
-      return [
-        ...getKnownDeviceContextData({data: contextValue, event, meta}),
-        ...getUnknownDeviceContextData({data: contextValue, meta}),
-      ];
+      return getDeviceContextData({data: contextValue, event, meta});
     case 'memory_info': // Current
     case 'Memory Info': // Legacy
       return getMemoryInfoContext({data: contextValue, meta});
@@ -412,18 +413,10 @@ export function getFormattedContextData({
       return getBrowserContextData({data: contextValue, meta});
     case 'os':
       return getOperatingSystemContextData({data: contextValue, meta});
-    case 'unity':
-      return [
-        ...getKnownUnityContextData({data: contextValue, meta}),
-        ...getUnknownUnityContextData({data: contextValue, meta}),
-      ];
     case 'runtime':
       return getRuntimeContextData({data: contextValue, meta});
     case 'user':
-      return [
-        ...getKnownUserContextData({data: contextValue, meta}),
-        ...getUnknownUserContextData({data: contextValue, meta}),
-      ];
+      return getUserContextData({data: contextValue, meta});
     case 'gpu':
       return getGPUContextData({data: contextValue, meta});
     case 'trace':
@@ -451,7 +444,12 @@ export function getFormattedContextData({
     case 'missing_instrumentation':
       return getMissingInstrumentationContextData({data: contextValue, meta});
     default:
-      return getDefaultContextData(contextValue);
+      return getContextKeys({data: contextValue}).map(ctxKey => ({
+        key: ctxKey,
+        subject: ctxKey,
+        value: contextValue[ctxKey],
+        meta: meta?.[ctxKey]?.[''],
+      }));
   }
 }
 /**
diff --git a/static/app/components/events/eventReplay/replayClipSection.tsx b/static/app/components/events/eventReplay/replayClipSection.tsx
index 0a744f665047da..eb7998a87ad9dc 100644
--- a/static/app/components/events/eventReplay/replayClipSection.tsx
+++ b/static/app/components/events/eventReplay/replayClipSection.tsx
@@ -65,10 +65,13 @@ export function ReplayClipSection({event, group, replayId}: Props) {
     replayCount && replayCount > 1 ? (
       <Fragment>
         <div>
-          {t(
-            'There are %s for this issue.',
-            tn('%s replay', '%s replays', replayCount ?? 0)
-          )}
+          {replayCount > 50
+            ? t('There are 50+ replays for this issue.')
+            : tn(
+                'There is %s replay for this issue.',
+                'there are %s replays for this issue.',
+                replayCount ?? 0
+              )}
         </div>
         {allReplaysButton}
       </Fragment>
diff --git a/static/app/components/events/eventStatisticalDetector/eventAffectedTransactions.tsx b/static/app/components/events/eventStatisticalDetector/eventAffectedTransactions.tsx
deleted file mode 100644
index af95c4189d4722..00000000000000
--- a/static/app/components/events/eventStatisticalDetector/eventAffectedTransactions.tsx
+++ /dev/null
@@ -1,360 +0,0 @@
-import {useEffect, useMemo, useState} from 'react';
-import * as Sentry from '@sentry/react';
-
-import {COL_WIDTH_UNDEFINED} from 'sentry/components/gridEditable';
-import {SegmentedControl} from 'sentry/components/segmentedControl';
-import {t} from 'sentry/locale';
-import type {Event} from 'sentry/types/event';
-import type {Group} from 'sentry/types/group';
-import type {Project} from 'sentry/types/project';
-import {defined} from 'sentry/utils';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {useProfileTopEventsStats} from 'sentry/utils/profiling/hooks/useProfileTopEventsStats';
-import {useRelativeDateTime} from 'sentry/utils/profiling/hooks/useRelativeDateTime';
-import {
-  generateProfileFlamechartRouteWithQuery,
-  generateProfileSummaryRouteWithQuery,
-} from 'sentry/utils/profiling/routes';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-import useOrganization from 'sentry/utils/useOrganization';
-import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
-import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
-
-import {RELATIVE_DAYS_WINDOW} from './consts';
-import {EventRegressionTable} from './eventRegressionTable';
-import {useTransactionsDelta} from './transactionsDeltaProvider';
-
-interface EventAffectedTransactionsProps {
-  event: Event;
-  group: Group;
-  project: Project;
-}
-
-export function EventAffectedTransactions({
-  event,
-  project,
-}: EventAffectedTransactionsProps) {
-  const evidenceData = event.occurrence?.evidenceData;
-  const fingerprint = evidenceData?.fingerprint;
-  const breakpoint = evidenceData?.breakpoint;
-  const frameName = evidenceData?.function;
-  const framePackage = evidenceData?.package || evidenceData?.module;
-
-  const isValid = defined(fingerprint) && defined(breakpoint);
-
-  useEffect(() => {
-    if (isValid) {
-      return;
-    }
-
-    Sentry.withScope(scope => {
-      scope.setContext('evidence data fields', {
-        fingerprint,
-        breakpoint,
-      });
-
-      Sentry.captureException(
-        new Error('Missing required evidence data on function regression issue.')
-      );
-    });
-  }, [isValid, fingerprint, breakpoint]);
-
-  if (!isValid) {
-    return null;
-  }
-
-  return (
-    <EventAffectedTransactionsInner
-      breakpoint={breakpoint}
-      fingerprint={fingerprint}
-      frameName={frameName}
-      framePackage={framePackage}
-      project={project}
-    />
-  );
-}
-
-const TRANSACTIONS_LIMIT = 10;
-
-const ADDITIONAL_COLUMNS = [
-  {key: 'transaction', name: t('Transaction'), width: COL_WIDTH_UNDEFINED},
-];
-
-interface EventAffectedTransactionsInnerProps {
-  breakpoint: number;
-  fingerprint: number;
-  frameName: string;
-  framePackage: string;
-  project: Project;
-}
-
-function EventAffectedTransactionsInner({
-  breakpoint,
-  fingerprint,
-  frameName,
-  framePackage,
-  project,
-}: EventAffectedTransactionsInnerProps) {
-  const [causeType, setCauseType] = useState<'duration' | 'throughput'>('duration');
-  const organization = useOrganization();
-
-  const datetime = useRelativeDateTime({
-    anchor: breakpoint,
-    relativeDays: RELATIVE_DAYS_WINDOW,
-  });
-
-  const transactionsDeltaQuery = useTransactionsDelta();
-
-  const percentileBefore = `percentile_before(function.duration, 0.95, ${breakpoint})`;
-  const percentileAfter = `percentile_after(function.duration, 0.95, ${breakpoint})`;
-  const throughputBefore = `cpm_before(${breakpoint})`;
-  const throughputAfter = `cpm_after(${breakpoint})`;
-
-  const query = useMemo(() => {
-    const data = transactionsDeltaQuery.data?.data ?? [];
-    if (!data.length) {
-      return null;
-    }
-
-    const conditions = new MutableSearch('');
-    conditions.addFilterValue('fingerprint', String(fingerprint), true);
-    conditions.addOp('(');
-    for (let i = 0; i < data.length; i++) {
-      if (i > 0) {
-        conditions.addOp('OR');
-      }
-      conditions.addFilterValue('transaction', data[i].transaction as string, true);
-    }
-    conditions.addOp(')');
-    return conditions.formatString();
-  }, [fingerprint, transactionsDeltaQuery]);
-
-  const functionStats = useProfileTopEventsStats({
-    dataset: 'profileFunctions',
-    datetime,
-    fields: ['transaction', 'count()'],
-    query: query ?? '',
-    enabled: defined(query),
-    others: false,
-    referrer: 'api.profiling.functions.regression.transaction-stats',
-    topEvents: TRANSACTIONS_LIMIT,
-    yAxes: ['examples()'],
-  });
-
-  const examplesByTransaction = useMemo(() => {
-    const allExamples: Record<string, [string | null, string | null]> = {};
-    if (!defined(functionStats.data)) {
-      return allExamples;
-    }
-
-    const timestamps = functionStats.data.timestamps;
-    const breakpointIndex = timestamps.indexOf(breakpoint);
-    if (breakpointIndex < 0) {
-      return allExamples;
-    }
-
-    transactionsDeltaQuery.data?.data?.forEach(row => {
-      const transaction = row.transaction as string;
-      const data = functionStats.data.data.find(
-        ({axis, label}) => axis === 'examples()' && label === transaction
-      );
-      if (!defined(data)) {
-        return;
-      }
-
-      allExamples[transaction] = findExamplePair(data.values, breakpointIndex);
-    });
-
-    return allExamples;
-  }, [breakpoint, transactionsDeltaQuery, functionStats]);
-
-  const tableData = useMemo(() => {
-    return (
-      transactionsDeltaQuery.data?.data.map(row => {
-        const [exampleBefore, exampleAfter] = examplesByTransaction[
-          row.transaction as string
-        ] ?? [null, null];
-
-        if (causeType === 'throughput') {
-          const before = row[throughputBefore] as number;
-          const after = row[throughputAfter] as number;
-          return {
-            exampleBefore,
-            exampleAfter,
-            transaction: row.transaction,
-            throughputBefore: before,
-            throughputAfter: after,
-            percentageChange: after / before - 1,
-          };
-        }
-
-        const before = (row[percentileBefore] as number) / 1e9;
-        const after = (row[percentileAfter] as number) / 1e9;
-        return {
-          exampleBefore,
-          exampleAfter,
-          transaction: row.transaction,
-          durationBefore: before,
-          durationAfter: after,
-          percentageChange: after / before - 1,
-        };
-      }) || []
-    );
-  }, [
-    causeType,
-    percentileBefore,
-    percentileAfter,
-    throughputBefore,
-    throughputAfter,
-    transactionsDeltaQuery.data?.data,
-    examplesByTransaction,
-  ]);
-
-  const options = useMemo(() => {
-    function handleGoToProfile() {
-      trackAnalytics('profiling_views.go_to_flamegraph', {
-        organization,
-        source: 'profiling.issue.function_regression.transactions',
-      });
-    }
-
-    const before = dataRow =>
-      defined(dataRow.exampleBefore)
-        ? {
-            target: generateProfileFlamechartRouteWithQuery({
-              orgSlug: organization.slug,
-              projectSlug: project.slug,
-              profileId: dataRow.exampleBefore,
-              query: {
-                frameName,
-                framePackage,
-              },
-            }),
-            onClick: handleGoToProfile,
-          }
-        : undefined;
-
-    const after = dataRow =>
-      defined(dataRow.exampleAfter)
-        ? {
-            target: generateProfileFlamechartRouteWithQuery({
-              orgSlug: organization.slug,
-              projectSlug: project.slug,
-              profileId: dataRow.exampleAfter,
-              query: {
-                frameName,
-                framePackage,
-              },
-            }),
-            onClick: handleGoToProfile,
-          }
-        : undefined;
-
-    return {
-      transaction: {
-        link: dataRow => ({
-          target: generateProfileSummaryRouteWithQuery({
-            orgSlug: organization.slug,
-            projectSlug: project.slug,
-            transaction: dataRow.transaction as string,
-          }),
-        }),
-      },
-      durationBefore: {link: before},
-      durationAfter: {link: after},
-      throughputBefore: {link: before},
-      throughputAfter: {link: after},
-    };
-  }, [organization, project, frameName, framePackage]);
-
-  return (
-    <InterimSection
-      type={SectionKey.REGRESSION_AFFECTED_TRANSACTIONS}
-      title={t('Most Affected')}
-      actions={
-        <SegmentedControl
-          size="xs"
-          aria-label={t('Duration or Throughput')}
-          value={causeType}
-          onChange={setCauseType}
-        >
-          <SegmentedControl.Item key="duration">
-            {t('Duration (P95)')}
-          </SegmentedControl.Item>
-          <SegmentedControl.Item key="throughput">
-            {t('Throughput')}
-          </SegmentedControl.Item>
-        </SegmentedControl>
-      }
-    >
-      <EventRegressionTable
-        causeType={causeType}
-        columns={ADDITIONAL_COLUMNS}
-        data={tableData || []}
-        isLoading={transactionsDeltaQuery.isPending}
-        isError={transactionsDeltaQuery.isError}
-        options={options}
-      />
-    </InterimSection>
-  );
-}
-
-/**
- * Find an example pair of profile ids from before and after the breakpoint.
- *
- * We prioritize profile ids from outside some window around the breakpoint
- * because the breakpoint is not 100% accurate and giving a buffer around
- * the breakpoint to so we can more accurate get a example profile from
- * before and after ranges.
- *
- * @param examples list of example profile ids
- * @param breakpointIndex the index where the breakpoint is
- * @param window the window around the breakpoint to deprioritize
- */
-function findExamplePair(
-  examples: string[][],
-  breakpointIndex,
-  window = 3
-): [string | null, string | null] {
-  let before: string | null = null;
-
-  for (let i = breakpointIndex - window; i < examples.length && i >= 0; i--) {
-    if (Array.isArray(examples[i]) && examples[i].length > 0) {
-      before = examples[i][0];
-      break;
-    }
-  }
-
-  if (!defined(before)) {
-    for (
-      let i = breakpointIndex;
-      i < examples.length && i > breakpointIndex - window;
-      i--
-    ) {
-      if (Array.isArray(examples[i]) && examples[i].length > 0) {
-        before = examples[i][0];
-        break;
-      }
-    }
-  }
-
-  let after: string | null = null;
-
-  for (let i = breakpointIndex + window; i < examples.length; i++) {
-    if (Array.isArray(examples[i]) && examples[i].length > 0) {
-      after = examples[i][0];
-      break;
-    }
-  }
-
-  if (!defined(before)) {
-    for (let i = breakpointIndex; i < breakpointIndex + window; i++) {
-      if (Array.isArray(examples[i]) && examples[i].length > 0) {
-        after = examples[i][0];
-        break;
-      }
-    }
-  }
-
-  return [before, after];
-}
diff --git a/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx b/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx
index 1911f9b30e8841..db7b22c57bac9c 100644
--- a/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx
+++ b/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx
@@ -8,7 +8,6 @@ import ButtonBar from 'sentry/components/buttonBar';
 import Link from 'sentry/components/links/link';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import Panel from 'sentry/components/panels/panel';
-import PerformanceDuration from 'sentry/components/performanceDuration';
 import Placeholder from 'sentry/components/placeholder';
 import {DifferentialFlamegraph} from 'sentry/components/profiling/flamegraph/differentialFlamegraph';
 import {DifferentialFlamegraphToolbar} from 'sentry/components/profiling/flamegraph/flamegraphToolbar/differentialFlamegraphToolbar';
@@ -18,6 +17,7 @@ import ProjectsStore from 'sentry/stores/projectsStore';
 import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
 import type {Project} from 'sentry/types/project';
+import {defined} from 'sentry/utils';
 import {formatAbbreviatedNumber} from 'sentry/utils/formatters';
 import {formatPercentage} from 'sentry/utils/number/formatPercentage';
 import {
@@ -31,7 +31,6 @@ import {FlamegraphThemeProvider} from 'sentry/utils/profiling/flamegraph/flamegr
 import {useFlamegraphTheme} from 'sentry/utils/profiling/flamegraph/useFlamegraphTheme';
 import type {FlamegraphFrame} from 'sentry/utils/profiling/flamegraphFrame';
 import type {Frame} from 'sentry/utils/profiling/frame';
-import type {EventsResultsDataRow} from 'sentry/utils/profiling/hooks/types';
 import {useDifferentialFlamegraphModel} from 'sentry/utils/profiling/hooks/useDifferentialFlamegraphModel';
 import type {DifferentialFlamegraphQueryResult} from 'sentry/utils/profiling/hooks/useDifferentialFlamegraphQuery';
 import {useDifferentialFlamegraphQuery} from 'sentry/utils/profiling/hooks/useDifferentialFlamegraphQuery';
@@ -41,8 +40,6 @@ import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {LOADING_PROFILE_GROUP} from 'sentry/views/profiling/profileGroupProvider';
 
-import {useTransactionsDelta} from './transactionsDeltaProvider';
-
 interface EventDifferentialFlamegraphProps {
   event: Event;
 }
@@ -75,53 +72,13 @@ export function EventDifferentialFlamegraph(props: EventDifferentialFlamegraphPr
     });
   }, [isValid, fingerprint, breakpoint]);
 
-  const transactions = useTransactionsDelta();
-  const [transaction, setTransaction] = useState<
-    EventsResultsDataRow<string> | undefined
-  >(undefined);
-
-  if (transaction === undefined) {
-    const firstTransaction = transactions?.data?.data?.[0];
-    if (firstTransaction) {
-      setTransaction(firstTransaction);
-    }
-  }
-
   const {before, after} = useDifferentialFlamegraphQuery({
     projectID: parseInt(props.event.projectID, 10),
     breakpoint,
     environments: selection.selection.environments,
     fingerprint: props.event.occurrence?.evidenceData?.fingerprint,
-    transaction: (transaction?.transaction as string) ?? '',
   });
 
-  const onNextTransactionClick = useMemo(() => {
-    if (!transaction) {
-      return undefined;
-    }
-    const idx = transactions?.data?.data?.indexOf?.(transaction) ?? -1;
-    if (idx === -1 || idx === (transactions?.data?.data?.length ?? 0) - 1) {
-      return undefined;
-    }
-
-    return () => {
-      setTransaction(transactions?.data?.data?.[idx + 1] ?? transaction);
-    };
-  }, [transaction, transactions?.data?.data]);
-
-  const onPreviousTransactionClick = useMemo(() => {
-    if (!transaction) {
-      return undefined;
-    }
-    const idx = transactions?.data?.data?.indexOf?.(transaction) ?? -1;
-    if (idx === -1 || idx === 0) {
-      return undefined;
-    }
-    return () => {
-      setTransaction(transactions?.data?.data?.[idx - 1] ?? transaction);
-    };
-  }, [transaction, transactions?.data?.data]);
-
   return (
     <Fragment>
       <FlamegraphThemeProvider>
@@ -135,9 +92,6 @@ export function EventDifferentialFlamegraph(props: EventDifferentialFlamegraphPr
         >
           <EventDifferentialFlamegraphView
             project={project}
-            onNextTransactionClick={onNextTransactionClick}
-            onPreviousTransactionClick={onPreviousTransactionClick}
-            transaction={transaction}
             before={before}
             after={after}
           />
@@ -158,10 +112,7 @@ function systemFrameOnly(frame: Frame): boolean {
 interface EventDifferentialFlamegraphViewProps {
   after: DifferentialFlamegraphQueryResult['before'];
   before: DifferentialFlamegraphQueryResult['after'];
-  onNextTransactionClick: (() => void) | undefined;
-  onPreviousTransactionClick: (() => void) | undefined;
   project: Project | undefined;
-  transaction: EventsResultsDataRow<string> | undefined;
 }
 function EventDifferentialFlamegraphView(props: EventDifferentialFlamegraphViewProps) {
   const organization = useOrganization();
@@ -196,27 +147,21 @@ function EventDifferentialFlamegraphView(props: EventDifferentialFlamegraphViewP
       if (!frame.profileIds?.length) {
         return '';
       }
-      const profileId = frame.profileIds[0];
-
-      if (typeof profileId !== 'undefined') {
-        return (
-          generateProfileRouteFromProfileReference({
-            orgSlug: organization.slug,
-            projectSlug: props.project.slug,
-            reference:
-              typeof profileId === 'string'
-                ? profileId
-                : 'profiler_id' in profileId
-                  ? profileId.profiler_id
-                  : profileId.profile_id,
-            framePackage: frame.frame.package,
-            frameName: frame.frame.name,
-          }) ?? ''
-        );
+      const profile = frame.profileIds?.[0];
+
+      if (!defined(profile)) {
+        return '';
       }
 
-      // Regression issues do not work with continuous profiles
-      return '';
+      return (
+        generateProfileRouteFromProfileReference({
+          orgSlug: organization.slug,
+          projectSlug: props.project.slug,
+          reference: profile,
+          framePackage: frame.frame.package,
+          frameName: frame.frame.name,
+        }) ?? ''
+      );
     },
     [organization.slug, props.project]
   );
@@ -224,11 +169,6 @@ function EventDifferentialFlamegraphView(props: EventDifferentialFlamegraphViewP
   return (
     <FlamegraphContainer>
       <StyledPanel>
-        <DifferentialFlamegraphTransactionToolbar
-          transaction={props.transaction}
-          onNextTransactionClick={props.onNextTransactionClick}
-          onPreviousTransactionClick={props.onPreviousTransactionClick}
-        />
         <DifferentialFlamegraphToolbar
           frameFilter={frameFilterSetting}
           onFrameFilterChange={setFrameFilterSetting}
@@ -310,85 +250,6 @@ function EventDifferentialFlamegraphView(props: EventDifferentialFlamegraphViewP
   );
 }
 
-const numberFormatter = Intl.NumberFormat(undefined, {
-  maximumFractionDigits: 2,
-});
-
-interface DifferentialFlamegraphTransactionToolbarProps {
-  onNextTransactionClick: (() => void) | undefined;
-  onPreviousTransactionClick: (() => void) | undefined;
-  transaction: EventsResultsDataRow<string> | undefined;
-}
-function DifferentialFlamegraphTransactionToolbar(
-  props: DifferentialFlamegraphTransactionToolbarProps
-) {
-  const [before, after] = useMemo(() => {
-    if (!props.transaction) {
-      return [0, 0];
-    }
-
-    const keys = Object.keys(props.transaction);
-
-    let beforePercentile = 0;
-    let afterPercentile = 0;
-
-    for (const key of keys) {
-      if (key.startsWith('percentile_after')) {
-        afterPercentile = props.transaction[key] as number;
-      }
-      if (key.startsWith('percentile_before')) {
-        beforePercentile = props.transaction[key] as number;
-      }
-    }
-
-    return [beforePercentile, afterPercentile];
-  }, [props.transaction]);
-
-  return (
-    <DifferentialFlamegraphTransactionToolbarContainer>
-      {props.transaction?.transaction ? (
-        <DifferentialFlamegraphTransactionName>
-          {props.transaction.transaction}
-        </DifferentialFlamegraphTransactionName>
-      ) : (
-        <Placeholder height="20px" width="66%" />
-      )}
-
-      {props.transaction ? (
-        <span>
-          <PerformanceDuration nanoseconds={before} abbreviation />
-          <DifferentialFlamegraphRegressionChange>
-            {after === 0 || before === 0
-              ? ''
-              : '+' + numberFormatter.format(relativeChange(after, before) * 100) + '%'}
-          </DifferentialFlamegraphRegressionChange>
-        </span>
-      ) : (
-        <Fragment>
-          <Placeholder height="20px" width="60px" />
-          <Placeholder height="20px" width="60px" />
-        </Fragment>
-      )}
-      <ButtonBar merged>
-        <DifferentialFlamegraphPaginationButton
-          icon={<IconChevron direction="left" />}
-          aria-label={t('Previous Transaction')}
-          size="xs"
-          disabled={!props.onPreviousTransactionClick}
-          onClick={props.onPreviousTransactionClick}
-        />
-        <DifferentialFlamegraphPaginationButton
-          icon={<IconChevron direction="right" />}
-          aria-label={t('Next Transaction')}
-          size="xs"
-          disabled={!props.onNextTransactionClick}
-          onClick={props.onNextTransactionClick}
-        />
-      </ButtonBar>
-    </DifferentialFlamegraphTransactionToolbarContainer>
-  );
-}
-
 interface PaginationReducerState {
   page: number;
   pageCount: number;
@@ -762,26 +623,6 @@ const DifferentialFlamegraphPaginationButton = styled(Button)`
   padding-left: ${space(0.75)};
   padding-right: ${space(0.75)};
 `;
-const DifferentialFlamegraphTransactionName = styled('div')`
-  font-weight: ${p => p.theme.fontWeightBold};
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-`;
-
-const DifferentialFlamegraphRegressionChange = styled('span')`
-  margin-left: ${space(1)};
-  color: ${p => p.theme.red300};
-`;
-
-const DifferentialFlamegraphTransactionToolbarContainer = styled('div')`
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: ${space(1)};
-  gap: ${space(1)};
-  border-bottom: 1px solid ${p => p.theme.border};
-`;
 
 const ErrorMessageContainer = styled('div')`
   position: absolute;
diff --git a/static/app/components/events/eventStatisticalDetector/eventFunctionComparisonList.tsx b/static/app/components/events/eventStatisticalDetector/eventFunctionComparisonList.tsx
deleted file mode 100644
index 16c60bc563bb22..00000000000000
--- a/static/app/components/events/eventStatisticalDetector/eventFunctionComparisonList.tsx
+++ /dev/null
@@ -1,320 +0,0 @@
-import {Fragment, useEffect, useMemo} from 'react';
-import styled from '@emotion/styled';
-import * as Sentry from '@sentry/react';
-
-import Link from 'sentry/components/links/link';
-import PerformanceDuration from 'sentry/components/performanceDuration';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {Event} from 'sentry/types/event';
-import type {Group} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
-import type {Project} from 'sentry/types/project';
-import {defined} from 'sentry/utils';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {Container, NumberContainer} from 'sentry/utils/discover/styles';
-import {getShortEventId} from 'sentry/utils/events';
-import {useProfileEvents} from 'sentry/utils/profiling/hooks/useProfileEvents';
-import {useProfileFunctions} from 'sentry/utils/profiling/hooks/useProfileFunctions';
-import {useRelativeDateTime} from 'sentry/utils/profiling/hooks/useRelativeDateTime';
-import {generateProfileFlamechartRouteWithQuery} from 'sentry/utils/profiling/routes';
-import useOrganization from 'sentry/utils/useOrganization';
-import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
-import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
-
-interface EventFunctionComparisonListProps {
-  event: Event;
-  group: Group;
-  project: Project;
-}
-
-export function EventFunctionComparisonList({
-  event,
-  project,
-}: EventFunctionComparisonListProps) {
-  const evidenceData = event.occurrence?.evidenceData;
-  const fingerprint = evidenceData?.fingerprint;
-  const breakpoint = evidenceData?.breakpoint;
-  const frameName = evidenceData?.function;
-  const framePackage = evidenceData?.package || evidenceData?.module;
-
-  const isValid =
-    defined(fingerprint) &&
-    defined(breakpoint) &&
-    defined(frameName) &&
-    defined(framePackage);
-
-  useEffect(() => {
-    if (isValid) {
-      return;
-    }
-
-    Sentry.withScope(scope => {
-      scope.setContext('evidence data fields', {
-        fingerprint,
-        breakpoint,
-        frameName,
-        framePackage,
-      });
-
-      Sentry.captureException(
-        new Error('Missing required evidence data on function regression issue.')
-      );
-    });
-  }, [isValid, fingerprint, breakpoint, frameName, framePackage]);
-
-  if (!isValid) {
-    return null;
-  }
-
-  return (
-    <EventComparisonListInner
-      breakpoint={breakpoint}
-      fingerprint={fingerprint}
-      frameName={frameName}
-      framePackage={framePackage}
-      project={project}
-    />
-  );
-}
-
-interface EventComparisonListInnerProps {
-  breakpoint: number;
-  fingerprint: number;
-  frameName: string;
-  framePackage: string;
-  project: Project;
-}
-
-function EventComparisonListInner({
-  breakpoint,
-  fingerprint,
-  frameName,
-  framePackage,
-  project,
-}: EventComparisonListInnerProps) {
-  const organization = useOrganization();
-
-  const breakpointDateTime = new Date(breakpoint * 1000);
-  const datetime = useRelativeDateTime({
-    anchor: breakpoint,
-    relativeDays: 1,
-  });
-  const {start: beforeDateTime, end: afterDateTime} = datetime;
-
-  const beforeProfilesQuery = useProfileFunctions({
-    datetime: {
-      start: beforeDateTime,
-      end: breakpointDateTime,
-      utc: true,
-      period: null,
-    },
-    fields: ['examples()'],
-    sort: {
-      key: 'examples()',
-      order: 'asc',
-    },
-    query: `fingerprint:${fingerprint}`,
-    projects: [project.id],
-    limit: 1,
-    referrer: 'api.profiling.functions.regression.list',
-  });
-
-  const afterProfilesQuery = useProfileFunctions({
-    datetime: {
-      start: breakpointDateTime,
-      end: afterDateTime,
-      utc: true,
-      period: null,
-    },
-    fields: ['examples()'],
-    sort: {
-      key: 'examples()',
-      order: 'asc',
-    },
-    query: `fingerprint:${fingerprint}`,
-    projects: [project.id],
-    limit: 1,
-    referrer: 'api.profiling.functions.regression.list',
-  });
-
-  const beforeProfileIds =
-    (beforeProfilesQuery.data?.data?.[0]?.['examples()'] as string[]) ?? [];
-  const afterProfileIds =
-    (afterProfilesQuery.data?.data?.[0]?.['examples()'] as string[]) ?? [];
-
-  const profilesQuery = useProfileEvents({
-    datetime,
-    fields: ['profile.id', 'transaction', 'transaction.duration'],
-    query: `profile.id:[${[...beforeProfileIds, ...afterProfileIds].join(', ')}]`,
-    sort: {
-      key: 'transaction.duration',
-      order: 'desc',
-    },
-    projects: [project.id],
-    limit: beforeProfileIds.length + afterProfileIds.length,
-    enabled: beforeProfileIds.length > 0 && afterProfileIds.length > 0,
-    referrer: 'api.profiling.functions.regression.examples',
-  });
-
-  const beforeProfiles = useMemo(() => {
-    const profileIds = new Set(
-      (beforeProfilesQuery.data?.data?.[0]?.['examples()'] as string[]) ?? []
-    );
-
-    return (
-      (profilesQuery.data?.data?.filter(row =>
-        profileIds.has(row['profile.id'] as string)
-      ) as ProfileItem[]) ?? []
-    );
-  }, [beforeProfilesQuery, profilesQuery]);
-
-  const afterProfiles = useMemo(() => {
-    const profileIds = new Set(
-      (afterProfilesQuery.data?.data?.[0]?.['examples()'] as string[]) ?? []
-    );
-
-    return (
-      (profilesQuery.data?.data?.filter(row =>
-        profileIds.has(row['profile.id'] as string)
-      ) as ProfileItem[]) ?? []
-    );
-  }, [afterProfilesQuery, profilesQuery]);
-
-  const durationUnit = profilesQuery.data?.meta?.units?.['transaction.duration'] ?? '';
-
-  return (
-    <InterimSection
-      type={SectionKey.REGRESSION_PROFILE_COMPARISON}
-      title={t('Profile Comparison')}
-    >
-      <Wrapper>
-        <div>
-          <Header>{t('Example Profiles Before')}</Header>
-          <EventList
-            frameName={frameName}
-            framePackage={framePackage}
-            organization={organization}
-            profiles={beforeProfiles}
-            project={project}
-            unit={durationUnit}
-          />
-        </div>
-        <div>
-          <Header>{t('Example Profiles After')}</Header>
-          <EventList
-            frameName={frameName}
-            framePackage={framePackage}
-            organization={organization}
-            profiles={afterProfiles}
-            project={project}
-            unit={durationUnit}
-          />
-        </div>
-      </Wrapper>
-    </InterimSection>
-  );
-}
-
-interface ProfileItem {
-  'profile.id': string;
-  timestamp: string;
-  transaction: string;
-  'transaction.duration': number;
-}
-
-interface EventListProps {
-  frameName: string;
-  framePackage: string;
-  organization: Organization;
-  profiles: ProfileItem[];
-  project: Project;
-  unit: string;
-}
-
-function EventList({
-  frameName,
-  framePackage,
-  organization,
-  profiles,
-  project,
-  unit,
-}: EventListProps) {
-  return (
-    <ListContainer>
-      <Container>
-        <strong>{t('Profile ID')}</strong>
-      </Container>
-      <Container>
-        <strong>{t('Transaction')}</strong>
-      </Container>
-      <NumberContainer>
-        <strong>{t('Duration')} </strong>
-      </NumberContainer>
-      {profiles.map(item => {
-        const target = generateProfileFlamechartRouteWithQuery({
-          orgSlug: organization.slug,
-          projectSlug: project.slug,
-          profileId: item['profile.id'],
-          query: {
-            frameName,
-            framePackage,
-          },
-        });
-
-        return (
-          <Fragment key={item['profile.id']}>
-            <Container>
-              <Link
-                to={target}
-                onClick={() => {
-                  trackAnalytics('profiling_views.go_to_flamegraph', {
-                    organization,
-                    source: 'profiling.issue.function_regression.list',
-                  });
-                }}
-              >
-                {getShortEventId(item['profile.id'])}
-              </Link>
-            </Container>
-            <Container>{item.transaction}</Container>
-            <NumberContainer>
-              {unit === 'millisecond' ? (
-                <PerformanceDuration
-                  milliseconds={item['transaction.duration']}
-                  abbreviation
-                />
-              ) : (
-                <PerformanceDuration
-                  nanoseconds={item['transaction.duration']}
-                  abbreviation
-                />
-              )}
-            </NumberContainer>
-          </Fragment>
-        );
-      })}
-    </ListContainer>
-  );
-}
-
-const Header = styled('h6')`
-  font-size: ${p => p.theme.fontSizeMedium};
-  margin-bottom: ${space(1)};
-`;
-
-const Wrapper = styled('div')`
-  display: grid;
-  grid-template-columns: 1fr;
-  gap: ${space(1)};
-
-  @media (min-width: ${p => p.theme.breakpoints.medium}) {
-    grid-template-columns: 1fr 1fr;
-  }
-`;
-
-const ListContainer = styled('div')`
-  display: grid;
-  grid-template-columns: minmax(75px, 1fr) auto minmax(75px, 1fr);
-  gap: ${space(1)};
-`;
diff --git a/static/app/components/events/eventStatisticalDetector/eventRegressionTable.tsx b/static/app/components/events/eventStatisticalDetector/eventRegressionTable.tsx
index 616361971beb2d..cdb0e326dd79e3 100644
--- a/static/app/components/events/eventStatisticalDetector/eventRegressionTable.tsx
+++ b/static/app/components/events/eventStatisticalDetector/eventRegressionTable.tsx
@@ -137,6 +137,10 @@ function durationRenderer(duration, {dataRow, option}) {
 }
 
 function changeRenderer(percentageChange) {
+  if (percentageChange === Infinity) {
+    return <ChangeContainer change={'neutral'} />;
+  }
+
   return (
     <ChangeContainer
       change={
diff --git a/static/app/components/events/eventStatisticalDetector/transactionsDeltaProvider.tsx b/static/app/components/events/eventStatisticalDetector/transactionsDeltaProvider.tsx
deleted file mode 100644
index 521edd1f5b9a85..00000000000000
--- a/static/app/components/events/eventStatisticalDetector/transactionsDeltaProvider.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import type React from 'react';
-import {createContext, useContext} from 'react';
-
-import {RELATIVE_DAYS_WINDOW} from 'sentry/components/events/eventStatisticalDetector/consts';
-import type {Event} from 'sentry/types/event';
-import type {Project} from 'sentry/types/project';
-import type {EventsResults} from 'sentry/utils/profiling/hooks/types';
-import {useProfileFunctions} from 'sentry/utils/profiling/hooks/useProfileFunctions';
-import {useRelativeDateTime} from 'sentry/utils/profiling/hooks/useRelativeDateTime';
-import type {UseApiQueryResult} from 'sentry/utils/queryClient';
-import type RequestError from 'sentry/utils/requestError/requestError';
-
-const TransactionsDeltaProviderContext = createContext<UseApiQueryResult<
-  EventsResults<string>,
-  RequestError
-> | null>(null);
-
-const TRANSACTIONS_LIMIT = 10;
-
-export function useTransactionsDelta(): UseApiQueryResult<
-  EventsResults<string>,
-  RequestError
-> {
-  const ctx = useContext(TransactionsDeltaProviderContext);
-  if (!ctx) {
-    throw new Error(
-      'useTransactionsDelta called outside of TransactionsDeltaProviderProvider'
-    );
-  }
-  return ctx;
-}
-
-interface TransactionsDeltaProviderProps {
-  children: React.ReactNode;
-  event: Event;
-  project: Project;
-}
-
-export function TransactionsDeltaProvider(props: TransactionsDeltaProviderProps) {
-  const evidenceData = props.event.occurrence?.evidenceData;
-  const fingerprint = evidenceData?.fingerprint;
-  const breakpoint = evidenceData?.breakpoint;
-
-  const datetime = useRelativeDateTime({
-    anchor: breakpoint,
-    relativeDays: RELATIVE_DAYS_WINDOW,
-  });
-
-  const regressionScore = `regression_score(function.duration, 0.95, ${breakpoint})`;
-  const percentileBefore = `percentile_before(function.duration, 0.95, ${breakpoint})`;
-  const percentileAfter = `percentile_after(function.duration, 0.95, ${breakpoint})`;
-  const throughputBefore = `cpm_before(${breakpoint})`;
-  const throughputAfter = `cpm_after(${breakpoint})`;
-
-  const transactionsDeltaQuery = useProfileFunctions({
-    datetime,
-    fields: [
-      'transaction',
-      percentileBefore,
-      percentileAfter,
-      throughputBefore,
-      throughputAfter,
-      regressionScore,
-    ],
-    sort: {
-      key: regressionScore,
-      order: 'desc',
-    },
-    query: `fingerprint:${fingerprint}`,
-    projects: [props.project.id],
-    limit: TRANSACTIONS_LIMIT,
-    referrer: 'api.profiling.functions.regression.transactions',
-  });
-
-  return (
-    <TransactionsDeltaProviderContext.Provider value={transactionsDeltaQuery}>
-      {props.children}
-    </TransactionsDeltaProviderContext.Provider>
-  );
-}
diff --git a/static/app/components/events/eventTags/eventTagsTree.spec.tsx b/static/app/components/events/eventTags/eventTagsTree.spec.tsx
index 40f24bd15f60d6..65c65347f5b26d 100644
--- a/static/app/components/events/eventTags/eventTagsTree.spec.tsx
+++ b/static/app/components/events/eventTags/eventTagsTree.spec.tsx
@@ -22,9 +22,9 @@ describe('EventTagsTree', function () {
     {key: 'tree', value: 'maple'},
     {key: 'tree.branch', value: 'jagged'},
     {key: 'tree.branch.leaf', value: 'red'},
-    {key: 'favourite.colour', value: 'teal'},
-    {key: 'favourite.animal', value: 'dog'},
-    {key: 'favourite.game', value: 'everdell'},
+    {key: 'favorite.color', value: 'teal'},
+    {key: 'favorite.animal', value: 'dog'},
+    {key: 'favorite.game', value: 'everdell'},
     {key: 'magic.is', value: 'real'},
     {key: 'magic.is.probably.not', value: 'spells'},
     {key: 'double..dot', value: 'works'},
@@ -36,13 +36,13 @@ describe('EventTagsTree', function () {
     'app.version',
     'tree.branch',
     'tree.branch.leaf',
-    'favourite.colour',
-    'favourite.animal',
-    'favourite.game',
+    'favorite.color',
+    'favorite.animal',
+    'favorite.game',
     'magic.is',
     'magic.is.probably.not',
   ];
-  const emptyBranchTags = ['favourite', 'magic', 'probably'];
+  const emptyBranchTags = ['favorite', 'magic', 'probably'];
   const treeBranchTags = [
     'app_start_time',
     'app_name',
@@ -50,7 +50,7 @@ describe('EventTagsTree', function () {
     'tree',
     'branch',
     'leaf',
-    'colour',
+    'color',
     'animal',
     'game',
     'is',
diff --git a/static/app/components/events/featureFlags/eventFeatureFlagList.spec.tsx b/static/app/components/events/featureFlags/eventFeatureFlagList.spec.tsx
index bfb0c51acb982c..817f37e932878f 100644
--- a/static/app/components/events/featureFlags/eventFeatureFlagList.spec.tsx
+++ b/static/app/components/events/featureFlags/eventFeatureFlagList.spec.tsx
@@ -1,9 +1,11 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
 import {TagsFixture} from 'sentry-fixture/tags';
 
 import {
   render,
   screen,
   userEvent,
+  waitFor,
   waitForDrawerToHide,
 } from 'sentry-test/reactTestingLibrary';
 
@@ -12,7 +14,8 @@ import {
   EMPTY_STATE_SECTION_PROPS,
   MOCK_DATA_SECTION_PROPS,
   MOCK_FLAGS,
-  NO_FLAG_CONTEXT_SECTION_PROPS,
+  NO_FLAG_CONTEXT_SECTION_PROPS_CTA,
+  NO_FLAG_CONTEXT_SECTION_PROPS_NO_CTA,
 } from 'sentry/components/events/featureFlags/testUtils';
 
 // Needed to mock useVirtualizer lists.
@@ -30,6 +33,22 @@ jest.spyOn(window.Element.prototype, 'getBoundingClientRect').mockImplementation
 
 describe('EventFeatureFlagList', function () {
   beforeEach(function () {
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/issues/1/events/',
+      body: [],
+    });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/flags/logs/',
+      body: {data: []},
+    });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/prompts-activity/',
+      body: {data: {}},
+    });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/prompts-activity/',
+      body: {data: {dismissed_ts: null}},
+    });
     MockApiClient.addMockResponse({
       url: `/organizations/org-slug/issues/1/tags/`,
       body: TagsFixture(),
@@ -208,8 +227,54 @@ describe('EventFeatureFlagList', function () {
     ).toBeInTheDocument();
   });
 
-  it('renders nothing if event.contexts.flags is not set', function () {
-    render(<EventFeatureFlagList {...NO_FLAG_CONTEXT_SECTION_PROPS} />);
+  it('renders cta if event.contexts.flags is not set and should show cta', async function () {
+    const org = OrganizationFixture({features: ['feature-flag-cta']});
+
+    render(<EventFeatureFlagList {...NO_FLAG_CONTEXT_SECTION_PROPS_CTA} />, {
+      organization: org,
+    });
+
+    const control = screen.queryByRole('button', {name: 'Sort Flags'});
+    expect(control).not.toBeInTheDocument();
+    const search = screen.queryByRole('button', {name: 'Open Feature Flag Search'});
+    expect(search).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', {name: 'Set Up Integration'})
+    ).not.toBeInTheDocument();
+
+    // wait for the CTA to be rendered
+    expect(await screen.findByText('Set Up Feature Flags')).toBeInTheDocument();
+    expect(screen.getByText('Feature Flags')).toBeInTheDocument();
+  });
+
+  it('renders nothing if event.contexts.flags is not set and should not show cta - wrong platform', async function () {
+    const org = OrganizationFixture({features: ['feature-flag-cta']});
+
+    render(<EventFeatureFlagList {...NO_FLAG_CONTEXT_SECTION_PROPS_NO_CTA} />, {
+      organization: org,
+    });
+
+    const control = screen.queryByRole('button', {name: 'Sort Flags'});
+    expect(control).not.toBeInTheDocument();
+    const search = screen.queryByRole('button', {name: 'Open Feature Flag Search'});
+    expect(search).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', {name: 'Set Up Integration'})
+    ).not.toBeInTheDocument();
+
+    // CTA should not appear
+    await waitFor(() => {
+      expect(screen.queryByText('Set Up Feature Flags')).not.toBeInTheDocument();
+    });
+    expect(screen.queryByText('Feature Flags')).not.toBeInTheDocument();
+  });
+
+  it('renders nothing if event.contexts.flags is not set and should not show cta - no feature flag', async function () {
+    const org = OrganizationFixture({features: ['fake-feature-flag']});
+
+    render(<EventFeatureFlagList {...NO_FLAG_CONTEXT_SECTION_PROPS_CTA} />, {
+      organization: org,
+    });
 
     const control = screen.queryByRole('button', {name: 'Sort Flags'});
     expect(control).not.toBeInTheDocument();
@@ -218,6 +283,11 @@ describe('EventFeatureFlagList', function () {
     expect(
       screen.queryByRole('button', {name: 'Set Up Integration'})
     ).not.toBeInTheDocument();
+
+    // CTA should not appear
+    await waitFor(() => {
+      expect(screen.queryByText('Set Up Feature Flags')).not.toBeInTheDocument();
+    });
     expect(screen.queryByText('Feature Flags')).not.toBeInTheDocument();
   });
 });
diff --git a/static/app/components/events/featureFlags/eventFeatureFlagList.tsx b/static/app/components/events/featureFlags/eventFeatureFlagList.tsx
index 3b8b5ef9575776..550a4d2b3e8ca7 100644
--- a/static/app/components/events/featureFlags/eventFeatureFlagList.tsx
+++ b/static/app/components/events/featureFlags/eventFeatureFlagList.tsx
@@ -1,20 +1,17 @@
 import {Fragment, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 
-import {openModal} from 'sentry/actionCreators/modal';
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
-import ErrorBoundary from 'sentry/components/errorBoundary';
 import {
   CardContainer,
   FeatureFlagDrawer,
 } from 'sentry/components/events/featureFlags/featureFlagDrawer';
+import FeatureFlagInlineCTA from 'sentry/components/events/featureFlags/featureFlagInlineCTA';
 import FeatureFlagSort from 'sentry/components/events/featureFlags/featureFlagSort';
-import {
-  modalCss,
-  SetupIntegrationModal,
-} from 'sentry/components/events/featureFlags/setupIntegrationModal';
+import {useFeatureFlagOnboarding} from 'sentry/components/events/featureFlags/useFeatureFlagOnboarding';
+import useIssueEvents from 'sentry/components/events/featureFlags/useIssueEvents';
 import {
   FlagControlOptions,
   OrderBy,
@@ -23,6 +20,7 @@ import {
 } from 'sentry/components/events/featureFlags/utils';
 import useDrawer from 'sentry/components/globalDrawer';
 import KeyValueData from 'sentry/components/keyValueData';
+import {featureFlagOnboardingPlatforms} from 'sentry/data/platformCategories';
 import {IconMegaphone, IconSearch} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {Event, FeatureFlag} from 'sentry/types/event';
@@ -32,10 +30,10 @@ import {trackAnalytics} from 'sentry/utils/analytics';
 import {useFeedbackForm} from 'sentry/utils/useFeedbackForm';
 import useOrganization from 'sentry/utils/useOrganization';
 import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
+import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery';
+import {useOrganizationFlagLog} from 'sentry/views/issueDetails/streamline/hooks/useOrganizationFlagLog';
+import useSuspectFlags from 'sentry/views/issueDetails/streamline/hooks/useSuspectFlags';
 import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
-import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/useIssueDetailsDiscoverQuery';
-import {useOrganizationFlagLog} from 'sentry/views/issueDetails/streamline/useOrganizationFlagLog';
-import useSuspectFlags from 'sentry/views/issueDetails/streamline/useSuspectFlags';
 
 export function EventFeatureFlagList({
   event,
@@ -81,6 +79,14 @@ export function EventFeatureFlagList({
     },
   });
 
+  const {
+    data: relatedEvents,
+    isPending: isRelatedEventsPending,
+    isError: isRelatedEventsError,
+  } = useIssueEvents({issueId: group.id});
+
+  const {activateSidebarSkipConfigure} = useFeatureFlagOnboarding();
+
   const {
     suspectFlags,
     isError: isSuspectError,
@@ -92,33 +98,43 @@ export function EventFeatureFlagList({
     event,
   });
 
-  const hasFlagContext = !!event.contexts.flags;
-  const hasFlags = Boolean(hasFlagContext && event?.contexts?.flags?.values.length);
-
-  function handleSetupButtonClick() {
-    trackAnalytics('flags.setup_modal_opened', {organization});
-    openModal(modalProps => <SetupIntegrationModal {...modalProps} />, {
-      modalCss,
-    });
-  }
-
   const suspectFlagNames: Set<string> = useMemo(() => {
     return isSuspectError || isSuspectPending
       ? new Set()
       : new Set(suspectFlags.map(f => f.flag));
   }, [isSuspectError, isSuspectPending, suspectFlags]);
 
-  const hydratedFlags = useMemo(() => {
-    // Transform the flags array into something readable by the key-value component
-    // Reverse the flags to show newest at the top by default
-    const rawFlags: FeatureFlag[] = event.contexts?.flags?.values.toReversed() ?? [];
+  const hasFlagContext = Boolean(event.contexts?.flags?.values);
+  const anyEventHasContext =
+    isRelatedEventsPending || isRelatedEventsError
+      ? false
+      : relatedEvents.filter(e => Boolean(e.contexts?.flags?.values)).length > 0;
 
-    // Filter out ill-formatted flags, which come from SDK developer error or user-provided contexts.
-    const flags = rawFlags.filter(
-      f => f && typeof f === 'object' && 'flag' in f && 'result' in f
+  const eventFlags: Required<FeatureFlag>[] = useMemo(() => {
+    // At runtime there's no type guarantees on the event flags. So we have to
+    // explicitly validate against SDK developer error or user-provided contexts.
+    const rawFlags = event.contexts?.flags?.values ?? [];
+    return rawFlags.filter(
+      (f): f is Required<FeatureFlag> =>
+        f &&
+        typeof f === 'object' &&
+        typeof f.flag === 'string' &&
+        typeof f.result === 'boolean'
     );
+  }, [event]);
+
+  const hasFlags = hasFlagContext && eventFlags.length > 0;
+
+  const showCTA =
+    !hasFlagContext &&
+    !anyEventHasContext &&
+    featureFlagOnboardingPlatforms.includes(project.platform ?? 'other') &&
+    organization.features.includes('feature-flag-cta');
 
-    return flags.map(f => {
+  const hydratedFlags = useMemo(() => {
+    // Transform the flags array into something readable by the key-value component.
+    // Reverse the flags to show newest at the top by default.
+    return eventFlags.toReversed().map(f => {
       return {
         item: {
           key: f.flag,
@@ -135,7 +151,7 @@ export function EventFeatureFlagList({
         isSuspectFlag: suspectFlagNames.has(f.flag),
       };
     });
-  }, [event, suspectFlagNames]);
+  }, [suspectFlagNames, eventFlags]);
 
   const onViewAllFlags = useCallback(
     (focusControl?: FlagControlOptions) => {
@@ -181,7 +197,10 @@ export function EventFeatureFlagList({
     }
   }, [hasFlags, hydratedFlags.length, organization]);
 
-  // TODO: for LD users, show a CTA in this section instead
+  if (showCTA) {
+    return <FeatureFlagInlineCTA projectId={event.projectID} />;
+  }
+
   // if contexts.flags is not set, hide the section
   if (!hasFlagContext) {
     return null;
@@ -190,45 +209,45 @@ export function EventFeatureFlagList({
   const actions = (
     <ButtonBar gap={1}>
       {feedbackButton}
-      {hasFlagContext && (
-        <Fragment>
-          <Button
-            aria-label={t('Set Up Integration')}
-            size="xs"
-            onClick={handleSetupButtonClick}
-          >
-            {t('Set Up Integration')}
-          </Button>
-          {hasFlags && (
-            <Fragment>
-              <Button
-                size="xs"
-                aria-label={t('View All')}
-                ref={viewAllButtonRef}
-                title={t('View All Flags')}
-                onClick={() => {
-                  isDrawerOpen ? closeDrawer() : onViewAllFlags();
-                }}
-              >
-                {t('View All')}
-              </Button>
-              <Button
-                aria-label={t('Open Feature Flag Search')}
-                icon={<IconSearch size="xs" />}
-                size="xs"
-                title={t('Open Search')}
-                onClick={() => onViewAllFlags(FlagControlOptions.SEARCH)}
-              />
-              <FeatureFlagSort
-                orderBy={orderBy}
-                sortBy={sortBy}
-                setSortBy={setSortBy}
-                setOrderBy={setOrderBy}
-              />
-            </Fragment>
-          )}
-        </Fragment>
-      )}
+      <Fragment>
+        <Button
+          aria-label={t('Set Up Integration')}
+          size="xs"
+          onClick={mouseEvent => {
+            activateSidebarSkipConfigure(mouseEvent, project.id);
+          }}
+        >
+          {t('Set Up Integration')}
+        </Button>
+        {hasFlags && (
+          <Fragment>
+            <Button
+              size="xs"
+              aria-label={t('View All')}
+              ref={viewAllButtonRef}
+              title={t('View All Flags')}
+              onClick={() => {
+                isDrawerOpen ? closeDrawer() : onViewAllFlags();
+              }}
+            >
+              {t('View All')}
+            </Button>
+            <Button
+              aria-label={t('Open Feature Flag Search')}
+              icon={<IconSearch size="xs" />}
+              size="xs"
+              title={t('Open Search')}
+              onClick={() => onViewAllFlags(FlagControlOptions.SEARCH)}
+            />
+            <FeatureFlagSort
+              orderBy={orderBy}
+              sortBy={sortBy}
+              setSortBy={setSortBy}
+              setOrderBy={setOrderBy}
+            />
+          </Fragment>
+        )}
+      </Fragment>
     </ButtonBar>
   );
 
@@ -241,28 +260,26 @@ export function EventFeatureFlagList({
   }
 
   return (
-    <ErrorBoundary mini message={t('There was a problem loading feature flags.')}>
-      <InterimSection
-        help={t(
-          "The last 100 flags evaluated in the user's session leading up to this event."
-        )}
-        isHelpHoverable
-        title={t('Feature Flags')}
-        type={SectionKey.FEATURE_FLAGS}
-        actions={actions}
-      >
-        {hasFlags ? (
-          <CardContainer numCols={columnTwo.length ? 2 : 1}>
-            <KeyValueData.Card expandLeft contentItems={columnOne} />
-            <KeyValueData.Card expandLeft contentItems={columnTwo} />
-          </CardContainer>
-        ) : (
-          <StyledEmptyStateWarning withIcon>
-            {t('No feature flags were found for this event')}
-          </StyledEmptyStateWarning>
-        )}
-      </InterimSection>
-    </ErrorBoundary>
+    <InterimSection
+      help={t(
+        "The last 100 flags evaluated in the user's session leading up to this event."
+      )}
+      isHelpHoverable
+      title={t('Feature Flags')}
+      type={SectionKey.FEATURE_FLAGS}
+      actions={actions}
+    >
+      {hasFlags ? (
+        <CardContainer numCols={columnTwo.length ? 2 : 1}>
+          <KeyValueData.Card expandLeft contentItems={columnOne} />
+          <KeyValueData.Card expandLeft contentItems={columnTwo} />
+        </CardContainer>
+      ) : (
+        <StyledEmptyStateWarning withIcon>
+          {t('No feature flags were found for this event')}
+        </StyledEmptyStateWarning>
+      )}
+    </InterimSection>
   );
 }
 
diff --git a/static/app/components/events/featureFlags/featureFlagDrawer.spec.tsx b/static/app/components/events/featureFlags/featureFlagDrawer.spec.tsx
index b1c9ef98b4970c..d7f38d6317839c 100644
--- a/static/app/components/events/featureFlags/featureFlagDrawer.spec.tsx
+++ b/static/app/components/events/featureFlags/featureFlagDrawer.spec.tsx
@@ -30,6 +30,14 @@ async function renderFlagDrawer() {
 
 describe('FeatureFlagDrawer', function () {
   beforeEach(function () {
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/issues/1/events/',
+      body: [],
+    });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/flags/logs/',
+      body: {data: []},
+    });
     MockApiClient.addMockResponse({
       url: `/organizations/org-slug/issues/1/tags/`,
       body: TagsFixture(),
diff --git a/static/app/components/events/featureFlags/featureFlagInlineCTA.spec.tsx b/static/app/components/events/featureFlags/featureFlagInlineCTA.spec.tsx
new file mode 100644
index 00000000000000..c509ede0025661
--- /dev/null
+++ b/static/app/components/events/featureFlags/featureFlagInlineCTA.spec.tsx
@@ -0,0 +1,93 @@
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import FeatureFlagInlineCTA from 'sentry/components/events/featureFlags/featureFlagInlineCTA';
+
+describe('featureFlagInlineCTA', () => {
+  beforeEach(() => {
+    MockApiClient.clearMockResponses();
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/prompts-activity/',
+      body: {data: {dismissed_ts: null}},
+    });
+  });
+
+  it('shows an onboarding banner that may be dismissed', async () => {
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/prompts-activity/',
+      body: {data: {}},
+    });
+    const dismissMock = MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/prompts-activity/',
+      method: 'PUT',
+    });
+
+    render(<FeatureFlagInlineCTA projectId="123" />);
+    expect(await screen.findByText('Set Up Feature Flags')).toBeInTheDocument();
+
+    // Open the snooze or dismiss dropdown
+    await userEvent.click(screen.getByTestId('icon-close'));
+    expect(screen.getByText('Dismiss')).toBeInTheDocument();
+    expect(screen.getByText('Snooze')).toBeInTheDocument();
+
+    // Click dismiss
+    await userEvent.click(screen.getByRole('menuitemradio', {name: 'Dismiss'}));
+    expect(dismissMock).toHaveBeenCalledWith(
+      '/organizations/org-slug/prompts-activity/',
+      expect.objectContaining({
+        data: expect.objectContaining({
+          feature: 'issue_feature_flags_inline_onboarding',
+          status: 'dismissed',
+        }),
+      })
+    );
+    expect(screen.queryByText('Set Up Feature Flags')).not.toBeInTheDocument();
+  });
+
+  it('shows an onboarding banner that may be snoozed', async () => {
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/prompts-activity/',
+      body: {data: {}},
+    });
+    const snoozeMock = MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/prompts-activity/',
+      method: 'PUT',
+    });
+
+    render(<FeatureFlagInlineCTA projectId="123" />);
+    expect(await screen.findByText('Set Up Feature Flags')).toBeInTheDocument();
+
+    // Open the snooze or dismiss dropdown
+    await userEvent.click(screen.getByTestId('icon-close'));
+    expect(screen.getByText('Dismiss')).toBeInTheDocument();
+    expect(screen.getByText('Snooze')).toBeInTheDocument();
+
+    // Click snooze
+    await userEvent.click(screen.getByRole('menuitemradio', {name: 'Snooze'}));
+    expect(snoozeMock).toHaveBeenCalledWith(
+      '/organizations/org-slug/prompts-activity/',
+      expect.objectContaining({
+        data: expect.objectContaining({
+          feature: 'issue_feature_flags_inline_onboarding',
+          status: 'snoozed',
+        }),
+      })
+    );
+    expect(screen.queryByText('Set Up Feature Flags')).not.toBeInTheDocument();
+  });
+
+  it('does not render if already dismissed', () => {
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/prompts-activity/',
+      body: {
+        data: {
+          feature: 'issue_feature_flags_inline_onboarding',
+          status: 'dismissed',
+          dismissed_ts: 3,
+        },
+      },
+    });
+
+    render(<FeatureFlagInlineCTA projectId="123" />);
+    expect(screen.queryByText('Set Up Feature Flags')).not.toBeInTheDocument();
+  });
+});
diff --git a/static/app/components/events/featureFlags/featureFlagInlineCTA.tsx b/static/app/components/events/featureFlags/featureFlagInlineCTA.tsx
new file mode 100644
index 00000000000000..3613830bb7cb37
--- /dev/null
+++ b/static/app/components/events/featureFlags/featureFlagInlineCTA.tsx
@@ -0,0 +1,167 @@
+import styled from '@emotion/styled';
+
+import {usePrompt} from 'sentry/actionCreators/prompts';
+import {Button, LinkButton} from 'sentry/components/button';
+import ButtonBar from 'sentry/components/buttonBar';
+import {DropdownMenu} from 'sentry/components/dropdownMenu';
+import {useFeatureFlagOnboarding} from 'sentry/components/events/featureFlags/useFeatureFlagOnboarding';
+import {IconClose, IconMegaphone} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import {trackAnalytics} from 'sentry/utils/analytics';
+import {useFeedbackForm} from 'sentry/utils/useFeedbackForm';
+import useOrganization from 'sentry/utils/useOrganization';
+import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
+import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
+
+export default function FeatureFlagInlineCTA({projectId}: {projectId: string}) {
+  const organization = useOrganization();
+  const {activateSidebar} = useFeatureFlagOnboarding();
+
+  function handleSetupButtonClick(e) {
+    trackAnalytics('flags.setup_modal_opened', {organization});
+    trackAnalytics('flags.cta_setup_button_clicked', {organization});
+    activateSidebar(e);
+  }
+
+  const {isLoading, isError, isPromptDismissed, dismissPrompt, snoozePrompt} = usePrompt({
+    feature: 'issue_feature_flags_inline_onboarding',
+    organization,
+    projectId,
+    daysToSnooze: 7,
+  });
+
+  const openForm = useFeedbackForm();
+  const feedbackButton = openForm ? (
+    <Button
+      aria-label={t('Give feedback on the feature flag section')}
+      icon={<IconMegaphone />}
+      size={'xs'}
+      onClick={() =>
+        openForm({
+          messagePlaceholder: t('How can we make feature flags work better for you?'),
+          tags: {
+            ['feedback.source']: 'issue_details_feature_flags',
+            ['feedback.owner']: 'replay',
+          },
+        })
+      }
+    >
+      {t('Give Feedback')}
+    </Button>
+  ) : null;
+
+  if (isLoading || isError || isPromptDismissed) {
+    return null;
+  }
+
+  const actions = <ButtonBar gap={1}>{feedbackButton}</ButtonBar>;
+
+  return (
+    <InterimSection
+      help={t(
+        "The last 100 flags evaluated in the user's session leading up to this event."
+      )}
+      isHelpHoverable
+      title={t('Feature Flags')}
+      type={SectionKey.FEATURE_FLAGS}
+      actions={actions}
+    >
+      <BannerWrapper>
+        <div>
+          <BannerTitle>{t('Set Up Feature Flags')}</BannerTitle>
+          <BannerDescription>
+            {t(
+              'Want to know which feature flags were associated with this error? Set up your feature flag integration.'
+            )}
+          </BannerDescription>
+          <ActionButton>
+            <Button onClick={handleSetupButtonClick} priority="primary">
+              {t('Set Up Now')}
+            </Button>
+            <LinkButton
+              priority="default"
+              href="https://docs.sentry.io/product/explore/feature-flags/"
+              external
+            >
+              {t('Read More')}
+            </LinkButton>
+          </ActionButton>
+        </div>
+        <CloseDropdownMenu
+          position="bottom-end"
+          triggerProps={{
+            showChevron: false,
+            borderless: true,
+            icon: <IconClose color="subText" />,
+          }}
+          size="xs"
+          items={[
+            {
+              key: 'dismiss',
+              label: t('Dismiss'),
+              onAction: () => {
+                dismissPrompt();
+                trackAnalytics('flags.cta_dismissed', {
+                  organization,
+                  type: 'dismiss',
+                });
+              },
+            },
+            {
+              key: 'snooze',
+              label: t('Snooze'),
+              onAction: () => {
+                snoozePrompt();
+                trackAnalytics('flags.cta_dismissed', {
+                  organization,
+                  type: 'snooze',
+                });
+              },
+            },
+          ]}
+        />
+      </BannerWrapper>
+    </InterimSection>
+  );
+}
+
+const BannerTitle = styled('div')`
+  font-size: ${p => p.theme.fontSizeExtraLarge};
+  margin-bottom: ${space(1)};
+  font-weight: ${p => p.theme.fontWeightBold};
+`;
+
+const BannerDescription = styled('div')`
+  margin-bottom: ${space(1.5)};
+  max-width: 340px;
+`;
+
+const CloseDropdownMenu = styled(DropdownMenu)`
+  position: absolute;
+  display: block;
+  top: ${space(1)};
+  right: ${space(1)};
+  color: ${p => p.theme.white};
+  cursor: pointer;
+  z-index: 1;
+`;
+
+const ActionButton = styled('div')`
+  display: flex;
+  gap: ${space(1)};
+`;
+
+const BannerWrapper = styled('div')`
+  position: relative;
+  border: 1px solid ${p => p.theme.border};
+  border-radius: ${p => p.theme.borderRadius};
+  padding: ${space(2)};
+  margin: ${space(1)} 0;
+  background: linear-gradient(
+    90deg,
+    ${p => p.theme.backgroundSecondary}00 0%,
+    ${p => p.theme.backgroundSecondary}FF 70%,
+    ${p => p.theme.backgroundSecondary}FF 100%
+  );
+`;
diff --git a/static/app/components/events/featureFlags/featureFlagOnboardingLayout.tsx b/static/app/components/events/featureFlags/featureFlagOnboardingLayout.tsx
new file mode 100644
index 00000000000000..2ec92f0865c5e7
--- /dev/null
+++ b/static/app/components/events/featureFlags/featureFlagOnboardingLayout.tsx
@@ -0,0 +1,139 @@
+import {useMemo, useState} from 'react';
+import styled from '@emotion/styled';
+
+import Alert from 'sentry/components/alert';
+import {Button} from 'sentry/components/button';
+import {Flex} from 'sentry/components/container/flex';
+import OnboardingIntegrationSection from 'sentry/components/events/featureFlags/onboardingIntegrationSection';
+import {AuthTokenGeneratorProvider} from 'sentry/components/onboarding/gettingStartedDoc/authTokenGenerator';
+import type {OnboardingLayoutProps} from 'sentry/components/onboarding/gettingStartedDoc/onboardingLayout';
+import {Step} from 'sentry/components/onboarding/gettingStartedDoc/step';
+import type {DocsParams} from 'sentry/components/onboarding/gettingStartedDoc/types';
+import {useSourcePackageRegistries} from 'sentry/components/onboarding/gettingStartedDoc/useSourcePackageRegistries';
+import {useUrlPlatformOptions} from 'sentry/components/onboarding/platformOptionsControl';
+import {t} from 'sentry/locale';
+import ConfigStore from 'sentry/stores/configStore';
+import {useLegacyStore} from 'sentry/stores/useLegacyStore';
+import {space} from 'sentry/styles/space';
+import useApi from 'sentry/utils/useApi';
+import useOrganization from 'sentry/utils/useOrganization';
+
+interface FeatureFlagOnboardingLayoutProps extends OnboardingLayoutProps {
+  integration?: string;
+  provider?: string;
+  skipConfig?: boolean;
+}
+
+export function FeatureFlagOnboardingLayout({
+  docsConfig,
+  dsn,
+  platformKey,
+  projectId,
+  projectSlug,
+  projectKeyId,
+  configType = 'onboarding',
+  integration = '',
+  provider = '',
+  skipConfig,
+}: FeatureFlagOnboardingLayoutProps) {
+  const api = useApi();
+  const organization = useOrganization();
+  const {isPending: isLoadingRegistry, data: registryData} =
+    useSourcePackageRegistries(organization);
+  const selectedOptions = useUrlPlatformOptions(docsConfig.platformOptions);
+  const {isSelfHosted, urlPrefix} = useLegacyStore(ConfigStore);
+  const [skipSteps, setSkipSteps] = useState(skipConfig);
+
+  const {steps} = useMemo(() => {
+    const doc = docsConfig[configType] ?? docsConfig.onboarding;
+
+    const docParams: DocsParams<any> = {
+      api,
+      projectKeyId,
+      dsn,
+      organization,
+      platformKey,
+      projectId,
+      projectSlug,
+      isFeedbackSelected: false,
+      isPerformanceSelected: false,
+      isProfilingSelected: false,
+      isReplaySelected: false,
+      sourcePackageRegistries: {
+        isLoading: isLoadingRegistry,
+        data: registryData,
+      },
+      platformOptions: selectedOptions,
+      isSelfHosted,
+      urlPrefix,
+      featureFlagOptions: {
+        integration,
+      },
+    };
+
+    return {
+      steps: [...doc.install(docParams), ...doc.configure(docParams)],
+    };
+  }, [
+    docsConfig,
+    dsn,
+    isLoadingRegistry,
+    organization,
+    platformKey,
+    projectId,
+    projectSlug,
+    registryData,
+    selectedOptions,
+    configType,
+    urlPrefix,
+    isSelfHosted,
+    api,
+    projectKeyId,
+    integration,
+  ]);
+
+  return (
+    <AuthTokenGeneratorProvider projectSlug={projectSlug}>
+      <Wrapper>
+        {!skipConfig ? null : (
+          <Alert type="info" showIcon>
+            <Flex gap={space(3)}>
+              {t('Feature flag integration detected. Please follow the remaining steps.')}
+              <Button onClick={() => setSkipSteps(!skipSteps)}>
+                {skipSteps ? t('Show Full Guide') : t('Hide Full Guide')}
+              </Button>
+            </Flex>
+          </Alert>
+        )}
+        {!skipSteps && (
+          <Steps>
+            {steps.map(step => (
+              <Step key={step.title ?? step.type} {...step} />
+            ))}
+          </Steps>
+        )}
+        <OnboardingIntegrationSection provider={provider} integration={integration} />
+      </Wrapper>
+    </AuthTokenGeneratorProvider>
+  );
+}
+
+const Steps = styled('div')`
+  display: flex;
+  flex-direction: column;
+  gap: 1.5rem;
+`;
+
+const Wrapper = styled('div')`
+  h4 {
+    margin-bottom: 0.5em;
+  }
+  && {
+    p {
+      margin-bottom: 0;
+    }
+    h5 {
+      margin-bottom: 0;
+    }
+  }
+`;
diff --git a/static/app/components/events/featureFlags/featureFlagOnboardingSidebar.tsx b/static/app/components/events/featureFlags/featureFlagOnboardingSidebar.tsx
new file mode 100644
index 00000000000000..ea3a6dbd5551ad
--- /dev/null
+++ b/static/app/components/events/featureFlags/featureFlagOnboardingSidebar.tsx
@@ -0,0 +1,411 @@
+import type {ReactNode} from 'react';
+import {Fragment, useMemo, useState} from 'react';
+import styled from '@emotion/styled';
+
+import HighlightTopRightPattern from 'sentry-images/pattern/highlight-top-right.svg';
+
+import {LinkButton} from 'sentry/components/button';
+import {CompactSelect} from 'sentry/components/compactSelect';
+import {FeatureFlagOnboardingLayout} from 'sentry/components/events/featureFlags/featureFlagOnboardingLayout';
+import {FLAG_HASH_SKIP_CONFIG} from 'sentry/components/events/featureFlags/useFeatureFlagOnboarding';
+import {
+  IntegrationOptions,
+  ProviderOptions,
+} from 'sentry/components/events/featureFlags/utils';
+import RadioGroup from 'sentry/components/forms/controls/radioGroup';
+import IdBadge from 'sentry/components/idBadge';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
+import useCurrentProjectState from 'sentry/components/onboarding/gettingStartedDoc/utils/useCurrentProjectState';
+import {useLoadGettingStarted} from 'sentry/components/onboarding/gettingStartedDoc/utils/useLoadGettingStarted';
+import SidebarPanel from 'sentry/components/sidebar/sidebarPanel';
+import type {CommonSidebarProps} from 'sentry/components/sidebar/types';
+import {SidebarPanelKey} from 'sentry/components/sidebar/types';
+import TextOverflow from 'sentry/components/textOverflow';
+import {featureFlagOnboardingPlatforms} from 'sentry/data/platformCategories';
+import platforms, {otherPlatform} from 'sentry/data/platforms';
+import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import type {SelectValue} from 'sentry/types/core';
+import type {Project} from 'sentry/types/project';
+import useOrganization from 'sentry/utils/useOrganization';
+import useUrlParams from 'sentry/utils/useUrlParams';
+
+function FeatureFlagOnboardingSidebar(props: CommonSidebarProps) {
+  const {currentPanel, collapsed, hidePanel, orientation} = props;
+  const organization = useOrganization();
+
+  const isActive = currentPanel === SidebarPanelKey.FEATURE_FLAG_ONBOARDING;
+  const hasProjectAccess = organization.access.includes('project:read');
+
+  const {
+    hasDocs,
+    projects,
+    allProjects,
+    currentProject,
+    setCurrentProject,
+    supportedProjects,
+    unsupportedProjects,
+  } = useCurrentProjectState({
+    currentPanel,
+    targetPanel: SidebarPanelKey.FEATURE_FLAG_ONBOARDING,
+    onboardingPlatforms: featureFlagOnboardingPlatforms,
+    allPlatforms: featureFlagOnboardingPlatforms,
+  });
+
+  const projectSelectOptions = useMemo(() => {
+    const supportedProjectItems: SelectValue<string>[] = supportedProjects.map(
+      project => {
+        return {
+          value: project.id,
+          textValue: project.id,
+          label: (
+            <StyledIdBadge project={project} avatarSize={16} hideOverflow disableLink />
+          ),
+        };
+      }
+    );
+
+    const unsupportedProjectItems: SelectValue<string>[] = unsupportedProjects.map(
+      project => {
+        return {
+          value: project.id,
+          textValue: project.id,
+          label: (
+            <StyledIdBadge project={project} avatarSize={16} hideOverflow disableLink />
+          ),
+          disabled: true,
+        };
+      }
+    );
+    return [
+      {
+        label: t('Supported'),
+        options: supportedProjectItems,
+      },
+      {
+        label: t('Unsupported'),
+        options: unsupportedProjectItems,
+      },
+    ];
+  }, [supportedProjects, unsupportedProjects]);
+
+  const selectedProject = currentProject ?? projects[0] ?? allProjects[0];
+  if (!isActive || !hasProjectAccess || !selectedProject) {
+    return null;
+  }
+
+  return (
+    <TaskSidebarPanel
+      orientation={orientation}
+      collapsed={collapsed}
+      hidePanel={hidePanel}
+    >
+      <TopRightBackgroundImage src={HighlightTopRightPattern} />
+      <TaskList>
+        <Heading>{t('Debug Issues with Feature Flag Context')}</Heading>
+        <HeaderActions>
+          <div
+            onClick={e => {
+              // we need to stop bubbling the CompactSelect click event
+              // failing to do so will cause the sidebar panel to close
+              // the event.target will be unmounted by the time the panel listener
+              // receives the event and assume the click was outside the panel
+              e.stopPropagation();
+            }}
+          >
+            <CompactSelect
+              triggerLabel={
+                currentProject ? (
+                  <StyledIdBadge
+                    project={currentProject}
+                    avatarSize={16}
+                    hideOverflow
+                    disableLink
+                  />
+                ) : (
+                  t('Select a project')
+                )
+              }
+              value={currentProject?.id}
+              onChange={opt =>
+                setCurrentProject(allProjects.find(p => p.id === opt.value))
+              }
+              triggerProps={{'aria-label': currentProject?.slug}}
+              options={projectSelectOptions}
+              position="bottom-end"
+            />
+          </div>
+        </HeaderActions>
+        <OnboardingContent currentProject={selectedProject} hasDocs={hasDocs} />
+      </TaskList>
+    </TaskSidebarPanel>
+  );
+}
+
+function OnboardingContent({
+  currentProject,
+  hasDocs,
+}: {
+  currentProject: Project;
+  hasDocs: boolean;
+}) {
+  const organization = useOrganization();
+
+  // useMemo is needed to remember the original hash
+  // in case window.location.hash disappears
+  const ORIGINAL_HASH = useMemo(() => {
+    return window.location.hash;
+  }, []);
+  const skipConfig = ORIGINAL_HASH === FLAG_HASH_SKIP_CONFIG;
+  const openFeatureProviders = [ProviderOptions.LAUNCHDARKLY];
+  const sdkProviders = [ProviderOptions.LAUNCHDARKLY];
+
+  // First dropdown: OpenFeature providers
+  const openFeatureProviderOptions = openFeatureProviders.map(provider => {
+    return {
+      value: provider,
+      textValue: provider,
+      label: <TextOverflow>{provider}</TextOverflow>,
+    };
+  });
+
+  const [openFeatureProvider, setOpenFeatureProvider] = useState<{
+    value: string;
+    label?: ReactNode;
+    textValue?: string;
+  }>(openFeatureProviderOptions[0]);
+
+  // Second dropdown: other SDK providers
+  const sdkProviderOptions = sdkProviders.map(provider => {
+    return {
+      value: provider,
+      textValue: provider,
+      label: <TextOverflow>{provider}</TextOverflow>,
+    };
+  });
+
+  const [sdkProvider, setsdkProvider] = useState<{
+    value: string;
+    label?: ReactNode;
+    textValue?: string;
+  }>(sdkProviderOptions[0]);
+
+  const defaultTab: string = 'openFeature';
+  const {getParamValue: setupMode, setParamValue: setSetupMode} = useUrlParams(
+    'mode',
+    defaultTab
+  );
+
+  const currentPlatform = currentProject.platform
+    ? platforms.find(p => p.id === currentProject.platform) ?? otherPlatform
+    : otherPlatform;
+
+  const {
+    docs,
+    dsn,
+    isLoading: isProjKeysLoading,
+    projectKeyId,
+  } = useLoadGettingStarted({
+    platform: currentPlatform,
+    projSlug: currentProject.slug,
+    orgSlug: organization.slug,
+    productType: 'featureFlags',
+  });
+
+  const radioButtons = (
+    <Header>
+      <StyledRadioGroup
+        label="mode"
+        choices={[
+          [
+            'openFeature',
+            <PlatformSelect key="platform-select">
+              {tct('I use the OpenFeature SDK using a provider from [providerSelect]', {
+                providerSelect: (
+                  <CompactSelect
+                    triggerLabel={openFeatureProvider.label}
+                    value={openFeatureProvider.value}
+                    onChange={setOpenFeatureProvider}
+                    options={openFeatureProviderOptions}
+                    position="bottom-end"
+                    key={openFeatureProvider.textValue}
+                    disabled={setupMode() === 'other'}
+                  />
+                ),
+              })}
+            </PlatformSelect>,
+          ],
+          [
+            'other',
+            <PlatformSelect key="platform-select">
+              {tct('I use an SDK from [providerSelect]', {
+                providerSelect: (
+                  <CompactSelect
+                    triggerLabel={sdkProvider.label}
+                    value={sdkProvider.value}
+                    onChange={setsdkProvider}
+                    options={sdkProviderOptions}
+                    position="bottom-end"
+                    key={sdkProvider.textValue}
+                    disabled={setupMode() === 'openFeature'}
+                  />
+                ),
+              })}
+            </PlatformSelect>,
+          ],
+        ]}
+        value={setupMode()}
+        onChange={value => {
+          setSetupMode(value);
+          window.location.hash = ORIGINAL_HASH;
+        }}
+      />
+    </Header>
+  );
+
+  if (isProjKeysLoading) {
+    return (
+      <Fragment>
+        {radioButtons}
+        <LoadingIndicator />
+      </Fragment>
+    );
+  }
+
+  const doesNotSupportFeatureFlags = currentProject.platform
+    ? !featureFlagOnboardingPlatforms.includes(currentProject.platform)
+    : true;
+
+  if (doesNotSupportFeatureFlags) {
+    return (
+      <Fragment>
+        <div>
+          {tct(
+            'Feature Flags isn’t available for your [platform] project. It is currently only available for Python and JavaScript projects.',
+            {platform: currentPlatform?.name || currentProject.slug}
+          )}
+        </div>
+        <div>
+          <LinkButton
+            size="sm"
+            href="https://docs.sentry.io/product/explore/feature-flags/"
+            external
+          >
+            {t('Go to Sentry Documentation')}
+          </LinkButton>
+        </div>
+      </Fragment>
+    );
+  }
+
+  // No platform, docs import failed, no DSN, or the platform doesn't have onboarding yet
+  if (!currentPlatform || !docs || !dsn || !hasDocs || !projectKeyId) {
+    return (
+      <Fragment>
+        <div>
+          {tct(
+            'Fiddlesticks. This checklist isn’t available for your [project] project yet, but for now, go to Sentry docs for installation details.',
+            {project: currentProject.slug}
+          )}
+        </div>
+        <div>
+          <LinkButton
+            size="sm"
+            href="https://docs.sentry.io/platforms/python/feature-flags/"
+            external
+          >
+            {t('Read Docs')}
+          </LinkButton>
+        </div>
+      </Fragment>
+    );
+  }
+
+  return (
+    <Fragment>
+      {radioButtons}
+      <FeatureFlagOnboardingLayout
+        skipConfig={skipConfig}
+        docsConfig={docs}
+        dsn={dsn}
+        projectKeyId={projectKeyId}
+        activeProductSelection={[]}
+        platformKey={currentPlatform.id}
+        projectId={currentProject.id}
+        projectSlug={currentProject.slug}
+        integration={
+          // either OpenFeature or the SDK selected from the second dropdown
+          setupMode() === 'openFeature'
+            ? IntegrationOptions.OPENFEATURE
+            : sdkProvider.value
+        }
+        provider={
+          // dropdown value (from either dropdown)
+          setupMode() === 'openFeature' ? openFeatureProvider.value : sdkProvider.value
+        }
+        configType="featureFlagOnboarding"
+      />
+    </Fragment>
+  );
+}
+
+const TaskSidebarPanel = styled(SidebarPanel)`
+  width: 600px;
+  max-width: 100%;
+`;
+
+const TopRightBackgroundImage = styled('img')`
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 60%;
+  user-select: none;
+`;
+
+const TaskList = styled('div')`
+  display: grid;
+  grid-auto-flow: row;
+  grid-template-columns: 100%;
+  gap: ${space(1)};
+  margin: 50px ${space(4)} ${space(4)} ${space(4)};
+`;
+
+const Heading = styled('div')`
+  display: flex;
+  color: ${p => p.theme.activeText};
+  font-size: ${p => p.theme.fontSizeExtraSmall};
+  text-transform: uppercase;
+  font-weight: ${p => p.theme.fontWeightBold};
+  line-height: 1;
+  margin-top: ${space(3)};
+`;
+
+const StyledIdBadge = styled(IdBadge)`
+  overflow: hidden;
+  white-space: nowrap;
+  flex-shrink: 1;
+`;
+
+const HeaderActions = styled('div')`
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  gap: ${space(3)};
+`;
+
+const PlatformSelect = styled('div')`
+  display: flex;
+  gap: ${space(1)};
+  align-items: center;
+  flex-wrap: wrap;
+`;
+
+const StyledRadioGroup = styled(RadioGroup)`
+  padding: ${space(1)} 0;
+`;
+
+const Header = styled('div')`
+  padding: ${space(1)} 0;
+`;
+
+export default FeatureFlagOnboardingSidebar;
diff --git a/static/app/components/events/featureFlags/onboardingIntegrationSection.tsx b/static/app/components/events/featureFlags/onboardingIntegrationSection.tsx
new file mode 100644
index 00000000000000..aa67e54383bce2
--- /dev/null
+++ b/static/app/components/events/featureFlags/onboardingIntegrationSection.tsx
@@ -0,0 +1,184 @@
+import {Fragment, useState} from 'react';
+import styled from '@emotion/styled';
+
+import {
+  addErrorMessage,
+  addLoadingMessage,
+  addSuccessMessage,
+} from 'sentry/actionCreators/indicator';
+import {hasEveryAccess} from 'sentry/components/acl/access';
+import Alert from 'sentry/components/alert';
+import {Button} from 'sentry/components/button';
+import {PROVIDER_OPTION_TO_URLS} from 'sentry/components/events/featureFlags/utils';
+import Input from 'sentry/components/input';
+import ExternalLink from 'sentry/components/links/externalLink';
+import TextCopyInput from 'sentry/components/textCopyInput';
+import {Tooltip} from 'sentry/components/tooltip';
+import {IconCheckmark, IconWarning} from 'sentry/icons';
+import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import {handleXhrErrorResponse} from 'sentry/utils/handleXhrErrorResponse';
+import {useMutation, useQueryClient} from 'sentry/utils/queryClient';
+import type RequestError from 'sentry/utils/requestError/requestError';
+import useApi from 'sentry/utils/useApi';
+import useOrganization from 'sentry/utils/useOrganization';
+import {makeFetchSecretQueryKey} from 'sentry/views/settings/featureFlags';
+import type {
+  CreateSecretQueryVariables,
+  CreateSecretResponse,
+} from 'sentry/views/settings/featureFlags/newProviderForm';
+
+export default function OnboardingIntegrationSection({
+  provider,
+  integration,
+}: {
+  integration: string;
+  provider: string;
+}) {
+  const api = useApi();
+  const queryClient = useQueryClient();
+  const organization = useOrganization();
+
+  const {mutate: submitSecret, isPending} = useMutation<
+    CreateSecretResponse,
+    RequestError,
+    CreateSecretQueryVariables
+  >({
+    mutationFn: ({secret}) => {
+      addLoadingMessage();
+      return api.requestPromise(
+        `/organizations/${organization.slug}/flags/signing-secrets/`,
+        {
+          method: 'POST',
+          data: {
+            provider: provider.toLowerCase(),
+            secret,
+          },
+        }
+      );
+    },
+
+    onSuccess: () => {
+      addSuccessMessage(t('Added provider and secret.'));
+      setSecretSaved(true);
+      queryClient.invalidateQueries({
+        queryKey: makeFetchSecretQueryKey({orgSlug: organization.slug}),
+      });
+    },
+    onError: error => {
+      const message = t('Failed to add provider or secret.');
+      setSecretSaved(false);
+      handleXhrErrorResponse(message, error);
+      addErrorMessage(message);
+    },
+  });
+
+  const [secretSaved, setSecretSaved] = useState(false);
+  const [secret, setSecret] = useState('');
+  const [storedProvider, setStoredProvider] = useState(provider);
+  const [storedIntegration, setStoredIntegration] = useState(integration);
+
+  if (provider !== storedProvider || integration !== storedIntegration) {
+    setStoredProvider(provider);
+    setStoredIntegration(integration);
+    setSecret('');
+    setSecretSaved(false);
+  }
+
+  const canRead = hasEveryAccess(['org:read'], {organization});
+  const canWrite = hasEveryAccess(['org:write'], {organization});
+  const canAdmin = hasEveryAccess(['org:admin'], {organization});
+  const hasAccess = canRead || canWrite || canAdmin;
+
+  return (
+    <Fragment>
+      <h4 style={{marginTop: space(4)}}>{t('Integrate Feature Flag Service')}</h4>
+      <IntegrationSection>
+        <SubSection>
+          <div>
+            {tct(
+              "Create a webhook integration with your [link:feature flag service]. When you do so, you'll need to enter a URL, which you can find below.",
+              {link: <ExternalLink href={PROVIDER_OPTION_TO_URLS[provider]} />}
+            )}
+          </div>
+          <InputTitle>{t('Webhook URL')}</InputTitle>
+          <TextCopyInput
+            style={{padding: '20px'}}
+            aria-label={t('Webhook URL')}
+            size="sm"
+          >
+            {`https://sentry.io/api/0/organizations/${organization.slug}/flags/hooks/provider/${provider.toLowerCase()}/`}
+          </TextCopyInput>
+        </SubSection>
+        <SubSection>
+          <div>
+            {t(
+              "During the process of creating a webhook integration, you'll be given the option to sign the webhook. This is an auto-generated secret code that Sentry requires to verify requests from your feature flag service. Paste the secret below."
+            )}
+          </div>
+          <InputTitle>{t('Secret')}</InputTitle>
+          <InputArea>
+            <Input
+              maxLength={32}
+              minLength={32}
+              required
+              value={secret}
+              type="text"
+              placeholder={t('Secret')}
+              onChange={e => setSecret(e.target.value)}
+            />
+            <Tooltip
+              title={t('You must be an organization member to add a secret.')}
+              disabled={hasAccess}
+            >
+              <Button
+                priority="default"
+                onClick={() => submitSecret({provider, secret})}
+                disabled={secret.length < 32 || secret === '' || !hasAccess || isPending}
+              >
+                {t('Save Secret')}
+              </Button>
+            </Tooltip>
+          </InputArea>
+          {secretSaved ? (
+            <StyledAlert showIcon type="success" icon={<IconCheckmark />}>
+              {t('Secret verified.')}
+            </StyledAlert>
+          ) : secret ? (
+            <StyledAlert showIcon type="warning" icon={<IconWarning />}>
+              {t('Make sure the secret is 32 characters long.')}
+            </StyledAlert>
+          ) : null}
+        </SubSection>
+      </IntegrationSection>
+    </Fragment>
+  );
+}
+
+const InputTitle = styled('div')`
+  font-weight: bold;
+`;
+
+const InputArea = styled('div')`
+  display: flex;
+  flex-direction: row;
+  gap: ${space(1)};
+  align-items: center;
+`;
+
+const IntegrationSection = styled('div')`
+  display: flex;
+  flex-direction: column;
+  gap: ${space(3)};
+  margin: ${space(3)} 0;
+`;
+
+const SubSection = styled('div')`
+  display: flex;
+  gap: ${space(1)};
+  flex-direction: column;
+`;
+
+const StyledAlert = styled(Alert)`
+  margin: ${space(1.5)} 0 0 0;
+`;
diff --git a/static/app/components/events/featureFlags/setupIntegrationModal.tsx b/static/app/components/events/featureFlags/setupIntegrationModal.tsx
deleted file mode 100644
index aa66ca627d75e2..00000000000000
--- a/static/app/components/events/featureFlags/setupIntegrationModal.tsx
+++ /dev/null
@@ -1,215 +0,0 @@
-import {Fragment, useCallback, useState} from 'react';
-import {css} from '@emotion/react';
-import styled from '@emotion/styled';
-
-import type {ModalRenderProps} from 'sentry/actionCreators/modal';
-import Alert from 'sentry/components/alert';
-import {Button, LinkButton} from 'sentry/components/button';
-import ButtonBar from 'sentry/components/buttonBar';
-import SelectField from 'sentry/components/forms/fields/selectField';
-import type {Data} from 'sentry/components/forms/types';
-import TextCopyInput from 'sentry/components/textCopyInput';
-import {IconWarning} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import OrganizationStore from 'sentry/stores/organizationStore';
-import {useLegacyStore} from 'sentry/stores/useLegacyStore';
-import {space} from 'sentry/styles/space';
-import {defined} from 'sentry/utils';
-import useApi from 'sentry/utils/useApi';
-
-export type ChildrenProps<T> = {
-  Body: (props: {children: React.ReactNode}) => ReturnType<ModalRenderProps['Body']>;
-  Footer: () => ReturnType<ModalRenderProps['Footer']>;
-  Header: (props: {children: React.ReactNode}) => ReturnType<ModalRenderProps['Header']>;
-  state: T;
-};
-
-interface State {
-  provider: string;
-  url: string | undefined;
-}
-
-function useGenerateAuthToken({
-  state,
-  orgSlug,
-}: {
-  orgSlug: string | undefined;
-  state: State;
-}) {
-  const api = useApi();
-  const date = new Date().toISOString();
-
-  const createToken = async () =>
-    await api.requestPromise(`/organizations/${orgSlug}/org-auth-tokens/`, {
-      method: 'POST',
-      data: {
-        name: `${state.provider} Token ${date}`,
-      },
-    });
-
-  return {createToken};
-}
-
-export function SetupIntegrationModal<T extends Data>({
-  Header,
-  Body,
-  Footer,
-  closeModal,
-}: ModalRenderProps) {
-  const [state, setState] = useState<State>({
-    provider: 'LaunchDarkly',
-    url: undefined,
-  });
-  const {organization} = useLegacyStore(OrganizationStore);
-  const {createToken} = useGenerateAuthToken({state, orgSlug: organization?.slug});
-
-  const handleDone = useCallback(() => {
-    closeModal();
-  }, [closeModal]);
-
-  const ModalHeader = useCallback(
-    ({children: headerChildren}: {children: React.ReactNode}) => {
-      return (
-        <Header closeButton>
-          <h3>{headerChildren}</h3>
-        </Header>
-      );
-    },
-    [Header]
-  );
-
-  const ModalFooter = useCallback(() => {
-    return (
-      <Footer>
-        <StyledButtonBar gap={1}>
-          <LinkButton
-            priority="default"
-            href="https://docs.sentry.io/product/issues/issue-details/#feature-flags"
-            external
-          >
-            {t('Read Docs')}
-          </LinkButton>
-          <Button
-            priority="primary"
-            title={!defined(state.provider) && t('Required fields must be filled out.')}
-            onClick={handleDone}
-            disabled={!defined(state.provider)}
-          >
-            {t('Done')}
-          </Button>
-        </StyledButtonBar>
-      </Footer>
-    );
-  }, [Footer, handleDone, state]);
-
-  const ModalBody = useCallback(
-    ({children: bodyChildren}: Parameters<ChildrenProps<T>['Body']>[0]) => {
-      return <Body>{bodyChildren}</Body>;
-    },
-    [Body]
-  );
-
-  const onGenerateURL = useCallback(async () => {
-    const newToken = await createToken();
-    const encodedToken = encodeURI(newToken.token);
-    const provider = state.provider.toLowerCase();
-
-    setState(prevState => {
-      return {
-        ...prevState,
-        url: `https://sentry.io/api/0/organizations/${organization?.slug}/flags/hooks/provider/${provider}/token/${encodedToken}/`,
-      };
-    });
-  }, [createToken, organization, state.provider]);
-
-  const providers = ['LaunchDarkly'];
-
-  return (
-    <Fragment>
-      <ModalHeader>{t('Set Up Feature Flag Integration')}</ModalHeader>
-      <ModalBody>
-        <SelectContainer>
-          <SelectField
-            label={t('Feature Flag Services')}
-            name="provider"
-            inline={false}
-            options={providers.map(integration => ({
-              value: integration,
-              label: integration,
-            }))}
-            placeholder={t('Select a feature flag service')}
-            value={state.provider}
-            onChange={value => setState({...state, provider: value})}
-            flexibleControlStateSize
-            stacked
-            required
-          />
-          <WebhookButton
-            priority="default"
-            title={!defined(state.provider) && t('You must select a provider first.')}
-            onClick={onGenerateURL}
-            disabled={!defined(state.provider) || defined(state.url)}
-          >
-            {t('Create Webhook URL')}
-          </WebhookButton>
-        </SelectContainer>
-        <WebhookContainer>
-          {t('Webhook URL')}
-          <TextCopyInput
-            style={{padding: '20px'}}
-            disabled={!defined(state.url)}
-            placeholder={t('No webhook URL created yet')}
-            aria-label={t('Webhook URL')}
-            size="sm"
-          >
-            {state.url ?? ''}
-          </TextCopyInput>
-          <InfoContainer>
-            {t(
-              'The final step is to create a Webhook integration within your feature flag service by utilizing the Webhook URL provided in the field above.'
-            )}
-            <Alert showIcon type="warning" icon={<IconWarning />}>
-              {t('You won’t be able to access this URL once this modal is closed.')}
-            </Alert>
-          </InfoContainer>
-        </WebhookContainer>
-      </ModalBody>
-      <ModalFooter />
-    </Fragment>
-  );
-}
-
-export const modalCss = css`
-  width: 100%;
-  max-width: 680px;
-`;
-
-const StyledButtonBar = styled(ButtonBar)`
-  display: flex;
-  width: 100%;
-  justify-content: space-between;
-`;
-
-const SelectContainer = styled('div')`
-  display: grid;
-  grid-template-columns: 1fr max-content;
-  align-items: center;
-  gap: ${space(1)};
-`;
-
-const WebhookButton = styled(Button)`
-  margin-top: ${space(1)};
-`;
-
-const WebhookContainer = styled('div')`
-  display: flex;
-  flex-direction: column;
-  gap: ${space(1)};
-`;
-
-const InfoContainer = styled('div')`
-  display: flex;
-  flex-direction: column;
-  gap: ${space(2)};
-  margin-top: ${space(1)};
-`;
diff --git a/static/app/components/events/featureFlags/testUtils.tsx b/static/app/components/events/featureFlags/testUtils.tsx
index e4de5c67748a87..832cd223918135 100644
--- a/static/app/components/events/featureFlags/testUtils.tsx
+++ b/static/app/components/events/featureFlags/testUtils.tsx
@@ -4,7 +4,7 @@ import {ProjectFixture} from 'sentry-fixture/project';
 
 import type {FeatureFlag} from 'sentry/types/event';
 
-export const MOCK_FLAGS: FeatureFlag[] = [
+export const MOCK_FLAGS: Required<FeatureFlag>[] = [
   {
     flag: 'mobile-replay-ui',
     result: false,
@@ -41,11 +41,22 @@ export const EMPTY_STATE_SECTION_PROPS = {
   group: GroupFixture(),
 };
 
-export const NO_FLAG_CONTEXT_SECTION_PROPS = {
+export const NO_FLAG_CONTEXT_SECTION_PROPS_NO_CTA = {
   event: EventFixture({
     id: 'abc123def456ghi789jkl',
     contexts: {other: {}},
+    platform: 'unity',
   }),
-  project: ProjectFixture(),
-  group: GroupFixture(),
+  project: ProjectFixture({platform: 'unity'}),
+  group: GroupFixture({platform: 'unity'}),
+};
+
+export const NO_FLAG_CONTEXT_SECTION_PROPS_CTA = {
+  event: EventFixture({
+    id: 'abc123def456ghi789jkl',
+    contexts: {other: {}},
+    platform: 'javascript',
+  }),
+  project: ProjectFixture({platform: 'javascript'}),
+  group: GroupFixture({platform: 'javascript'}),
 };
diff --git a/static/app/components/events/featureFlags/useFeatureFlagOnboarding.tsx b/static/app/components/events/featureFlags/useFeatureFlagOnboarding.tsx
new file mode 100644
index 00000000000000..abfe3af57313bf
--- /dev/null
+++ b/static/app/components/events/featureFlags/useFeatureFlagOnboarding.tsx
@@ -0,0 +1,53 @@
+import {useCallback, useEffect} from 'react';
+
+import {SidebarPanelKey} from 'sentry/components/sidebar/types';
+import SidebarPanelStore from 'sentry/stores/sidebarPanelStore';
+import {trackAnalytics} from 'sentry/utils/analytics';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import useOrganization from 'sentry/utils/useOrganization';
+
+const FLAG_HASH = '#flag-sidequest';
+export const FLAG_HASH_SKIP_CONFIG = '#flag-sidequest-skip';
+
+export function useFeatureFlagOnboarding() {
+  const location = useLocation();
+  const organization = useOrganization();
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (location.hash === FLAG_HASH || location.hash === FLAG_HASH_SKIP_CONFIG) {
+      SidebarPanelStore.activatePanel(SidebarPanelKey.FEATURE_FLAG_ONBOARDING);
+      trackAnalytics('flags.view-setup-sidebar', {
+        organization,
+      });
+    }
+  }, [location.hash, organization]);
+
+  const activateSidebar = useCallback((event: React.MouseEvent) => {
+    event.preventDefault();
+    window.location.hash = FLAG_HASH;
+    SidebarPanelStore.activatePanel(SidebarPanelKey.FEATURE_FLAG_ONBOARDING);
+  }, []);
+
+  // if we detect that event.contexts.flags is set, use this hook instead
+  // to skip the configure step
+  const activateSidebarSkipConfigure = useCallback(
+    (event: React.MouseEvent, projectId: string) => {
+      event.preventDefault();
+      navigate(
+        {
+          pathname: location.pathname,
+          // Adding the projectId will help pick the correct project in onboarding
+          query: {...location.query, project: projectId},
+          hash: FLAG_HASH_SKIP_CONFIG,
+        },
+        {replace: true}
+      );
+      SidebarPanelStore.activatePanel(SidebarPanelKey.FEATURE_FLAG_ONBOARDING);
+    },
+    [navigate, location.pathname, location.query]
+  );
+
+  return {activateSidebar, activateSidebarSkipConfigure};
+}
diff --git a/static/app/components/events/featureFlags/useIssueEvents.tsx b/static/app/components/events/featureFlags/useIssueEvents.tsx
new file mode 100644
index 00000000000000..11c7fd95a66f3a
--- /dev/null
+++ b/static/app/components/events/featureFlags/useIssueEvents.tsx
@@ -0,0 +1,21 @@
+import type {Event} from '@sentry/types';
+
+import {useApiQuery} from 'sentry/utils/queryClient';
+import useOrganization from 'sentry/utils/useOrganization';
+
+export default function useIssueEvents({issueId}: {issueId: string}) {
+  const organization = useOrganization();
+  return useApiQuery<Event[]>(
+    [
+      `/organizations/${organization.slug}/issues/${issueId}/events/`,
+      {
+        query: {
+          statsPeriod: '14d',
+          limit: 20,
+          full: true,
+        },
+      },
+    ],
+    {staleTime: 0}
+  );
+}
diff --git a/static/app/components/events/featureFlags/utils.tsx b/static/app/components/events/featureFlags/utils.tsx
index a560b54d3d3609..59b1814ecc91fc 100644
--- a/static/app/components/events/featureFlags/utils.tsx
+++ b/static/app/components/events/featureFlags/utils.tsx
@@ -112,3 +112,17 @@ export const sortedFlags = ({
       return flags;
   }
 };
+
+export enum ProviderOptions {
+  LAUNCHDARKLY = 'LaunchDarkly',
+}
+
+export enum IntegrationOptions {
+  LAUNCHDARKLY = 'LaunchDarkly',
+  OPENFEATURE = 'OpenFeature',
+}
+
+export const PROVIDER_OPTION_TO_URLS: Record<ProviderOptions, string> = {
+  [ProviderOptions.LAUNCHDARKLY]:
+    'https://app.launchdarkly.com/settings/integrations/webhooks/new?q=Webhooks',
+};
diff --git a/static/app/components/events/groupingInfo/groupingInfo.tsx b/static/app/components/events/groupingInfo/groupingInfo.tsx
index a99e19affb6754..a78b096c85e201 100644
--- a/static/app/components/events/groupingInfo/groupingInfo.tsx
+++ b/static/app/components/events/groupingInfo/groupingInfo.tsx
@@ -79,7 +79,7 @@ export default function GroupingInfo({
 
   return (
     <Fragment>
-      {!hasStreamlinedUI && (
+      {hasStreamlinedUI && (
         <GroupInfoSummary event={event} group={group} projectSlug={projectSlug} />
       )}
       <ConfigHeader>
diff --git a/static/app/components/events/interfaces/breadcrumbs/index.tsx b/static/app/components/events/interfaces/breadcrumbs/index.tsx
index e5f978275e3d60..b50eb5bcc00221 100644
--- a/static/app/components/events/interfaces/breadcrumbs/index.tsx
+++ b/static/app/components/events/interfaces/breadcrumbs/index.tsx
@@ -346,6 +346,10 @@ export const SearchAndSortWrapper = styled('div')`
   @media (max-width: ${p => p.theme.breakpoints.small}) {
     grid-template-columns: 1fr;
   }
+
+  @container breadcrumbs (width < 640px) {
+    display: none;
+  }
 `;
 
 const LevelWrap = styled('span')`
diff --git a/static/app/components/events/interfaces/debugMeta/index.tsx b/static/app/components/events/interfaces/debugMeta/index.tsx
index d5ddc67a72c41f..9ee105aa9b2231 100644
--- a/static/app/components/events/interfaces/debugMeta/index.tsx
+++ b/static/app/components/events/interfaces/debugMeta/index.tsx
@@ -370,12 +370,14 @@ export function DebugMeta({data, projectSlug, groupId, event}: DebugMetaProps) {
     />
   );
 
+  const isJSPlatform = event.platform?.includes('javascript');
+
   return (
     <InterimSection
       type={SectionKey.DEBUGMETA}
-      title={t('Images Loaded')}
+      title={isJSPlatform ? t('Source Maps Loaded') : t('Images Loaded')}
       help={t(
-        'A list of dynamic libraries or shared objects loaded into process memory at the time of the crash. Images contribute application code that is referenced in stack traces.'
+        'A list of dynamic libraries, shared objects or source maps loaded into process memory at the time of the crash. Images contribute application code that is referenced in stack traces.'
       )}
       actions={actions}
       initialCollapse
@@ -383,7 +385,7 @@ export function DebugMeta({data, projectSlug, groupId, event}: DebugMetaProps) {
       {isOpen || hasStreamlinedUI ? (
         <Fragment>
           <StyledSearchBarAction
-            placeholder={t('Search images loaded')}
+            placeholder={isJSPlatform ? t('Search source maps') : t('Search images')}
             onChange={value => DebugMetaStore.updateFilter(value)}
             query={searchTerm}
             filterOptions={showFilters ? filterOptions : undefined}
diff --git a/static/app/components/events/interfaces/frame/contexts.spec.tsx b/static/app/components/events/interfaces/frame/contexts.spec.tsx
deleted file mode 100644
index 2856687f03329a..00000000000000
--- a/static/app/components/events/interfaces/frame/contexts.spec.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import {EventFixture} from 'sentry-fixture/event';
-
-import {render, screen} from 'sentry-test/reactTestingLibrary';
-
-import {DeviceEventContext} from 'sentry/components/events/contexts/device';
-import {commonDisplayResolutions} from 'sentry/components/events/contexts/device/utils';
-import {UserEventContext} from 'sentry/components/events/contexts/user';
-import {FILTER_MASK} from 'sentry/constants';
-import type {DeviceContext} from 'sentry/types/event';
-
-describe('User', function () {
-  it("displays filtered values but doesn't use them for avatar", function () {
-    const {rerender} = render(
-      <UserEventContext
-        data={{
-          id: '26',
-          name: FILTER_MASK,
-          email: '',
-          username: '',
-          ip_address: '',
-          data: {},
-        }}
-        event={EventFixture()}
-      />
-    );
-
-    expect(screen.getByTestId('user-context-name-value')).toHaveTextContent(FILTER_MASK);
-    expect(screen.getByText('?')).toBeInTheDocument();
-
-    rerender(
-      <UserEventContext
-        data={{
-          id: '26',
-          name: '',
-          email: FILTER_MASK,
-          username: '',
-          ip_address: '',
-          data: {},
-        }}
-        event={EventFixture()}
-      />
-    );
-
-    expect(screen.getByTestId('user-context-email-value')).toHaveTextContent(FILTER_MASK);
-    expect(screen.getByText('?')).toBeInTheDocument();
-
-    rerender(
-      <UserEventContext
-        data={{
-          id: '26',
-          name: '',
-          email: '',
-          username: FILTER_MASK,
-          ip_address: '',
-          data: {},
-        }}
-        event={EventFixture()}
-      />
-    );
-
-    expect(screen.getByTestId('user-context-username-value')).toHaveTextContent(
-      FILTER_MASK
-    );
-    expect(screen.getByText('?')).toBeInTheDocument();
-  });
-});
-
-describe('Device', function () {
-  const device: DeviceContext = {
-    type: 'device',
-    name: 'Device Name',
-    screen_resolution: '3840x2160',
-    screen_width_pixels: 3840,
-    screen_height_pixels: 2160,
-    device_type: 'desktop',
-  };
-
-  describe('getInferredData', function () {
-    it('renders', function () {
-      render(<DeviceEventContext data={device} event={EventFixture()} />);
-    });
-
-    it('renders screen_resolution inferred from screen_width_pixels and screen_height_pixels', function () {
-      render(
-        <DeviceEventContext
-          data={{...device, screen_resolution: undefined}}
-          event={EventFixture()}
-        />
-      );
-
-      expect(
-        screen.getByTestId('device-context-screen_width_pixels-value')
-      ).toHaveTextContent(String(device.screen_width_pixels));
-
-      expect(
-        screen.getByTestId('device-context-screen_height_pixels-value')
-      ).toHaveTextContent(String(device.screen_height_pixels));
-
-      expect(
-        screen.getByTestId('device-context-screen_resolution-value')
-      ).toHaveTextContent(
-        `${device.screen_resolution} (${
-          commonDisplayResolutions[String(device.screen_resolution)]
-        })`
-      );
-    });
-
-    it('renders screen_width_pixels and screen_height_pixels inferred from screen_resolution', function () {
-      render(
-        <DeviceEventContext
-          data={{
-            ...device,
-            screen_width_pixels: undefined,
-            screen_height_pixels: undefined,
-          }}
-          event={EventFixture()}
-        />
-      );
-
-      expect(
-        screen.getByTestId('device-context-screen_width_pixels-value')
-      ).toHaveTextContent(String(device.screen_width_pixels));
-
-      expect(
-        screen.getByTestId('device-context-screen_height_pixels-value')
-      ).toHaveTextContent(String(device.screen_height_pixels));
-
-      expect(
-        screen.getByTestId('device-context-screen_resolution-value')
-      ).toHaveTextContent(
-        `${device.screen_resolution} (${
-          commonDisplayResolutions[String(device.screen_resolution)]
-        })`
-      );
-    });
-  });
-});
diff --git a/static/app/components/events/interfaces/frame/deprecatedLine.tsx b/static/app/components/events/interfaces/frame/deprecatedLine.tsx
index 05194fdd4dc3a2..df32df23de9a06 100644
--- a/static/app/components/events/interfaces/frame/deprecatedLine.tsx
+++ b/static/app/components/events/interfaces/frame/deprecatedLine.tsx
@@ -290,7 +290,7 @@ export class DeprecatedLine extends Component<Props, State> {
             frame_count: hiddenFrameCount,
             is_frame_expanded: isShowFramesToggleExpanded,
           }}
-          size="xs"
+          size="zero"
           borderless
           onClick={e => {
             this.props.onShowFramesToggle?.(e);
@@ -568,6 +568,7 @@ const StyledLi = styled('li')`
 
 const ToggleButton = styled(Button)`
   color: ${p => p.theme.subText};
+  font-size: ${p => p.theme.fontSizeSmall};
   font-style: italic;
   font-weight: ${p => p.theme.fontWeightNormal};
   padding: ${space(0.25)} ${space(0.5)};
diff --git a/static/app/components/events/interfaces/nativeFrame.tsx b/static/app/components/events/interfaces/nativeFrame.tsx
index 79727934bdbda6..0f598426f97037 100644
--- a/static/app/components/events/interfaces/nativeFrame.tsx
+++ b/static/app/components/events/interfaces/nativeFrame.tsx
@@ -387,7 +387,7 @@ function NativeFrame({
                 frame_count: hiddenFrameCount,
                 is_frame_expanded: isShowFramesToggleExpanded,
               }}
-              size="xs"
+              size="zero"
               borderless
               onClick={e => {
                 onShowFramesToggle?.(e);
@@ -568,6 +568,7 @@ const SymbolicatorIcon = styled('div')`
 
 const ShowHideButton = styled(Button)`
   color: ${p => p.theme.subText};
+  font-size: ${p => p.theme.fontSizeSmall};
   font-style: italic;
   font-weight: ${p => p.theme.fontWeightNormal};
   padding: ${space(0.25)} ${space(0.5)};
diff --git a/static/app/components/events/interfaces/noStackTraceMessage.tsx b/static/app/components/events/interfaces/noStackTraceMessage.tsx
index cd3b236ee5c347..0cfbf1c3a2794e 100644
--- a/static/app/components/events/interfaces/noStackTraceMessage.tsx
+++ b/static/app/components/events/interfaces/noStackTraceMessage.tsx
@@ -6,7 +6,7 @@ type Props = {
 };
 
 function NoStackTraceMessage({message}: Props) {
-  return <Alert type="error">{message ?? t('No or unknown stacktrace')}</Alert>;
+  return <Alert type="muted">{message ?? t('No stacktrace found.')}</Alert>;
 }
 
 export default NoStackTraceMessage;
diff --git a/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx b/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx
index b11d431282e3da..a01c8f1e53f503 100644
--- a/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx
+++ b/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx
@@ -5,7 +5,9 @@ import {initializeData} from 'sentry-test/performance/initializePerformanceData'
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import {EntryType} from 'sentry/types/event';
+import {IssueCategory, IssueTitle} from 'sentry/types/group';
 import type {TraceEventResponse} from 'sentry/views/issueDetails/traceTimeline/useTraceTimelineEvents';
+import {makeTraceError} from 'sentry/views/performance/newTraceDetails/traceModels/traceTreeTestUtils';
 
 import {EventTraceView} from './eventTraceView';
 
@@ -29,6 +31,7 @@ describe('EventTraceView', () => {
         trace_id: traceId,
       },
     },
+    eventID: 'issue-5',
   });
   const issuePlatformBody: TraceEventResponse = {
     data: [],
@@ -51,16 +54,18 @@ describe('EventTraceView', () => {
         performance_issues: 1,
         projects: 1,
         transactions: 1,
-        transaction_child_count_map: [{'transaction.id': '1', count: 1}],
+        transaction_child_count_map: new Array(20)
+          .fill(0)
+          .map((_, i) => [{'transaction.id': i.toString(), count: 1}]),
       },
     });
     MockApiClient.addMockResponse({
       url: `/organizations/${organization.slug}/events-trace/${traceId}/`,
       body: {
-        transactions: [
+        transactions: new Array(20).fill(0).map((_, i) => [
           {
             project_slug: project.slug,
-            event_id: '1',
+            event_id: i.toString(),
             children: [],
             sdk_name: '',
             start_timestamp: 0,
@@ -69,10 +74,10 @@ describe('EventTraceView', () => {
             'transaction.op': '',
             'transaction.status': '',
             performance_issues: [],
-            errors: [],
+            errors: i === 5 ? [makeTraceError({event_id: 'issue-5'})] : [],
           },
-        ],
-        orphan_errors: [],
+        ]),
+        orphan_errors: [makeTraceError()],
       },
     });
     MockApiClient.addMockResponse({
@@ -92,7 +97,38 @@ describe('EventTraceView', () => {
     render(<EventTraceView group={group} event={event} organization={organization} />);
 
     expect(await screen.findByText('Trace')).toBeInTheDocument();
-    expect(await screen.findByText('transaction')).toBeInTheDocument();
+    expect(
+      await screen.findByText('MaybeEncodingError: Error sending result')
+    ).toBeInTheDocument();
+  });
+
+  it('still renders trace link for performance issues', async () => {
+    const perfGroup = GroupFixture({issueCategory: IssueCategory.PERFORMANCE});
+    const perfEvent = EventFixture({
+      occurrence: {
+        type: 1001,
+        issueTitle: IssueTitle.PERFORMANCE_SLOW_DB_QUERY,
+      },
+      entries: [
+        {
+          data: [],
+          type: EntryType.SPANS,
+        },
+      ],
+      contexts: {
+        trace: {
+          trace_id: traceId,
+        },
+      },
+    });
+
+    render(
+      <EventTraceView group={perfGroup} event={perfEvent} organization={organization} />
+    );
+    expect(await screen.findByText('Trace')).toBeInTheDocument();
+    expect(
+      await screen.findByRole('link', {name: 'View Full Trace'})
+    ).toBeInTheDocument();
   });
 
   it('does not render the trace preview if it has no transactions', async () => {
diff --git a/static/app/components/events/interfaces/performance/eventTraceView.tsx b/static/app/components/events/interfaces/performance/eventTraceView.tsx
index 6b8266734716d6..f47817c661bb32 100644
--- a/static/app/components/events/interfaces/performance/eventTraceView.tsx
+++ b/static/app/components/events/interfaces/performance/eventTraceView.tsx
@@ -1,28 +1,32 @@
-import {Fragment, useMemo} from 'react';
+import {useMemo} from 'react';
 import styled from '@emotion/styled';
 
-import ErrorBoundary from 'sentry/components/errorBoundary';
-import {ALL_ACCESS_PROJECTS} from 'sentry/constants/pageFilters';
+import {LinkButton} from 'sentry/components/button';
+import {generateTraceTarget} from 'sentry/components/quickTrace/utils';
+import {IconOpen} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
 import {type Group, IssueCategory} from 'sentry/types/group';
 import type {Organization} from 'sentry/types/organization';
-import EventView from 'sentry/utils/discover/eventView';
 import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
 import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
 import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
 import {TraceDataSection} from 'sentry/views/issueDetails/traceDataSection';
-import {TraceViewWaterfall} from 'sentry/views/performance/newTraceDetails';
+import {IssuesTraceWaterfall} from 'sentry/views/performance/newTraceDetails/issuesTraceWaterfall';
+import {useIssuesTraceTree} from 'sentry/views/performance/newTraceDetails/traceApi/useIssuesTraceTree';
 import {useTrace} from 'sentry/views/performance/newTraceDetails/traceApi/useTrace';
 import {useTraceMeta} from 'sentry/views/performance/newTraceDetails/traceApi/useTraceMeta';
 import {useTraceRootEvent} from 'sentry/views/performance/newTraceDetails/traceApi/useTraceRootEvent';
-import {useTraceTree} from 'sentry/views/performance/newTraceDetails/traceApi/useTraceTree';
+import {TraceViewSources} from 'sentry/views/performance/newTraceDetails/traceHeader/breadcrumbs';
 import {
   loadTraceViewPreferences,
   type TracePreferencesState,
 } from 'sentry/views/performance/newTraceDetails/traceState/tracePreferences';
 import {TraceStateProvider} from 'sentry/views/performance/newTraceDetails/traceState/traceStateProvider';
+import {useTraceEventView} from 'sentry/views/performance/newTraceDetails/useTraceEventView';
+import {useTraceQueryParams} from 'sentry/views/performance/newTraceDetails/useTraceQueryParams';
 
 const DEFAULT_ISSUE_DETAILS_TRACE_VIEW_PREFERENCES: TracePreferencesState = {
   drawer: {
@@ -48,25 +52,26 @@ const DEFAULT_ISSUE_DETAILS_TRACE_VIEW_PREFERENCES: TracePreferencesState = {
 interface EventTraceViewInnerProps {
   event: Event;
   organization: Organization;
+  traceId: string;
 }
 
-function EventTraceViewInner({event, organization}: EventTraceViewInnerProps) {
-  // Assuming profile exists, should be checked in the parent component
-  const traceId = event.contexts.trace!.trace_id!;
-  const location = useLocation();
+function EventTraceViewInner({event, organization, traceId}: EventTraceViewInnerProps) {
+  const timestamp = new Date(event.dateReceived).getTime() / 1e3;
 
   const trace = useTrace({
-    traceSlug: traceId ? traceId : undefined,
+    timestamp,
+    traceSlug: traceId,
     limit: 10000,
   });
-  const meta = useTraceMeta([{traceSlug: traceId, timestamp: undefined}]);
-  const tree = useTraceTree({trace, meta, replay: null});
+  const params = useTraceQueryParams({
+    timestamp,
+  });
+  const meta = useTraceMeta([{traceSlug: traceId, timestamp}]);
+  const tree = useIssuesTraceTree({trace, meta, replay: null});
 
-  const hasNoTransactions = meta.data?.transactions === 0;
-  const shouldLoadTraceRoot = !trace.isPending && trace.data && !hasNoTransactions;
+  const shouldLoadTraceRoot = !trace.isPending && trace.data;
 
   const rootEvent = useTraceRootEvent(shouldLoadTraceRoot ? trace.data! : null);
-
   const preferences = useMemo(
     () =>
       loadTraceViewPreferences('issue-details-trace-view-preferences') ||
@@ -74,64 +79,88 @@ function EventTraceViewInner({event, organization}: EventTraceViewInnerProps) {
     []
   );
 
-  const traceEventView = useMemo(() => {
-    const statsPeriod = location.query.statsPeriod as string | undefined;
-    // Not currently expecting start/end timestamps to be applied to this view
-
-    return EventView.fromSavedQuery({
-      id: undefined,
-      name: `Events with Trace ID ${traceId}`,
-      fields: ['title', 'event.type', 'project', 'timestamp'],
-      orderby: '-timestamp',
-      query: `trace:${traceId}`,
-      projects: [ALL_ACCESS_PROJECTS],
-      version: 2,
-      range: statsPeriod,
-    });
-  }, [location.query.statsPeriod, traceId]);
-
-  const scrollToNode = useMemo(() => {
-    const firstTransactionEventId = trace.data?.transactions[0]?.event_id;
-    return {eventId: firstTransactionEventId};
-  }, [trace.data]);
-
-  if (trace.isPending || rootEvent.isPending || !rootEvent.data || hasNoTransactions) {
+  const traceEventView = useTraceEventView(traceId, params);
+
+  if (!traceId) {
     return null;
   }
 
   return (
-    <Fragment>
-      <TraceStateProvider
-        initialPreferences={preferences}
-        preferencesStorageKey="issue-details-view-preferences"
-      >
-        <TraceViewWaterfallWrapper>
-          <TraceViewWaterfall
-            tree={tree}
-            trace={trace}
-            replay={null}
-            rootEvent={rootEvent}
-            traceSlug={undefined}
-            organization={organization}
-            traceEventView={traceEventView}
-            meta={meta}
-            source="issues"
-            scrollToNode={scrollToNode}
-            isEmbedded
-          />
-        </TraceViewWaterfallWrapper>
-      </TraceStateProvider>
-    </Fragment>
+    <TraceStateProvider
+      initialPreferences={preferences}
+      preferencesStorageKey="issue-details-view-preferences"
+    >
+      <IssuesTraceContainer>
+        <IssuesTraceWaterfall
+          tree={tree}
+          trace={trace}
+          traceSlug={traceId}
+          rootEvent={rootEvent}
+          organization={organization}
+          traceEventView={traceEventView}
+          meta={meta}
+          source="issues"
+          replay={null}
+          event={event}
+        />
+        <IssuesTraceOverlay event={event} />
+      </IssuesTraceContainer>
+    </TraceStateProvider>
   );
 }
 
-interface EventTraceViewProps extends EventTraceViewInnerProps {
+function IssuesTraceOverlay({event}: {event: Event}) {
+  const location = useLocation();
+  const organization = useOrganization();
+
+  const traceTarget = generateTraceTarget(
+    event,
+    organization,
+    {
+      ...location,
+      query: {
+        ...location.query,
+        groupId: event.groupID,
+      },
+    },
+    TraceViewSources.ISSUE_DETAILS
+  );
+
+  return (
+    <IssuesTraceOverlayContainer>
+      <LinkButton
+        size="sm"
+        icon={<IconOpen />}
+        aria-label={t('Open Trace')}
+        to={traceTarget}
+      />
+    </IssuesTraceOverlayContainer>
+  );
+}
+
+const IssuesTraceContainer = styled('div')`
+  position: relative;
+`;
+
+const IssuesTraceOverlayContainer = styled('div')`
+  position: absolute;
+  inset: 0;
+  z-index: 10;
+
+  a {
+    position: absolute;
+    top: ${space(1)};
+    right: ${space(1)};
+  }
+`;
+
+interface EventTraceViewProps extends Omit<EventTraceViewInnerProps, 'traceId'> {
   group: Group;
 }
 
 export function EventTraceView({group, event, organization}: EventTraceViewProps) {
-  // Check trace id exists
-  if (!event || !event.contexts.trace?.trace_id) {
+  const traceId = event.contexts.trace?.trace_id;
+  if (!traceId) {
     return null;
   }
 
@@ -139,37 +168,22 @@ export function EventTraceView({group, event, organization}: EventTraceViewProps
   const hasIssueDetailsTrace = organization.features.includes(
     'issue-details-always-show-trace'
   );
-  const hasTracePreviewFeature = hasProfilingFeature && hasIssueDetailsTrace;
-
-  // Only display this for error or default events since performance events are handled elsewhere
-  if (group.issueCategory === IssueCategory.PERFORMANCE) {
-    return null;
-  }
+  const hasTracePreviewFeature =
+    hasProfilingFeature &&
+    hasIssueDetailsTrace &&
+    // Only display this for error or default events since performance events are handled elsewhere
+    group.issueCategory !== IssueCategory.PERFORMANCE;
 
   return (
-    <ErrorBoundary mini>
-      <InterimSection type={SectionKey.TRACE} title={t('Trace')}>
-        <TraceContentWrapper>
-          <div>
-            <TraceDataSection event={event} />
-          </div>
-          {hasTracePreviewFeature && (
-            <EventTraceViewInner event={event} organization={organization} />
-          )}
-        </TraceContentWrapper>
-      </InterimSection>
-    </ErrorBoundary>
+    <InterimSection type={SectionKey.TRACE} title={t('Trace')}>
+      <TraceDataSection event={event} />
+      {hasTracePreviewFeature && (
+        <EventTraceViewInner
+          event={event}
+          organization={organization}
+          traceId={traceId}
+        />
+      )}
+    </InterimSection>
   );
 }
-
-const TraceContentWrapper = styled('div')`
-  display: flex;
-  flex-direction: column;
-  gap: ${space(1)};
-`;
-
-const TraceViewWaterfallWrapper = styled('div')`
-  display: flex;
-  flex-direction: column;
-  height: 500px;
-`;
diff --git a/static/app/components/events/interfaces/request/index.spec.tsx b/static/app/components/events/interfaces/request/index.spec.tsx
index df27c7b78df44f..2ee61131f256e3 100644
--- a/static/app/components/events/interfaces/request/index.spec.tsx
+++ b/static/app/components/events/interfaces/request/index.spec.tsx
@@ -1,16 +1,22 @@
 import {DataScrubbingRelayPiiConfigFixture} from 'sentry-fixture/dataScrubbingRelayPiiConfig';
 import {EventFixture} from 'sentry-fixture/event';
+import {UserFixture} from 'sentry-fixture/user';
 
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import {textWithMarkupMatcher} from 'sentry-test/utils';
 
 import {Request} from 'sentry/components/events/interfaces/request';
+import ConfigStore from 'sentry/stores/configStore';
 import type {EntryRequest} from 'sentry/types/event';
 import {EntryType} from 'sentry/types/event';
 
 jest.unmock('prismjs');
 
 describe('Request entry', function () {
+  beforeEach(() => {
+    ConfigStore.set('user', UserFixture());
+  });
+
   it('display redacted data', async function () {
     const event = EventFixture({
       entries: [
@@ -327,6 +333,38 @@ describe('Request entry', function () {
       ).not.toThrow();
     });
 
+    it('should remove any non-tuple values from array', function () {
+      const user = UserFixture();
+      user.options.prefersIssueDetailsStreamlinedUI = true;
+      ConfigStore.set('user', user);
+
+      const data: EntryRequest['data'] = {
+        apiTarget: null,
+        query: 'a%AFc',
+        data: '',
+        headers: [['foo', 'bar'], null],
+        cookies: [],
+        env: {},
+        method: 'POST',
+        url: '/Home/PostIndex',
+      };
+      const event = EventFixture({
+        entries: [
+          {
+            type: EntryType.REQUEST,
+            data,
+          },
+        ],
+      });
+      expect(() =>
+        render(<Request event={event} data={event.entries[0].data} />, {
+          organization: {
+            relayPiiConfig: JSON.stringify(DataScrubbingRelayPiiConfigFixture()),
+          },
+        })
+      ).not.toThrow();
+    });
+
     it("should not cause an invariant violation if data.data isn't a string", function () {
       const data: EntryRequest['data'] = {
         apiTarget: null,
diff --git a/static/app/components/events/interfaces/request/index.tsx b/static/app/components/events/interfaces/request/index.tsx
index 16be046eaa16aa..c1417f34507a58 100644
--- a/static/app/components/events/interfaces/request/index.tsx
+++ b/static/app/components/events/interfaces/request/index.tsx
@@ -251,10 +251,13 @@ function RequestDataCard({
   const contentItems: KeyValueDataContentProps[] = [];
 
   if (Array.isArray(data) && data.length > 0) {
-    data.forEach(([key, value], i: number) => {
-      const valueMeta = meta?.[i] ? meta[i]?.[1] : undefined;
-      contentItems.push({item: {key, subject: key, value}, meta: valueMeta});
-    });
+    data
+      // Remove any non-tuple values
+      .filter(x => Array.isArray(x))
+      .forEach(([key, value], i: number) => {
+        const valueMeta = meta?.[i] ? meta[i]?.[1] : undefined;
+        contentItems.push({item: {key, subject: key, value}, meta: valueMeta});
+      });
   } else if (typeof data === 'object') {
     // Spread to flatten if it's a proxy
     Object.entries({...data}).forEach(([key, value]) => {
diff --git a/static/app/components/events/interfaces/spans/spanDescendantGroupBar.tsx b/static/app/components/events/interfaces/spans/spanDescendantGroupBar.tsx
index 92f7cec076a058..b4c560a86af6be 100644
--- a/static/app/components/events/interfaces/spans/spanDescendantGroupBar.tsx
+++ b/static/app/components/events/interfaces/spans/spanDescendantGroupBar.tsx
@@ -3,7 +3,7 @@ import countBy from 'lodash/countBy';
 
 import type {SpanBarType} from 'sentry/components/performance/waterfall/constants';
 import {
-  getSpanBarColours,
+  getSpanBarColors,
   ROW_HEIGHT,
 } from 'sentry/components/performance/waterfall/constants';
 import {DurationPill, RowRectangle} from 'sentry/components/performance/waterfall/rowBar';
@@ -150,7 +150,7 @@ export function SpanDescendantGroupBar(props: SpanDescendantGroupBarProps) {
     return (
       <RowRectangle
         style={{
-          backgroundColor: getSpanBarColours(spanBarType, theme).primary,
+          backgroundColor: getSpanBarColors(spanBarType, theme).primary,
           left: `min(${toPercent(bounds.left || 0)}, calc(100% - 1px))`,
           width: toPercent(bounds.width || 0),
         }}
diff --git a/static/app/components/events/interfaces/spans/spanDetail.spec.tsx b/static/app/components/events/interfaces/spans/spanDetail.spec.tsx
index f3f03e2cdc85eb..be5a4df59b5b89 100644
--- a/static/app/components/events/interfaces/spans/spanDetail.spec.tsx
+++ b/static/app/components/events/interfaces/spans/spanDetail.spec.tsx
@@ -6,7 +6,6 @@ import {SpanFixture} from 'sentry-fixture/span';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import SpanDetail from 'sentry/components/events/interfaces/spans/spanDetail';
-import {TransactionProfileIdProvider} from 'sentry/components/profiling/transactionProfileIdProvider';
 import type {EventTransaction} from 'sentry/types/event';
 
 describe('SpanDetail', function () {
@@ -36,33 +35,20 @@ describe('SpanDetail', function () {
     description: 'SELECT * FROM users;',
   });
 
-  beforeEach(function () {
-    MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/events/`,
-      method: 'GET',
-    });
-  });
-
   function renderSpanDetail(props: Partial<React.ComponentProps<typeof SpanDetail>>) {
     return (
-      <TransactionProfileIdProvider
-        projectId={project.id}
-        transactionId={event.id}
-        timestamp={event.dateReceived}
-      >
-        <SpanDetail
-          organization={organization}
-          event={event}
-          resetCellMeasureCache={jest.fn()}
-          scrollToHash={jest.fn()}
-          isRoot={false}
-          relatedErrors={[]}
-          trace={trace}
-          childTransactions={[]}
-          span={span}
-          {...props}
-        />
-      </TransactionProfileIdProvider>
+      <SpanDetail
+        organization={organization}
+        event={event}
+        resetCellMeasureCache={jest.fn()}
+        scrollToHash={jest.fn()}
+        isRoot={false}
+        relatedErrors={[]}
+        trace={trace}
+        childTransactions={[]}
+        span={span}
+        {...props}
+      />
     );
   }
 
@@ -164,7 +150,7 @@ describe('SpanDetail', function () {
       ).toBeInTheDocument();
       expect(screen.getByRole('button', {name: 'View Query Summary'})).toHaveAttribute(
         'href',
-        '/organizations/org-slug/insights/database/spans/span/a7ebd21614897/?project=2'
+        '/organizations/org-slug/insights/backend/database/spans/span/a7ebd21614897/?project=2'
       );
     });
   });
diff --git a/static/app/components/events/interfaces/spans/spanDetail.tsx b/static/app/components/events/interfaces/spans/spanDetail.tsx
index 5b6c419541ce61..7630e53cb5b904 100644
--- a/static/app/components/events/interfaces/spans/spanDetail.tsx
+++ b/static/app/components/events/interfaces/spans/spanDetail.tsx
@@ -22,7 +22,6 @@ import {
 } from 'sentry/components/performance/waterfall/rowDetails';
 import Pill from 'sentry/components/pill';
 import Pills from 'sentry/components/pills';
-import {useTransactionProfileId} from 'sentry/components/profiling/transactionProfileIdProvider';
 import {TransactionToProfileButton} from 'sentry/components/profiling/transactionToProfileButton';
 import {
   generateIssueEventTarget,
@@ -106,7 +105,7 @@ type Props = {
 function SpanDetail(props: Props) {
   const [errorsOpened, setErrorsOpened] = useState(false);
   const location = useLocation();
-  const profileId = useTransactionProfileId();
+  const profileId = props.event.contexts.profile?.profile_id;
   const {projects} = useProjects();
   const project = projects.find(p => p.id === props.event.projectID);
 
diff --git a/static/app/components/events/interfaces/spans/spanGroupBar.tsx b/static/app/components/events/interfaces/spans/spanGroupBar.tsx
index ccca4f7afbfe51..c16ad4ee760fe9 100644
--- a/static/app/components/events/interfaces/spans/spanGroupBar.tsx
+++ b/static/app/components/events/interfaces/spans/spanGroupBar.tsx
@@ -10,7 +10,7 @@ import {
 } from 'sentry/components/events/interfaces/spans/spanFrequencyBox';
 import type {SpanBarType} from 'sentry/components/performance/waterfall/constants';
 import {
-  getSpanBarColours,
+  getSpanBarColors,
   ROW_HEIGHT,
 } from 'sentry/components/performance/waterfall/constants';
 import {
@@ -315,7 +315,7 @@ export function SpanGroupBar(props: Props) {
                     }}
                   >
                     <SpanGroupRowTitleContent
-                      color={getSpanBarColours(spanBarType, theme).primary}
+                      color={getSpanBarColors(spanBarType, theme).primary}
                     >
                       {props.renderGroupSpansTitle()}
                     </SpanGroupRowTitleContent>
diff --git a/static/app/components/events/interfaces/spans/spanProfileDetails.tsx b/static/app/components/events/interfaces/spans/spanProfileDetails.tsx
index b7d1fda8e4ecb7..22f63b9582b4ca 100644
--- a/static/app/components/events/interfaces/spans/spanProfileDetails.tsx
+++ b/static/app/components/events/interfaces/spans/spanProfileDetails.tsx
@@ -10,8 +10,7 @@ import QuestionTooltip from 'sentry/components/questionTooltip';
 import {IconChevron, IconProfiling} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {EventTransaction, Frame} from 'sentry/types/event';
-import {EntryType} from 'sentry/types/event';
+import {EntryType, type EventTransaction, type Frame} from 'sentry/types/event';
 import type {PlatformKey} from 'sentry/types/project';
 import {StackView} from 'sentry/types/stacktrace';
 import {defined} from 'sentry/utils';
@@ -38,15 +37,7 @@ interface SpanProfileDetailsProps {
   onNoProfileFound?: () => void;
 }
 
-export function SpanProfileDetails({
-  event,
-  span,
-  onNoProfileFound,
-}: SpanProfileDetailsProps) {
-  const organization = useOrganization();
-  const {projects} = useProjects();
-  const project = projects.find(p => p.id === event.projectID);
-
+export function useSpanProfileDetails(event, span) {
   const profileGroup = useProfileGroup();
 
   const processedEvent = useMemo(() => {
@@ -140,6 +131,43 @@ export function SpanProfileDetails({
     };
   }, [index, maxNodes, event, nodes]);
 
+  return {
+    processedEvent,
+    profileGroup,
+    profile,
+    nodes,
+    index,
+    setIndex,
+    totalWeight,
+    maxNodes,
+    frames,
+    hasPrevious,
+    hasNext,
+  };
+}
+
+export function SpanProfileDetails({
+  event,
+  span,
+  onNoProfileFound,
+}: SpanProfileDetailsProps) {
+  const organization = useOrganization();
+  const {projects} = useProjects();
+  const project = projects.find(p => p.id === event.projectID);
+  const {
+    processedEvent,
+    profileGroup,
+    profile,
+    nodes,
+    index,
+    setIndex,
+    maxNodes,
+    hasNext,
+    hasPrevious,
+    totalWeight,
+    frames,
+  } = useSpanProfileDetails(event, span);
+
   const spanTarget =
     project &&
     profileGroup &&
diff --git a/static/app/components/events/interfaces/spans/spanRectangle.tsx b/static/app/components/events/interfaces/spans/spanRectangle.tsx
index a482f4b7a8de1f..b38aac9dd36e1a 100644
--- a/static/app/components/events/interfaces/spans/spanRectangle.tsx
+++ b/static/app/components/events/interfaces/spans/spanRectangle.tsx
@@ -1,7 +1,7 @@
 import {useTheme} from '@emotion/react';
 
 import type {SpanBarType} from 'sentry/components/performance/waterfall/constants';
-import {getSpanBarColours} from 'sentry/components/performance/waterfall/constants';
+import {getSpanBarColors} from 'sentry/components/performance/waterfall/constants';
 import {RowRectangle} from 'sentry/components/performance/waterfall/rowBar';
 import toPercent from 'sentry/utils/number/toPercent';
 
@@ -20,7 +20,7 @@ export default function SpanRectangle({
   return (
     <RowRectangle
       style={{
-        backgroundColor: getSpanBarColours(spanBarType, theme).primary,
+        backgroundColor: getSpanBarColors(spanBarType, theme).primary,
         left: `min(${toPercent(bounds.left || 0)}, calc(100% - 1px))`,
         width: toPercent(bounds.width || 0),
       }}
diff --git a/static/app/components/events/interfaces/spans/spanSummaryButton.tsx b/static/app/components/events/interfaces/spans/spanSummaryButton.tsx
index fd231382221f9d..12750e292fc7bf 100644
--- a/static/app/components/events/interfaces/spans/spanSummaryButton.tsx
+++ b/static/app/components/events/interfaces/spans/spanSummaryButton.tsx
@@ -23,6 +23,7 @@ interface Props {
 function SpanSummaryButton(props: Props) {
   const location = useLocation();
   const resourceBaseUrl = useModuleURL(ModuleName.RESOURCE);
+  const queryBaseUrl = useModuleURL(ModuleName.DB);
 
   const {event, organization, span} = props;
 
@@ -41,7 +42,7 @@ function SpanSummaryButton(props: Props) {
       <LinkButton
         size="xs"
         to={querySummaryRouteWithQuery({
-          orgSlug: organization.slug,
+          base: queryBaseUrl,
           query: location.query,
           group: sentryTags.group,
           projectID: event.projectID,
diff --git a/static/app/components/events/interfaces/spans/traceView.spec.tsx b/static/app/components/events/interfaces/spans/traceView.spec.tsx
index 3d0ac813a423a4..8a916e488f39b3 100644
--- a/static/app/components/events/interfaces/spans/traceView.spec.tsx
+++ b/static/app/components/events/interfaces/spans/traceView.spec.tsx
@@ -16,7 +16,6 @@ import * as AnchorLinkManager from 'sentry/components/events/interfaces/spans/sp
 import TraceView from 'sentry/components/events/interfaces/spans/traceView';
 import {spanTargetHash} from 'sentry/components/events/interfaces/spans/utils';
 import WaterfallModel from 'sentry/components/events/interfaces/spans/waterfallModel';
-import {TransactionProfileIdProvider} from 'sentry/components/profiling/transactionProfileIdProvider';
 import ProjectsStore from 'sentry/stores/projectsStore';
 import {QuickTraceContext} from 'sentry/utils/performance/quickTrace/quickTraceContext';
 import QuickTraceQuery from 'sentry/utils/performance/quickTrace/quickTraceQuery';
@@ -534,11 +533,9 @@ describe('TraceView', () => {
       const waterfallModel = new WaterfallModel(builder.getEventFixture());
 
       render(
-        <TransactionProfileIdProvider transactionId={undefined} timestamp={undefined}>
-          <AnchorLinkManager.Provider>
-            <TraceView organization={data.organization} waterfallModel={waterfallModel} />
-          </AnchorLinkManager.Provider>
-        </TransactionProfileIdProvider>
+        <AnchorLinkManager.Provider>
+          <TraceView organization={data.organization} waterfallModel={waterfallModel} />
+        </AnchorLinkManager.Provider>
       );
 
       expect(await screen.findByText(/0000000000000003/i)).toBeInTheDocument();
@@ -562,11 +559,9 @@ describe('TraceView', () => {
       const waterfallModel = new WaterfallModel(builder.getEventFixture());
 
       render(
-        <TransactionProfileIdProvider transactionId={undefined} timestamp={undefined}>
-          <AnchorLinkManager.Provider>
-            <TraceView organization={data.organization} waterfallModel={waterfallModel} />
-          </AnchorLinkManager.Provider>
-        </TransactionProfileIdProvider>
+        <AnchorLinkManager.Provider>
+          <TraceView organization={data.organization} waterfallModel={waterfallModel} />
+        </AnchorLinkManager.Provider>
       );
 
       expect(await screen.findByText(/0000000000000003/i)).toBeInTheDocument();
diff --git a/static/app/components/events/interfaces/spans/types.tsx b/static/app/components/events/interfaces/spans/types.tsx
index 7a2b916262ee33..ccd8afd617f095 100644
--- a/static/app/components/events/interfaces/spans/types.tsx
+++ b/static/app/components/events/interfaces/spans/types.tsx
@@ -56,6 +56,7 @@ export type RawSpanType = {
   op?: string;
   origin?: string;
   parent_span_id?: string;
+  project_slug?: string;
   same_process_as_parent?: boolean;
   sentry_tags?: Record<string, string>;
   'span.averageResults'?: {
diff --git a/static/app/components/events/interfaces/threads.spec.tsx b/static/app/components/events/interfaces/threads.spec.tsx
index 70c756ac8b5d2e..3ff3b1fce7e1a0 100644
--- a/static/app/components/events/interfaces/threads.spec.tsx
+++ b/static/app/components/events/interfaces/threads.spec.tsx
@@ -1267,6 +1267,18 @@ describe('Threads', function () {
         within(threadSelector).getByText('ViewController.causeCrash');
       });
 
+      it('can navigate to next/previous thread', async function () {
+        render(<Threads {...props} />, {organization});
+        const threadSelector = await screen.findByTestId('thread-selector');
+        expect(threadSelector).toHaveTextContent('Thread #0');
+        await userEvent.click(await screen.findByRole('button', {name: 'Next Thread'}));
+        expect(threadSelector).toHaveTextContent('Thread #1');
+        await userEvent.click(
+          await screen.findByRole('button', {name: 'Previous Thread'})
+        );
+        expect(threadSelector).toHaveTextContent('Thread #0');
+      });
+
       it('renders raw stack trace', async function () {
         MockApiClient.addMockResponse({
           url: `/projects/${organization.slug}/${project.slug}/events/${event.id}/apple-crash-report?minified=false`,
diff --git a/static/app/components/events/interfaces/threads.tsx b/static/app/components/events/interfaces/threads.tsx
index 90be7c3fec25b0..40582aecafd6e8 100644
--- a/static/app/components/events/interfaces/threads.tsx
+++ b/static/app/components/events/interfaces/threads.tsx
@@ -1,6 +1,8 @@
-import {Fragment, useEffect, useState} from 'react';
+import {Fragment, useEffect, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
 
+import {Button} from 'sentry/components/button';
+import ButtonBar from 'sentry/components/buttonBar';
 import {CommitRow} from 'sentry/components/commitRow';
 import {Flex} from 'sentry/components/container/flex';
 import ErrorBoundary from 'sentry/components/errorBoundary';
@@ -15,7 +17,14 @@ import Pill from 'sentry/components/pill';
 import Pills from 'sentry/components/pills';
 import QuestionTooltip from 'sentry/components/questionTooltip';
 import TextOverflow from 'sentry/components/textOverflow';
-import {IconClock, IconInfo, IconLock, IconPlay, IconTimer} from 'sentry/icons';
+import {
+  IconChevron,
+  IconClock,
+  IconInfo,
+  IconLock,
+  IconPlay,
+  IconTimer,
+} from 'sentry/icons';
 import {t, tn} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Event, Thread} from 'sentry/types/event';
@@ -101,7 +110,11 @@ const useActiveThreadState = (
 };
 
 export function Threads({data, event, projectSlug, groupingCurrentLevel, group}: Props) {
-  const threads = data.values ?? [];
+  // Sort threads by crashed first
+  const threads = useMemo(
+    () => (data.values ?? []).toSorted((a, b) => Number(b.crashed) - Number(a.crashed)),
+    [data.values]
+  );
   const hasStreamlinedUI = useHasStreamlinedUI();
   const [activeThread, setActiveThread] = useActiveThreadState(event, threads);
 
@@ -109,7 +122,10 @@ export function Threads({data, event, projectSlug, groupingCurrentLevel, group}:
 
   const hasMoreThanOneThread = threads.length > 1;
 
-  const exception = getThreadException(event, activeThread);
+  const exception = useMemo(
+    () => getThreadException(event, activeThread),
+    [event, activeThread]
+  );
 
   const entryIndex = exception
     ? event.entries.findIndex(entry => entry.type === EntryType.EXCEPTION)
@@ -226,6 +242,18 @@ export function Threads({data, event, projectSlug, groupingCurrentLevel, group}:
   const {id: activeThreadId, name: activeThreadName} = activeThread ?? {};
   const hideThreadTags = activeThreadId === undefined || !activeThreadName;
 
+  function handleChangeThread(direction: 'previous' | 'next') {
+    const currentIndex = threads.findIndex(thread => thread.id === activeThreadId);
+    let nextIndex = direction === 'previous' ? currentIndex - 1 : currentIndex + 1;
+    if (nextIndex < 0) {
+      nextIndex = threads.length - 1;
+    } else if (nextIndex >= threads.length) {
+      nextIndex = 0;
+    }
+
+    setActiveThread(threads[nextIndex]);
+  }
+
   const threadComponent = (
     <Fragment>
       {hasMoreThanOneThread && (
@@ -235,6 +263,28 @@ export function Threads({data, event, projectSlug, groupingCurrentLevel, group}:
               <ThreadHeading>{t('Threads')}</ThreadHeading>
               {activeThread && (
                 <Wrapper>
+                  <ButtonBar merged>
+                    <Button
+                      title={t('Previous Thread')}
+                      tooltipProps={{delay: 1000}}
+                      icon={<IconChevron direction="left" />}
+                      aria-label={t('Previous Thread')}
+                      size="xs"
+                      onClick={() => {
+                        handleChangeThread('previous');
+                      }}
+                    />
+                    <Button
+                      title={t('Next Thread')}
+                      tooltipProps={{delay: 1000}}
+                      icon={<IconChevron direction="right" />}
+                      aria-label={t('Next Thread')}
+                      size="xs"
+                      onClick={() => {
+                        handleChangeThread('next');
+                      }}
+                    />
+                  </ButtonBar>
                   <ThreadSelector
                     threads={threads}
                     activeThread={activeThread}
@@ -276,7 +326,7 @@ export function Threads({data, event, projectSlug, groupingCurrentLevel, group}:
         </Fragment>
       )}
       <TraceEventDataSection
-        type={EntryType.THREADS}
+        type={SectionKey.THREADS}
         projectSlug={projectSlug}
         eventId={event.id}
         recentFirst={isStacktraceNewestFirst()}
@@ -398,6 +448,8 @@ const LockReason = styled(TextOverflow)`
 `;
 
 const Wrapper = styled('div')`
+  display: flex;
+  gap: ${space(1)};
   align-items: center;
   flex-wrap: wrap;
   flex-grow: 1;
diff --git a/static/app/components/events/interfaces/threads/threadSelector/filterThreadInfo.tsx b/static/app/components/events/interfaces/threads/threadSelector/filterThreadInfo.tsx
index 188a0f10095fbb..42354fc1a8cea1 100644
--- a/static/app/components/events/interfaces/threads/threadSelector/filterThreadInfo.tsx
+++ b/static/app/components/events/interfaces/threads/threadSelector/filterThreadInfo.tsx
@@ -8,7 +8,6 @@ import type {StacktraceType} from 'sentry/types/stacktrace';
 import getRelevantFrame from './getRelevantFrame';
 import getThreadException from './getThreadException';
 import getThreadStacktrace from './getThreadStacktrace';
-import trimFilename from './trimFilename';
 
 type ThreadInfo = {
   crashedInfo?: EntryData;
@@ -17,6 +16,11 @@ type ThreadInfo = {
   state?: ThreadStates;
 };
 
+function trimFilename(filename: string) {
+  const pieces = filename.split(/\//g);
+  return pieces[pieces.length - 1];
+}
+
 function filterThreadInfo(
   event: Event,
   thread: Thread,
diff --git a/static/app/components/events/interfaces/threads/threadSelector/header.tsx b/static/app/components/events/interfaces/threads/threadSelector/header.tsx
deleted file mode 100644
index e12de4884b87cc..00000000000000
--- a/static/app/components/events/interfaces/threads/threadSelector/header.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import {t} from 'sentry/locale';
-
-import {Grid, GridCell} from './styles';
-
-type Props = {
-  hasThreadStates: boolean;
-};
-
-function Header({hasThreadStates}: Props) {
-  return (
-    <Grid hasThreadStates={hasThreadStates}>
-      <GridCell />
-      <GridCell>{t('Id')}</GridCell>
-      <GridCell>{t('Name')}</GridCell>
-      <GridCell>{t('Label')}</GridCell>
-      {hasThreadStates && <GridCell>{t('State')}</GridCell>}
-    </Grid>
-  );
-}
-
-export default Header;
diff --git a/static/app/components/events/interfaces/threads/threadSelector/index.tsx b/static/app/components/events/interfaces/threads/threadSelector/index.tsx
index ad60590945069c..2c7871acdacf7a 100644
--- a/static/app/components/events/interfaces/threads/threadSelector/index.tsx
+++ b/static/app/components/events/interfaces/threads/threadSelector/index.tsx
@@ -1,172 +1,149 @@
-import {ClassNames} from '@emotion/react';
+import {useMemo} from 'react';
 import styled from '@emotion/styled';
-import partition from 'lodash/partition';
 
-import DropdownAutoComplete from 'sentry/components/dropdownAutoComplete';
-import DropdownButton from 'sentry/components/dropdownButton';
-import {getMappedThreadState} from 'sentry/components/events/interfaces/threads/threadSelector/threadStates';
+import {CompactSelect} from 'sentry/components/compactSelect';
 import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
 import type {Event, ExceptionType, Frame, Thread} from 'sentry/types/event';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import theme from 'sentry/utils/theme';
 import useOrganization from 'sentry/utils/useOrganization';
 
 import filterThreadInfo from './filterThreadInfo';
-import Header from './header';
 import Option from './option';
-import SelectedOption from './selectedOption';
+import {ThreadSelectorGrid, ThreadSelectorGridCell} from './styles';
+import {getMappedThreadState} from './threadStates';
 
 type Props = {
   activeThread: Thread;
   event: Event;
-  threads: Array<Thread>;
-  exception?: Required<ExceptionType>;
-  fullWidth?: boolean;
-  onChange?: (thread: Thread) => void;
+  exception: Required<ExceptionType> | undefined;
+  onChange: (thread: Thread) => void;
+  /**
+   * Expects threads to be sorted by crashed first
+   */
+  threads: Thread[];
 };
 
-const DROPDOWN_MAX_HEIGHT = 400;
+function Header({hasThreadStates}: {hasThreadStates: boolean}) {
+  return (
+    <StyledGrid hasThreadStates={hasThreadStates}>
+      <ThreadSelectorGridCell />
+      <ThreadSelectorGridCell>{t('ID')}</ThreadSelectorGridCell>
+      <ThreadSelectorGridCell>{t('Name')}</ThreadSelectorGridCell>
+      <ThreadSelectorGridCell>{t('Label')}</ThreadSelectorGridCell>
+      {hasThreadStates && <ThreadSelectorGridCell>{t('State')}</ThreadSelectorGridCell>}
+    </StyledGrid>
+  );
+}
+
+function getThreadLabel(
+  details: ReturnType<typeof filterThreadInfo>,
+  name: string | null | undefined
+) {
+  if (name?.length) {
+    return name;
+  }
 
-function ThreadSelector({
-  threads,
-  event,
-  exception,
-  activeThread,
-  onChange,
-  fullWidth = false,
-}: Props) {
+  return details?.label || `<${t('unknown')}>`;
+}
+
+function ThreadSelector({threads, event, exception, activeThread, onChange}: Props) {
   const organization = useOrganization({allowNull: true});
+
   const hasThreadStates = threads.some(thread =>
     defined(getMappedThreadState(thread.state))
   );
 
-  const getDropDownItem = (thread: Thread) => {
-    const {label, filename, crashedInfo, state} = filterThreadInfo(
-      event,
-      thread,
-      exception
-    );
-    const threadInfo = {label, filename, state};
-    return {
-      value: `#${thread.id}: ${thread.name} ${label} ${filename}`,
-      threadInfo,
-      thread,
-      label: (
-        <Option
-          id={thread.id}
-          details={threadInfo}
-          name={thread.name}
-          crashed={thread.crashed}
-          crashedInfo={crashedInfo}
-          hasThreadStates={hasThreadStates}
-        />
-      ),
-    };
-  };
-
-  const getItems = () => {
-    const [crashed, notCrashed] = partition(threads, thread => !!thread?.crashed);
-    return [...crashed, ...notCrashed].map(getDropDownItem);
-  };
-
-  const handleChange = (thread: Thread) => {
-    if (onChange) {
-      onChange(thread);
-    }
-  };
-
-  const items = getItems();
+  const items = useMemo(() => {
+    return threads.map((thread: Thread) => {
+      const threadInfo = filterThreadInfo(event, thread, exception);
+      return {
+        value: thread.id,
+        textValue: `#${thread.id}: ${thread.name} ${threadInfo.label} ${threadInfo.filename}`,
+        label: (
+          <Option
+            thread={thread}
+            details={threadInfo}
+            crashedInfo={threadInfo.crashedInfo}
+            hasThreadStates={hasThreadStates}
+          />
+        ),
+      };
+    });
+  }, [threads, event, exception, hasThreadStates]);
 
   return (
-    <ClassNames>
-      {({css}) => (
-        <StyledDropdownAutoComplete
-          detached
-          data-test-id="thread-selector"
-          items={items}
-          onOpen={() => {
-            trackAnalytics('stack_trace.threads.thread_selector_opened', {
-              organization,
-              platform: event.platform,
-              num_threads: items.length,
-            });
-          }}
-          onSelect={item => {
-            const selectedThread: Thread = item.thread;
-
-            trackAnalytics('stack_trace.threads.thread_selected', {
-              organization,
-              platform: event.platform,
-              thread_index: items.findIndex(
-                ({thread}) => thread.id === selectedThread.id
-              ),
-              num_threads: items.length,
-              is_crashed_thread: selectedThread.crashed,
-              is_current_thread: selectedThread.current,
-              thread_state: selectedThread.state ?? '',
-              has_stacktrace: defined(selectedThread.stacktrace),
-              num_in_app_frames:
-                selectedThread.stacktrace?.frames?.filter((frame: Frame) => frame.inApp)
-                  .length ?? 0,
-            });
-            handleChange(item.thread);
-          }}
-          maxHeight={DROPDOWN_MAX_HEIGHT}
-          searchPlaceholder={t('Filter Threads')}
-          emptyMessage={t('You have no threads')}
-          noResultsMessage={t('No threads found')}
-          menuHeader={<Header hasThreadStates={hasThreadStates} />}
-          rootClassName={
-            fullWidth
-              ? css`
-                  width: 100%;
-                `
-              : undefined
-          }
-          closeOnSelect
-          emptyHidesInput
-        >
-          {({isOpen, selectedItem}) => (
-            <StyledDropdownButton isOpen={isOpen} size="xs">
-              {selectedItem ? (
-                <SelectedOption
-                  id={selectedItem.thread.id}
-                  name={selectedItem.thread.name}
-                  details={selectedItem.threadInfo}
-                />
-              ) : (
-                <SelectedOption
-                  id={activeThread.id}
-                  name={activeThread.name}
-                  details={filterThreadInfo(event, activeThread, exception)}
-                />
-              )}
-            </StyledDropdownButton>
-          )}
-        </StyledDropdownAutoComplete>
-      )}
-    </ClassNames>
+    <CompactSelect
+      data-test-id="thread-selector"
+      searchable
+      searchPlaceholder={t('Filter threads')}
+      onOpenChange={() => {
+        trackAnalytics('stack_trace.threads.thread_selector_opened', {
+          organization,
+          platform: event.platform,
+          num_threads: items.length,
+        });
+      }}
+      value={activeThread.id}
+      options={items}
+      menuWidth={450}
+      triggerProps={{size: 'xs'}}
+      triggerLabel={
+        <ThreadName>
+          {t('Thread #%s: ', activeThread.id)}
+          <ActiveThreadName>
+            {getThreadLabel(
+              filterThreadInfo(event, activeThread, exception),
+              activeThread.name
+            )}
+          </ActiveThreadName>
+        </ThreadName>
+      }
+      menuBody={<Header hasThreadStates={hasThreadStates} />}
+      onChange={selected => {
+        const threadIndex = threads.findIndex(th => th.id === selected.value);
+        const thread = threads[threadIndex];
+        if (thread) {
+          trackAnalytics('stack_trace.threads.thread_selected', {
+            organization,
+            platform: event.platform,
+            thread_index: threadIndex,
+            num_threads: items.length,
+            is_crashed_thread: thread.crashed,
+            is_current_thread: thread.current,
+            thread_state: thread.state ?? '',
+            has_stacktrace: defined(thread.stacktrace),
+            num_in_app_frames:
+              thread.stacktrace?.frames?.filter((frame: Frame) => frame.inApp).length ??
+              0,
+          });
+          onChange(thread);
+        }
+      }}
+    />
   );
 }
 
 export default ThreadSelector;
 
-const StyledDropdownAutoComplete = styled(DropdownAutoComplete)`
-  min-width: 300px;
-  @media (min-width: ${theme.breakpoints.small}) {
-    width: 500px;
-  }
-  @media (max-width: ${p => p.theme.breakpoints.large}) {
-    top: calc(100% - 2px);
-  }
+const ThreadName = styled('div')`
+  display: flex;
+  gap: ${space(0.5)};
+  font-weight: ${p => p.theme.fontWeightBold};
 `;
 
-const StyledDropdownButton = styled(DropdownButton)`
-  > *:first-child {
-    justify-content: space-between;
-    width: 100%;
-  }
-  width: 100%;
-  min-width: 150px;
+const ActiveThreadName = styled('span')`
+  font-weight: ${p => p.theme.fontWeightNormal};
+  max-width: 200px;
+  ${p => p.theme.overflowEllipsis};
+`;
+
+const StyledGrid = styled(ThreadSelectorGrid)`
+  padding-left: 40px;
+  padding-right: 40px;
+  color: ${p => p.theme.subText};
+  font-weight: ${p => p.theme.fontWeightBold};
+  border-bottom: 1px solid ${p => p.theme.border};
+  margin-bottom: 2px;
 `;
diff --git a/static/app/components/events/interfaces/threads/threadSelector/option.tsx b/static/app/components/events/interfaces/threads/threadSelector/option.tsx
index 65ae4aa9f68708..36d8cb3974b02a 100644
--- a/static/app/components/events/interfaces/threads/threadSelector/option.tsx
+++ b/static/app/components/events/interfaces/threads/threadSelector/option.tsx
@@ -1,22 +1,20 @@
 import styled from '@emotion/styled';
 
-import type {ThreadStates} from 'sentry/components/events/interfaces/threads/threadSelector/threadStates';
 import TextOverflow from 'sentry/components/textOverflow';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconFire} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
+import type {Thread} from 'sentry/types/event';
 import type {EntryData} from 'sentry/types/group';
-import type {ColorOrAlias} from 'sentry/utils/theme';
 
-import {Grid, GridCell} from './styles';
+import {ThreadSelectorGrid} from './styles';
+import type {ThreadStates} from './threadStates';
 
 type Props = {
+  crashedInfo: EntryData | undefined;
   details: ThreadInfo;
   hasThreadStates: boolean;
-  id: number;
-  crashed?: boolean;
-  crashedInfo?: EntryData;
-  name?: string | null;
+  thread: Thread;
 };
 
 type ThreadInfo = {
@@ -25,14 +23,14 @@ type ThreadInfo = {
   state?: ThreadStates;
 };
 
-function Option({id, details, name, crashed, crashedInfo, hasThreadStates}: Props) {
+function Option({thread, crashedInfo, details, hasThreadStates}: Props) {
   const label = details.label ?? `<${t('unknown')}>`;
-  const optionName = name || `<${t('unknown')}>`;
+  const optionName = thread.name || `<${t('unknown')}>`;
 
   return (
-    <Grid hasThreadStates={hasThreadStates}>
-      <GridCell>
-        {crashed && (
+    <ThreadSelectorGrid hasThreadStates={hasThreadStates}>
+      <div>
+        {thread.crashed && (
           <InnerCell isCentered>
             {crashedInfo ? (
               <Tooltip
@@ -50,51 +48,42 @@ function Option({id, details, name, crashed, crashedInfo, hasThreadStates}: Prop
             )}
           </InnerCell>
         )}
-      </GridCell>
-      <GridCell>
+      </div>
+      <InnerCell>
+        <Tooltip title={`#${thread.id}`} position="top">
+          <TextOverflow>{`#${thread.id}`}</TextOverflow>
+        </Tooltip>
+      </InnerCell>
+      <InnerCell isBold>
+        <Tooltip title={optionName} position="top">
+          <TextOverflow>{optionName}</TextOverflow>
+        </Tooltip>
+      </InnerCell>
+      <InnerCell>
+        <Tooltip title={label} position="top">
+          <TextOverflow>{label}</TextOverflow>
+        </Tooltip>
+      </InnerCell>
+      {hasThreadStates && (
         <InnerCell>
-          <Tooltip title={`#${id}`} position="top">
-            <TextOverflow>{`#${id}`}</TextOverflow>
-          </Tooltip>
-        </InnerCell>
-      </GridCell>
-      <GridCell>
-        <InnerCell isBold>
-          <Tooltip title={optionName} position="top">
-            <TextOverflow>{optionName}</TextOverflow>
+          <Tooltip title={details.state} position="top">
+            <TextOverflow>{details.state}</TextOverflow>
           </Tooltip>
         </InnerCell>
-      </GridCell>
-      <GridCell>
-        <InnerCell color="linkColor">
-          <Tooltip title={label} position="top">
-            <TextOverflow>{label}</TextOverflow>
-          </Tooltip>
-        </InnerCell>
-      </GridCell>
-      {hasThreadStates && (
-        <GridCell>
-          <InnerCell>
-            <Tooltip title={details.state} position="top">
-              <TextOverflow>{details.state}</TextOverflow>
-            </Tooltip>
-          </InnerCell>
-        </GridCell>
       )}
-    </Grid>
+    </ThreadSelectorGrid>
   );
 }
 
 export default Option;
 
 const InnerCell = styled('div')<{
-  color?: ColorOrAlias;
   isBold?: boolean;
   isCentered?: boolean;
 }>`
+  ${p => p.theme.overflowEllipsis}
   display: flex;
   align-items: center;
   justify-content: ${p => (p.isCentered ? 'center' : 'flex-start')};
   font-weight: ${p => (p.isBold ? 600 : 400)};
-  ${p => p.color && `color: ${p.theme[p.color]}`}
 `;
diff --git a/static/app/components/events/interfaces/threads/threadSelector/selectedOption.tsx b/static/app/components/events/interfaces/threads/threadSelector/selectedOption.tsx
deleted file mode 100644
index 53426c473ae89e..00000000000000
--- a/static/app/components/events/interfaces/threads/threadSelector/selectedOption.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import styled from '@emotion/styled';
-
-import type {ThreadStates} from 'sentry/components/events/interfaces/threads/threadSelector/threadStates';
-import TextOverflow from 'sentry/components/textOverflow';
-import {t, tct} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-
-type Props = {
-  details: ThreadInfo;
-  id: number;
-  name?: string | null;
-};
-
-type ThreadInfo = {
-  filename?: string;
-  label?: string;
-  state?: ThreadStates;
-};
-
-function getThreadLabel(details: ThreadInfo, name?: string | null) {
-  if (name?.length) {
-    return name;
-  }
-  return details?.label || `<${t('unknown')}>`;
-}
-
-function SelectedOption({id, name, details}: Props) {
-  return (
-    <Wrapper>
-      <ThreadId>{tct('Thread #[id]:', {id})}</ThreadId>
-      <Label>{getThreadLabel(details, name)}</Label>
-    </Wrapper>
-  );
-}
-
-export default SelectedOption;
-
-const Wrapper = styled('div')`
-  grid-template-columns: auto 1fr;
-  display: grid;
-`;
-
-const ThreadId = styled(TextOverflow)`
-  padding-right: ${space(1)};
-  max-width: 100%;
-  text-align: left;
-`;
-
-const Label = styled(ThreadId)`
-  font-weight: ${p => p.theme.fontWeightNormal};
-`;
diff --git a/static/app/components/events/interfaces/threads/threadSelector/styles.tsx b/static/app/components/events/interfaces/threads/threadSelector/styles.tsx
index 8a453ea0c1d43c..dca4e5d5bdd1f5 100644
--- a/static/app/components/events/interfaces/threads/threadSelector/styles.tsx
+++ b/static/app/components/events/interfaces/threads/threadSelector/styles.tsx
@@ -2,16 +2,15 @@ import styled from '@emotion/styled';
 
 import {space} from 'sentry/styles/space';
 
-const Grid = styled('div')<{hasThreadStates: boolean}>`
+export const ThreadSelectorGrid = styled('div')<{hasThreadStates: boolean}>`
   font-size: ${p => p.theme.fontSizeSmall};
   display: grid;
-  gap: ${space(1)};
+  gap: ${space(0.5)};
   align-items: center;
-  grid-template-columns: 16px repeat(${p => (p.hasThreadStates ? '3' : '2')}, 1fr) 1fr;
+  grid-template-columns: 16px 0.5fr repeat(${p => (p.hasThreadStates ? '2' : '1')}, 1fr) 1fr;
+  min-height: 18px;
 `;
 
-const GridCell = styled('div')`
+export const ThreadSelectorGridCell = styled('div')`
   ${p => p.theme.overflowEllipsis};
 `;
-
-export {Grid, GridCell};
diff --git a/static/app/components/events/interfaces/threads/threadSelector/trimFilename.tsx b/static/app/components/events/interfaces/threads/threadSelector/trimFilename.tsx
deleted file mode 100644
index 746741dae578a1..00000000000000
--- a/static/app/components/events/interfaces/threads/threadSelector/trimFilename.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-function trimFilename(filename: string) {
-  const pieces = filename.split(/\//g);
-  return pieces[pieces.length - 1];
-}
-
-export default trimFilename;
diff --git a/static/app/components/events/interfaces/utils.tsx b/static/app/components/events/interfaces/utils.tsx
index da8de23bbbd49f..5020068be07e2b 100644
--- a/static/app/components/events/interfaces/utils.tsx
+++ b/static/app/components/events/interfaces/utils.tsx
@@ -125,22 +125,22 @@ export function getCurlCommand(data: EntryRequest['data']) {
     result += ' \\\n -X ' + data.method;
   }
 
-  data.headers = data.headers?.filter(defined);
+  const headers =
+    data.headers
+      ?.filter(defined)
+      // sort headers
+      .sort(function (a, b) {
+        return a[0] === b[0] ? 0 : a[0] < b[0] ? -1 : 1;
+      }) ?? [];
 
   // TODO(benvinegar): just gzip? what about deflate?
-  const compressed = data.headers?.find(
+  const compressed = headers?.find(
     h => h[0] === 'Accept-Encoding' && h[1].includes('gzip')
   );
   if (compressed) {
     result += ' \\\n --compressed';
   }
 
-  // sort headers
-  const headers =
-    data.headers?.sort(function (a, b) {
-      return a[0] === b[0] ? 0 : a[0] < b[0] ? -1 : 1;
-    }) ?? [];
-
   for (const header of headers) {
     result += ' \\\n -H "' + header[0] + ': ' + escapeBashString(header[1] + '') + '"';
   }
@@ -172,7 +172,9 @@ export function getCurlCommand(data: EntryRequest['data']) {
   return result;
 }
 
-export function stringifyQueryList(query: string | [key: string, value: string][]) {
+export function stringifyQueryList(
+  query: string | Array<[key: string, value: string] | null>
+) {
   if (typeof query === 'string') {
     return query;
   }
diff --git a/static/app/components/events/meta/metaProxy.tsx b/static/app/components/events/meta/metaProxy.tsx
index 1637ffd039cd2e..1581658d9b9509 100644
--- a/static/app/components/events/meta/metaProxy.tsx
+++ b/static/app/components/events/meta/metaProxy.tsx
@@ -1,5 +1,4 @@
 import isEmpty from 'lodash/isEmpty';
-import memoize from 'lodash/memoize';
 
 import type {Meta} from 'sentry/types/group';
 
@@ -64,7 +63,7 @@ export class MetaProxy {
   }
 }
 
-export const withMeta = memoize(function withMeta<T>(event: T): T {
+export function withMeta<T>(event: T): T {
   if (!event) {
     return event;
   }
@@ -80,7 +79,7 @@ export const withMeta = memoize(function withMeta<T>(event: T): T {
   //
   // https://github.com/microsoft/TypeScript/issues/20846
   return new Proxy(event, new MetaProxy((event as any)._meta)) as T;
-});
+}
 
 export function getMeta<T extends {}>(
   obj: T | undefined,
diff --git a/static/app/components/feedback/feedbackItem/feedbackAssignedTo.tsx b/static/app/components/feedback/feedbackItem/feedbackAssignedTo.tsx
index dbe4818d223422..d896c90b390333 100644
--- a/static/app/components/feedback/feedbackItem/feedbackAssignedTo.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackAssignedTo.tsx
@@ -72,7 +72,7 @@ export default function FeedbackAssignedTo({
       }}
       owners={owners}
       group={feedbackIssue}
-      alignMenu="left"
+      alignMenu="right"
     >
       {({isOpen, getActorProps}) => (
         <Button size="xs" aria-label={t('Assigned dropdown')} {...getActorProps({})}>
diff --git a/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx b/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx
index 67d348ac9949c6..6f4abca146d595 100644
--- a/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx
@@ -11,6 +11,7 @@ import {space} from 'sentry/styles/space';
 import type {FeedbackIssue} from 'sentry/utils/feedback/types';
 import {selectText} from 'sentry/utils/selectText';
 import useCopyToClipboard from 'sentry/utils/useCopyToClipboard';
+import useOrganization from 'sentry/utils/useOrganization';
 
 interface Props {
   feedbackIssue: FeedbackIssue;
@@ -22,6 +23,7 @@ export default function FeedbackItemUsername({className, feedbackIssue, style}:
   const name = feedbackIssue.metadata.name;
   const email = feedbackIssue.metadata.contact_email;
 
+  const organization = useOrganization();
   const nameOrEmail = name || email;
   const isSameNameAndEmail = name === email;
 
@@ -52,6 +54,13 @@ export default function FeedbackItemUsername({className, feedbackIssue, style}:
     return <strong>{t('Anonymous User')}</strong>;
   }
 
+  const mailToHref = `mailto:${email}?subject=${encodeURIComponent(`Following up from ${organization.name}`)}&body=${encodeURIComponent(
+    feedbackIssue.metadata.message
+      .split('\n')
+      .map(s => `> ${s}`)
+      .join('\n')
+  )}`;
+
   return (
     <Flex align="center" gap={space(1)} className={className} style={style}>
       <Tooltip title={t('Click to copy')} containerDisplayMode="flex">
@@ -79,7 +88,7 @@ export default function FeedbackItemUsername({className, feedbackIssue, style}:
       {email ? (
         <Tooltip title={t(`Email %s`, user)} containerDisplayMode="flex">
           <LinkButton
-            href={`mailto:${email}`}
+            href={mailToHref}
             external
             icon={<IconMail color="gray300" />}
             aria-label={t(`Email %s`, user)}
diff --git a/static/app/components/feedback/feedbackOnboarding/sidebar.tsx b/static/app/components/feedback/feedbackOnboarding/sidebar.tsx
index cffec03850be74..921adbf3424630 100644
--- a/static/app/components/feedback/feedbackOnboarding/sidebar.tsx
+++ b/static/app/components/feedback/feedbackOnboarding/sidebar.tsx
@@ -246,15 +246,12 @@ function OnboardingContent({currentProject}: {currentProject: Project}) {
                       />
                     ),
                   })}
-                  {jsFrameworkDocs?.platformOptions &&
-                    tct('with [optionSelect]', {
-                      optionSelect: (
-                        <PlatformOptionDropdown
-                          platformOptions={jsFrameworkDocs?.platformOptions}
-                          disabled={setupMode() === 'jsLoader'}
-                        />
-                      ),
-                    })}
+                  {jsFrameworkDocs?.platformOptions && (
+                    <PlatformOptionDropdown
+                      platformOptions={jsFrameworkDocs?.platformOptions}
+                      disabled={setupMode() === 'jsLoader'}
+                    />
+                  )}
                 </PlatformSelect>
               ) : (
                 t('I use NPM or Yarn')
diff --git a/static/app/components/feedback/list/useHasLinkedIssues.tsx b/static/app/components/feedback/list/useHasLinkedIssues.tsx
index b829cdca9848dc..aab310f37c71af 100644
--- a/static/app/components/feedback/list/useHasLinkedIssues.tsx
+++ b/static/app/components/feedback/list/useHasLinkedIssues.tsx
@@ -1,5 +1,6 @@
 import type {ExternalIssueComponent} from 'sentry/components/group/externalIssuesList/types';
 import useIssueTrackingFilter from 'sentry/components/group/externalIssuesList/useIssueTrackingFilter';
+import {sentryAppComponentIsDisabled} from 'sentry/components/sentryAppComponentIcon';
 import SentryAppInstallationStore from 'sentry/stores/sentryAppInstallationsStore';
 import {useLegacyStore} from 'sentry/stores/useLegacyStore';
 import type {Event} from 'sentry/types/event';
@@ -23,7 +24,8 @@ export default function useExternalIssueData({group, event, project}: Props) {
   const renderSentryAppIssues = (): ExternalIssueComponent[] => {
     return components
       .map<ExternalIssueComponent | null>(component => {
-        const {sentryApp, error: disabled} = component;
+        const {sentryApp} = component;
+        const disabled = sentryAppComponentIsDisabled(component);
         const installation = sentryAppInstallations.find(
           i => i.app.uuid === sentryApp.uuid
         );
diff --git a/static/app/components/forms/fieldGroup/index.tsx b/static/app/components/forms/fieldGroup/index.tsx
index 23cdfa471d1a7c..566f21f4fd8a14 100644
--- a/static/app/components/forms/fieldGroup/index.tsx
+++ b/static/app/components/forms/fieldGroup/index.tsx
@@ -96,7 +96,12 @@ function FieldGroup({
             </span>
             {helpElement && showHelpInTooltip && (
               <FieldQuestion>
-                <QuestionTooltip position="top" size="sm" title={helpElement} />
+                <QuestionTooltip
+                  position="top"
+                  size="sm"
+                  {...(showHelpInTooltip !== true ? showHelpInTooltip : {})}
+                  title={helpElement}
+                />
               </FieldQuestion>
             )}
           </FieldLabel>
diff --git a/static/app/components/forms/fieldGroup/types.tsx b/static/app/components/forms/fieldGroup/types.tsx
index dd15c4f454dba9..bb5078ec281d23 100644
--- a/static/app/components/forms/fieldGroup/types.tsx
+++ b/static/app/components/forms/fieldGroup/types.tsx
@@ -1,3 +1,5 @@
+import type {TooltipProps} from 'sentry/components/tooltip';
+
 /**
  * Props that control UI elements that are part of a Form Group
  */
@@ -91,9 +93,10 @@ export interface FieldGroupProps {
    */
   required?: boolean;
   /**
-   * Displays the help element in the tooltip
+   * Displays the help element in the tooltip. Tooltip props may be passed to
+   * customize the help tooltip.
    */
-  showHelpInTooltip?: boolean;
+  showHelpInTooltip?: boolean | Omit<TooltipProps, 'title'>;
   /**
    * When stacking forms the bottom border is hidden and padding is adjusted
    * for form elements to be stacked on each other.
diff --git a/static/app/components/globalEventProcessingAlert.tsx b/static/app/components/globalEventProcessingAlert.tsx
index 3565284f6ed921..f3e569a5c96de7 100644
--- a/static/app/components/globalEventProcessingAlert.tsx
+++ b/static/app/components/globalEventProcessingAlert.tsx
@@ -15,7 +15,7 @@ type Props = {
 // This alert makes the user aware that one or more projects have been selected for the Low Priority Queue
 function GlobalEventProcessingAlert({className, projects}: Props) {
   const projectsInTheLowPriorityQueue = projects.filter(
-    project => project.eventProcessing.symbolicationDegraded
+    project => project?.eventProcessing?.symbolicationDegraded
   );
 
   if (!projectsInTheLowPriorityQueue.length) {
diff --git a/static/app/components/gridEditable/index.tsx b/static/app/components/gridEditable/index.tsx
index e301366dd19a62..e28ef18e1e8f55 100644
--- a/static/app/components/gridEditable/index.tsx
+++ b/static/app/components/gridEditable/index.tsx
@@ -94,6 +94,7 @@ type GridEditableProps<DataRow, ColumnKey> = {
     ) => React.ReactNode[];
   };
   'aria-label'?: string;
+  bodyStyle?: React.CSSProperties;
   emptyMessage?: React.ReactNode;
   error?: unknown | null;
   /**
@@ -450,6 +451,7 @@ class GridEditable<
       scrollable,
       height,
       'aria-label': ariaLabel,
+      bodyStyle,
     } = this.props;
     const showHeader = title || headerButtons;
     return (
@@ -463,7 +465,7 @@ class GridEditable<
               )}
             </Header>
           )}
-          <Body>
+          <Body style={bodyStyle}>
             <Grid
               aria-label={ariaLabel}
               data-test-id="grid-editable"
diff --git a/static/app/components/group/assigneeSelector.tsx b/static/app/components/group/assigneeSelector.tsx
index 8f192826ffa5b7..90b6f6a65da19c 100644
--- a/static/app/components/group/assigneeSelector.tsx
+++ b/static/app/components/group/assigneeSelector.tsx
@@ -20,6 +20,7 @@ interface AssigneeSelectorProps {
   assigneeLoading: boolean;
   group: Group;
   handleAssigneeChange: (assignedActor: AssignableEntity | null) => void;
+  additionalMenuFooterItems?: React.ReactNode;
   memberList?: User[];
   owners?: Omit<SuggestedAssignee, 'assignee'>[];
 }
@@ -76,6 +77,7 @@ export function AssigneeSelector({
   assigneeLoading,
   handleAssigneeChange,
   owners,
+  additionalMenuFooterItems,
 }: AssigneeSelectorProps) {
   return (
     <AssigneeSelectorDropdown
@@ -107,6 +109,7 @@ export function AssigneeSelector({
           />
         </StyledDropdownButton>
       )}
+      additionalMenuFooterItems={additionalMenuFooterItems}
     />
   );
 }
diff --git a/static/app/components/group/externalIssuesList/hooks/useSentryAppExternalIssues.tsx b/static/app/components/group/externalIssuesList/hooks/useSentryAppExternalIssues.tsx
index 42b54637032883..c16d5e4e8a112c 100644
--- a/static/app/components/group/externalIssuesList/hooks/useSentryAppExternalIssues.tsx
+++ b/static/app/components/group/externalIssuesList/hooks/useSentryAppExternalIssues.tsx
@@ -51,16 +51,21 @@ export function useSentryAppExternalIssues({
     const externalIssue = externalIssues.find(
       i => i.serviceType === component.sentryApp.slug
     );
-    const displayName = component.sentryApp.name;
+    const appDisplayName = component.sentryApp.name;
     const displayIcon = (
       <SentryAppComponentIcon sentryAppComponent={component} size={14} />
     );
     if (externalIssue) {
       result.linkedIssues.push({
         key: externalIssue.id,
-        displayName: `${displayName} Issue`,
+        displayName: externalIssue.displayName,
         url: externalIssue.webUrl,
-        title: externalIssue.displayName,
+        // Some display names look like PROJ#1234
+        // Others look like ClickUp: Title
+        // Add the integration name if it's not already included
+        title: externalIssue.displayName.includes(appDisplayName)
+          ? externalIssue.displayName
+          : `${appDisplayName}: ${externalIssue.displayName}`,
         displayIcon,
         onUnlink: () => {
           deleteExternalIssue(api, group.id, externalIssue.id)
@@ -76,10 +81,10 @@ export function useSentryAppExternalIssues({
     } else {
       result.integrations.push({
         key: component.sentryApp.slug,
-        displayName,
+        displayName: appDisplayName,
         displayIcon,
         disabled: Boolean(component.error),
-        disabledText: t('Unable to connect to %s', displayName),
+        disabledText: t('Unable to connect to %s', appDisplayName),
         actions: [
           {
             id: component.sentryApp.slug,
diff --git a/static/app/components/group/externalIssuesList/useExternalIssueData.tsx b/static/app/components/group/externalIssuesList/useExternalIssueData.tsx
index 47104210634fec..767c96371e5cab 100644
--- a/static/app/components/group/externalIssuesList/useExternalIssueData.tsx
+++ b/static/app/components/group/externalIssuesList/useExternalIssueData.tsx
@@ -2,6 +2,7 @@ import type {ExternalIssueComponent} from 'sentry/components/group/externalIssue
 import {useExternalIssues} from 'sentry/components/group/externalIssuesList/useExternalIssues';
 import useFetchIntegrations from 'sentry/components/group/externalIssuesList/useFetchIntegrations';
 import useIssueTrackingFilter from 'sentry/components/group/externalIssuesList/useIssueTrackingFilter';
+import {sentryAppComponentIsDisabled} from 'sentry/components/sentryAppComponentIcon';
 import SentryAppInstallationStore from 'sentry/stores/sentryAppInstallationsStore';
 import {useLegacyStore} from 'sentry/stores/useLegacyStore';
 import type {Event} from 'sentry/types/event';
@@ -71,7 +72,8 @@ export default function useExternalIssueData({group, event, project}: Props) {
   const renderSentryAppIssues = (): ExternalIssueComponent[] => {
     return components
       .map<ExternalIssueComponent | null>(component => {
-        const {sentryApp, error: disabled} = component;
+        const {sentryApp} = component;
+        const disabled = sentryAppComponentIsDisabled(component);
         const installation = sentryAppInstallations.find(
           i => i.app.uuid === sentryApp.uuid
         );
diff --git a/static/app/components/group/groupSummary.spec.tsx b/static/app/components/group/groupSummary.spec.tsx
index 7ce89a68ba8c6f..010a073c42dda1 100644
--- a/static/app/components/group/groupSummary.spec.tsx
+++ b/static/app/components/group/groupSummary.spec.tsx
@@ -1,101 +1,19 @@
-import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
+import {render, screen} from 'sentry-test/reactTestingLibrary';
 
-import {
-  GroupSummary,
-  makeGroupSummaryQueryKey,
-} from 'sentry/components/group/groupSummary';
-import {IssueCategory} from 'sentry/types/group';
+import {GroupSummary} from 'sentry/components/group/groupSummary';
 
 describe('GroupSummary', function () {
-  beforeEach(() => {
-    MockApiClient.clearMockResponses();
-  });
-
-  it('renders the collapsed group summary', async function () {
-    const groupId = '1';
-    const organizationSlug = 'org-slug';
-
-    MockApiClient.addMockResponse({
-      url: makeGroupSummaryQueryKey(organizationSlug, groupId)[0],
-      method: 'POST',
-      body: {
-        groupId,
-        whatsWrong: 'Test whats wrong',
-        trace: 'Test trace',
-        possibleCause: 'Test possible cause',
-        headline: 'Test headline',
-      },
-    });
-
-    MockApiClient.addMockResponse({
-      url: `/issues/${groupId}/autofix/setup/`,
-      body: {
-        genAIConsent: {ok: true},
-        integration: {ok: true},
-        githubWriteIntegration: {
-          ok: true,
-          repos: [
-            {
-              provider: 'integrations:github',
-              owner: 'getsentry',
-              name: 'sentry',
-              external_id: '123',
-            },
-          ],
-        },
-      },
-    });
-
-    render(<GroupSummary groupId={groupId} groupCategory={IssueCategory.ERROR} />);
-
-    // Verify the summary loads and renders the collapsed view with TL;DR prefix
-    expect(await screen.findByText('TL;DR: Test headline')).toBeInTheDocument();
-    expect(
-      screen.getByText('Details: Test whats wrong Test trace Test possible cause')
-    ).toBeInTheDocument();
-  });
-
-  it('expands the summary when clicked', async function () {
-    const groupId = '1';
-    const organizationSlug = 'org-slug';
-
-    MockApiClient.addMockResponse({
-      url: makeGroupSummaryQueryKey(organizationSlug, groupId)[0],
-      method: 'POST',
-      body: {
-        groupId,
-        whatsWrong: 'Test whats wrong',
-        trace: 'Test trace',
-        possibleCause: 'Test possible cause',
-        headline: 'Test headline',
-      },
-    });
-
-    MockApiClient.addMockResponse({
-      url: `/issues/${groupId}/autofix/setup/`,
-      body: {
-        genAIConsent: {ok: true},
-        integration: {ok: true},
-        githubWriteIntegration: {
-          ok: true,
-          repos: [
-            {
-              provider: 'integrations:github',
-              owner: 'getsentry',
-              name: 'sentry',
-              external_id: '123',
-            },
-          ],
-        },
-      },
-    });
-
-    render(<GroupSummary groupId={groupId} groupCategory={IssueCategory.ERROR} />);
-    expect(await screen.findByText('TL;DR: Test headline')).toBeInTheDocument();
+  const mockSummaryData = {
+    groupId: '1',
+    whatsWrong: 'Test whats wrong',
+    trace: 'Test trace',
+    possibleCause: 'Test possible cause',
+    headline: 'Test headline',
+  };
 
-    await userEvent.click(screen.getByText('TL;DR: Test headline'));
+  it('renders the summary with all sections', function () {
+    render(<GroupSummary data={mockSummaryData} isError={false} isPending={false} />);
 
-    // Verify expanded view shows the individual sections
     expect(screen.getByText("What's wrong")).toBeInTheDocument();
     expect(screen.getByText('Test whats wrong')).toBeInTheDocument();
     expect(screen.getByText('In the trace')).toBeInTheDocument();
@@ -104,93 +22,40 @@ describe('GroupSummary', function () {
     expect(screen.getByText('Test possible cause')).toBeInTheDocument();
   });
 
-  it('does not render the summary if no consent', async function () {
-    const groupId = '1';
-    const organizationSlug = 'org-slug';
+  it('shows loading state', function () {
+    render(<GroupSummary data={undefined} isError={false} isPending />);
 
-    MockApiClient.addMockResponse({
-      url: makeGroupSummaryQueryKey(organizationSlug, groupId)[0],
-      method: 'POST',
-      body: {
-        groupId,
-        whatsWrong: 'Test whats wrong',
-        trace: 'Test trace',
-        possibleCause: 'Test possible cause',
-        headline: 'Test headline',
-      },
-    });
-
-    const setupCall = MockApiClient.addMockResponse({
-      url: `/issues/${groupId}/autofix/setup/`,
-      body: {
-        genAIConsent: {ok: false},
-        integration: {ok: true},
-        githubWriteIntegration: {
-          ok: true,
-          repos: [
-            {
-              provider: 'integrations:github',
-              owner: 'getsentry',
-              name: 'sentry',
-              external_id: '123',
-            },
-          ],
-        },
-      },
-    });
-
-    render(<GroupSummary groupId={groupId} groupCategory={IssueCategory.ERROR} />);
+    // Should show loading placeholders
+    expect(screen.getAllByTestId('loading-placeholder')).toHaveLength(2);
+  });
 
-    await waitFor(() => {
-      expect(setupCall).toHaveBeenCalled();
-    });
+  it('shows error state', function () {
+    render(<GroupSummary data={undefined} isError isPending={false} />);
 
-    expect(screen.queryByText('TL;DR: Test headline')).not.toBeInTheDocument();
-    expect(
-      screen.queryByText('Details: Test whats wrong Test trace Test possible cause')
-    ).not.toBeInTheDocument();
+    expect(screen.getByText('Error loading summary')).toBeInTheDocument();
   });
 
-  it('does not render the summary if the issue is not in the error category', function () {
-    const groupId = '1';
-    const organizationSlug = 'org-slug';
+  it('hides cards with no content', function () {
+    const dataWithNulls = {
+      ...mockSummaryData,
+      trace: null,
+    };
 
-    MockApiClient.addMockResponse({
-      url: makeGroupSummaryQueryKey(organizationSlug, groupId)[0],
-      method: 'POST',
-      body: {
-        groupId,
-        whatsWrong: 'Test whats wrong',
-        trace: 'Test trace',
-        possibleCause: 'Test possible cause',
-        headline: 'Test headline',
-      },
-    });
+    render(<GroupSummary data={dataWithNulls} isError={false} isPending={false} />);
 
-    MockApiClient.addMockResponse({
-      url: `/issues/${groupId}/autofix/setup/`,
-      body: {
-        genAIConsent: {ok: true},
-        integration: {ok: true},
-        githubWriteIntegration: {
-          ok: true,
-          repos: [
-            {
-              provider: 'integrations:github',
-              owner: 'getsentry',
-              name: 'sentry',
-              external_id: '123',
-            },
-          ],
-        },
-      },
-    });
+    expect(screen.getByText("What's wrong")).toBeInTheDocument();
+    expect(screen.getByText('Test whats wrong')).toBeInTheDocument();
+    expect(screen.queryByText('In the trace')).not.toBeInTheDocument();
+    expect(screen.getByText('Possible cause')).toBeInTheDocument();
+    expect(screen.getByText('Test possible cause')).toBeInTheDocument();
+  });
 
-    render(<GroupSummary groupId={groupId} groupCategory={IssueCategory.PERFORMANCE} />);
+  it('renders in preview mode', function () {
+    render(
+      <GroupSummary data={mockSummaryData} isError={false} isPending={false} preview />
+    );
 
-    expect(screen.queryByText('TL;DR: Test headline')).not.toBeInTheDocument();
-    expect(
-      screen.queryByText('Details: Test whats wrong Test trace Test possible cause')
-    ).not.toBeInTheDocument();
+    expect(screen.getByText("What's wrong")).toBeInTheDocument();
+    expect(screen.getByText('Test whats wrong')).toBeInTheDocument();
   });
 });
diff --git a/static/app/components/group/groupSummary.tsx b/static/app/components/group/groupSummary.tsx
index e810542c322e09..bda98a71497b83 100644
--- a/static/app/components/group/groupSummary.tsx
+++ b/static/app/components/group/groupSummary.tsx
@@ -1,24 +1,16 @@
-import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 
-import FeatureBadge from 'sentry/components/badge/featureBadge';
-import {Button} from 'sentry/components/button';
-import {useAutofixSetup} from 'sentry/components/events/autofix/useAutofixSetup';
-import Panel from 'sentry/components/panels/panel';
 import Placeholder from 'sentry/components/placeholder';
-import {IconChevron, IconFatal, IconFocus, IconMegaphone, IconSpan} from 'sentry/icons';
+import {IconFatal, IconFocus, IconSpan} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {IssueCategory} from 'sentry/types/group';
-import marked, {singleLineRenderer} from 'sentry/utils/marked';
+import type {Event} from 'sentry/types/event';
+import type {Group} from 'sentry/types/group';
+import type {Project} from 'sentry/types/project';
+import marked from 'sentry/utils/marked';
 import {type ApiQueryKey, useApiQuery} from 'sentry/utils/queryClient';
-import {useFeedbackForm} from 'sentry/utils/useFeedbackForm';
 import useOrganization from 'sentry/utils/useOrganization';
-
-interface GroupSummaryProps {
-  groupCategory: IssueCategory;
-  groupId: string;
-}
+import {useAiConfig} from 'sentry/views/issueDetails/streamline/hooks/useAiConfig';
 
 interface GroupSummaryData {
   groupId: string;
@@ -28,14 +20,6 @@ interface GroupSummaryData {
   whatsWrong?: string | null;
 }
 
-const isSummaryEnabled = (
-  hasGenAIConsent: boolean,
-  hideAiFeatures: boolean,
-  groupCategory: IssueCategory
-) => {
-  return hasGenAIConsent && !hideAiFeatures && groupCategory === IssueCategory.ERROR;
-};
-
 export const makeGroupSummaryQueryKey = (
   organizationSlug: string,
   groupId: string
@@ -44,50 +28,39 @@ export const makeGroupSummaryQueryKey = (
   {method: 'POST'},
 ];
 
-export function useGroupSummary(groupId: string, groupCategory: IssueCategory) {
+export function useGroupSummary(
+  group: Group,
+  event: Event | null | undefined,
+  project: Project
+) {
   const organization = useOrganization();
-  // We piggyback and use autofix's genai consent check for now.
-  const {
-    data: autofixSetupData,
-    isPending: isAutofixSetupLoading,
-    isError: isAutofixSetupError,
-  } = useAutofixSetup({groupId});
 
-  const hasGenAIConsent = autofixSetupData?.genAIConsent.ok ?? false;
-  const hideAiFeatures = organization.hideAiFeatures;
+  const aiConfig = useAiConfig(group, event, project);
 
   const queryData = useApiQuery<GroupSummaryData>(
-    makeGroupSummaryQueryKey(organization.slug, groupId),
+    makeGroupSummaryQueryKey(organization.slug, group.id),
     {
       staleTime: Infinity, // Cache the result indefinitely as it's unlikely to change if it's already computed
-      enabled: isSummaryEnabled(hasGenAIConsent, hideAiFeatures, groupCategory),
+      enabled: aiConfig.hasSummary,
     }
   );
   return {
     ...queryData,
-    isPending: isAutofixSetupLoading || queryData.isPending,
-    isError: queryData.isError || isAutofixSetupError,
-    hasGenAIConsent,
+    isPending: aiConfig.isAutofixSetupLoading || queryData.isPending,
+    isError: queryData.isError,
   };
 }
 
-function GroupSummaryFeatureBadge() {
-  return (
-    <StyledFeatureBadge
-      type="experimental"
-      title={t(
-        'This feature is experimental and may produce inaccurate results. Please share feedback to help us improve the experience.'
-      )}
-    />
-  );
-}
-
-export function GroupSummaryBody({
+export function GroupSummary({
   data,
   isError,
+  isPending,
+  preview = false,
 }: {
   data: GroupSummaryData | undefined;
   isError: boolean;
+  isPending: boolean;
+  preview?: boolean;
 }) {
   const insightCards = [
     {
@@ -95,247 +68,106 @@ export function GroupSummaryBody({
       title: t("What's wrong"),
       insight: data?.whatsWrong,
       icon: <IconFatal size="sm" />,
+      showWhenLoading: true,
     },
     {
       id: 'trace',
       title: t('In the trace'),
       insight: data?.trace,
       icon: <IconSpan size="sm" />,
+      showWhenLoading: false,
     },
     {
       id: 'possible_cause',
       title: t('Possible cause'),
       insight: data?.possibleCause,
       icon: <IconFocus size="sm" />,
+      showWhenLoading: true,
     },
-  ].filter(card => card.insight);
+  ];
 
   return (
-    <Body>
+    <div data-testid="group-summary">
       {isError ? <div>{t('Error loading summary')}</div> : null}
-      {data && (
-        <Content>
-          <InsightGrid>
-            {insightCards.map(card => (
+      <Content>
+        <InsightGrid>
+          {insightCards.map(card => {
+            // Hide the card if we're not loading and there's no insight
+            // Also hide if we're loading and the card shouldn't show when loading
+            if ((!isPending && !card.insight) || (isPending && !card.showWhenLoading)) {
+              return null;
+            }
+
+            return (
               <InsightCard key={card.id}>
-                <CardTitle>
+                <CardTitle preview={preview}>
                   <CardTitleIcon>{card.icon}</CardTitleIcon>
                   <CardTitleText>{card.title}</CardTitleText>
                 </CardTitle>
-                <CardContent
-                  dangerouslySetInnerHTML={{
-                    __html: marked(card.insight ?? ''),
-                  }}
-                />
+                <CardContentContainer>
+                  <CardLineDecorationWrapper>
+                    <CardLineDecoration />
+                  </CardLineDecorationWrapper>
+                  {isPending ? (
+                    <CardContent>
+                      <Placeholder height="1.5rem" />
+                    </CardContent>
+                  ) : (
+                    card.insight && (
+                      <CardContent
+                        dangerouslySetInnerHTML={{
+                          __html: marked(
+                            preview
+                              ? card.insight.replace(/\*\*/g, '') ?? ''
+                              : card.insight ?? ''
+                          ),
+                        }}
+                      />
+                    )
+                  )}
+                </CardContentContainer>
               </InsightCard>
-            ))}
-          </InsightGrid>
-        </Content>
-      )}
-    </Body>
-  );
-}
-
-export function GroupSummary({groupId, groupCategory}: GroupSummaryProps) {
-  const {data, isPending, isError, hasGenAIConsent} = useGroupSummary(
-    groupId,
-    groupCategory
-  );
-
-  const organization = useOrganization();
-  const [expanded, setExpanded] = useState(false);
-  const openForm = useFeedbackForm();
-
-  if (!isSummaryEnabled(hasGenAIConsent, organization.hideAiFeatures, groupCategory)) {
-    return null;
-  }
-
-  return (
-    <Wrapper>
-      <StyledTitleRow onClick={() => setExpanded(!data ? false : !expanded)}>
-        <CollapsedRow>
-          <IconContainer>
-            <IconFocus />
-          </IconContainer>
-          {isPending && <Placeholder height="19px" width="95%" />}
-          {isError ? <div>{t('Error loading summary')}</div> : null}
-          {data && !expanded && (
-            <Fragment>
-              <HeadlinePreview
-                dangerouslySetInnerHTML={{
-                  __html: singleLineRenderer(`TL;DR: ${data.headline ?? ''}`),
-                }}
-              />
-              <SummaryPreview
-                dangerouslySetInnerHTML={{
-                  __html: singleLineRenderer(
-                    `Details: ${[data.whatsWrong, data.trace, data.possibleCause]
-                      .filter(Boolean)
-                      .join(' ')
-                      .replaceAll('\n', ' ')
-                      .replaceAll('-', '')}`
-                  ),
-                }}
-              />
-            </Fragment>
-          )}
-          {data && expanded && (
-            <HeadlineContent
-              dangerouslySetInnerHTML={{
-                __html: singleLineRenderer(`TL;DR: ${data.headline ?? ''}`),
-              }}
-            />
-          )}
-        </CollapsedRow>
-        <IconContainerRight>
-          <IconChevron direction={expanded ? 'up' : 'down'} />
-        </IconContainerRight>
-      </StyledTitleRow>
-      {expanded && (
-        <Fragment>
-          <GroupSummaryBody data={data} isError={isError} />
-          {openForm && !isPending && (
-            <ButtonContainer>
-              <Button
-                onClick={() => {
-                  openForm({
-                    messagePlaceholder: t(
-                      'How can we make this issue summary more useful?'
-                    ),
-                    tags: {
-                      ['feedback.source']: 'issue_details_ai_issue_summary',
-                      ['feedback.owner']: 'ml-ai',
-                    },
-                  });
-                }}
-                size="xs"
-                icon={<IconMegaphone />}
-              >
-                Give Feedback
-              </Button>
-              <GroupSummaryFeatureBadge />
-            </ButtonContainer>
-          )}
-        </Fragment>
-      )}
-    </Wrapper>
+            );
+          })}
+        </InsightGrid>
+      </Content>
+    </div>
   );
 }
 
-const Body = styled('div')`
-  padding: 0 ${space(2)} ${space(0.5)} ${space(2)};
-`;
-
-const HeadlinePreview = styled('span')`
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  margin-right: ${space(0.5)};
-  flex-shrink: 0;
-  max-width: 92%;
-`;
-
-const Wrapper = styled(Panel)`
-  margin-bottom: ${space(1)};
-  padding: ${space(0.5)};
-`;
-
-const StyledTitleRow = styled('div')`
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  padding: ${space(1)} ${space(1)} ${space(1)} ${space(1)};
-  border-radius: ${p => p.theme.borderRadius};
-
-  &:hover {
-    cursor: pointer;
-    background: ${p => p.theme.backgroundSecondary};
-  }
-`;
-
-const CollapsedRow = styled('div')`
-  display: flex;
-  width: 100%;
-  align-items: flex-start;
-  overflow: hidden;
-`;
-
-const StyledFeatureBadge = styled(FeatureBadge)``;
-
-const HeadlineContent = styled('span')`
-  overflow-wrap: break-word;
-  p {
-    margin: 0;
-  }
-  code {
-    word-break: break-all;
-  }
-  width: 100%;
-`;
-
 const Content = styled('div')`
   display: flex;
   flex-direction: column;
   gap: ${space(1)};
 `;
 
-const ButtonContainer = styled('div')`
-  align-items: center;
-  display: flex;
-  margin: ${space(1)} 0 ${space(1)} ${space(2)};
-`;
-
-const IconContainer = styled('div')`
-  flex-shrink: 0;
-  margin-right: ${space(1)};
-  margin-top: ${space(0.25)};
-  max-height: ${space(2)};
-`;
-
-const IconContainerRight = styled('div')`
-  flex-shrink: 0;
-  margin-left: ${space(1)};
-  margin-top: ${space(0.25)};
-  max-height: ${space(2)};
-`;
-
 const InsightGrid = styled('div')`
   display: flex;
   flex-direction: column;
   gap: ${space(1)};
-  margin-top: ${space(1)};
 `;
 
 const InsightCard = styled('div')`
   display: flex;
   flex-direction: column;
-  padding: ${space(0.5)};
   border-radius: ${p => p.theme.borderRadius};
   background: ${p => p.theme.background};
   width: 100%;
   min-height: 0;
 `;
 
-const SummaryPreview = styled('span')`
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  flex-grow: 1;
-  color: ${p => p.theme.subText};
-`;
-
-const CardTitle = styled('div')`
+const CardTitle = styled('div')<{preview?: boolean}>`
   display: flex;
   align-items: center;
   gap: ${space(1)};
   color: ${p => p.theme.subText};
-  font-weight: ${p => p.theme.fontWeightBold};
   padding-bottom: ${space(0.5)};
 `;
 
 const CardTitleText = styled('p')`
   margin: 0;
   font-size: ${p => p.theme.fontSizeMedium};
+  font-weight: ${p => p.theme.fontWeightBold};
 `;
 
 const CardTitleIcon = styled('div')`
@@ -344,12 +176,30 @@ const CardTitleIcon = styled('div')`
   color: ${p => p.theme.subText};
 `;
 
+const CardContentContainer = styled('div')`
+  display: flex;
+  align-items: center;
+  gap: ${space(1)};
+`;
+
+const CardLineDecorationWrapper = styled('div')`
+  display: flex;
+  width: 14px;
+  align-self: stretch;
+  justify-content: center;
+  flex-shrink: 0;
+  padding: 0.275rem 0;
+`;
+
+const CardLineDecoration = styled('div')`
+  width: 2px;
+  align-self: stretch;
+  background-color: ${p => p.theme.border};
+`;
+
 const CardContent = styled('div')`
   overflow-wrap: break-word;
   word-break: break-word;
-  padding-left: ${space(2)};
-  border-left: 3px solid ${p => p.theme.border};
-  margin-left: ${space(0.5)};
   p {
     margin: 0;
     white-space: pre-wrap;
@@ -357,4 +207,5 @@ const CardContent = styled('div')`
   code {
     word-break: break-all;
   }
+  flex: 1;
 `;
diff --git a/static/app/components/hovercard.tsx b/static/app/components/hovercard.tsx
index ef82873eae8e6c..058d1161495658 100644
--- a/static/app/components/hovercard.tsx
+++ b/static/app/components/hovercard.tsx
@@ -177,6 +177,7 @@ const Header = styled('div')`
 const Body = styled('div')`
   padding: ${space(2)};
   min-height: 30px;
+  word-wrap: break-word;
 `;
 
 const Divider = styled('div')`
diff --git a/static/app/components/interactionStateLayer.stories.tsx b/static/app/components/interactionStateLayer.stories.tsx
new file mode 100644
index 00000000000000..8b892285079921
--- /dev/null
+++ b/static/app/components/interactionStateLayer.stories.tsx
@@ -0,0 +1,66 @@
+import {Fragment} from 'react';
+import styled from '@emotion/styled';
+
+import storyBook from 'sentry/stories/storyBook';
+import {space} from 'sentry/styles/space';
+
+import Panel from './panels/panel';
+import JSXNode from './stories/jsxNode';
+import SideBySide from './stories/sideBySide';
+import InteractionStateLayer from './interactionStateLayer';
+
+export default storyBook(InteractionStateLayer, story => {
+  story('Getting Started', () => {
+    return (
+      <Fragment>
+        <p>
+          <JSXNode name="InteractionStateLayer" /> is a visual component that adds a
+          visible hover and active state. <JSXNode name="InteractionStateLayer" />. It
+          uses opacity to manage the visual state, which is more mindful of contrast
+          requirements. Our own components (e.g., <code>Button</code>,{' '}
+          <code>Checkbox</code>, etc.) use <JSXNode name="InteractionStateLayer" /> under
+          the hood. Here is an example of a <JSXNode name="Panel" /> with an interaction
+          state, and one without:
+        </p>
+
+        <SideBySide>
+          <StyledPanel tabIndex={1}>
+            <InteractionStateLayer />
+            <Activity />
+          </StyledPanel>
+
+          <StyledPanel tabIndex={1}>
+            <Activity />
+          </StyledPanel>
+        </SideBySide>
+      </Fragment>
+    );
+  });
+
+  story('Manual State', () => {
+    return (
+      <p>
+        <JSXNode name="InteractionStateLayer" /> uses normal CSS selectors for hover and
+        focus to add the visual effect. If this is not suitable, you can manually set the{' '}
+        <code>isHovered</code> and <code>isPressed</code> props.
+      </p>
+    );
+  });
+});
+
+const StyledPanel = styled(Panel)`
+  padding: ${space(1)};
+  max-width: 300px;
+`;
+
+function Activity() {
+  return (
+    <Fragment>
+      <h3>Summary of Activity</h3>
+      <p>
+        In the last three days you drank 7 bottles of ketchup, ate 67 jars of mayo, and
+        smelled 0.5 tablespoons of mustard. Relish stats are not available.
+      </p>
+    </Fragment>
+  );
+}
diff --git a/static/app/components/issueDiff/index.spec.tsx b/static/app/components/issueDiff/index.spec.tsx
index 51aacbd7939ff9..ea0d60a0d7363f 100644
--- a/static/app/components/issueDiff/index.spec.tsx
+++ b/static/app/components/issueDiff/index.spec.tsx
@@ -15,7 +15,7 @@ describe('IssueDiff', function () {
   const entries123Base = Entries123Base();
   const api = new MockApiClient();
   const organization = OrganizationFixture();
-  const project = ProjectFixture({features: ['similarity-embeddings']});
+  const project = ProjectFixture();
 
   beforeEach(function () {
     MockApiClient.addMockResponse({
@@ -92,6 +92,7 @@ describe('IssueDiff', function () {
           action: 'PUSH',
           key: 'default',
         }}
+        hasSimilarityEmbeddingsProjectFeature
       />
     );
 
diff --git a/static/app/components/issueDiff/index.tsx b/static/app/components/issueDiff/index.tsx
index 1bbb3dd50a1e64..859368cbbe45bd 100644
--- a/static/app/components/issueDiff/index.tsx
+++ b/static/app/components/issueDiff/index.tsx
@@ -31,6 +31,7 @@ type Props = {
   targetIssueId: string;
   baseEventId?: string;
   className?: string;
+  hasSimilarityEmbeddingsProjectFeature?: boolean;
   organization?: Organization;
   shouldBeGrouped?: string;
   targetEventId?: string;
@@ -67,12 +68,12 @@ class IssueDiff extends Component<Props, State> {
       baseEventId,
       targetEventId,
       organization,
-      project,
       shouldBeGrouped,
       location,
+      hasSimilarityEmbeddingsProjectFeature,
     } = this.props;
     const hasSimilarityEmbeddingsFeature =
-      project.features.includes('similarity-embeddings') ||
+      hasSimilarityEmbeddingsProjectFeature ||
       location.query.similarityEmbeddings === '1';
 
     // Fetch component and event data
diff --git a/static/app/components/keyValueData/index.tsx b/static/app/components/keyValueData/index.tsx
index 2f7f99c4720dd0..ab9bcdb45ea1c5 100644
--- a/static/app/components/keyValueData/index.tsx
+++ b/static/app/components/keyValueData/index.tsx
@@ -239,7 +239,7 @@ const ContentWrapper = styled('div')<{
   expandLeft?: boolean;
 }>`
   display: grid;
-  grid-template-columns: ${p => (p.expandLeft ? '0.95fr 0.41fr' : 'subgrid')};
+  grid-template-columns: ${p => (p.expandLeft ? '2fr 0.8fr' : 'subgrid')};
   grid-column: span 2;
   column-gap: ${space(1.5)};
   padding: ${space(0.25)} ${space(0.75)};
diff --git a/static/app/components/loadingTriangle.tsx b/static/app/components/loadingTriangle.tsx
index 2477a5069f6e27..d1a4ab986f831a 100644
--- a/static/app/components/loadingTriangle.tsx
+++ b/static/app/components/loadingTriangle.tsx
@@ -3,15 +3,19 @@ import styled from '@emotion/styled';
 import sentryLoader from 'sentry-images/sentry-loader.svg';
 
 import {space} from 'sentry/styles/space';
+import {useUser} from 'sentry/utils/useUser';
 
 type Props = {
   children?: React.ReactNode;
 };
 
 function LoadingTriangle({children}: Props) {
+  const user = useUser();
   return (
     <LoadingTriangleWrapper data-test-id="loading-indicator">
-      <CircleBackground>
+      <CircleBackground
+        className={user?.options.theme ? `theme-${user.options.theme}` : ''}
+      >
         <img src={sentryLoader} />
       </CircleBackground>
       {children && <div>{children}</div>}
@@ -37,8 +41,19 @@ const CircleBackground = styled('div')`
   display: flex;
   align-items: center;
   justify-content: center;
-  background: ${p => p.theme.surface300};
+  background: #fff;
   border-radius: 50%;
+
+  &.theme-dark {
+    filter: invert(100%);
+    opacity: 0.8;
+  }
+  &.theme-system {
+    @media (prefers-color-scheme: dark) {
+      filter: invert(100%);
+      opacity: 0.8;
+    }
+  }
 `;
 
 export default LoadingTriangle;
diff --git a/static/app/components/metrics/metricSearchBar.spec.tsx b/static/app/components/metrics/metricSearchBar.spec.tsx
index ec8b3083e27c63..023be4ebef3604 100644
--- a/static/app/components/metrics/metricSearchBar.spec.tsx
+++ b/static/app/components/metrics/metricSearchBar.spec.tsx
@@ -55,20 +55,5 @@ describe('metricSearchBar', function () {
       screen.getByText('Invalid key. "span.module" is not a supported search key.');
       expect(onChange).not.toHaveBeenCalled();
     });
-    it('allows insights specific filters when using an insights mri', async function () {
-      render(
-        <MetricSearchBar onChange={onChange} mri="d:spans/exclusive_time@millisecond" />
-      );
-      await screen.findByPlaceholderText('Filter by tags');
-      await userEvent.type(
-        screen.getByPlaceholderText('Filter by tags'),
-        'span.module:db'
-      );
-      await userEvent.keyboard('{enter}');
-      expect(
-        screen.queryByText('Invalid key. "span.module" is not a supported search key.')
-      ).not.toBeInTheDocument();
-      expect(onChange).toHaveBeenCalledWith('span.module:"db"');
-    });
   });
 });
diff --git a/static/app/components/metrics/metricSearchBar.tsx b/static/app/components/metrics/metricSearchBar.tsx
index f3d8b58a7375c2..b73d67a407aa78 100644
--- a/static/app/components/metrics/metricSearchBar.tsx
+++ b/static/app/components/metrics/metricSearchBar.tsx
@@ -12,13 +12,10 @@ import {SavedSearchType, type TagCollection} from 'sentry/types/group';
 import type {MRI} from 'sentry/types/metrics';
 import {hasMetricsNewInputs} from 'sentry/utils/metrics/features';
 import {getUseCaseFromMRI} from 'sentry/utils/metrics/mri';
-import type {MetricTag} from 'sentry/utils/metrics/types';
 import {useMetricsTags} from 'sentry/utils/metrics/useMetricsTags';
 import useApi from 'sentry/utils/useApi';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
-import {INSIGHTS_METRICS} from 'sentry/views/alerts/rules/metric/utils/isInsightsMetricAlert';
-import {SpanMetricsField} from 'sentry/views/insights/types';
 import {ensureQuotedTextFilters} from 'sentry/views/metrics/utils';
 import {useSelectedProjects} from 'sentry/views/metrics/utils/useSelectedProjects';
 
@@ -34,23 +31,6 @@ export interface MetricSearchBarProps
 
 const EMPTY_ARRAY = [];
 const EMPTY_SET = new Set<never>();
-const INSIGHTS_ADDITIONAL_TAG_FILTERS: MetricTag[] = [
-  {
-    key: 'has',
-  },
-  {
-    key: SpanMetricsField.SPAN_MODULE,
-  },
-  {
-    key: SpanMetricsField.FILE_EXTENSION,
-  },
-  {
-    key: SpanMetricsField.SPAN_SYSTEM,
-  },
-  {
-    key: SpanMetricsField.SPAN_GROUP,
-  },
-];
 
 export function MetricSearchBar({
   mri,
@@ -80,18 +60,9 @@ export function MetricSearchBar({
     blockedTags
   );
 
-  const additionalTags: MetricTag[] = useMemo(
-    () =>
-      // Insights metrics allow the `has` filter.
-      // `span.module` is a discover field alias that does not appear in the metrics meta endpoint.
-      INSIGHTS_METRICS.includes(mri as string) ? INSIGHTS_ADDITIONAL_TAG_FILTERS : [],
-    [mri]
-  );
-
   const supportedTags: TagCollection = useMemo(
-    () =>
-      [...tags, ...additionalTags].reduce((acc, tag) => ({...acc, [tag.key]: tag}), {}),
-    [tags, additionalTags]
+    () => tags.reduce((acc, tag) => ({...acc, [tag.key]: tag}), {}),
+    [tags]
   );
 
   const searchConfig = useMemo(
diff --git a/static/app/components/modals/diffModal.spec.tsx b/static/app/components/modals/diffModal.spec.tsx
index c763244ee561e1..26417688ea4799 100644
--- a/static/app/components/modals/diffModal.spec.tsx
+++ b/static/app/components/modals/diffModal.spec.tsx
@@ -28,6 +28,10 @@ describe('DiffModal', function () {
       url: '/projects/123/project-slug/events/789/',
       body: [],
     });
+    MockApiClient.addMockResponse({
+      url: `/projects/org-slug/project-slug/`,
+      body: {features: []},
+    });
 
     const styledWrapper = styled(c => c.children);
 
diff --git a/static/app/components/modals/diffModal.tsx b/static/app/components/modals/diffModal.tsx
index e472aea915c71d..816f033f22777e 100644
--- a/static/app/components/modals/diffModal.tsx
+++ b/static/app/components/modals/diffModal.tsx
@@ -2,16 +2,32 @@ import {css} from '@emotion/react';
 
 import type {ModalRenderProps} from 'sentry/actionCreators/modal';
 import IssueDiff from 'sentry/components/issueDiff';
+import {useDetailedProject} from 'sentry/utils/useDetailedProject';
 import useOrganization from 'sentry/utils/useOrganization';
 
 type Props = ModalRenderProps & React.ComponentProps<typeof IssueDiff>;
 
 function DiffModal({className, Body, CloseButton, ...props}: Props) {
   const organization = useOrganization();
+  const {project} = props;
+  const {data: projectData} = useDetailedProject({
+    orgSlug: organization.slug,
+    projectSlug: project.slug,
+  });
+  // similarity-embeddings feature is only available on project details
+  const similarityEmbeddingsProjectFeature = projectData?.features.includes(
+    'similarity-embeddings'
+  );
+
   return (
     <Body>
       <CloseButton />
-      <IssueDiff className={className} organization={organization} {...props} />
+      <IssueDiff
+        className={className}
+        organization={organization}
+        hasSimilarityEmbeddingsProjectFeature={similarityEmbeddingsProjectFeature}
+        {...props}
+      />
     </Body>
   );
 }
diff --git a/static/app/components/modals/inviteMembersModal/index.tsx b/static/app/components/modals/inviteMembersModal/index.tsx
index 1747499c0d5324..d32a3f20e192c5 100644
--- a/static/app/components/modals/inviteMembersModal/index.tsx
+++ b/static/app/components/modals/inviteMembersModal/index.tsx
@@ -82,7 +82,12 @@ function InviteMembersModal({
         willInvite={willInvite}
         onSendInvites={sendInvites}
       >
-        {({sendInvites: inviteModalSendInvites, canSend, headerInfo}) => {
+        {({
+          sendInvites: inviteModalSendInvites,
+          canSend: canSend,
+          headerInfo: headerInfo,
+          isOverMemberLimit: isOverMemberLimit,
+        }) => {
           return organization.features.includes('invite-members-new-modal') ? (
             <InviteMembersContext.Provider
               value={{
@@ -133,6 +138,9 @@ function InviteMembersModal({
               headerInfo={headerInfo}
               invites={invites}
               inviteStatus={inviteStatus}
+              isOverMemberLimit={
+                isOverMemberLimit && organization.features?.includes('invite-billing')
+              }
               member={memberResult.data}
               pendingInvites={pendingInvites}
               removeInviteRow={removeInviteRow}
diff --git a/static/app/components/modals/inviteMembersModal/inviteMembersModalview.spec.tsx b/static/app/components/modals/inviteMembersModal/inviteMembersModalview.spec.tsx
index 66c8d4a035bc64..2cdf934076f726 100644
--- a/static/app/components/modals/inviteMembersModal/inviteMembersModalview.spec.tsx
+++ b/static/app/components/modals/inviteMembersModal/inviteMembersModalview.spec.tsx
@@ -26,6 +26,29 @@ describe('InviteMembersModalView', function () {
     setRole: () => {},
     setTeams: () => {},
     willInvite: false,
+    isOverMemberLimit: false,
+  };
+
+  const overMemberLimitModalProps: ComponentProps<typeof InviteMembersModalView> = {
+    Footer: styledWrapper(),
+    addInviteRow: () => {},
+    canSend: true,
+    closeModal: () => {},
+    complete: false,
+    headerInfo: null,
+    inviteStatus: {},
+    invites: [],
+    member: undefined,
+    pendingInvites: [],
+    removeInviteRow: () => {},
+    reset: () => {},
+    sendInvites: () => {},
+    sendingInvites: false,
+    setEmails: () => {},
+    setRole: () => {},
+    setTeams: () => {},
+    willInvite: true,
+    isOverMemberLimit: true,
   };
 
   it('renders', function () {
@@ -45,4 +68,10 @@ describe('InviteMembersModalView', function () {
     // Check that the Alert component renders with the provided error message
     expect(screen.getByText('This is an error message')).toBeInTheDocument();
   });
+
+  it('renders when over member limit', function () {
+    render(<InviteMembersModalView {...overMemberLimitModalProps} />);
+
+    expect(screen.getByText('Invite New Members')).toBeInTheDocument();
+  });
 });
diff --git a/static/app/components/modals/inviteMembersModal/inviteMembersModalview.tsx b/static/app/components/modals/inviteMembersModal/inviteMembersModalview.tsx
index 9e9bedfbd9ec88..9d63b10faa7a96 100644
--- a/static/app/components/modals/inviteMembersModal/inviteMembersModalview.tsx
+++ b/static/app/components/modals/inviteMembersModal/inviteMembersModalview.tsx
@@ -1,5 +1,4 @@
-import type {ReactNode} from 'react';
-import {Fragment} from 'react';
+import {Fragment, type ReactNode, useEffect, useRef} from 'react';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 
@@ -30,6 +29,7 @@ interface Props {
   headerInfo: ReactNode;
   inviteStatus: InviteStatus;
   invites: NormalizedInvite[];
+  isOverMemberLimit: boolean;
   member: Member | undefined;
   pendingInvites: InviteRow[];
   removeInviteRow: (index: number) => void;
@@ -52,6 +52,7 @@ export default function InviteMembersModalView({
   headerInfo,
   invites,
   inviteStatus,
+  isOverMemberLimit,
   member,
   pendingInvites,
   removeInviteRow,
@@ -76,6 +77,16 @@ export default function InviteMembersModalView({
     </Alert>
   ) : null;
 
+  const canSendRef = useRef(canSend);
+
+  useEffect(() => {
+    if (isOverMemberLimit) {
+      setRole('billing', 0);
+      setTeams([], 0);
+      canSendRef.current = true;
+    }
+  });
+
   return (
     <Fragment>
       {errorAlert}
@@ -115,10 +126,10 @@ export default function InviteMembersModalView({
             onChangeRole={value => setRole(value?.value, i)}
             onChangeTeams={opts => setTeams(opts ? opts.map(v => v.value) : [], i)}
             disableRemove={disableInputs || pendingInvites.length === 1}
+            isOverMemberLimit={isOverMemberLimit}
           />
         ))}
       </Rows>
-
       <AddButton
         disabled={disableInputs}
         size="sm"
@@ -128,7 +139,6 @@ export default function InviteMembersModalView({
       >
         {t('Add another')}
       </AddButton>
-
       <Footer>
         <FooterContent>
           <div>
@@ -140,7 +150,6 @@ export default function InviteMembersModalView({
               willInvite={willInvite}
             />
           </div>
-
           <ButtonBar gap={1}>
             {complete ? (
               <Fragment>
@@ -172,7 +181,7 @@ export default function InviteMembersModalView({
                   size="sm"
                   data-test-id="send-invites"
                   priority="primary"
-                  disabled={!canSend || !isValidInvites || disableInputs}
+                  disabled={!canSendRef.current || !isValidInvites || disableInputs}
                   onClick={sendInvites}
                 />
               </Fragment>
diff --git a/static/app/components/modals/inviteMembersModal/inviteRowControl.tsx b/static/app/components/modals/inviteMembersModal/inviteRowControl.tsx
index 529502f202c633..cd73db279ef038 100644
--- a/static/app/components/modals/inviteMembersModal/inviteRowControl.tsx
+++ b/static/app/components/modals/inviteMembersModal/inviteRowControl.tsx
@@ -23,6 +23,7 @@ type Props = {
   disabled: boolean;
   emails: string[];
   inviteStatus: InviteStatus;
+  isOverMemberLimit: boolean;
   onChangeEmails: (emails: SelectOption[]) => void;
   onChangeRole: (role: SelectOption) => void;
   onChangeTeams: (teams: SelectOption[]) => void;
@@ -52,6 +53,7 @@ function InviteRowControl({
   onChangeRole,
   onChangeTeams,
   disableRemove,
+  isOverMemberLimit,
 }: Props) {
   const [inputValue, setInputValue] = useState('');
 
@@ -118,7 +120,7 @@ function InviteRowControl({
       <RoleSelectControl
         aria-label={t('Role')}
         data-test-id="select-role"
-        disabled={disabled}
+        disabled={isOverMemberLimit ? true : disabled}
         value={role}
         roles={roleOptions}
         disableUnallowed={roleDisabledUnallowed}
diff --git a/static/app/components/modals/memberInviteModalCustomization.tsx b/static/app/components/modals/memberInviteModalCustomization.tsx
index 26e5be1f25293e..cbbaa49b0e4c33 100644
--- a/static/app/components/modals/memberInviteModalCustomization.tsx
+++ b/static/app/components/modals/memberInviteModalCustomization.tsx
@@ -3,7 +3,7 @@ import HookOrDefault from 'sentry/components/hookOrDefault';
 export const InviteModalHook = HookOrDefault({
   hookName: 'member-invite-modal:customization',
   defaultComponent: ({onSendInvites, children}) =>
-    children({sendInvites: onSendInvites, canSend: true}),
+    children({sendInvites: onSendInvites, canSend: true, isOverMemberLimit: false}),
 });
 
 export type InviteModalRenderFunc = React.ComponentProps<
diff --git a/static/app/components/modals/widgetBuilder/addToDashboardModal.spec.tsx b/static/app/components/modals/widgetBuilder/addToDashboardModal.spec.tsx
index 268919cd4399a9..94543d87695743 100644
--- a/static/app/components/modals/widgetBuilder/addToDashboardModal.spec.tsx
+++ b/static/app/components/modals/widgetBuilder/addToDashboardModal.spec.tsx
@@ -97,6 +97,11 @@ describe('add to dashboard modal', () => {
       body: testDashboard,
     });
 
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/releases/stats/',
+      body: [],
+    });
+
     eventsStatsMock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/events-stats/',
       body: [],
diff --git a/static/app/components/modals/widgetBuilder/addToDashboardModal.tsx b/static/app/components/modals/widgetBuilder/addToDashboardModal.tsx
index f03b399feaf527..7da42feb17ae34 100644
--- a/static/app/components/modals/widgetBuilder/addToDashboardModal.tsx
+++ b/static/app/components/modals/widgetBuilder/addToDashboardModal.tsx
@@ -306,11 +306,11 @@ function AddToDashboardModal({
                     widgetLegendState={widgetLegendState}
                     onLegendSelectChanged={() => {}}
                     legendOptions={
-                      organization.features.includes('dashboards-releases-on-charts') &&
                       widgetLegendState.widgetRequiresLegendUnselection(widget)
                         ? {selected: unselectedReleasesForCharts}
                         : undefined
                     }
+                    disableFullscreen
                   />
 
                   <IndexedEventsSelectionAlert widget={widget} />
diff --git a/static/app/components/modals/widgetViewerModal.spec.tsx b/static/app/components/modals/widgetViewerModal.spec.tsx
index 33a1bc37770931..8edf9f12b1edd4 100644
--- a/static/app/components/modals/widgetViewerModal.spec.tsx
+++ b/static/app/components/modals/widgetViewerModal.spec.tsx
@@ -2,6 +2,7 @@ import ReactEchartsCore from 'echarts-for-react/lib/core';
 import {DashboardFixture} from 'sentry-fixture/dashboard';
 import {MetricsTotalCountByReleaseIn24h} from 'sentry-fixture/metrics';
 import {ProjectFixture} from 'sentry-fixture/project';
+import {WidgetFixture} from 'sentry-fixture/widget';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {act, render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
@@ -130,6 +131,11 @@ describe('Modals -> WidgetViewerModal', function () {
       body: [],
     });
 
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/releases/stats/',
+      body: [],
+    });
+
     eventsMetaMock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/events-meta/',
       body: {count: 33323612},
@@ -1479,4 +1485,35 @@ describe('Modals -> WidgetViewerModal', function () {
       });
     });
   });
+
+  describe('Span Widgets', function () {
+    beforeEach(function () {
+      MockApiClient.addMockResponse({
+        url: '/organizations/org-slug/events/',
+        body: {},
+      });
+      MockApiClient.addMockResponse({
+        url: '/organizations/org-slug/events-stats/',
+        body: {},
+      });
+    });
+
+    it('renders the Open in Explore button', async function () {
+      const mockWidget = WidgetFixture({
+        widgetType: WidgetType.SPANS,
+        queries: [
+          {
+            fields: ['span.description', 'avg(span.duration)'],
+            aggregates: ['avg(span.duration)'],
+            columns: ['span.description'],
+            conditions: '',
+            orderby: '',
+            name: '',
+          },
+        ],
+      });
+      await renderModal({initialData, widget: mockWidget});
+      expect(await screen.findByText('Open in Explore')).toBeInTheDocument();
+    });
+  });
 });
diff --git a/static/app/components/modals/widgetViewerModal.tsx b/static/app/components/modals/widgetViewerModal.tsx
index bcb3e4f7064f54..f343822c3a8797 100644
--- a/static/app/components/modals/widgetViewerModal.tsx
+++ b/static/app/components/modals/widgetViewerModal.tsx
@@ -31,6 +31,7 @@ import {space} from 'sentry/styles/space';
 import type {PageFilters, SelectValue} from 'sentry/types/core';
 import type {Series} from 'sentry/types/echarts';
 import type {Organization} from 'sentry/types/organization';
+import type {User} from 'sentry/types/user';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {getUtcDateString} from 'sentry/utils/dates';
@@ -54,9 +55,16 @@ import useApi from 'sentry/utils/useApi';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useProjects from 'sentry/utils/useProjects';
+import {useUser} from 'sentry/utils/useUser';
+import {useUserTeams} from 'sentry/utils/useUserTeams';
 import withPageFilters from 'sentry/utils/withPageFilters';
+import {checkUserHasEditAccess} from 'sentry/views/dashboards/detail';
 import {DiscoverSplitAlert} from 'sentry/views/dashboards/discoverSplitAlert';
-import type {DashboardFilters, Widget} from 'sentry/views/dashboards/types';
+import type {
+  DashboardFilters,
+  DashboardPermissions,
+  Widget,
+} from 'sentry/views/dashboards/types';
 import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
 import {
   dashboardFiltersToString,
@@ -71,6 +79,7 @@ import {
   isUsingPerformanceScore,
   performanceScoreTooltip,
 } from 'sentry/views/dashboards/utils';
+import {getWidgetExploreUrl} from 'sentry/views/dashboards/utils/getWidgetExploreUrl';
 import {
   SESSION_DURATION_ALERT,
   WidgetDescription,
@@ -103,7 +112,9 @@ export interface WidgetViewerModalOptions {
   organization: Organization;
   widget: Widget;
   widgetLegendState: WidgetLegendSelectionState;
+  dashboardCreator?: User;
   dashboardFilters?: DashboardFilters;
+  dashboardPermissions?: DashboardPermissions;
   onEdit?: () => void;
   onMetricWidgetEdit?: (widget: Widget) => void;
   pageLinks?: string;
@@ -193,6 +204,8 @@ function WidgetViewerModal(props: Props) {
     seriesResultsType,
     dashboardFilters,
     widgetLegendState,
+    dashboardPermissions,
+    dashboardCreator,
   } = props;
   const location = useLocation();
   const {projects} = useProjects();
@@ -842,6 +855,18 @@ function WidgetViewerModal(props: Props) {
     }
   }
 
+  const currentUser = useUser();
+  const {teams: userTeams} = useUserTeams();
+  let hasEditAccess = true;
+  if (organization.features.includes('dashboards-edit-access')) {
+    hasEditAccess = checkUserHasEditAccess(
+      currentUser,
+      userTeams,
+      organization,
+      dashboardPermissions,
+      dashboardCreator
+    );
+  }
   function renderWidgetViewer() {
     return (
       <Fragment>
@@ -1058,6 +1083,11 @@ function WidgetViewerModal(props: Props) {
                                 display_type: widget.displayType,
                               });
                             }}
+                            disabled={!hasEditAccess}
+                            title={
+                              !hasEditAccess &&
+                              t('You do not have permission to edit this widget')
+                            }
                           >
                             {t('Edit Widget')}
                           </Button>
@@ -1123,6 +1153,10 @@ function OpenButton({
       openLabel = t('Open in Metrics');
       path = getWidgetMetricsUrl(widget, selection, organization);
       break;
+    case WidgetType.SPANS:
+      openLabel = t('Open in Explore');
+      path = getWidgetExploreUrl(widget, selection, organization);
+      break;
     case WidgetType.DISCOVER:
     default:
       openLabel = t('Open in Discover');
diff --git a/static/app/components/nav/config.tsx b/static/app/components/nav/config.tsx
index b0b058936d6881..0c128bff586ea0 100644
--- a/static/app/components/nav/config.tsx
+++ b/static/app/components/nav/config.tsx
@@ -1,5 +1,5 @@
 import {openHelpSearchModal} from 'sentry/actionCreators/modal';
-import type {NavConfig, NavSidebarItem} from 'sentry/components/nav/utils';
+import type {NavConfig} from 'sentry/components/nav/utils';
 import {
   IconDashboard,
   IconGraph,
@@ -15,26 +15,23 @@ import {t} from 'sentry/locale';
 import ConfigStore from 'sentry/stores/configStore';
 import type {Organization} from 'sentry/types/organization';
 import {getDiscoverLandingUrl} from 'sentry/utils/discover/urls';
-import {MODULE_BASE_URLS} from 'sentry/views/insights/common/utils/useModuleURL';
-import {MODULE_SIDEBAR_TITLE as MODULE_TITLE_HTTP} from 'sentry/views/insights/http/settings';
 import {
   AI_LANDING_SUB_PATH,
-  AI_LANDING_TITLE,
+  AI_SIDEBAR_LABEL,
 } from 'sentry/views/insights/pages/ai/settings';
 import {
   BACKEND_LANDING_SUB_PATH,
-  BACKEND_LANDING_TITLE,
+  BACKEND_SIDEBAR_LABEL,
 } from 'sentry/views/insights/pages/backend/settings';
 import {
   FRONTEND_LANDING_SUB_PATH,
-  FRONTEND_LANDING_TITLE,
+  FRONTEND_SIDEBAR_LABEL,
 } from 'sentry/views/insights/pages/frontend/settings';
 import {
   MOBILE_LANDING_SUB_PATH,
-  MOBILE_LANDING_TITLE,
+  MOBILE_SIDEBAR_LABEL,
 } from 'sentry/views/insights/pages/mobile/settings';
 import {DOMAIN_VIEW_BASE_URL} from 'sentry/views/insights/pages/settings';
-import {INSIGHTS_BASE_URL, MODULE_TITLES} from 'sentry/views/insights/settings';
 import {getSearchForIssueGroup, IssueGroup} from 'sentry/views/issueList/utils';
 
 /**
@@ -45,91 +42,13 @@ import {getSearchForIssueGroup, IssueGroup} from 'sentry/views/issueList/utils';
  */
 export function createNavConfig({organization}: {organization: Organization}): NavConfig {
   const prefix = `organizations/${organization.slug}`;
-  const insightsPrefix = `${prefix}/${INSIGHTS_BASE_URL}`;
-  const hasPerfDomainViews = organization.features.includes('insights-domain-view');
-
-  const insights: NavSidebarItem = {
-    label: t('Insights'),
-    icon: <IconGraph />,
-    feature: {features: 'insights-entry-points'},
-    submenu: [
-      {
-        label: MODULE_TITLE_HTTP,
-        to: `/${insightsPrefix}/${MODULE_BASE_URLS.http}/`,
-      },
-      {label: MODULE_TITLES.db, to: `/${insightsPrefix}/${MODULE_BASE_URLS.db}/`},
-      {
-        label: MODULE_TITLES.resource,
-        to: `/${insightsPrefix}/${MODULE_BASE_URLS.resource}/`,
-      },
-      {
-        label: MODULE_TITLES.app_start,
-        to: `/${insightsPrefix}/${MODULE_BASE_URLS.app_start}/`,
-      },
-      {
-        label: MODULE_TITLES['mobile-screens'],
-        to: `/${insightsPrefix}/${MODULE_BASE_URLS['mobile-screens']}/`,
-        feature: {features: 'insights-mobile-screens-module'},
-      },
-      {
-        label: MODULE_TITLES.vital,
-        to: `/${insightsPrefix}/${MODULE_BASE_URLS.vital}/`,
-      },
-      {
-        label: MODULE_TITLES.cache,
-        to: `/${insightsPrefix}/${MODULE_BASE_URLS.cache}/`,
-      },
-      {
-        label: MODULE_TITLES.queue,
-        to: `/${insightsPrefix}/${MODULE_BASE_URLS.queue}/`,
-      },
-      {
-        label: MODULE_TITLES.ai,
-        to: `/${insightsPrefix}/${MODULE_BASE_URLS.ai}/`,
-        feature: {features: 'insights-entry-points'},
-      },
-    ],
-  };
-
-  const perf: NavSidebarItem = {
-    label: t('Perf.'),
-    to: '/performance/',
-    icon: <IconLightning />,
-    feature: {
-      features: 'performance-view',
-      hookName: 'feature-disabled:performance-sidebar-item',
-    },
-  };
-
-  const perfDomainViews: NavSidebarItem = {
-    label: t('Perf.'),
-    icon: <IconLightning />,
-    feature: {features: ['insights-domain-view', 'performance-view']},
-    submenu: [
-      {
-        label: FRONTEND_LANDING_TITLE,
-        to: `/${prefix}/${DOMAIN_VIEW_BASE_URL}/${FRONTEND_LANDING_SUB_PATH}/`,
-      },
-      {
-        label: BACKEND_LANDING_TITLE,
-        to: `/${prefix}/${DOMAIN_VIEW_BASE_URL}/${BACKEND_LANDING_SUB_PATH}/`,
-      },
-      {
-        label: AI_LANDING_TITLE,
-        to: `/${prefix}/${DOMAIN_VIEW_BASE_URL}/${AI_LANDING_SUB_PATH}/`,
-      },
-      {
-        label: MOBILE_LANDING_TITLE,
-        to: `/${prefix}/${DOMAIN_VIEW_BASE_URL}/${MOBILE_LANDING_SUB_PATH}/`,
-      },
-    ],
-  };
 
   return {
     main: [
       {
         label: t('Issues'),
         icon: <IconIssues />,
+        analyticsKey: 'issues',
         submenu: [
           {
             label: t('All'),
@@ -154,10 +73,16 @@ export function createNavConfig({organization}: {organization: Organization}): N
           {label: t('Feedback'), to: `/${prefix}/feedback/`},
         ],
       },
-      {label: t('Projects'), to: `/${prefix}/projects/`, icon: <IconProject />},
+      {
+        label: t('Projects'),
+        analyticsKey: 'projects',
+        to: `/${prefix}/projects/`,
+        icon: <IconProject />,
+      },
       {
         label: t('Explore'),
         icon: <IconSearch />,
+        analyticsKey: 'explore',
         submenu: [
           {
             label: t('Traces'),
@@ -198,9 +123,43 @@ export function createNavConfig({organization}: {organization: Organization}): N
           {label: t('Crons'), to: `/${prefix}/crons/`},
         ],
       },
-      ...(hasPerfDomainViews ? [perfDomainViews, perf] : [insights, perf]),
+      {
+        label: t('Insights'),
+        icon: <IconGraph />,
+        analyticsKey: 'insights-domains',
+        feature: {features: ['performance-view']},
+        submenu: [
+          {
+            label: FRONTEND_SIDEBAR_LABEL,
+            to: `/${prefix}/${DOMAIN_VIEW_BASE_URL}/${FRONTEND_LANDING_SUB_PATH}/`,
+          },
+          {
+            label: BACKEND_SIDEBAR_LABEL,
+            to: `/${prefix}/${DOMAIN_VIEW_BASE_URL}/${BACKEND_LANDING_SUB_PATH}/`,
+          },
+          {
+            label: MOBILE_SIDEBAR_LABEL,
+            to: `/${prefix}/${DOMAIN_VIEW_BASE_URL}/${MOBILE_LANDING_SUB_PATH}/`,
+          },
+          {
+            label: AI_SIDEBAR_LABEL,
+            to: `/${prefix}/${DOMAIN_VIEW_BASE_URL}/${AI_LANDING_SUB_PATH}/`,
+          },
+        ],
+      },
+      {
+        label: t('Perf.'),
+        to: '/performance/',
+        analyticsKey: 'performance',
+        icon: <IconLightning />,
+        feature: {
+          features: 'performance-view',
+          hookName: 'feature-disabled:performance-sidebar-item',
+        },
+      },
       {
         label: t('Boards'),
+        analyticsKey: 'customizable-dashboards',
         to: '/dashboards/',
         icon: <IconDashboard />,
         feature: {
@@ -209,12 +168,18 @@ export function createNavConfig({organization}: {organization: Organization}): N
           requireAll: false,
         },
       },
-      {label: t('Alerts'), to: `/${prefix}/alerts/rules/`, icon: <IconSiren />},
+      {
+        label: t('Alerts'),
+        analyticsKey: 'alerts',
+        to: `/${prefix}/alerts/rules/`,
+        icon: <IconSiren />,
+      },
     ],
     footer: [
       {
         label: t('Help'),
         icon: <IconQuestion />,
+        analyticsKey: 'help',
         dropdown: [
           {
             key: 'search',
@@ -242,6 +207,7 @@ export function createNavConfig({organization}: {organization: Organization}): N
       },
       {
         label: t('Settings'),
+        analyticsKey: 'settings',
         to: `/settings/${organization.slug}/`,
         icon: <IconSettings />,
       },
diff --git a/static/app/components/nav/index.spec.tsx b/static/app/components/nav/index.spec.tsx
index 0ca7e1efb43bde..2572f9e5d50cbb 100644
--- a/static/app/components/nav/index.spec.tsx
+++ b/static/app/components/nav/index.spec.tsx
@@ -2,7 +2,13 @@ import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {RouterFixture} from 'sentry-fixture/routerFixture';
 
-import {getAllByRole, render, screen} from 'sentry-test/reactTestingLibrary';
+import {trackAnalytics} from 'sentry/utils/analytics';
+
+jest.mock('sentry/utils/analytics', () => ({
+  trackAnalytics: jest.fn(),
+}));
+
+import {getAllByRole, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import Nav from 'sentry/components/nav';
 
@@ -101,7 +107,9 @@ describe('Nav', function () {
     beforeEach(() => {
       render(<Nav />, {
         router: RouterFixture({
-          location: LocationFixture({pathname: '/organizations/org-slug/insights/http/'}),
+          location: LocationFixture({
+            pathname: '/organizations/org-slug/insights/backend/',
+          }),
         }),
         organization: OrganizationFixture({features: ALL_AVAILABLE_FEATURES}),
       });
@@ -116,17 +124,8 @@ describe('Nav', function () {
     it('includes expected submenu items', function () {
       const container = screen.getByRole('navigation', {name: 'Secondary Navigation'});
       const links = getAllByRole(container, 'link');
-      expect(links).toHaveLength(8);
-      [
-        'Requests',
-        'Queries',
-        'Assets',
-        'App Starts',
-        'Web Vitals',
-        'Caches',
-        'Queues',
-        'LLM Monitoring',
-      ].forEach((title, index) => {
+      expect(links).toHaveLength(4);
+      ['Frontend', 'Backend', 'Mobile', 'AI'].forEach((title, index) => {
         expect(links[index]).toHaveAccessibleName(title);
       });
     });
@@ -165,4 +164,26 @@ describe('Nav', function () {
       });
     });
   });
+
+  describe('analytics', function () {
+    beforeEach(() => {
+      render(<Nav />, {
+        router: RouterFixture({
+          location: LocationFixture({pathname: '/organizations/org-slug/traces/'}),
+        }),
+        organization: OrganizationFixture({features: ALL_AVAILABLE_FEATURES}),
+      });
+    });
+
+    it('tracks primary sidebar item', async function () {
+      const issues = screen.getByRole('link', {name: 'Issues'});
+      await userEvent.click(issues);
+      expect(trackAnalytics).toHaveBeenCalledWith(
+        'growth.clicked_sidebar',
+        expect.objectContaining({
+          item: 'issues',
+        })
+      );
+    });
+  });
 });
diff --git a/static/app/components/nav/sidebar.tsx b/static/app/components/nav/sidebar.tsx
index f2f47ec04d4877..2911ca134206ce 100644
--- a/static/app/components/nav/sidebar.tsx
+++ b/static/app/components/nav/sidebar.tsx
@@ -1,4 +1,5 @@
-import {Fragment} from 'react';
+import type {MouseEventHandler} from 'react';
+import {Fragment, useCallback} from 'react';
 import styled from '@emotion/styled';
 
 import Feature from 'sentry/components/acl/feature';
@@ -18,8 +19,10 @@ import {
 } from 'sentry/components/nav/utils';
 import SidebarDropdown from 'sentry/components/sidebar/sidebarDropdown';
 import {space} from 'sentry/styles/space';
+import {trackAnalytics} from 'sentry/utils/analytics';
 import theme from 'sentry/utils/theme';
 import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
 
 function Sidebar() {
   return (
@@ -93,19 +96,28 @@ const SidebarItemList = styled('ul')`
 
 interface SidebarItemProps {
   item: NavSidebarItem;
+  children?: React.ReactNode;
+  onClick?: MouseEventHandler<HTMLElement>;
 }
 
 function SidebarItem({item}: SidebarItemProps) {
   const to = resolveNavItemTo(item);
   const SidebarChild = to ? SidebarLink : SidebarMenu;
+  const organization = useOrganization();
 
   const FeatureGuard = item.feature ? Feature : Fragment;
   const featureGuardProps: any = item.feature ?? {};
 
+  const recordAnalytics = useCallback(
+    () =>
+      trackAnalytics('growth.clicked_sidebar', {item: item.analyticsKey, organization}),
+    [organization, item.analyticsKey]
+  );
+
   return (
     <FeatureGuard {...featureGuardProps}>
       <SidebarItemWrapper>
-        <SidebarChild item={item} key={item.label}>
+        <SidebarChild item={item} key={item.label} onClick={recordAnalytics}>
           {item.icon}
           <span>{item.label}</span>
         </SidebarChild>
@@ -127,7 +139,7 @@ const NavButton = styled('button')`
   ${linkStyles}
 `;
 
-function SidebarLink({children, item}: SidebarItemProps & {children: React.ReactNode}) {
+function SidebarLink({children, item, onClick}: SidebarItemProps) {
   const location = useLocation();
   const isActive = isNavItemActive(item, location);
   const isSubmenuActive = isSubmenuItemActive(item, location);
@@ -142,6 +154,7 @@ function SidebarLink({children, item}: SidebarItemProps & {children: React.React
   return (
     <NavLink
       {...linkProps}
+      onClick={onClick}
       className={isActive || isSubmenuActive ? 'active' : undefined}
       aria-current={isActive ? 'page' : undefined}
     >
@@ -151,7 +164,7 @@ function SidebarLink({children, item}: SidebarItemProps & {children: React.React
   );
 }
 
-function SidebarMenu({item, children}: SidebarItemProps & {children: React.ReactNode}) {
+function SidebarMenu({item, children, onClick}: SidebarItemProps) {
   if (!item.dropdown) {
     throw new Error(
       `Nav item "${item.label}" must have either a \`dropdown\` or \`to\` value!`
@@ -162,7 +175,13 @@ function SidebarMenu({item, children}: SidebarItemProps & {children: React.React
       position="right-end"
       trigger={(props, isOpen) => {
         return (
-          <NavButton {...props}>
+          <NavButton
+            {...props}
+            onClick={event => {
+              onClick?.(event);
+              props.onClick?.(event);
+            }}
+          >
             <InteractionStateLayer hasSelectedBackground={isOpen} />
             {children}
           </NavButton>
diff --git a/static/app/components/nav/utils.tsx b/static/app/components/nav/utils.tsx
index 98193be8222d9f..498162e743828d 100644
--- a/static/app/components/nav/utils.tsx
+++ b/static/app/components/nav/utils.tsx
@@ -33,6 +33,10 @@ export interface NavItemLayout<Item extends NavSidebarItem | NavSubmenuItem> {
  * SidebarItem is a top-level NavItem which is always displayed in the app sidebar
  */
 export interface NavSidebarItem extends NavItem {
+  /**
+   * A unique identifier string, used as a key for analytics
+   */
+  analyticsKey: string;
   /**
    * The icon to render in the sidebar
    */
diff --git a/static/app/components/onboarding/gettingStartedDoc/types.ts b/static/app/components/onboarding/gettingStartedDoc/types.ts
index 81f16159610cad..54e05444dd473f 100644
--- a/static/app/components/onboarding/gettingStartedDoc/types.ts
+++ b/static/app/components/onboarding/gettingStartedDoc/types.ts
@@ -62,6 +62,9 @@ export interface DocsParams<
    * The page where the docs are being displayed
    */
   docsLocation?: DocsPageLocation;
+  featureFlagOptions?: {
+    integration: string;
+  };
   feedbackOptions?: {
     email?: boolean;
     name?: boolean;
@@ -106,6 +109,7 @@ export interface Docs<PlatformOptions extends BasePlatformOptions = BasePlatform
   onboarding: OnboardingConfig<PlatformOptions>;
   crashReportOnboarding?: OnboardingConfig<PlatformOptions>;
   customMetricsOnboarding?: OnboardingConfig<PlatformOptions>;
+  featureFlagOnboarding?: OnboardingConfig<PlatformOptions>;
   feedbackOnboardingCrashApi?: OnboardingConfig<PlatformOptions>;
   feedbackOnboardingNpm?: OnboardingConfig<PlatformOptions>;
   performanceOnboarding?: OnboardingConfig<PlatformOptions>;
@@ -122,4 +126,5 @@ export type ConfigType =
   | 'crashReportOnboarding'
   | 'replayOnboarding'
   | 'replayOnboardingJsLoader'
-  | 'customMetricsOnboarding';
+  | 'customMetricsOnboarding'
+  | 'featureFlagOnboarding';
diff --git a/static/app/components/onboarding/gettingStartedDoc/utils/useLoadGettingStarted.tsx b/static/app/components/onboarding/gettingStartedDoc/utils/useLoadGettingStarted.tsx
index 74d29988835926..9c66df925109cf 100644
--- a/static/app/components/onboarding/gettingStartedDoc/utils/useLoadGettingStarted.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/utils/useLoadGettingStarted.tsx
@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/react';
 
 import type {Docs} from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {
+  featureFlagOnboardingPlatforms,
   feedbackOnboardingPlatforms,
   replayPlatforms,
   withPerformanceOnboarding,
@@ -15,7 +16,7 @@ import {useProjectKeys} from 'sentry/utils/useProjectKeys';
 type Props = {
   orgSlug: Organization['slug'];
   platform: PlatformIntegration;
-  productType?: 'feedback' | 'replay' | 'performance';
+  productType?: 'feedback' | 'replay' | 'performance' | 'featureFlags';
   projSlug?: Project['slug'];
 };
 
@@ -45,7 +46,10 @@ export function useLoadGettingStarted({
         !platformPath ||
         (productType === 'replay' && !replayPlatforms.includes(platform.id)) ||
         (productType === 'performance' && !withPerformanceOnboarding.has(platform.id)) ||
-        (productType === 'feedback' && !feedbackOnboardingPlatforms.includes(platform.id))
+        (productType === 'feedback' &&
+          !feedbackOnboardingPlatforms.includes(platform.id)) ||
+        (productType === 'featureFlags' &&
+          !featureFlagOnboardingPlatforms.includes(platform.id))
       ) {
         setModule('none');
         return;
diff --git a/static/app/components/onboarding/productSelection.tsx b/static/app/components/onboarding/productSelection.tsx
index d8d1798c5d04ce..ad91ebd536de2a 100644
--- a/static/app/components/onboarding/productSelection.tsx
+++ b/static/app/components/onboarding/productSelection.tsx
@@ -82,7 +82,7 @@ function getDisabledProducts(organization: Organization): DisabledProducts {
 // Since the ProductSelection component is rendered in the onboarding/project creation flow only, it is ok to have this list here
 // NOTE: Please keep the prefix in alphabetical order
 export const platformProductAvailability = {
-  android: [ProductSolution.PERFORMANCE_MONITORING, ProductSolution.PROFILING],
+  android: [ProductSolution.PERFORMANCE_MONITORING],
   'apple-ios': [ProductSolution.PERFORMANCE_MONITORING, ProductSolution.PROFILING],
   'apple-macos': [ProductSolution.PERFORMANCE_MONITORING, ProductSolution.PROFILING],
   bun: [ProductSolution.PERFORMANCE_MONITORING],
@@ -119,10 +119,6 @@ export const platformProductAvailability = {
     ProductSolution.PERFORMANCE_MONITORING,
     ProductSolution.SESSION_REPLAY,
   ],
-  'javascript-nuxt': [
-    ProductSolution.PERFORMANCE_MONITORING,
-    ProductSolution.SESSION_REPLAY,
-  ],
   'javascript-angular': [
     ProductSolution.PERFORMANCE_MONITORING,
     ProductSolution.SESSION_REPLAY,
diff --git a/static/app/components/onboardingWizard/newSidebar.tsx b/static/app/components/onboardingWizard/newSidebar.tsx
index 2c9504b2f5fdf6..72fa11a44e48d9 100644
--- a/static/app/components/onboardingWizard/newSidebar.tsx
+++ b/static/app/components/onboardingWizard/newSidebar.tsx
@@ -13,7 +13,7 @@ import {Chevron} from 'sentry/components/chevron';
 import InteractionStateLayer from 'sentry/components/interactionStateLayer';
 import SkipConfirm from 'sentry/components/onboardingWizard/skipConfirm';
 import type {useOnboardingTasks} from 'sentry/components/onboardingWizard/useOnboardingTasks';
-import {findCompleteTasks, taskIsDone} from 'sentry/components/onboardingWizard/utils';
+import {taskIsDone} from 'sentry/components/onboardingWizard/utils';
 import ProgressRing from 'sentry/components/progressRing';
 import SidebarPanel from 'sentry/components/sidebar/sidebarPanel';
 import type {CommonSidebarProps} from 'sentry/components/sidebar/types';
@@ -52,9 +52,7 @@ const orderedBeyondBasicsTasks = [
 ];
 
 function groupTasksByCompletion(tasks: OnboardingTask[]) {
-  const [completedTasks, incompletedTasks] = partition(tasks, task =>
-    findCompleteTasks(task)
-  );
+  const [completedTasks, incompletedTasks] = partition(tasks, task => taskIsDone(task));
   return {
     completedTasks,
     incompletedTasks,
diff --git a/static/app/components/onboardingWizard/skipConfirm.tsx b/static/app/components/onboardingWizard/skipConfirm.tsx
index aafe6287ba87de..4820c9fe8c4b5a 100644
--- a/static/app/components/onboardingWizard/skipConfirm.tsx
+++ b/static/app/components/onboardingWizard/skipConfirm.tsx
@@ -87,7 +87,7 @@ const Confirmation = styled(({onDismiss, onSkip, visible: _, ...props}: ConfirmP
   align-items: center;
   flex-direction: column;
   justify-content: center;
-  background: rgba(255, 255, 255, 0.9);
+  background: ${p => p.theme.surface200};
   animation: ${fadeIn} 200ms normal forwards;
   font-size: ${p => p.theme.fontSizeMedium};
 
diff --git a/static/app/components/onboardingWizard/taskConfig.tsx b/static/app/components/onboardingWizard/taskConfig.tsx
index 8d746f7a6654bf..74e69ba9329289 100644
--- a/static/app/components/onboardingWizard/taskConfig.tsx
+++ b/static/app/components/onboardingWizard/taskConfig.tsx
@@ -313,7 +313,7 @@ export function getOnboardingTasks({
       display: true,
       pendingTitle: t('Awaiting an error for this project.'),
       SupplementComponent: ({task}: OnboardingSupplementComponentProps) => {
-        if (!hasQuickStartUpdatesFeature(organization)) {
+        if (hasQuickStartUpdatesFeature(organization)) {
           return null;
         }
         if (!projects?.length || task.requisiteTasks.length > 0 || taskIsDone(task)) {
diff --git a/static/app/components/organizations/projectPageFilter/index.spec.tsx b/static/app/components/organizations/projectPageFilter/index.spec.tsx
index dcd45ef9612bd2..4a116187aae2d6 100644
--- a/static/app/components/organizations/projectPageFilter/index.spec.tsx
+++ b/static/app/components/organizations/projectPageFilter/index.spec.tsx
@@ -147,14 +147,12 @@ describe('ProjectPageFilter', function () {
 
     // Move focus to "Bookmark Project" button
     await userEvent.keyboard('{ArrowRight}');
-    expect(
-      within(optionOne).getByRole('button', {name: 'Bookmark Project'})
-    ).toHaveFocus();
+    expect(within(optionOne).getByRole('button', {name: 'Bookmark'})).toHaveFocus();
 
     // Activate the button
     await userEvent.keyboard('{Enter}');
     expect(
-      within(optionOne).getByRole('button', {name: 'Bookmark Project'})
+      within(optionOne).getByRole('button', {name: 'Remove Bookmark'})
     ).toHaveAttribute('aria-pressed', 'true');
     expect(mockApi).toHaveBeenCalledWith(
       `/projects/${organization.slug}/project-1/`,
diff --git a/static/app/components/pageHeadingQuestionTooltip.tsx b/static/app/components/pageHeadingQuestionTooltip.tsx
index 2cedc04b153c64..e2b6e056779837 100644
--- a/static/app/components/pageHeadingQuestionTooltip.tsx
+++ b/static/app/components/pageHeadingQuestionTooltip.tsx
@@ -13,17 +13,22 @@ interface PageHeadingQuestionTooltipProps extends TooltipProps {
    * The link to the documentation for this page.
    */
   docsUrl: string;
+  /**
+   * The label to use for the external link.
+   */
+  linkLabel?: React.ReactNode;
 }
 
 export function PageHeadingQuestionTooltip({
   docsUrl,
   title,
+  linkLabel,
   ...props
 }: PageHeadingQuestionTooltipProps) {
   const contents = (
     <Container>
       {title}
-      <ExternalLink href={docsUrl}>{t('Read the Docs')}</ExternalLink>
+      <ExternalLink href={docsUrl}>{linkLabel ?? t('Read the Docs')}</ExternalLink>
     </Container>
   );
 
diff --git a/static/app/components/passwordStrength.tsx b/static/app/components/passwordStrength.tsx
index ad88fd838be76d..627c310a191424 100644
--- a/static/app/components/passwordStrength.tsx
+++ b/static/app/components/passwordStrength.tsx
@@ -1,19 +1,12 @@
 import {Fragment} from 'react';
-import {render} from 'react-dom';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
-import throttle from 'lodash/throttle';
 import zxcvbn from 'zxcvbn';
 
 import {tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import theme from 'sentry/utils/theme';
 
-/**
- * NOTE: Do not import this component synchronously. The zxcvbn library is
- * relatively large. This component should be loaded async as a split chunk.
- */
-
 /**
  * The maximum score that zxcvbn reports
  */
@@ -34,7 +27,11 @@ type Props = {
   labels?: [string, string, string, string, string];
 };
 
-function PasswordStrength({
+/**
+ * NOTE: Do not import this component synchronously. The zxcvbn library is
+ * relatively large. This component should be loaded async as a split chunk.
+ */
+export function PasswordStrength({
   value,
   labels = ['Very Weak', 'Very Weak', 'Weak', 'Strong', 'Very Strong'],
   colors = [theme.red300, theme.red300, theme.yellow300, theme.green300, theme.green300],
@@ -96,20 +93,3 @@ const StrengthLabel = styled('div')`
 const ScoreText = styled('strong')`
   color: ${p => p.theme.black};
 `;
-
-export default PasswordStrength;
-
-/**
- * This is a shim that allows the password strength component to be used
- * outside of our main react application. Mostly useful since all of our
- * registration pages aren't in the react app.
- */
-export const attachTo = ({input, element}) =>
-  element &&
-  input &&
-  input.addEventListener(
-    'input',
-    throttle(e => {
-      render(<PasswordStrength value={e.target.value} />, element);
-    })
-  );
diff --git a/static/app/components/performance/spanSearchQueryBuilder.tsx b/static/app/components/performance/spanSearchQueryBuilder.tsx
index 887c64a9580817..8bef5f125bbad9 100644
--- a/static/app/components/performance/spanSearchQueryBuilder.tsx
+++ b/static/app/components/performance/spanSearchQueryBuilder.tsx
@@ -30,6 +30,7 @@ interface SpanSearchQueryBuilderProps {
   searchSource: string;
   datetime?: PageFilters['datetime'];
   disableLoadingTags?: boolean;
+  onBlur?: (query: string, state: CallbackSearchState) => void;
   onSearch?: (query: string, state: CallbackSearchState) => void;
   placeholder?: string;
   projects?: PageFilters['projects'];
@@ -50,15 +51,18 @@ const getFunctionTags = (supportedAggregates?: AggregationKey[]) => {
   }, {});
 };
 
-const getSpanFieldDefinition = (key: string, kind?: FieldKind) => {
-  return getFieldDefinition(key, 'span', kind);
-};
+function getSpanFieldDefinitionFunction(tags: TagCollection) {
+  return (key: string) => {
+    return getFieldDefinition(key, 'span', tags[key]?.kind);
+  };
+}
 
 export function SpanSearchQueryBuilder({
   initialQuery,
   searchSource,
   datetime,
   onSearch,
+  onBlur,
   placeholder,
   projects,
 }: SpanSearchQueryBuilderProps) {
@@ -133,8 +137,9 @@ export function SpanSearchQueryBuilder({
       placeholder={placeholderText}
       filterKeys={filterTags}
       initialQuery={initialQuery}
-      fieldDefinitionGetter={getSpanFieldDefinition}
+      fieldDefinitionGetter={getSpanFieldDefinitionFunction(filterTags)}
       onSearch={onSearch}
+      onBlur={onBlur}
       searchSource={searchSource}
       filterKeySections={filterKeySections}
       getTagValues={getSpanFilterTagValues}
@@ -148,6 +153,7 @@ export function SpanSearchQueryBuilder({
 interface EAPSpanSearchQueryBuilderProps extends SpanSearchQueryBuilderProps {
   numberTags: TagCollection;
   stringTags: TagCollection;
+  getFilterTokenWarning?: (key: string) => React.ReactNode;
   supportedAggregates?: AggregationKey[];
 }
 
@@ -155,9 +161,11 @@ export function EAPSpanSearchQueryBuilder({
   initialQuery,
   placeholder,
   onSearch,
+  onBlur,
   searchSource,
   numberTags,
   stringTags,
+  getFilterTokenWarning,
   supportedAggregates = [],
 }: EAPSpanSearchQueryBuilderProps) {
   const api = useApi();
@@ -179,7 +187,12 @@ export function EAPSpanSearchQueryBuilder({
       SPANS_FILTER_KEY_SECTIONS.flatMap(section => section.children)
     );
     return [
-      ...SPANS_FILTER_KEY_SECTIONS,
+      ...SPANS_FILTER_KEY_SECTIONS.map(section => {
+        return {
+          ...section,
+          children: section.children.filter(key => stringTags.hasOwnProperty(key)),
+        };
+      }),
       {
         value: 'custom_fields',
         label: 'Custom Tags',
@@ -219,8 +232,10 @@ export function EAPSpanSearchQueryBuilder({
       placeholder={placeholderText}
       filterKeys={tags}
       initialQuery={initialQuery}
-      fieldDefinitionGetter={getSpanFieldDefinition}
+      fieldDefinitionGetter={getSpanFieldDefinitionFunction(tags)}
       onSearch={onSearch}
+      onBlur={onBlur}
+      getFilterTokenWarning={getFilterTokenWarning}
       searchSource={searchSource}
       filterKeySections={filterKeySections}
       getTagValues={getSpanFilterTagValues}
diff --git a/static/app/components/performance/waterfall/constants.tsx b/static/app/components/performance/waterfall/constants.tsx
index 0f06ed639aea6f..adb530ee222fc5 100644
--- a/static/app/components/performance/waterfall/constants.tsx
+++ b/static/app/components/performance/waterfall/constants.tsx
@@ -10,35 +10,35 @@ export enum SpanBarType {
   AUTOGROUPED_AND_AFFECTED = 'autogrouped_and_affected',
 }
 
-type SpanBarColours = {
+type SpanBarColors = {
   alternate: string;
-  insetTextColour: string;
+  insetTextColor: string;
   primary: string;
 };
 
-// TODO: Need to eventually add dark mode colours as well
-export function getSpanBarColours(
+// TODO: Need to eventually add dark mode colors as well
+export function getSpanBarColors(
   spanBarType: SpanBarType | undefined,
   theme: Theme
-): SpanBarColours {
+): SpanBarColors {
   switch (spanBarType) {
     case SpanBarType.GAP:
-      return {primary: '#dedae3', alternate: '#f4f2f7', insetTextColour: theme.gray300};
+      return {primary: '#dedae3', alternate: '#f4f2f7', insetTextColor: theme.gray300};
     case SpanBarType.AFFECTED:
-      return {primary: '#f55459', alternate: '#faa9ac', insetTextColour: theme.white};
+      return {primary: '#f55459', alternate: '#faa9ac', insetTextColor: theme.white};
     case SpanBarType.AUTOGROUPED:
       return {
         primary: theme.blue300,
         alternate: '#d1dff9',
-        insetTextColour: theme.gray300,
+        insetTextColor: theme.gray300,
       };
     case SpanBarType.AUTOGROUPED_AND_AFFECTED:
       return {
         primary: '#f55459',
         alternate: '#faa9ac',
-        insetTextColour: theme.white,
+        insetTextColor: theme.white,
       };
     default:
-      return {primary: '', alternate: '', insetTextColour: theme.white};
+      return {primary: '', alternate: '', insetTextColor: theme.white};
   }
 }
diff --git a/static/app/components/performance/waterfall/rowBar.tsx b/static/app/components/performance/waterfall/rowBar.tsx
index 9ad547f4c459f5..3c61b935478bdc 100644
--- a/static/app/components/performance/waterfall/rowBar.tsx
+++ b/static/app/components/performance/waterfall/rowBar.tsx
@@ -5,7 +5,7 @@ import {ROW_HEIGHT, ROW_PADDING} from 'sentry/components/performance/waterfall/c
 import type {DurationDisplay} from 'sentry/components/performance/waterfall/types';
 import {
   getDurationPillAlignment,
-  getDurationPillColours,
+  getDurationPillColors,
   getHatchPattern,
 } from 'sentry/components/performance/waterfall/utils';
 import {space} from 'sentry/styles/space';
@@ -42,7 +42,7 @@ export const DurationPill = styled('div')<{
   line-height: 1;
 
   ${getDurationPillAlignment}
-  ${getDurationPillColours}
+  ${getDurationPillColors}
 
   @media (max-width: ${p => p.theme.breakpoints.medium}) {
     font-size: 10px;
diff --git a/static/app/components/performance/waterfall/utils.tsx b/static/app/components/performance/waterfall/utils.tsx
index 114736039780f3..63b7fed34ff53c 100644
--- a/static/app/components/performance/waterfall/utils.tsx
+++ b/static/app/components/performance/waterfall/utils.tsx
@@ -6,7 +6,7 @@ import {CHART_PALETTE} from 'sentry/constants/chartPalette';
 import {space} from 'sentry/styles/space';
 
 import type {SpanBarType} from './constants';
-import {getSpanBarColours} from './constants';
+import {getSpanBarColors} from './constants';
 
 export const getBackgroundColor = ({
   showStriping,
@@ -30,7 +30,7 @@ export const getBackgroundColor = ({
 
 export function getHatchPattern(spanBarType: SpanBarType | undefined, theme: Theme) {
   if (spanBarType) {
-    const {primary, alternate} = getSpanBarColours(spanBarType, theme);
+    const {primary, alternate} = getSpanBarColors(spanBarType, theme);
 
     return css`
       background-image: linear-gradient(
@@ -81,7 +81,7 @@ export const getDurationPillAlignment = ({
   }
 };
 
-export const getDurationPillColours = ({
+export const getDurationPillColors = ({
   durationDisplay,
   theme,
   showDetail,
@@ -93,8 +93,8 @@ export const getDurationPillColours = ({
   spanBarType?: SpanBarType;
 }) => {
   if (durationDisplay === 'inset') {
-    const {alternate, insetTextColour} = getSpanBarColours(spanBarType, theme);
-    return `background: ${alternate}; color: ${insetTextColour};`;
+    const {alternate, insetTextColor} = getSpanBarColors(spanBarType, theme);
+    return `background: ${alternate}; color: ${insetTextColor};`;
   }
 
   return `color: ${showDetail ? theme.gray200 : theme.gray300};`;
@@ -116,7 +116,7 @@ export const getToggleTheme = ({
   spanBarType?: SpanBarType;
 }) => {
   if (spanBarType) {
-    const {primary} = getSpanBarColours(spanBarType, theme);
+    const {primary} = getSpanBarColors(spanBarType, theme);
     return css`
       background: ${primary};
       border: 2px solid ${theme.button.default.border};
diff --git a/static/app/components/platformPicker.spec.tsx b/static/app/components/platformPicker.spec.tsx
index 2f79bbb0ba6ee6..a0a31b356c4904 100644
--- a/static/app/components/platformPicker.spec.tsx
+++ b/static/app/components/platformPicker.spec.tsx
@@ -88,6 +88,7 @@ describe('PlatformPicker', function () {
       'Nest.js',
       'Next.js',
       'Node.js',
+      'Nuxt',
       'PHP',
       'Python',
       'Rails',
diff --git a/static/app/components/profiling/boundTooltip.tsx b/static/app/components/profiling/boundTooltip.tsx
index 34796ca64a42be..6a6cfc933af580 100644
--- a/static/app/components/profiling/boundTooltip.tsx
+++ b/static/app/components/profiling/boundTooltip.tsx
@@ -6,39 +6,74 @@ import {space} from 'sentry/styles/space';
 import type {CanvasView} from 'sentry/utils/profiling/canvasView';
 import {useFlamegraphTheme} from 'sentry/utils/profiling/flamegraph/useFlamegraphTheme';
 import type {FlamegraphCanvas} from 'sentry/utils/profiling/flamegraphCanvas';
-import type {Rect} from 'sentry/utils/profiling/speedscope';
+import {Rect} from 'sentry/utils/profiling/speedscope';
 import theme from 'sentry/utils/theme';
 
+// The cursor icon is drawn with an origin in the top left, which means that if we render
+// a tooltip directly at the cursor's position, it will overlap with the cursor icon.
+//          x      <- client x
+//          |----| <- cursor icon
+//          |-------------| <- tooltip
+//
+// This wont happen if we draw the tooltip to the left of the cursor, as the cursor icon will
+// be drawn to right of the tooltip. The offset helps us correct this and remove the overlap.
+//               x      <- client x offset
+//               |----| <- cursor icon
+// |-------------|      <- tooltip
+
+// We only need to do this when drawing the tooltip on the left side of the cursor, as
+// the origin is in the correct position when drawing the tooltip on the right side.
+const CURSOR_LEFT_OFFSET_PX = 6;
+const CURSOR_TOP_OFFSET_PX = 4;
+// Gap between the tooltip and container edge for each side
+const WIDTH_OFFSET = 8;
+
 function computeBestTooltipPlacement(
   cursor: vec2,
-  container: Rect,
-  tooltip: DOMRect
+  tooltip: DOMRect,
+  canvas: Rect,
+  container: Rect
 ): string {
   // This is because the cursor's origin is in the top left corner of the arrow, so we want
   // to offset it just enough so that the tooltip does not overlap with the arrow's tail.
   // When the tooltip placed to the left of the cursor, we do not have that issue and hence
   // no offset is applied.
-  const OFFSET_PX = 6;
-  let left = cursor[0] + OFFSET_PX;
-  const top = cursor[1] + OFFSET_PX;
+  const cursorLeft = cursor[0];
+  const cursorTop = cursor[1];
+
+  // Cursor is relative to canvas, not container
+  const cursorRelativeToContainer = cursorLeft + canvas.x;
+
+  let left =
+    cursorRelativeToContainer > container.width / 2
+      ? cursorLeft - tooltip.width
+      : cursorLeft + CURSOR_LEFT_OFFSET_PX;
+
+  const right = left + tooltip.width + canvas.left;
 
-  if (cursor[0] > container.width / 2) {
-    left = cursor[0] - tooltip.width; // No offset is applied here as tooltip is placed to the left
+  if (left + canvas.left - WIDTH_OFFSET <= 0) {
+    left = -canvas.left + WIDTH_OFFSET;
+  } else if (right >= container.width - WIDTH_OFFSET) {
+    left = container.width - tooltip.width - canvas.left - WIDTH_OFFSET;
   }
 
-  return `translate(${left || 0}px, ${top || 0}px)`;
+  return `translate(${left}px, ${cursorTop + CURSOR_TOP_OFFSET_PX}px)`;
 }
 
 interface BoundTooltipProps {
-  bounds: Rect;
   canvas: FlamegraphCanvas;
+  canvasBounds: Rect;
   canvasView: CanvasView<any>;
   cursor: vec2;
   children?: React.ReactNode;
+  containerBounds?: Rect;
 }
 
+const DEFAULT_BOUNDS = Rect.Empty();
+
 function BoundTooltip({
-  bounds,
+  containerBounds,
+  canvasBounds,
   canvas,
   cursor,
   canvasView,
@@ -58,6 +93,21 @@ function BoundTooltip({
     canvas.physicalToLogicalSpace
   );
 
+  const containerBoundsRef = useRef<Rect>(containerBounds ?? DEFAULT_BOUNDS);
+
+  if (containerBounds) {
+    containerBoundsRef.current = containerBounds;
+  } else if (containerBoundsRef.current.isEmpty()) {
+    const bodyRect = document.body.getBoundingClientRect();
+    containerBoundsRef.current = new Rect(
+      bodyRect.x,
+      bodyRect.y,
+      bodyRect.width,
+      bodyRect.height
+    );
+  }
+
+  const sizeCache = useRef<{size: DOMRect; value: React.ReactNode} | null>(null);
   const rafIdRef = useRef<number | undefined>();
   const onRef = useCallback(
     node => {
@@ -71,14 +121,19 @@ function BoundTooltip({
       }
 
       rafIdRef.current = window.requestAnimationFrame(() => {
+        if (!sizeCache.current || sizeCache.current?.value !== children) {
+          sizeCache.current = {value: children, size: node.getBoundingClientRect()};
+        }
+
         node.style.transform = computeBestTooltipPlacement(
           logicalSpaceCursor,
-          bounds,
-          node.getBoundingClientRect()
+          sizeCache.current.size,
+          canvasBounds,
+          containerBoundsRef.current
         );
       });
     },
-    [bounds, logicalSpaceCursor]
+    [canvasBounds, logicalSpaceCursor, children]
   );
 
   return (
@@ -89,7 +144,7 @@ function BoundTooltip({
         fontSize: flamegraphTheme.SIZES.TOOLTIP_FONT_SIZE,
         fontFamily: flamegraphTheme.FONTS.FONT,
         zIndex: theme.zIndex.tooltip,
-        maxWidth: bounds.width,
+        maxWidth: containerBoundsRef.current.width - 2 * WIDTH_OFFSET,
       }}
     >
       {children}
diff --git a/static/app/components/profiling/flamegraph/flamegraphChartTooltip.tsx b/static/app/components/profiling/flamegraph/flamegraphChartTooltip.tsx
index b7a86cbc2036b1..02ac3aadbec950 100644
--- a/static/app/components/profiling/flamegraph/flamegraphChartTooltip.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphChartTooltip.tsx
@@ -45,9 +45,9 @@ export function FlamegraphChartTooltip({
 
   return series.length > 0 ? (
     <BoundTooltip
-      bounds={canvasBounds}
       cursor={configSpaceCursor}
       canvas={chartCanvas}
+      canvasBounds={canvasBounds}
       canvasView={chartView}
     >
       {series.map((p, i) => {
diff --git a/static/app/components/profiling/flamegraph/flamegraphSpanTooltip.tsx b/static/app/components/profiling/flamegraph/flamegraphSpanTooltip.tsx
index 2da641c8bdb0bd..b8e76f2fa640a8 100644
--- a/static/app/components/profiling/flamegraph/flamegraphSpanTooltip.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphSpanTooltip.tsx
@@ -53,9 +53,9 @@ export function FlamegraphSpanTooltip({
 
   return (
     <BoundTooltip
-      bounds={canvasBounds}
       cursor={configSpaceCursor}
       canvas={spansCanvas}
+      canvasBounds={canvasBounds}
       canvasView={spansView}
     >
       <FlamegraphTooltipFrameMainInfo>
diff --git a/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx b/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx
index d2f7d74eb5d346..cb9630fbac6045 100644
--- a/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx
@@ -106,9 +106,9 @@ function DifferentialFlamegraphTooltip(props: DifferentialFlamegraphTooltipProps
 
   return (
     <BoundTooltip
-      bounds={props.canvasBounds}
       cursor={props.configSpaceCursor}
       canvas={props.flamegraphCanvas}
+      canvasBounds={props.canvasBounds}
       canvasView={props.flamegraphView}
     >
       <FlamegraphTooltipFrameMainInfo>
@@ -140,7 +140,7 @@ interface AggregateFlamegraphTooltipProps extends FlamegraphTooltipProps {
 function AggregateFlamegraphTooltip(props: AggregateFlamegraphTooltipProps) {
   return (
     <BoundTooltip
-      bounds={props.canvasBounds}
+      canvasBounds={props.canvasBounds}
       cursor={props.configSpaceCursor}
       canvas={props.flamegraphCanvas}
       canvasView={props.flamegraphView}
@@ -173,7 +173,7 @@ interface FlamechartTooltipProps extends FlamegraphTooltipProps {
 function FlamechartTooltip(props: FlamechartTooltipProps) {
   return (
     <BoundTooltip
-      bounds={props.canvasBounds}
+      canvasBounds={props.canvasBounds}
       cursor={props.configSpaceCursor}
       canvas={props.flamegraphCanvas}
       canvasView={props.flamegraphView}
@@ -237,8 +237,9 @@ export const FlamegraphTooltipTimelineInfo = styled('div')`
 `;
 
 export const FlamegraphTooltipFrameMainInfo = styled('div')`
-  display: flex;
-  align-items: center;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 `;
 
 export const FlamegraphTooltipColorIndicator = styled('div')<{
@@ -255,4 +256,5 @@ export const FlamegraphTooltipColorIndicator = styled('div')<{
   background-size: 16px 16px;
   background-color: ${p => p.backgroundColor};
   margin-right: ${space(1)};
+  transform: translateY(2px);
 `;
diff --git a/static/app/components/profiling/flamegraph/flamegraphUIFramesTooltip.tsx b/static/app/components/profiling/flamegraph/flamegraphUIFramesTooltip.tsx
index 2d013f77effd51..9d316a7ce57a96 100644
--- a/static/app/components/profiling/flamegraph/flamegraphUIFramesTooltip.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphUIFramesTooltip.tsx
@@ -50,9 +50,9 @@ export function FlamegraphUIFramesTooltip({
 
   return (
     <BoundTooltip
-      bounds={canvasBounds}
       cursor={configSpaceCursor}
       canvas={uiFramesCanvas}
+      canvasBounds={canvasBounds}
       canvasView={uiFramesView}
     >
       {uiFramesInConfigSpace.map((frame, i) => {
diff --git a/static/app/components/profiling/profileEventsTable.tsx b/static/app/components/profiling/profileEventsTable.tsx
index b33320da3da652..862aedcb48ebae 100644
--- a/static/app/components/profiling/profileEventsTable.tsx
+++ b/static/app/components/profiling/profileEventsTable.tsx
@@ -14,6 +14,7 @@ import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {defined} from 'sentry/utils';
+import {trackAnalytics} from 'sentry/utils/analytics';
 import {getTimeStampFromTableDateField} from 'sentry/utils/dates';
 import EventView from 'sentry/utils/discover/eventView';
 import {DURATION_UNITS} from 'sentry/utils/discover/fieldRenderers';
@@ -33,8 +34,7 @@ import {
   useDomainViewFilters,
 } from 'sentry/views/insights/pages/useFilters';
 import {getTraceDetailsUrl} from 'sentry/views/performance/traceDetails/utils';
-
-import {ProfilingTransactionHovercard} from './profilingTransactionHovercard';
+import {profilesRouteWithQuery} from 'sentry/views/performance/transactionSummary/transactionProfiles/utils';
 
 interface ProfileEventsTableProps<F extends FieldType> {
   columns: readonly F[];
@@ -236,13 +236,26 @@ function ProfileEventsCell<F extends FieldType>(props: ProfileEventsCellProps<F>
     const project = getProjectForRow(props.baggage, props.dataRow);
 
     if (defined(project)) {
+      const linkToSummary = profilesRouteWithQuery({
+        query: props.baggage.location.query,
+        orgSlug: props.baggage.organization.slug,
+        projectID: project.id,
+        transaction: props.dataRow.transaction,
+      });
+
       return (
         <Container>
-          <ProfilingTransactionHovercard
-            transaction={value}
-            project={project}
-            organization={props.baggage.organization}
-          />
+          <Link
+            to={linkToSummary}
+            onClick={() =>
+              trackAnalytics('profiling_views.go_to_transaction', {
+                organization: props.baggage.organization,
+                source: 'profiling.landing.transaction_table',
+              })
+            }
+          >
+            {props.dataRow.transaction}
+          </Link>
         </Container>
       );
     }
diff --git a/static/app/components/profiling/profilingTransactionHovercard.tsx b/static/app/components/profiling/profilingTransactionHovercard.tsx
deleted file mode 100644
index 0294088b7c9f8d..00000000000000
--- a/static/app/components/profiling/profilingTransactionHovercard.tsx
+++ /dev/null
@@ -1,270 +0,0 @@
-import {Fragment, useEffect} from 'react';
-import styled from '@emotion/styled';
-
-import {LinkButton} from 'sentry/components/button';
-import {Flex} from 'sentry/components/container/flex';
-import {Hovercard} from 'sentry/components/hovercard';
-import {
-  FunctionsMiniGrid,
-  FunctionsMiniGridEmptyState,
-  FunctionsMiniGridLoading,
-} from 'sentry/components/profiling/functionsMiniGrid';
-import {TextTruncateOverflow} from 'sentry/components/profiling/textTruncateOverflow';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {Organization} from 'sentry/types/organization';
-import type {Project} from 'sentry/types/project';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {getShortEventId} from 'sentry/utils/events';
-import {useProfilingTransactionQuickSummary} from 'sentry/utils/profiling/hooks/useProfilingTransactionQuickSummary';
-import {
-  generateProfileFlamechartRouteWithQuery,
-  generateProfileSummaryRouteWithQuery,
-} from 'sentry/utils/profiling/routes';
-import {useLocation} from 'sentry/utils/useLocation';
-import {profilesRouteWithQuery} from 'sentry/views/performance/transactionSummary/transactionProfiles/utils';
-
-import Link from '../links/link';
-import LoadingIndicator from '../loadingIndicator';
-import PerformanceDuration from '../performanceDuration';
-
-interface ProfilingTransactionHovercardProps {
-  organization: Organization;
-  project: Project;
-  transaction: string;
-}
-
-export function ProfilingTransactionHovercard(props: ProfilingTransactionHovercardProps) {
-  const {project, transaction, organization} = props;
-  const {query} = useLocation();
-
-  if (!organization.features.includes('continuous-profiling-ui')) {
-    const linkToSummary = generateProfileSummaryRouteWithQuery({
-      query,
-      orgSlug: organization.slug,
-      projectSlug: project.slug,
-      transaction,
-    });
-
-    const triggerLink = (
-      <Link
-        to={linkToSummary}
-        onClick={() =>
-          trackAnalytics('profiling_views.go_to_transaction', {
-            organization,
-            source: 'transaction_hovercard.trigger',
-          })
-        }
-      >
-        {transaction}
-      </Link>
-    );
-
-    return (
-      <StyledHovercard
-        delay={250}
-        header={
-          <Flex justify="space-between" align="center">
-            <TextTruncateOverflow>{transaction}</TextTruncateOverflow>
-            <LinkButton to={linkToSummary} size="xs">
-              {t('View Profiles')}
-            </LinkButton>
-          </Flex>
-        }
-        body={
-          <ProfilingTransactionHovercardBody
-            transaction={transaction}
-            project={project}
-            organization={organization}
-          />
-        }
-        showUnderline
-      >
-        {triggerLink}
-      </StyledHovercard>
-    );
-  }
-
-  const linkToSummary = profilesRouteWithQuery({
-    query,
-    orgSlug: organization.slug,
-    projectID: project.id,
-    transaction,
-  });
-
-  return (
-    <Link
-      to={linkToSummary}
-      onClick={() =>
-        trackAnalytics('profiling_views.go_to_transaction', {
-          organization,
-          source: 'profiling.landing.transaction_table',
-        })
-      }
-    >
-      {transaction}
-    </Link>
-  );
-}
-
-export function ProfilingTransactionHovercardBody({
-  transaction,
-  project,
-  organization,
-}: ProfilingTransactionHovercardProps) {
-  const {
-    slowestProfile,
-    slowestProfileQuery,
-    slowestProfileDurationMultiplier,
-    latestProfileQuery,
-    latestProfile,
-    functionsQuery,
-    functions,
-  } = useProfilingTransactionQuickSummary({
-    transaction,
-    project,
-    referrer: 'api.profiling.transaction-hovercard',
-  });
-
-  const linkToFlamechartRoute = (
-    profileId: string,
-    query?: {frameName: string; framePackage: string}
-  ) => {
-    return generateProfileFlamechartRouteWithQuery({
-      orgSlug: organization.slug,
-      projectSlug: project.slug,
-      profileId,
-      query,
-    });
-  };
-
-  useEffect(() => {
-    trackAnalytics('profiling_ui_events.transaction_hovercard_view', {
-      organization,
-    });
-  }, [organization]);
-
-  return (
-    <Flex gap={space(3)} column>
-      <Flex justify="space-between">
-        <ContextDetail
-          title={t('Latest profile')}
-          isLoading={latestProfileQuery.isPending}
-        >
-          {latestProfile ? (
-            <Link
-              to={linkToFlamechartRoute(String(latestProfile['profile.id']))}
-              onClick={() =>
-                trackAnalytics('profiling_views.go_to_flamegraph', {
-                  organization,
-                  source: 'transaction_hovercard.latest_profile',
-                })
-              }
-            >
-              {getShortEventId(String(latestProfile!['profile.id']))}
-            </Link>
-          ) : (
-            '-'
-          )}
-        </ContextDetail>
-
-        <ContextDetail
-          title={t('Slowest profile')}
-          isLoading={slowestProfileQuery.isPending}
-        >
-          {slowestProfile ? (
-            <Flex gap={space(1)}>
-              <PerformanceDuration
-                milliseconds={
-                  slowestProfileDurationMultiplier *
-                  (slowestProfile['transaction.duration'] as number)
-                }
-                abbreviation
-              />
-              <Link
-                to={linkToFlamechartRoute(String(slowestProfile['profile.id']))}
-                onClick={() =>
-                  trackAnalytics('profiling_views.go_to_flamegraph', {
-                    organization,
-                    source: 'transaction_hovercard.slowest_profile',
-                  })
-                }
-              >
-                ({getShortEventId(String(slowestProfile['profile.id']))})
-              </Link>
-            </Flex>
-          ) : (
-            '-'
-          )}
-        </ContextDetail>
-      </Flex>
-
-      <Flex column h={125}>
-        <ProfilingTransactionHovercardFunctions
-          isLoading={functionsQuery.isPending}
-          functions={functions ?? []}
-          organization={organization}
-          project={project}
-          onLinkClick={() =>
-            trackAnalytics('profiling_views.go_to_flamegraph', {
-              organization,
-              source: 'transaction_hovercard.suspect_function',
-            })
-          }
-        />
-      </Flex>
-    </Flex>
-  );
-}
-
-type ProfilingTransactionHovercardFunctionsProps = React.ComponentProps<
-  typeof FunctionsMiniGrid
-> & {isLoading: boolean};
-
-function ProfilingTransactionHovercardFunctions(
-  props: ProfilingTransactionHovercardFunctionsProps
-) {
-  if (props.isLoading) {
-    return <FunctionsMiniGridLoading />;
-  }
-
-  if (!props.functions || props.functions?.length === 0) {
-    return <FunctionsMiniGridEmptyState />;
-  }
-  return <FunctionsMiniGrid {...props} />;
-}
-
-interface ContextDetailProps {
-  children: React.ReactNode;
-  isLoading: boolean;
-  title?: React.ReactNode;
-}
-function ContextDetail(props: ContextDetailProps) {
-  const {title, children, isLoading} = props;
-
-  return (
-    <Flex column gap={space(1)}>
-      {title && <UppercaseTitle>{title}</UppercaseTitle>}
-      <Fragment>
-        {isLoading ? (
-          <Flex align="center" justify="center" h="1em">
-            <LoadingIndicator mini />
-          </Flex>
-        ) : (
-          children
-        )}
-      </Fragment>
-    </Flex>
-  );
-}
-
-const UppercaseTitle = styled('span')`
-  text-transform: uppercase;
-  font-size: ${p => p.theme.fontSizeExtraSmall};
-  font-weight: ${p => p.theme.fontWeightBold};
-  color: ${p => p.theme.subText};
-`;
-
-const StyledHovercard = styled(Hovercard)`
-  width: 400px;
-`;
diff --git a/static/app/components/profiling/suspectFunctions/functionsTable.spec.tsx b/static/app/components/profiling/suspectFunctions/functionsTable.spec.tsx
deleted file mode 100644
index b66e717067acbf..00000000000000
--- a/static/app/components/profiling/suspectFunctions/functionsTable.spec.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import type {ReactElement} from 'react';
-import {useEffect} from 'react';
-import {ProjectFixture} from 'sentry-fixture/project';
-
-import {render, screen} from 'sentry-test/reactTestingLibrary';
-
-import {FunctionsTable} from 'sentry/components/profiling/suspectFunctions/functionsTable';
-import ProjectsStore from 'sentry/stores/projectsStore';
-
-const project = ProjectFixture();
-
-function TestContext({children}: {children: ReactElement}) {
-  useEffect(() => {
-    ProjectsStore.loadInitialData([project]);
-    return () => ProjectsStore.reset();
-  }, []);
-
-  return children;
-}
-
-describe('FunctionsTable', function () {
-  it('renders loading', function () {
-    render(
-      <TestContext>
-        <FunctionsTable
-          analyticsPageSource="profiling_transaction"
-          isLoading
-          error={null}
-          functions={[]}
-          project={project}
-          sort={{key: 'p95()', order: 'desc'}}
-        />
-      </TestContext>
-    );
-    expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
-  });
-
-  it('renders empty data', function () {
-    render(
-      <TestContext>
-        <FunctionsTable
-          analyticsPageSource="profiling_transaction"
-          isLoading={false}
-          error={null}
-          functions={[]}
-          project={project}
-          sort={{key: 'p95()', order: 'desc'}}
-        />
-      </TestContext>
-    );
-
-    expect(screen.getByText('No results found for your query')).toBeInTheDocument();
-  });
-
-  it('renders one function', function () {
-    const func = {
-      'count()': 10,
-      'all_examples()': [
-        {profile_id: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'},
-        {profile_id: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'},
-      ],
-      function: 'foo',
-      'p75()': 10000000,
-      'sum()': 25000000,
-      package: 'bar',
-    };
-
-    render(
-      <TestContext>
-        <FunctionsTable
-          analyticsPageSource="profiling_transaction"
-          isLoading={false}
-          error={null}
-          functions={[func]}
-          project={project}
-          sort={{key: 'p95()', order: 'desc'}}
-        />
-      </TestContext>
-    );
-
-    expect(screen.getByText('Name')).toBeInTheDocument();
-    expect(screen.getByText('foo')).toBeInTheDocument();
-
-    expect(screen.getByText('Package')).toBeInTheDocument();
-    expect(screen.getByText('bar')).toBeInTheDocument();
-
-    expect(screen.getByText('Occurrences')).toBeInTheDocument();
-    expect(screen.getByText('10')).toBeInTheDocument();
-
-    expect(screen.getByText('P75 Self Time')).toBeInTheDocument();
-    expect(screen.getByText('10.00ms')).toBeInTheDocument();
-
-    expect(screen.getByText('Total Self Time')).toBeInTheDocument();
-    expect(screen.getByText('25.00ms')).toBeInTheDocument();
-  });
-
-  it('renders empty name', function () {
-    const func = {
-      'count()': 10,
-      'all_examples()': [
-        {profile_id: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'},
-        {profile_id: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'},
-      ],
-      function: '',
-      'p75()': 10000000,
-      'sum()': 25000000,
-      package: 'bar',
-    };
-
-    render(
-      <TestContext>
-        <FunctionsTable
-          analyticsPageSource="profiling_transaction"
-          isLoading={false}
-          error={null}
-          functions={[func]}
-          project={project}
-          sort={{key: 'p75()', order: 'desc'}}
-        />
-      </TestContext>
-    );
-
-    expect(screen.getByText('Name')).toBeInTheDocument();
-    expect(screen.getByText('Unknown')).toBeInTheDocument();
-
-    expect(screen.getByText('Package')).toBeInTheDocument();
-    expect(screen.getByText('bar')).toBeInTheDocument();
-  });
-
-  it('renders empty package', function () {
-    const func = {
-      'count()': 10,
-      'all_examples()': [
-        {profile_id: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'},
-        {profile_id: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'},
-      ],
-      function: 'foo',
-      'p75()': 10000000,
-      'sum()': 25000000,
-      package: '',
-    };
-
-    render(
-      <TestContext>
-        <FunctionsTable
-          analyticsPageSource="profiling_transaction"
-          isLoading={false}
-          error={null}
-          functions={[func]}
-          project={project}
-          sort={{key: 'p75()', order: 'desc'}}
-        />
-      </TestContext>
-    );
-
-    expect(screen.getByText('Name')).toBeInTheDocument();
-    expect(screen.getByText('foo')).toBeInTheDocument();
-
-    expect(screen.getByText('Package')).toBeInTheDocument();
-    expect(screen.getByText('Unknown')).toBeInTheDocument();
-  });
-});
diff --git a/static/app/components/profiling/suspectFunctions/functionsTable.tsx b/static/app/components/profiling/suspectFunctions/functionsTable.tsx
deleted file mode 100644
index 69eb89e872d550..00000000000000
--- a/static/app/components/profiling/suspectFunctions/functionsTable.tsx
+++ /dev/null
@@ -1,238 +0,0 @@
-import {useCallback, useMemo} from 'react';
-import styled from '@emotion/styled';
-
-import Count from 'sentry/components/count';
-import type {GridColumnOrder} from 'sentry/components/gridEditable';
-import GridEditable, {COL_WIDTH_UNDEFINED} from 'sentry/components/gridEditable';
-import PerformanceDuration from 'sentry/components/performanceDuration';
-import {ArrayLinks} from 'sentry/components/profiling/arrayLinks';
-import {t} from 'sentry/locale';
-import type {Project} from 'sentry/types/project';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {Container, NumberContainer} from 'sentry/utils/discover/styles';
-import {getShortEventId} from 'sentry/utils/events';
-import {
-  isContinuousProfileReference,
-  isTransactionProfileReference,
-} from 'sentry/utils/profiling/guards/profile';
-import type {EventsResults, Sort} from 'sentry/utils/profiling/hooks/types';
-import {generateProfileRouteFromProfileReference} from 'sentry/utils/profiling/routes';
-import {renderTableHead} from 'sentry/utils/profiling/tableRenderer';
-import {useLocation} from 'sentry/utils/useLocation';
-import useOrganization from 'sentry/utils/useOrganization';
-
-interface FunctionsTableProps {
-  analyticsPageSource: 'performance_transaction' | 'profiling_transaction';
-  error: string | null;
-  functions: EventsResults<TableColumnKey>['data'];
-  isLoading: boolean;
-  project: Project | undefined;
-  sort: Sort<any>;
-}
-
-export function FunctionsTable(props: FunctionsTableProps) {
-  const location = useLocation();
-  const organization = useOrganization();
-
-  const functions: TableDataRow[] = useMemo(() => {
-    const project = props.project;
-    if (!project) {
-      return [];
-    }
-
-    return props.functions.map(func => {
-      const examples = func['all_examples()'];
-
-      return {
-        ...func,
-        'all_examples()': examples.map(example => {
-          return {
-            value: getShortEventId(getTargetId(example)),
-            onClick: () =>
-              trackAnalytics('profiling_views.go_to_flamegraph', {
-                organization,
-                source: `${props.analyticsPageSource}.suspect_functions_table`,
-              }),
-            target: generateProfileRouteFromProfileReference({
-              orgSlug: organization.slug,
-              projectSlug: project.slug,
-              reference: example,
-              // specify the frame to focus, the flamegraph will switch
-              // to the appropriate thread when these are specified
-              frameName: func.function as string,
-              framePackage: func.package as string,
-            }),
-          };
-        }),
-      };
-    });
-  }, [organization, props.project, props.functions, props.analyticsPageSource]);
-
-  const generateSortLink = useCallback(
-    (column: TableColumnKey) => {
-      if (!SORTABLE_COLUMNS.has(column)) {
-        return () => undefined;
-      }
-
-      const direction =
-        props.sort.key !== column ? 'desc' : props.sort.order === 'desc' ? 'asc' : 'desc';
-
-      return () => ({
-        ...location,
-        query: {
-          ...location.query,
-          functionsSort: `${direction === 'desc' ? '-' : ''}${column}`,
-        },
-      });
-    },
-    [location, props.sort]
-  );
-
-  return (
-    <GridEditable
-      isLoading={props.isLoading}
-      error={props.error}
-      data={functions}
-      columnOrder={COLUMN_ORDER.map(key => COLUMNS[key])}
-      columnSortBy={[]}
-      grid={{
-        renderHeadCell: renderTableHead({
-          currentSort: props.sort,
-          rightAlignedColumns: RIGHT_ALIGNED_COLUMNS,
-          sortableColumns: SORTABLE_COLUMNS,
-          generateSortLink,
-        }),
-        renderBodyCell: renderFunctionsTableCell,
-      }}
-    />
-  );
-}
-
-const RIGHT_ALIGNED_COLUMNS = new Set<TableColumnKey>(['p75()', 'sum()', 'count()']);
-
-const SORTABLE_COLUMNS = RIGHT_ALIGNED_COLUMNS;
-
-function renderFunctionsTableCell(
-  column: TableColumn,
-  dataRow: TableDataRow,
-  rowIndex: number,
-  columnIndex: number
-) {
-  return (
-    <ProfilingFunctionsTableCell
-      column={column}
-      dataRow={dataRow}
-      rowIndex={rowIndex}
-      columnIndex={columnIndex}
-    />
-  );
-}
-
-interface ProfilingFunctionsTableCellProps {
-  column: TableColumn;
-  columnIndex: number;
-  dataRow: TableDataRow;
-  rowIndex: number;
-}
-
-const EmptyValueContainer = styled('span')`
-  color: ${p => p.theme.gray300};
-`;
-
-function ProfilingFunctionsTableCell({
-  column,
-  dataRow,
-}: ProfilingFunctionsTableCellProps) {
-  const value = dataRow[column.key];
-
-  switch (column.key) {
-    case 'count()':
-      return (
-        <NumberContainer>
-          <Count value={value} />
-        </NumberContainer>
-      );
-    case 'p75()':
-    case 'sum()':
-      return (
-        <NumberContainer>
-          <PerformanceDuration nanoseconds={value} abbreviation />
-        </NumberContainer>
-      );
-    case 'all_examples()':
-      return <ArrayLinks items={value} />;
-    case 'function':
-    case 'package':
-      const name = value || <EmptyValueContainer>{t('Unknown')}</EmptyValueContainer>;
-      return <Container>{name}</Container>;
-    default:
-      return <Container>{value}</Container>;
-  }
-}
-
-export const functionsFields = [
-  'package',
-  'function',
-  'count()',
-  'p75()',
-  'sum()',
-  'all_examples()',
-] as const;
-
-export type TableColumnKey = (typeof functionsFields)[number];
-
-type TableDataRow = Record<TableColumnKey, any>;
-
-type TableColumn = GridColumnOrder<TableColumnKey>;
-
-const COLUMN_ORDER: TableColumnKey[] = [
-  'function',
-  'package',
-  'count()',
-  'p75()',
-  'sum()',
-  'all_examples()',
-];
-
-const COLUMNS: Record<TableColumnKey, TableColumn> = {
-  function: {
-    key: 'function',
-    name: t('Name'),
-    width: COL_WIDTH_UNDEFINED,
-  },
-  package: {
-    key: 'package',
-    name: t('Package'),
-    width: COL_WIDTH_UNDEFINED,
-  },
-  'p75()': {
-    key: 'p75()',
-    name: t('P75 Self Time'),
-    width: COL_WIDTH_UNDEFINED,
-  },
-  'sum()': {
-    key: 'sum()',
-    name: t('Total Self Time'),
-    width: COL_WIDTH_UNDEFINED,
-  },
-  'count()': {
-    key: 'count()',
-    name: t('Occurrences'),
-    width: COL_WIDTH_UNDEFINED,
-  },
-  'all_examples()': {
-    key: 'all_examples()',
-    name: t('Example Profiles'),
-    width: COL_WIDTH_UNDEFINED,
-  },
-};
-
-function getTargetId(reference): string {
-  if (isTransactionProfileReference(reference)) {
-    return reference.profile_id;
-  }
-  if (isContinuousProfileReference(reference)) {
-    return reference.profiler_id;
-  }
-  return reference;
-}
diff --git a/static/app/components/profiling/suspectFunctions/suspectFunctionsTable.tsx b/static/app/components/profiling/suspectFunctions/suspectFunctionsTable.tsx
index 25a65552978045..c12594b5584e7f 100644
--- a/static/app/components/profiling/suspectFunctions/suspectFunctionsTable.tsx
+++ b/static/app/components/profiling/suspectFunctions/suspectFunctionsTable.tsx
@@ -1,130 +1,292 @@
 import {Fragment, useCallback, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
+import clamp from 'lodash/clamp';
 
-import {CompactSelect} from 'sentry/components/compactSelect';
-import Pagination from 'sentry/components/pagination';
-import type {TableColumnKey as FunctionsField} from 'sentry/components/profiling/suspectFunctions/functionsTable';
-import {
-  functionsFields,
-  FunctionsTable,
-} from 'sentry/components/profiling/suspectFunctions/functionsTable';
+import {Button} from 'sentry/components/button';
+import ButtonBar from 'sentry/components/buttonBar';
+import {SectionHeading} from 'sentry/components/charts/styles';
+import EmptyStateWarning from 'sentry/components/emptyStateWarning';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
+import {ArrayLinks} from 'sentry/components/profiling/arrayLinks';
+import {IconChevron} from 'sentry/icons/iconChevron';
+import {IconWarning} from 'sentry/icons/iconWarning';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
-import {browserHistory} from 'sentry/utils/browserHistory';
-import {useProfileFunctions} from 'sentry/utils/profiling/hooks/useProfileFunctions';
-import {formatSort} from 'sentry/utils/profiling/hooks/utils';
-import {decodeScalar} from 'sentry/utils/queryString';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
+import {trackAnalytics} from 'sentry/utils/analytics';
+import type EventView from 'sentry/utils/discover/eventView';
+import type {RenderFunctionBaggage} from 'sentry/utils/discover/fieldRenderers';
+import {FIELD_FORMATTERS} from 'sentry/utils/discover/fieldRenderers';
+import {getShortEventId} from 'sentry/utils/events';
+import {useAggregateFlamegraphQuery} from 'sentry/utils/profiling/hooks/useAggregateFlamegraphQuery';
+import {generateProfileRouteFromProfileReference} from 'sentry/utils/profiling/routes';
 import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
+import {
+  Table,
+  TableBody,
+  TableBodyCell,
+  TableHead,
+  TableHeadCell,
+  TableRow,
+  TableStatus,
+  useTableStyles,
+} from 'sentry/views/explore/components/table';
+import {getProfileTargetId} from 'sentry/views/profiling/utils';
+
+function sortFunctions(a: Profiling.FunctionMetric, b: Profiling.FunctionMetric) {
+  return b.sum - a.sum;
+}
+
+type Column = {
+  label: React.ReactNode;
+  value: keyof Profiling.FunctionMetric;
+};
+
+const COLUMNS: Column[] = [
+  {
+    label: t('function'),
+    value: 'name',
+  },
+  {
+    label: t('package'),
+    value: 'package',
+  },
+  {
+    label: t('avg()'),
+    value: 'avg',
+  },
+  {
+    label: t('p75()'),
+    value: 'p75',
+  },
+  {
+    label: t('p95()'),
+    value: 'p95',
+  },
+  {
+    label: t('p99()'),
+    value: 'p99',
+  },
+  {
+    label: t('examples'),
+    value: 'examples',
+  },
+];
 
 interface SuspectFunctionsTableProps {
   analyticsPageSource: 'performance_transaction' | 'profiling_transaction';
-  project: Project | undefined;
-  transaction: string;
+  eventView: EventView;
+  project?: Project;
 }
 
-const FUNCTIONS_CURSOR_NAME = 'functionsCursor';
-
 export function SuspectFunctionsTable({
   analyticsPageSource,
+  eventView,
   project,
-  transaction,
 }: SuspectFunctionsTableProps) {
-  const [functionType, setFunctionType] = useState<'application' | 'system' | 'all'>(
-    'application'
-  );
   const location = useLocation();
-  const functionsCursor = useMemo(
-    () => decodeScalar(location.query[FUNCTIONS_CURSOR_NAME]),
-    [location.query]
-  );
-  const functionsSort = useMemo(
-    () =>
-      formatSort<FunctionsField>(
-        decodeScalar(location.query.functionsSort),
-        functionsFields,
-        {
-          key: 'sum()',
-          order: 'desc',
-        }
-      ),
-    [location.query.functionsSort]
-  );
+  const organization = useOrganization();
 
-  const handleFunctionsCursor = useCallback((cursor, pathname, query) => {
-    browserHistory.push({
-      pathname,
-      query: {...query, [FUNCTIONS_CURSOR_NAME]: cursor},
-    });
-  }, []);
-
-  const query = useMemo(() => {
-    const conditions = new MutableSearch('');
-    conditions.setFilterValues('transaction', [transaction]);
-    if (functionType === 'application') {
-      conditions.setFilterValues('is_application', ['1']);
-    } else if (functionType === 'system') {
-      conditions.setFilterValues('is_application', ['0']);
-    }
-    return conditions.formatString();
-  }, [functionType, transaction]);
-
-  const functionsQuery = useProfileFunctions<FunctionsField>({
-    fields: functionsFields,
-    referrer: 'api.profiling.profile-summary-functions-table',
-    sort: functionsSort,
-    query,
-    limit: 5,
-    cursor: functionsCursor,
+  const flamegraphQuery = useAggregateFlamegraphQuery({
+    // User query is only permitted when using transactions.
+    // If this is to be reused for strictly continuous profiling,
+    // it'll need to be swapped to use the `profiles` data source
+    // with no user query.
+    dataSource: 'transactions',
+    query: eventView.query,
+    metrics: true,
   });
 
+  const sortedMetrics = useMemo(() => {
+    const metrics = flamegraphQuery.data?.metrics || [];
+    return metrics.sort(sortFunctions);
+  }, [flamegraphQuery.data?.metrics]);
+
+  const pagination = useMemoryPagination(sortedMetrics, 5);
+
+  const metrics = useMemo(() => {
+    return sortedMetrics.slice(pagination.start, pagination.end);
+  }, [sortedMetrics, pagination]);
+
+  const {tableStyles} = useTableStyles({
+    items: COLUMNS,
+  });
+
+  const baggage: RenderFunctionBaggage = {
+    location,
+    organization,
+    unit: 'nanosecond',
+  };
+
   return (
     <Fragment>
       <TableHeader>
-        <CompactSelect
-          triggerProps={{prefix: t('Slowest Functions'), size: 'xs'}}
-          value={functionType}
-          options={[
-            {
-              label: t('All'),
-              value: 'all' as const,
-            },
-            {
-              label: t('Application'),
-              value: 'application' as const,
-            },
-            {
-              label: t('System'),
-              value: 'system' as const,
-            },
-          ]}
-          onChange={({value}) => setFunctionType(value)}
-        />
-        <StyledPagination
-          pageLinks={functionsQuery.getResponseHeader?.('Link')}
-          onCursor={handleFunctionsCursor}
-          size="xs"
-        />
+        <SectionHeading>{t('Suspect Functions')}</SectionHeading>
+        <ButtonBar merged>
+          <Button
+            icon={<IconChevron direction="left" />}
+            aria-label={t('Previous')}
+            size="xs"
+            {...pagination.previousButtonProps}
+          />
+          <Button
+            icon={<IconChevron direction="right" />}
+            aria-label={t('Next')}
+            size="xs"
+            {...pagination.nextButtonProps}
+          />
+        </ButtonBar>
       </TableHeader>
-      <FunctionsTable
-        analyticsPageSource={analyticsPageSource}
-        error={functionsQuery.isError ? functionsQuery.error.message : null}
-        isLoading={functionsQuery.isPending}
-        functions={functionsQuery.isFetched ? functionsQuery.data?.data ?? [] : []}
-        project={project}
-        sort={functionsSort}
-      />
+      <Table style={tableStyles}>
+        <TableHead>
+          <TableRow>
+            {COLUMNS.map((column, i) => {
+              return (
+                <TableHeadCell
+                  key={i}
+                  isFirst={i === 0}
+                  align={
+                    column.value === 'package' || column.value === 'name'
+                      ? 'left'
+                      : 'right'
+                  }
+                >
+                  {column.label}
+                </TableHeadCell>
+              );
+            })}
+          </TableRow>
+        </TableHead>
+        <TableBody>
+          {flamegraphQuery.isPending ? (
+            <TableStatus>
+              <LoadingIndicator />
+            </TableStatus>
+          ) : flamegraphQuery.isError ? (
+            <TableStatus>
+              <IconWarning data-test-id="error-indicator" color="gray300" size="lg" />
+            </TableStatus>
+          ) : flamegraphQuery.isFetched ? (
+            metrics.map((metric, i) => (
+              <TableEntry
+                key={i}
+                analyticsPageSource={analyticsPageSource}
+                baggage={baggage}
+                metric={metric}
+                organization={organization}
+                project={project}
+              />
+            ))
+          ) : (
+            <TableStatus>
+              <EmptyStateWarning>
+                <p>{t('No functions found')}</p>
+              </EmptyStateWarning>
+            </TableStatus>
+          )}
+        </TableBody>
+      </Table>
     </Fragment>
   );
 }
 
+interface TableEntryProps {
+  analyticsPageSource: 'performance_transaction' | 'profiling_transaction';
+  baggage: RenderFunctionBaggage;
+  metric: Profiling.FunctionMetric;
+  organization: Organization;
+  project?: Project;
+}
+
+function TableEntry({
+  analyticsPageSource,
+  baggage,
+  metric,
+  organization,
+  project,
+}: TableEntryProps) {
+  return (
+    <TableRow>
+      {COLUMNS.map(column => {
+        if (column.value === 'examples') {
+          const items = metric[column.value].map(example => {
+            return {
+              value: getShortEventId(getProfileTargetId(example)),
+              onClick: () =>
+                trackAnalytics('profiling_views.go_to_flamegraph', {
+                  organization,
+                  source: `${analyticsPageSource}.suspect_functions_table`,
+                }),
+              target: generateProfileRouteFromProfileReference({
+                orgSlug: organization.slug,
+                projectSlug: project?.slug || '',
+                reference: example,
+                // specify the frame to focus, the flamegraph will switch
+                // to the appropriate thread when these are specified
+                frameName: metric.name,
+                framePackage: metric.package,
+              }),
+            };
+          });
+          return (
+            <TableBodyCell key={column.value}>
+              <ArrayLinks items={items} />
+            </TableBodyCell>
+          );
+        }
+
+        const formatter =
+          typeof metric[column.value] === 'number'
+            ? FIELD_FORMATTERS.duration.renderFunc
+            : FIELD_FORMATTERS.string.renderFunc;
+        return (
+          <TableBodyCell key={column.value}>
+            {formatter(column.value, metric, baggage)}
+          </TableBodyCell>
+        );
+      })}
+    </TableRow>
+  );
+}
+
+function useMemoryPagination(items: any[], size: number) {
+  const [pagination, setPagination] = useState({
+    start: 0,
+    end: size,
+  });
+
+  const page = Math.floor(pagination.start / size);
+  const toPage = useCallback(
+    (p: number) => {
+      const next = clamp(p, 0, Math.floor(items.length / size));
+
+      setPagination({
+        start: clamp(next * size, 0, items.length - size),
+        end: Math.min(next * size + size, items.length),
+      });
+    },
+    [size, items]
+  );
+
+  return {
+    page,
+    start: pagination.start,
+    end: pagination.end,
+    nextButtonProps: {
+      disabled: pagination.end >= items.length,
+      onClick: () => toPage(page + 1),
+    },
+    previousButtonProps: {
+      disabled: pagination.start <= 0,
+      onClick: () => toPage(page - 1),
+    },
+  };
+}
+
 const TableHeader = styled('div')`
   display: flex;
   justify-content: space-between;
   margin-bottom: ${space(1)};
 `;
-
-const StyledPagination = styled(Pagination)`
-  margin: 0 0 0 ${space(1)};
-`;
diff --git a/static/app/components/profiling/transactionProfileIdProvider.tsx b/static/app/components/profiling/transactionProfileIdProvider.tsx
deleted file mode 100644
index e5d1f085afca08..00000000000000
--- a/static/app/components/profiling/transactionProfileIdProvider.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import {createContext, useContext, useEffect, useMemo} from 'react';
-import * as Sentry from '@sentry/react';
-
-import type {PageFilters} from 'sentry/types/core';
-import {useProfileEvents} from 'sentry/utils/profiling/hooks/useProfileEvents';
-
-const TransactionProfileContext = createContext<string | null | undefined>(undefined);
-
-interface TransactionToProfileIdProviderProps {
-  children: React.ReactNode;
-  timestamp: string | undefined;
-  transactionId: string | undefined;
-  projectId?: string | undefined;
-}
-
-export function TransactionProfileIdProvider({
-  projectId,
-  timestamp,
-  transactionId,
-  children,
-}: TransactionToProfileIdProviderProps) {
-  // create a 24h timeframe relative from the transaction timestamp to use for
-  // the profile events query
-  const datetime: PageFilters['datetime'] | undefined = useMemo(() => {
-    if (!timestamp) {
-      return undefined;
-    }
-    const ts = new Date(timestamp);
-    const start = new Date(new Date(ts).setHours(ts.getHours() - 12));
-    const end = new Date(new Date(ts).setHours(ts.getHours() + 12));
-
-    return {
-      start,
-      end,
-      period: null,
-      utc: true,
-    };
-  }, [timestamp]);
-
-  const transactionIdColumn = 'id';
-
-  const {status, data, error} = useProfileEvents({
-    projects: projectId ? [projectId] : undefined,
-    fields: ['profile.id'],
-    referrer: 'transactionToProfileProvider',
-    limit: 1,
-    sort: {
-      key: 'id',
-      order: 'asc',
-    },
-    query: `${transactionIdColumn}:${transactionId}`,
-    enabled: Boolean(transactionId),
-    datetime,
-  });
-
-  useEffect(() => {
-    if (status !== 'error') {
-      return;
-    }
-
-    if (error.status !== 404) {
-      Sentry.captureException(error);
-    }
-  }, [status, error]);
-
-  const profileId = (data?.data[0]?.['profile.id'] as string | undefined) ?? null;
-
-  return (
-    <TransactionProfileContext.Provider value={profileId}>
-      {children}
-    </TransactionProfileContext.Provider>
-  );
-}
-TransactionProfileIdProvider.Context = TransactionProfileContext;
-
-export function useTransactionProfileId() {
-  const ctx = useContext(TransactionProfileContext);
-  if (typeof ctx === 'undefined') {
-    throw new Error(`useTransactionProfile called outside of TransactionProfileProvider`);
-  }
-
-  return ctx;
-}
diff --git a/static/app/components/profiling/transactonProfileIdProvider.spec.tsx b/static/app/components/profiling/transactonProfileIdProvider.spec.tsx
deleted file mode 100644
index 3a970c78c354d8..00000000000000
--- a/static/app/components/profiling/transactonProfileIdProvider.spec.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import {render, screen, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import * as useProfileEventsModule from 'sentry/utils/profiling/hooks/useProfileEvents';
-import * as useApiModule from 'sentry/utils/useApi';
-
-import * as TransactionProfileIdProviderModule from './transactionProfileIdProvider';
-
-const useApiSpy = jest.spyOn(useApiModule, 'default');
-
-// this order matters; create the spy before dereferencing below
-const useTransactionProfileIdSpy = jest.spyOn(
-  TransactionProfileIdProviderModule,
-  'useTransactionProfileId'
-);
-
-const {TransactionProfileIdProvider, useTransactionProfileId} =
-  TransactionProfileIdProviderModule;
-
-const useProfileEventsSpy = jest.spyOn(useProfileEventsModule, 'useProfileEvents');
-
-function MockComponent() {
-  const profileId = useTransactionProfileId();
-  return <div data-test-id={profileId} />;
-}
-
-const MOCK_TRX_ID = '123';
-const MOCK_PROFILE_ID = '456';
-
-describe('TransactionProfileIdProvider', () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-  it('provides default profileId state as null', () => {
-    render(
-      <TransactionProfileIdProvider transactionId={undefined} timestamp={undefined}>
-        <MockComponent />
-      </TransactionProfileIdProvider>
-    );
-
-    expect(useProfileEventsSpy).toHaveBeenCalledWith(
-      expect.objectContaining({
-        enabled: false,
-      })
-    );
-    expect(useTransactionProfileIdSpy).toHaveReturnedWith(null);
-  });
-
-  it('does not query the events endpoint when transactionId is undefined', () => {
-    const requestPromiseMock = jest.fn();
-    // @ts-expect-error
-    useApiSpy.mockReturnValueOnce({
-      requestPromise: requestPromiseMock,
-    });
-    render(
-      <TransactionProfileIdProvider transactionId={undefined} timestamp={undefined}>
-        <MockComponent />
-      </TransactionProfileIdProvider>
-    );
-
-    expect(useProfileEventsSpy).toHaveBeenCalledWith(
-      expect.objectContaining({
-        enabled: false,
-      })
-    );
-    expect(requestPromiseMock).not.toHaveBeenCalled();
-    expect(useTransactionProfileIdSpy).toHaveReturnedWith(null);
-  });
-
-  it('queries the events endpoint for a profile id when given a transactionId', async () => {
-    MockApiClient.addMockResponse({
-      method: 'GET',
-      url: '/organizations/org-slug/events/',
-      body: {
-        data: [
-          {
-            'profile.id': MOCK_PROFILE_ID,
-          },
-        ],
-      },
-    });
-
-    render(
-      <TransactionProfileIdProvider
-        transactionId={MOCK_TRX_ID}
-        timestamp="2022-12-19T16:00:00.000Z"
-      >
-        <MockComponent />
-      </TransactionProfileIdProvider>
-    );
-
-    await waitFor(() => screen.findAllByTestId(MOCK_PROFILE_ID));
-
-    expect(useProfileEventsSpy).toHaveBeenCalledWith(
-      expect.objectContaining({
-        query: 'id:' + MOCK_TRX_ID,
-        datetime: {
-          end: new Date('2022-12-20T04:00:00.000Z'),
-          period: null,
-          start: new Date('2022-12-19T04:00:00.000Z'),
-          utc: true,
-        },
-      })
-    );
-    expect(useTransactionProfileIdSpy).toHaveReturnedWith(MOCK_PROFILE_ID);
-  });
-});
diff --git a/static/app/components/projects/bookmarkStar.tsx b/static/app/components/projects/bookmarkStar.tsx
index a660b822029b12..9c606e569b4873 100644
--- a/static/app/components/projects/bookmarkStar.tsx
+++ b/static/app/components/projects/bookmarkStar.tsx
@@ -9,6 +9,7 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
+import {useMutation} from 'sentry/utils/queryClient';
 import useApi from 'sentry/utils/useApi';
 
 type Props = {
@@ -19,28 +20,36 @@ type Props = {
 };
 
 function BookmarkStar({className, organization, project, onToggle}: Props) {
-  const api = useApi();
+  const api = useApi({persistInFlight: true});
   const [isBookmarked, setIsBookmarked] = useState(project.isBookmarked);
 
-  const handleBookmarkToggle = (event: React.MouseEvent) => {
-    // prevent dropdowns from closing
-    event.stopPropagation();
+  const {mutate: handleBookmarkToggle, isPending: isBookmarking} = useMutation({
+    mutationFn: () => {
+      return update(api, {
+        orgId: organization.slug,
+        projectId: project.slug,
+        data: {isBookmarked: !isBookmarked},
+      });
+    },
+    onMutate: () => {
+      onToggle?.(isBookmarked);
+      setIsBookmarked(current => !current);
+    },
+    onError: () => {
+      addErrorMessage(t('Unable to toggle bookmark for %s', project.slug));
+      setIsBookmarked(current => !current);
+    },
+  });
 
-    update(api, {
-      orgId: organization.slug,
-      projectId: project.slug,
-      data: {isBookmarked: !isBookmarked},
-    }).catch(() => addErrorMessage(t('Unable to toggle bookmark for %s', project.slug)));
-
-    setIsBookmarked(current => !current);
-    onToggle?.(!isBookmarked);
-  };
+  const label = isBookmarked ? t('Remove Bookmark') : t('Bookmark');
 
   return (
     <BookmarkStarButton
-      aria-label={t('Bookmark Project')}
+      title={label}
+      aria-label={label}
       aria-pressed={isBookmarked}
-      onClick={handleBookmarkToggle}
+      busy={isBookmarking}
+      onClick={() => handleBookmarkToggle()}
       size="zero"
       borderless
       className={className}
diff --git a/static/app/components/replays/breadcrumbs/breadcrumbItem.tsx b/static/app/components/replays/breadcrumbs/breadcrumbItem.tsx
index 084f0e15310f57..c23ad1fe73963f 100644
--- a/static/app/components/replays/breadcrumbs/breadcrumbItem.tsx
+++ b/static/app/components/replays/breadcrumbs/breadcrumbItem.tsx
@@ -16,7 +16,7 @@ import Timeline from 'sentry/components/timeline';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {Extraction} from 'sentry/utils/replays/extractHtml';
+import type {Extraction} from 'sentry/utils/replays/extractDomNodes';
 import {getReplayDiffOffsetsFromFrame} from 'sentry/utils/replays/getDiffTimestamps';
 import getFrameDetails from 'sentry/utils/replays/getFrameDetails';
 import type ReplayReader from 'sentry/utils/replays/replayReader';
diff --git a/static/app/components/replays/diff/replayDiffChooser.tsx b/static/app/components/replays/diff/replayDiffChooser.tsx
index f1dd87e6f6309e..63627a02d9cb0c 100644
--- a/static/app/components/replays/diff/replayDiffChooser.tsx
+++ b/static/app/components/replays/diff/replayDiffChooser.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled';
 
 import FeatureBadge from 'sentry/components/badge/featureBadge';
+import {ReplayMutationTree} from 'sentry/components/replays/diff/replayMutationTree';
 import {ReplaySideBySideImageDiff} from 'sentry/components/replays/diff/replaySideBySideImageDiff';
 import {ReplaySliderDiff} from 'sentry/components/replays/diff/replaySliderDiff';
 import {ReplayTextDiff} from 'sentry/components/replays/diff/replayTextDiff';
@@ -22,6 +23,7 @@ export const enum DiffType {
   HTML = 'html',
   SLIDER = 'slider',
   VISUAL = 'visual',
+  MUTATIONS = 'mutations',
 }
 
 export default function ReplayDiffChooser({
@@ -41,6 +43,9 @@ export default function ReplayDiffChooser({
         <TabList>
           <TabList.Item key={DiffType.SLIDER}>{t('Slider Diff')}</TabList.Item>
           <TabList.Item key={DiffType.VISUAL}>{t('Side By Side Diff')}</TabList.Item>
+          <TabList.Item key={DiffType.MUTATIONS}>
+            {t('Mutations')} <FeatureBadge type={'beta'} />
+          </TabList.Item>
           <TabList.Item key={DiffType.HTML}>
             {t('HTML Diff')} <FeatureBadge type={'beta'} />
           </TabList.Item>
@@ -68,6 +73,13 @@ export default function ReplayDiffChooser({
               rightOffsetMs={rightOffsetMs}
             />
           </TabPanels.Item>
+          <TabPanels.Item key={DiffType.MUTATIONS}>
+            <ReplayMutationTree
+              leftOffsetMs={leftOffsetMs}
+              replay={replay}
+              rightOffsetMs={rightOffsetMs}
+            />
+          </TabPanels.Item>
         </StyledTabPanels>
       </TabStateProvider>
     </Grid>
diff --git a/static/app/components/replays/diff/replayMutationTree.tsx b/static/app/components/replays/diff/replayMutationTree.tsx
new file mode 100644
index 00000000000000..a40b5770883e33
--- /dev/null
+++ b/static/app/components/replays/diff/replayMutationTree.tsx
@@ -0,0 +1,53 @@
+import {css} from '@emotion/react';
+import styled from '@emotion/styled';
+
+import StructuredEventData from 'sentry/components/structuredEventData';
+import useExtractDiffMutations from 'sentry/utils/replays/hooks/useExtractDiffMutations';
+import type ReplayReader from 'sentry/utils/replays/replayReader';
+
+interface Props {
+  leftOffsetMs: number;
+  replay: ReplayReader;
+  rightOffsetMs: number;
+}
+
+export function ReplayMutationTree({replay, leftOffsetMs, rightOffsetMs}: Props) {
+  const {data} = useExtractDiffMutations({
+    leftOffsetMs,
+    replay,
+    rightOffsetMs,
+  });
+
+  const timeIndexedMutations = Array.from(data?.values() ?? []).reduce(
+    (acc, mutation) => {
+      for (const timestamp of Object.keys(mutation)) {
+        acc[timestamp] = mutation[timestamp];
+      }
+      return acc;
+    },
+    {}
+  );
+
+  return (
+    <ScrollWrapper>
+      <StructuredEventData
+        key={data?.size}
+        data={timeIndexedMutations}
+        maxDefaultDepth={4}
+        css={css`
+          flex: auto 1 1;
+          & > pre {
+            margin: 0;
+          }
+        `}
+      />
+    </ScrollWrapper>
+  );
+}
+
+const ScrollWrapper = styled('div')`
+  overflow: auto;
+  height: 0;
+  display: flex;
+  flex-grow: 1;
+`;
diff --git a/static/app/components/replays/diff/replaySliderDiff.tsx b/static/app/components/replays/diff/replaySliderDiff.tsx
index 8873c8b18519a1..6d40793ab8730d 100644
--- a/static/app/components/replays/diff/replaySliderDiff.tsx
+++ b/static/app/components/replays/diff/replaySliderDiff.tsx
@@ -71,7 +71,7 @@ function DiffSides({
   viewDimensions: {height: number; width: number};
   width: string | undefined;
 }) {
-  const rightSideElem = useRef<HTMLDivElement>(null);
+  const beforeElemRef = useRef<HTMLDivElement>(null);
   const dividerElem = useRef<HTMLDivElement>(null);
 
   const {onMouseDown: onDividerMouseDown} = useResizableDrawer({
@@ -79,12 +79,11 @@ function DiffSides({
     initialSize: viewDimensions.width / 2,
     min: 0,
     onResize: newSize => {
-      if (rightSideElem.current) {
-        rightSideElem.current.style.width =
+      if (beforeElemRef.current) {
+        beforeElemRef.current.style.width =
           viewDimensions.width === 0
             ? '100%'
-            : toPixels(Math.min(viewDimensions.width, viewDimensions.width - newSize)) ??
-              '0px';
+            : toPixels(Math.min(viewDimensions.width, newSize)) ?? '0px';
       }
       if (dividerElem.current) {
         dividerElem.current.style.left =
@@ -118,18 +117,18 @@ function DiffSides({
               <ReplayPlayerStateContextProvider>
                 <StyledNegativeSpaceContainer>
                   <ReplayPlayerMeasurer measure="both">
-                    {style => <ReplayPlayer style={style} offsetMs={leftOffsetMs} />}
+                    {style => <ReplayPlayer style={style} offsetMs={rightOffsetMs} />}
                   </ReplayPlayerMeasurer>
                 </StyledNegativeSpaceContainer>
               </ReplayPlayerStateContextProvider>
             </Placement>
           </Cover>
-          <Cover ref={rightSideElem} style={{width: 0}}>
+          <Cover ref={beforeElemRef}>
             <Placement style={{width}}>
               <ReplayPlayerStateContextProvider>
                 <StyledNegativeSpaceContainer>
                   <ReplayPlayerMeasurer measure="both">
-                    {style => <ReplayPlayer style={style} offsetMs={rightOffsetMs} />}
+                    {style => <ReplayPlayer style={style} offsetMs={leftOffsetMs} />}
                   </ReplayPlayerMeasurer>
                 </StyledNegativeSpaceContainer>
               </ReplayPlayerStateContextProvider>
@@ -159,13 +158,15 @@ const Cover = styled('div')`
   height: 100%;
   overflow: hidden;
   position: absolute;
-  right: 0px;
+  left: 0px;
   top: 0px;
 
-  border-color: ${p => p.theme.red300};
+  border-color: ${p => p.theme.green300};
   & + & {
-    border-color: ${p => p.theme.green300};
-    border-left-color: transparent;
+    border: 3px solid;
+    border-radius: ${space(0.5)} 0 0 ${space(0.5)};
+    border-color: ${p => p.theme.red300};
+    border-right-width: 0;
   }
 `;
 
@@ -174,7 +175,7 @@ const Placement = styled('div')`
   height: 100%;
   justify-content: center;
   position: absolute;
-  right: 0;
+  left: 0;
   top: 0;
   place-items: center;
 `;
diff --git a/static/app/components/replays/replayContext.tsx b/static/app/components/replays/replayContext.tsx
index e8597ae48a340c..25b64b29411833 100644
--- a/static/app/components/replays/replayContext.tsx
+++ b/static/app/components/replays/replayContext.tsx
@@ -428,7 +428,8 @@ export function Provider({
         speed: prefs.playbackSpeed,
         // rrweb specific
         theme,
-        events: events ?? [],
+        eventsWithSnapshots: replay?.getRRWebFramesWithSnapshots() ?? [],
+        touchEvents: replay?.getRRwebTouchEvents() ?? [],
         // common to both
         root,
         context: {
@@ -448,7 +449,6 @@ export function Provider({
       applyInitialOffset,
       clipWindow,
       durationMs,
-      events,
       isFetching,
       isVideoReplay,
       organization.slug,
diff --git a/static/app/components/replays/videoReplayerWithInteractions.tsx b/static/app/components/replays/videoReplayerWithInteractions.tsx
index a1ca3510afa6e0..ebccbacb409ff7 100644
--- a/static/app/components/replays/videoReplayerWithInteractions.tsx
+++ b/static/app/components/replays/videoReplayerWithInteractions.tsx
@@ -5,20 +5,13 @@ import {Replayer} from '@sentry-internal/rrweb';
 import type {VideoReplayerConfig} from 'sentry/components/replays/videoReplayer';
 import {VideoReplayer} from 'sentry/components/replays/videoReplayer';
 import type {ClipWindow, RecordingFrame, VideoEvent} from 'sentry/utils/replays/types';
-import {
-  EventType,
-  isMetaFrame,
-  isTouchEndFrame,
-  isTouchStartFrame,
-  NodeType,
-} from 'sentry/utils/replays/types';
 
 type RootElem = HTMLDivElement | null;
 
 interface VideoReplayerWithInteractionsOptions {
   context: {sdkName: string | undefined | null; sdkVersion: string | undefined | null};
   durationMs: number;
-  events: RecordingFrame[];
+  eventsWithSnapshots: RecordingFrame[];
   onBuffer: (isBuffering: boolean) => void;
   onFinished: () => void;
   onLoaded: (event: any) => void;
@@ -26,6 +19,7 @@ interface VideoReplayerWithInteractionsOptions {
   speed: number;
   start: number;
   theme: Theme;
+  touchEvents: RecordingFrame[];
   videoApiPrefix: string;
   videoEvents: VideoEvent[];
   clipWindow?: ClipWindow;
@@ -42,7 +36,8 @@ export class VideoReplayerWithInteractions {
 
   constructor({
     videoEvents,
-    events,
+    eventsWithSnapshots,
+    touchEvents,
     root,
     start,
     videoApiPrefix,
@@ -74,62 +69,6 @@ export class VideoReplayerWithInteractions {
 
     root?.classList.add('video-replayer');
 
-    const eventsWithSnapshots: RecordingFrame[] = [];
-    events.forEach((e, index) => {
-      // For taps, sometimes the timestamp difference between TouchStart
-      // and TouchEnd is too small. This clamps the tap to a min time
-      // if the difference is less, so that the rrweb tap is visible and obvious.
-      if (isTouchStartFrame(e) && index < events.length - 2) {
-        const nextEvent = events[index + 1];
-        if (isTouchEndFrame(nextEvent)) {
-          nextEvent.timestamp = Math.max(nextEvent.timestamp, e.timestamp + 500);
-        }
-      }
-      eventsWithSnapshots.push(e);
-      if (isMetaFrame(e)) {
-        // Create a mock full snapshot event, in order to render rrweb gestures properly
-        // Need to add one for every meta event we see
-        // The hardcoded data.node.id here should match the ID of the data being sent
-        // in the `positions` arrays
-        eventsWithSnapshots.push({
-          type: EventType.FullSnapshot,
-          data: {
-            node: {
-              type: NodeType.Document,
-              childNodes: [
-                {
-                  type: NodeType.DocumentType,
-                  id: 1,
-                  name: 'html',
-                  publicId: '',
-                  systemId: '',
-                },
-                {
-                  type: NodeType.Element,
-                  id: 2,
-                  tagName: 'html',
-                  attributes: {
-                    lang: 'en',
-                  },
-                  childNodes: [],
-                },
-              ],
-              id: 0,
-            },
-            initialOffset: {
-              top: 0,
-              left: 0,
-            },
-          },
-          timestamp: e.timestamp,
-        });
-      }
-    });
-
-    // log instances where we have a pointer touchStart without a touchEnd
-    const touchEvents = eventsWithSnapshots.filter(
-      e => isTouchEndFrame(e) || isTouchStartFrame(e)
-    );
     const grouped = Object.groupBy(touchEvents, (t: any) => t.data.pointerId);
     Object.values(grouped).forEach(t => {
       if (t?.length !== 2) {
diff --git a/static/app/components/replaysOnboarding/platformOptionDropdown.tsx b/static/app/components/replaysOnboarding/platformOptionDropdown.tsx
index 457dc1dd4fd70e..780a9fc75f8924 100644
--- a/static/app/components/replaysOnboarding/platformOptionDropdown.tsx
+++ b/static/app/components/replaysOnboarding/platformOptionDropdown.tsx
@@ -1,7 +1,10 @@
+import {Fragment} from 'react';
+
 import type {SelectOption} from 'sentry/components/compactSelect';
 import {CompactSelect} from 'sentry/components/compactSelect';
 import type {PlatformOption} from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {useUrlPlatformOptions} from 'sentry/components/onboarding/platformOptionsControl';
+import {t} from 'sentry/locale';
 import useRouter from 'sentry/utils/useRouter';
 
 export type OptionControlProps = {
@@ -73,12 +76,15 @@ export function PlatformOptionDropdown({
   }
 
   return (
-    <OptionControl
-      key="platformOption"
-      option={platforms}
-      value={urlOptionValues.siblingOption ?? platforms.items[0]?.label}
-      onChange={v => handleChange('siblingOption', v.value)}
-      disabled={disabled}
-    />
+    <Fragment>
+      {t('with')}
+      <OptionControl
+        key="platformOption"
+        option={platforms}
+        value={urlOptionValues.siblingOption ?? platforms.items[0]?.label}
+        onChange={v => handleChange('siblingOption', v.value)}
+        disabled={disabled}
+      />
+    </Fragment>
   );
 }
diff --git a/static/app/components/replaysOnboarding/sidebar.tsx b/static/app/components/replaysOnboarding/sidebar.tsx
index aece2b7ef1e18f..f2c6054f997d19 100644
--- a/static/app/components/replaysOnboarding/sidebar.tsx
+++ b/static/app/components/replaysOnboarding/sidebar.tsx
@@ -259,15 +259,12 @@ function OnboardingContent({
                       />
                     ),
                   })}
-                  {jsFrameworkDocs?.platformOptions &&
-                    tct('with [optionSelect]', {
-                      optionSelect: (
-                        <PlatformOptionDropdown
-                          platformOptions={jsFrameworkDocs?.platformOptions}
-                          disabled={setupMode() === 'jsLoader'}
-                        />
-                      ),
-                    })}
+                  {jsFrameworkDocs?.platformOptions && (
+                    <PlatformOptionDropdown
+                      platformOptions={jsFrameworkDocs?.platformOptions}
+                      disabled={setupMode() === 'jsLoader'}
+                    />
+                  )}
                 </PlatformSelect>
               ) : (
                 t('I use NPM or Yarn')
diff --git a/static/app/components/repositoryEditForm.tsx b/static/app/components/repositoryEditForm.tsx
index eb963bd373a583..a7b869e704c820 100644
--- a/static/app/components/repositoryEditForm.tsx
+++ b/static/app/components/repositoryEditForm.tsx
@@ -58,7 +58,7 @@ function RepositoryEditForm({
           'Changing the [name:repo name] may have consequences if it no longer matches the repo name used when [link:sending commits with releases].',
           {
             link: (
-              <ExternalLink href="https://docs.sentry.io/product/cli/releases/#sentry-cli-commit-integration" />
+              <ExternalLink href="https://docs.sentry.io/cli/releases/#sentry-cli-commit-integration" />
             ),
             name: <strong>repo name</strong>,
           }
diff --git a/static/app/components/searchQueryBuilder/index.tsx b/static/app/components/searchQueryBuilder/index.tsx
index b21078ab190d04..ff0a27b3adf4cf 100644
--- a/static/app/components/searchQueryBuilder/index.tsx
+++ b/static/app/components/searchQueryBuilder/index.tsx
@@ -82,6 +82,11 @@ export interface SearchQueryBuilderProps {
    * Sections and filter keys are displayed in the order they are provided.
    */
   filterKeySections?: FilterKeySection[];
+  /**
+   * A function that returns a warning message for a given filter key
+   * will only render a warning if the value is truthy
+   */
+  getFilterTokenWarning?: (key: string) => React.ReactNode;
   /**
    * Allows for customization of the invalid token messages.
    */
@@ -195,6 +200,7 @@ export function SearchQueryBuilder({
   searchSource,
   showUnsubmittedIndicator,
   trailingItems,
+  getFilterTokenWarning,
 }: SearchQueryBuilderProps) {
   const wrapperRef = useRef<HTMLDivElement>(null);
   const actionBarRef = useRef<HTMLDivElement>(null);
@@ -207,6 +213,7 @@ export function SearchQueryBuilder({
   const parsedQuery = useMemo(
     () =>
       parseQueryBuilderValue(state.query, fieldDefinitionGetter, {
+        getFilterTokenWarning,
         disallowFreeText,
         disallowLogicalOperators,
         disallowUnsupportedFilters,
@@ -223,6 +230,7 @@ export function SearchQueryBuilder({
       disallowWildcard,
       filterKeys,
       invalidMessages,
+      getFilterTokenWarning,
     ]
   );
 
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx b/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx
index 09e30637eb7013..af001328692cca 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/filter.tsx
@@ -205,11 +205,13 @@ export function SearchQueryBuilderFilter({item, state, token}: SearchQueryTokenP
   });
 
   const tokenHasError = 'invalid' in token && defined(token.invalid);
+  const tokenHasWarning = 'warning' in token && defined(token.warning);
 
   return (
     <FilterWrapper
       aria-label={token.text}
       aria-invalid={tokenHasError}
+      state={tokenHasError ? 'invalid' : tokenHasWarning ? 'warning' : 'valid'}
       ref={ref}
       {...modifiedRowProps}
     >
@@ -265,7 +267,7 @@ export function SearchQueryBuilderFilter({item, state, token}: SearchQueryTokenP
   );
 }
 
-const FilterWrapper = styled('div')`
+const FilterWrapper = styled('div')<{state: 'invalid' | 'warning' | 'valid'}>`
   position: relative;
   border: 1px solid ${p => p.theme.innerBorder};
   border-radius: ${p => p.theme.borderRadius};
@@ -278,10 +280,18 @@ const FilterWrapper = styled('div')`
     outline: none;
   }
 
-  &[aria-invalid='true'] {
-    border-color: ${p => p.theme.red200};
-    background-color: ${p => p.theme.red100};
-  }
+  ${p =>
+    p.state === 'invalid'
+      ? `
+      border-color: ${p.theme.red200};
+      background-color: ${p.theme.red100};
+    `
+      : p.state === 'warning'
+        ? `
+      border-color: ${p.theme.gray300};
+      background-color: ${p.theme.gray100};
+    `
+        : ''}
 
   &[aria-selected='true'] {
     background-color: ${p => p.theme.gray100};
diff --git a/static/app/components/searchQueryBuilder/tokens/invalidTokenTooltip.tsx b/static/app/components/searchQueryBuilder/tokens/invalidTokenTooltip.tsx
index 219a92ef15dba2..ef673eebe8884f 100644
--- a/static/app/components/searchQueryBuilder/tokens/invalidTokenTooltip.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/invalidTokenTooltip.tsx
@@ -17,13 +17,15 @@ interface InvalidTokenTooltipProps extends Omit<TooltipProps, 'title'> {
 function getForceVisible({
   isFocused,
   isInvalid,
+  hasWarning,
   forceVisible,
 }: {
+  hasWarning: boolean;
   isFocused: boolean;
   isInvalid: boolean;
   forceVisible?: boolean;
 }) {
-  if (!isInvalid) {
+  if (!isInvalid && !hasWarning) {
     return false;
   }
 
@@ -43,6 +45,9 @@ export function InvalidTokenTooltip({
   ...tooltipProps
 }: InvalidTokenTooltipProps) {
   const invalid = 'invalid' in token ? token.invalid : null;
+  const warning = 'warning' in token ? token.warning : null;
+
+  const hasWarning = Boolean(warning);
   const isInvalid = Boolean(invalid);
   const isFocused =
     state.selectionManager.isFocused && state.selectionManager.focusedKey === item.key;
@@ -50,9 +55,9 @@ export function InvalidTokenTooltip({
   return (
     <Tooltip
       skipWrapper
-      forceVisible={getForceVisible({isFocused, isInvalid, forceVisible})}
+      forceVisible={getForceVisible({isFocused, isInvalid, hasWarning, forceVisible})}
       position="bottom"
-      title={invalid?.reason ?? t('This token is invalid')}
+      title={invalid?.reason ?? warning ?? t('This token is invalid')}
       {...tooltipProps}
     >
       {children}
diff --git a/static/app/components/searchQueryBuilder/utils.tsx b/static/app/components/searchQueryBuilder/utils.tsx
index fa4a29f501b8e1..740705c5cc9021 100644
--- a/static/app/components/searchQueryBuilder/utils.tsx
+++ b/static/app/components/searchQueryBuilder/utils.tsx
@@ -72,6 +72,7 @@ export function parseQueryBuilderValue(
     disallowLogicalOperators?: boolean;
     disallowUnsupportedFilters?: boolean;
     disallowWildcard?: boolean;
+    getFilterTokenWarning?: (key: string) => React.ReactNode;
     invalidMessages?: SearchConfig['invalidMessages'];
   }
 ): ParseResult | null {
@@ -79,6 +80,7 @@ export function parseQueryBuilderValue(
     parseSearch(value || ' ', {
       flattenParenGroups: true,
       disallowFreeText: options?.disallowFreeText,
+      getFilterTokenWarning: options?.getFilterTokenWarning,
       validateKeys: options?.disallowUnsupportedFilters,
       disallowWildcard: options?.disallowWildcard,
       disallowedLogicalOperators: options?.disallowLogicalOperators
diff --git a/static/app/components/searchSyntax/parser.tsx b/static/app/components/searchSyntax/parser.tsx
index 9d524fca7052aa..92c2970364247f 100644
--- a/static/app/components/searchSyntax/parser.tsx
+++ b/static/app/components/searchSyntax/parser.tsx
@@ -770,9 +770,12 @@ export class TokenConverter {
    * Checks a filter against some non-grammar validation rules
    */
   checkFilterWarning = <T extends FilterType>(key: FilterMap[T]['key']) => {
-    if (![Token.KEY_SIMPLE, Token.KEY_EXPLICIT_TAG].includes(key.type)) {
+    if (
+      ![Token.KEY_SIMPLE, Token.KEY_EXPLICIT_TAG, Token.KEY_AGGREGATE].includes(key.type)
+    ) {
       return null;
     }
+
     const keyName = getKeyName(
       key as TokenResult<Token.KEY_SIMPLE | Token.KEY_EXPLICIT_TAG>
     );
diff --git a/static/app/components/sentryAppComponentIcon.spec.tsx b/static/app/components/sentryAppComponentIcon.spec.tsx
new file mode 100644
index 00000000000000..824353b806cc07
--- /dev/null
+++ b/static/app/components/sentryAppComponentIcon.spec.tsx
@@ -0,0 +1,24 @@
+import {SentryAppComponentFixture} from 'sentry-fixture/sentryAppComponent';
+
+import {sentryAppComponentIsDisabled} from 'sentry/components/sentryAppComponentIcon';
+
+describe('SentryAppComponentIcon', function () {
+  it('sentryAppComponentIsDisabled returns false if the error is a non empty string', () => {
+    const component = SentryAppComponentFixture();
+    component.error = 'RIP couldnt connect to sentry :C';
+    expect(sentryAppComponentIsDisabled(component)).toBe(false);
+  });
+
+  it('sentryAppComponentIsDisabled returns true if the error is an empty string', () => {
+    const component = SentryAppComponentFixture();
+    component.error = '';
+    expect(sentryAppComponentIsDisabled(component)).toBe(true);
+  });
+
+  // TODO: Delete after new errors are deployed
+  it('sentryAppComponentIsDisabled returns itself if the error is a boolean', () => {
+    const component = SentryAppComponentFixture();
+    component.error = true;
+    expect(sentryAppComponentIsDisabled(component)).toBe(true);
+  });
+});
diff --git a/static/app/components/sentryAppComponentIcon.tsx b/static/app/components/sentryAppComponentIcon.tsx
index afda2cfa354ef8..b1e44f250a9dea 100644
--- a/static/app/components/sentryAppComponentIcon.tsx
+++ b/static/app/components/sentryAppComponentIcon.tsx
@@ -18,7 +18,8 @@ function SentryAppComponentIcon({sentryAppComponent, size = 20}: Props) {
     ({color}) => color === false
   );
   const isDefault = selectedAvatar?.avatarType !== 'upload';
-  const isDisabled = sentryAppComponent.error;
+  const isDisabled = sentryAppComponentIsDisabled(sentryAppComponent);
+
   return (
     <SentryAppAvatarWrapper
       isDark={ConfigStore.get('theme') === 'dark'}
@@ -34,6 +35,11 @@ function SentryAppComponentIcon({sentryAppComponent, size = 20}: Props) {
   );
 }
 
+// Patch for backwards compatibility as the change's truth table is inverse to the previous'
+export const sentryAppComponentIsDisabled = (component: SentryAppComponent) => {
+  return typeof component.error === 'boolean' ? component.error : !component.error;
+};
+
 export default SentryAppComponentIcon;
 
 const SentryAppAvatarWrapper = styled('span')<{
diff --git a/static/app/components/sidebar/index.spec.tsx b/static/app/components/sidebar/index.spec.tsx
index 58344913d66fef..ba4e9463a90470 100644
--- a/static/app/components/sidebar/index.spec.tsx
+++ b/static/app/components/sidebar/index.spec.tsx
@@ -11,6 +11,7 @@ import {logout} from 'sentry/actionCreators/account';
 import {OnboardingContextProvider} from 'sentry/components/onboarding/onboardingContext';
 import SidebarContainer from 'sentry/components/sidebar';
 import ConfigStore from 'sentry/stores/configStore';
+import PreferenceStore from 'sentry/stores/preferencesStore';
 import type {Organization} from 'sentry/types/organization';
 import type {StatuspageIncident} from 'sentry/types/system';
 import localStorage from 'sentry/utils/localStorage';
@@ -368,7 +369,7 @@ describe('Sidebar', function () {
       });
 
       const links = screen.getAllByRole('link');
-      expect(links).toHaveLength(31);
+      expect(links).toHaveLength(25);
 
       [
         'Issues',
@@ -380,16 +381,10 @@ describe('Sidebar', function () {
         'Replays',
         'Discover',
         /Insights/,
-        'Requests',
-        'Queries',
-        'Assets',
-        'App Starts',
-        'Screen Loads',
-        'Web Vitals',
-        /Caches/,
-        /Queues/,
-        /Mobile UI/,
-        /LLM Monitoring/,
+        'Frontend',
+        'Backend',
+        'Mobile',
+        'AI',
         'Performance',
         'User Feedback',
         'Crons',
@@ -406,36 +401,117 @@ describe('Sidebar', function () {
       });
     });
 
-    it('mobile screens module hides all other mobile modules', async function () {
-      localStorage.setItem('sidebar-accordion-insights:expanded', 'true');
-      renderSidebarWithFeatures([
-        'insights-entry-points',
-        'starfish-mobile-ui-module',
-        'insights-mobile-screens-module',
-      ]);
+    it('should not render floating accordion when expanded', async () => {
+      renderSidebarWithFeatures(ALL_AVAILABLE_FEATURES);
+      await userEvent.click(
+        screen.getByTestId('sidebar-accordion-insights-domains-item')
+      );
+      expect(screen.queryByTestId('floating-accordion')).not.toBeInTheDocument();
+    });
 
-      await waitFor(function () {
-        expect(apiMocks.broadcasts).toHaveBeenCalled();
+    it('should render floating accordion when collapsed', async () => {
+      renderSidebarWithFeatures(ALL_AVAILABLE_FEATURES);
+      await userEvent.click(screen.getByTestId('sidebar-collapse'));
+      await userEvent.click(
+        screen.getByTestId('sidebar-accordion-insights-domains-item')
+      );
+      expect(await screen.findByTestId('floating-accordion')).toBeInTheDocument();
+    });
+  });
+
+  describe('Rollback prompts', () => {
+    beforeEach(() => {
+      PreferenceStore.showSidebar();
+    });
+
+    it('should render the sidebar banner with no dismissed prompts and an existing rollback', async () => {
+      MockApiClient.addMockResponse({
+        url: `/organizations/${organization.slug}/prompts-activity/`,
+        body: {data: null},
       });
 
-      ['App Starts', 'Screen Loads', /Mobile UI/].forEach(title => {
-        expect(screen.queryByText(title)).not.toBeInTheDocument();
+      MockApiClient.addMockResponse({
+        url: `/organizations/${organization.slug}/user-rollback/`,
+        body: {data: null},
       });
 
-      expect(screen.getByText(/Mobile Screens/)).toBeInTheDocument();
+      renderSidebarWithFeatures(['sentry-rollback-2024']);
+
+      expect(await screen.findByText(/Your 2024 Rollback/)).toBeInTheDocument();
     });
 
-    it('should not render floating accordion when expanded', async () => {
-      renderSidebarWithFeatures(ALL_AVAILABLE_FEATURES);
-      await userEvent.click(screen.getByTestId('sidebar-accordion-insights-item'));
-      expect(screen.queryByTestId('floating-accordion')).not.toBeInTheDocument();
+    it('will not render anything if the user does not have a rollback', async () => {
+      MockApiClient.addMockResponse({
+        url: `/organizations/${organization.slug}/prompts-activity/`,
+        body: {data: null},
+      });
+
+      MockApiClient.addMockResponse({
+        url: `/organizations/${organization.slug}/user-rollback/`,
+        statusCode: 404,
+      });
+
+      renderSidebarWithFeatures(['sentry-rollback-2024']);
+
+      await screen.findByText('OS');
+
+      await waitFor(() => {
+        expect(screen.queryByText(/Your 2024 Rollback/)).not.toBeInTheDocument();
+      });
     });
 
-    it('should render floating accordion when collapsed', async () => {
-      renderSidebarWithFeatures(ALL_AVAILABLE_FEATURES);
+    it('will not render sidebar banner when collapsed', async () => {
+      MockApiClient.addMockResponse({
+        url: `/organizations/${organization.slug}/prompts-activity/`,
+        body: {data: null},
+      });
+
+      MockApiClient.addMockResponse({
+        url: `/organizations/${organization.slug}/user-rollback/`,
+        body: {data: null},
+      });
+
+      renderSidebarWithFeatures(['sentry-rollback-2024']);
+
       await userEvent.click(screen.getByTestId('sidebar-collapse'));
-      await userEvent.click(screen.getByTestId('sidebar-accordion-insights-item'));
-      expect(await screen.findByTestId('floating-accordion')).toBeInTheDocument();
+
+      await waitFor(() => {
+        expect(screen.queryByText(/Your 2024 Rollback/)).not.toBeInTheDocument();
+      });
+    });
+
+    it('should show dot on org dropdown after dismissing sidebar banner', async () => {
+      MockApiClient.addMockResponse({
+        url: `/organizations/${organization.slug}/prompts-activity/`,
+        body: {data: null},
+      });
+
+      MockApiClient.addMockResponse({
+        url: `/organizations/${organization.slug}/user-rollback/`,
+        body: {data: null},
+      });
+
+      const dismissMock = MockApiClient.addMockResponse({
+        url: `/organizations/${organization.slug}/prompts-activity/`,
+        method: 'PUT',
+        body: {},
+      });
+
+      renderSidebarWithFeatures(['sentry-rollback-2024']);
+
+      await userEvent.click(await screen.findByRole('button', {name: /Dismiss/}));
+
+      expect(await screen.findByTestId('rollback-notification-dot')).toBeInTheDocument();
+      expect(screen.queryByText(/Your 2024 Rollback/)).not.toBeInTheDocument();
+      expect(dismissMock).toHaveBeenCalled();
+
+      // Opening the org dropdown will remove the dot
+      await userEvent.click(screen.getByTestId('sidebar-dropdown'));
+      await waitFor(() => {
+        expect(screen.queryByTestId('rollback-notification-dot')).not.toBeInTheDocument();
+      });
+
+      expect(dismissMock).toHaveBeenCalledTimes(2);
     });
   });
 });
diff --git a/static/app/components/sidebar/index.tsx b/static/app/components/sidebar/index.tsx
index 06a3368b62f1c0..bae6b5408a7e31 100644
--- a/static/app/components/sidebar/index.tsx
+++ b/static/app/components/sidebar/index.tsx
@@ -6,6 +6,7 @@ import {hideSidebar, showSidebar} from 'sentry/actionCreators/preferences';
 import Feature from 'sentry/components/acl/feature';
 import GuideAnchor from 'sentry/components/assistant/guideAnchor';
 import {Chevron} from 'sentry/components/chevron';
+import FeatureFlagOnboardingSidebar from 'sentry/components/events/featureFlags/featureFlagOnboardingSidebar';
 import FeedbackOnboardingSidebar from 'sentry/components/feedback/feedbackOnboarding/sidebar';
 import Hook from 'sentry/components/hook';
 import {OnboardingContext} from 'sentry/components/onboarding/onboardingContext';
@@ -18,6 +19,7 @@ import {
   ExpandedContextProvider,
 } from 'sentry/components/sidebar/expandedContextProvider';
 import {NewOnboardingStatus} from 'sentry/components/sidebar/newOnboardingStatus';
+import {DismissableRollbackBanner} from 'sentry/components/sidebar/rollback/dismissableBanner';
 import {isDone} from 'sentry/components/sidebar/utils';
 import {
   IconDashboard,
@@ -53,8 +55,6 @@ import {useLocation} from 'sentry/utils/useLocation';
 import useMedia from 'sentry/utils/useMedia';
 import useOrganization from 'sentry/utils/useOrganization';
 import useProjects from 'sentry/utils/useProjects';
-import {useModuleURLBuilder} from 'sentry/views/insights/common/utils/useModuleURL';
-import {MODULE_SIDEBAR_TITLE as HTTP_MODULE_SIDEBAR_TITLE} from 'sentry/views/insights/http/settings';
 import {
   AI_LANDING_SUB_PATH,
   AI_SIDEBAR_LABEL,
@@ -75,7 +75,6 @@ import {
   DOMAIN_VIEW_BASE_TITLE,
   DOMAIN_VIEW_BASE_URL,
 } from 'sentry/views/insights/pages/settings';
-import {MODULE_TITLES} from 'sentry/views/insights/settings';
 import MetricsOnboardingSidebar from 'sentry/views/metrics/ddmOnboarding/sidebar';
 import {getPerformanceBaseUrl} from 'sentry/views/performance/utils';
 
@@ -143,7 +142,6 @@ function Sidebar() {
   const hasNewNav = organization?.features.includes('navigation-sidebar-v2');
   const hasOrganization = !!organization;
   const isSelfHostedErrorsOnly = ConfigStore.get('isSelfHostedErrorsOnly');
-  const hasPerfDomainViews = organization?.features.includes('insights-domain-view');
 
   const collapsed = hasNewNav ? true : !!preferences.collapsed;
   const horizontal = useMedia(`(max-width: ${theme.breakpoints.medium})`);
@@ -270,156 +268,6 @@ function Sidebar() {
     </Feature>
   );
 
-  const moduleURLBuilder = useModuleURLBuilder(true);
-
-  const queries = hasOrganization && (
-    <Feature key="db" features="insights-entry-points" organization={organization}>
-      <SidebarItem
-        {...sidebarItemProps}
-        label={
-          <GuideAnchor target="performance-database">{MODULE_TITLES.db}</GuideAnchor>
-        }
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('db')}/`}
-        id="performance-database"
-        icon={<SubitemDot collapsed />}
-      />
-    </Feature>
-  );
-
-  const requests = hasOrganization && (
-    <Feature key="http" features="insights-entry-points" organization={organization}>
-      <SidebarItem
-        {...sidebarItemProps}
-        label={
-          <GuideAnchor target="performance-http">{HTTP_MODULE_SIDEBAR_TITLE}</GuideAnchor>
-        }
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('http')}/`}
-        id="performance-http"
-        icon={<SubitemDot collapsed />}
-      />
-    </Feature>
-  );
-
-  const caches = hasOrganization && (
-    <Feature key="cache" features="insights-entry-points" organization={organization}>
-      <SidebarItem
-        {...sidebarItemProps}
-        label={
-          <GuideAnchor target="performance-cache">{MODULE_TITLES.cache}</GuideAnchor>
-        }
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('cache')}/`}
-        id="performance-cache"
-        icon={<SubitemDot collapsed />}
-      />
-    </Feature>
-  );
-
-  const webVitals = hasOrganization && (
-    <Feature key="vital" features="insights-entry-points" organization={organization}>
-      <SidebarItem
-        {...sidebarItemProps}
-        label={
-          <GuideAnchor target="performance-webvitals">{MODULE_TITLES.vital}</GuideAnchor>
-        }
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('vital')}/`}
-        id="performance-webvitals"
-        icon={<SubitemDot collapsed />}
-      />
-    </Feature>
-  );
-
-  const queues = hasOrganization && (
-    <Feature key="queue" features="insights-entry-points" organization={organization}>
-      <SidebarItem
-        {...sidebarItemProps}
-        label={
-          <GuideAnchor target="performance-queues">{MODULE_TITLES.queue}</GuideAnchor>
-        }
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('queue')}/`}
-        id="performance-queues"
-        icon={<SubitemDot collapsed />}
-      />
-    </Feature>
-  );
-
-  // the mobile screens module is meant to be as a replacement for screen load, app start, and mobile ui
-  // so if mobile screens is enabled, we should not show the other mobile modules
-  const hasMobileScreensModule =
-    hasOrganization && organization.features.includes('insights-mobile-screens-module');
-
-  const screenLoads = hasOrganization && !hasMobileScreensModule && (
-    <Feature
-      key="screen_load"
-      features="insights-entry-points"
-      organization={organization}
-    >
-      <SidebarItem
-        {...sidebarItemProps}
-        label={MODULE_TITLES.screen_load}
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('screen_load')}/`}
-        id="performance-mobile-screens"
-        icon={<SubitemDot collapsed />}
-      />
-    </Feature>
-  );
-
-  const appStarts = hasOrganization && !hasMobileScreensModule && (
-    <Feature key="app_start" features="insights-entry-points" organization={organization}>
-      <SidebarItem
-        {...sidebarItemProps}
-        label={MODULE_TITLES.app_start}
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('app_start')}/`}
-        id="performance-mobile-app-startup"
-        icon={<SubitemDot collapsed />}
-      />
-    </Feature>
-  );
-
-  const mobileUI = hasOrganization && !hasMobileScreensModule && (
-    <Feature
-      key="mobile-ui"
-      features={['insights-entry-points', 'starfish-mobile-ui-module']}
-      organization={organization}
-    >
-      <SidebarItem
-        {...sidebarItemProps}
-        label={MODULE_TITLES['mobile-ui']}
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('mobile-ui')}/`}
-        id="performance-mobile-ui"
-        icon={<SubitemDot collapsed />}
-        isAlpha
-      />
-    </Feature>
-  );
-
-  const mobileScreens = hasOrganization && hasMobileScreensModule && (
-    <Feature
-      key="mobile-screens"
-      features={['insights-entry-points']}
-      organization={organization}
-    >
-      <SidebarItem
-        {...sidebarItemProps}
-        label={MODULE_TITLES['mobile-screens']}
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('mobile-screens')}/`}
-        id="performance-mobile-screens"
-        icon={<SubitemDot collapsed />}
-      />
-    </Feature>
-  );
-
-  const resources = hasOrganization && (
-    <Feature key="resource" features="insights-entry-points">
-      <SidebarItem
-        {...sidebarItemProps}
-        label={<GuideAnchor target="starfish">{MODULE_TITLES.resource}</GuideAnchor>}
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('resource')}/`}
-        id="performance-browser-resources"
-        icon={<SubitemDot collapsed />}
-      />
-    </Feature>
-  );
-
   const traces = hasOrganization && (
     <Feature features="performance-trace-explorer">
       <SidebarItem
@@ -433,18 +281,6 @@ function Sidebar() {
     </Feature>
   );
 
-  const llmMonitoring = hasOrganization && (
-    <Feature features={['insights-entry-points']} organization={organization}>
-      <SidebarItem
-        {...sidebarItemProps}
-        icon={<SubitemDot collapsed />}
-        label={MODULE_TITLES.ai}
-        to={`/organizations/${organization.slug}/${moduleURLBuilder('ai')}/`}
-        id="llm-monitoring"
-      />
-    </Feature>
-  );
-
   const performance = hasOrganization && (
     <Feature
       hookName="feature-disabled:performance-sidebar-item"
@@ -611,10 +447,7 @@ function Sidebar() {
   );
 
   const performanceDomains = hasOrganization && (
-    <Feature
-      features={['insights-domain-view', 'performance-view']}
-      organization={organization}
-    >
+    <Feature features={['performance-view']} organization={organization}>
       <SidebarAccordion
         {...sidebarItemProps}
         icon={<IconGraph />}
@@ -655,31 +488,6 @@ function Sidebar() {
     </Feature>
   );
 
-  const insights = hasOrganization && !hasPerfDomainViews && (
-    <Feature key="insights" features="insights-entry-points" organization={organization}>
-      <SidebarAccordion
-        {...sidebarItemProps}
-        icon={<IconGraph />}
-        label={<GuideAnchor target="insights">{t('Insights')}</GuideAnchor>}
-        id="insights"
-        initiallyExpanded={false}
-        exact={!shouldAccordionFloat}
-      >
-        {requests}
-        {queries}
-        {resources}
-        {appStarts}
-        {screenLoads}
-        {webVitals}
-        {caches}
-        {queues}
-        {mobileUI}
-        {mobileScreens}
-        {llmMonitoring}
-      </SidebarAccordion>
-    </Feature>
-  );
-
   // Sidebar accordion includes a secondary list of nav items
   // TODO: replace with a secondary panel
   const explore = (
@@ -720,6 +528,13 @@ function Sidebar() {
             )}
           </DropdownSidebarSection>
 
+          {organization ? (
+            <DismissableRollbackBanner
+              organization={organization}
+              collapsed={collapsed || horizontal}
+            />
+          ) : null}
+
           <PrimaryItems>
             {hasOrganization && (
               <Fragment>
@@ -732,7 +547,6 @@ function Sidebar() {
                   <Fragment>
                     <SidebarSection hasNewNav={hasNewNav}>
                       {explore}
-                      {insights}
                       {performanceDomains}
                     </SidebarSection>
 
@@ -789,6 +603,12 @@ function Sidebar() {
               hidePanel={hidePanel}
               {...sidebarItemProps}
             />
+            <FeatureFlagOnboardingSidebar
+              currentPanel={activePanel}
+              onShowPanel={() => togglePanel(SidebarPanelKey.FEATURE_FLAG_ONBOARDING)}
+              hidePanel={hidePanel}
+              {...sidebarItemProps}
+            />
             <ProfilingOnboardingSidebar
               currentPanel={activePanel}
               onShowPanel={() => togglePanel(SidebarPanelKey.PROFILING_ONBOARDING)}
diff --git a/static/app/components/sidebar/newOnboardingStatus.tsx b/static/app/components/sidebar/newOnboardingStatus.tsx
index 62b0b659bfef62..2cb24e6e1a6880 100644
--- a/static/app/components/sidebar/newOnboardingStatus.tsx
+++ b/static/app/components/sidebar/newOnboardingStatus.tsx
@@ -73,12 +73,11 @@ export function NewOnboardingStatus({
   });
 
   const label = walkthrough ? t('Guided Tours') : t('Onboarding');
-  const totalRemainingTasks = allTasks.length - doneTasks.length;
   const pendingCompletionSeen = doneTasks.length !== completeTasks.length;
+  const allTasksCompleted = allTasks.length === completeTasks.length;
 
   const skipQuickStart =
-    !organization.features?.includes('onboarding') ||
-    (completeTasks.length === allTasks.length && !isActive);
+    !organization.features?.includes('onboarding') || (allTasksCompleted && !isActive);
 
   const unseenDoneTasks = useMemo(
     () =>
@@ -111,7 +110,7 @@ export function NewOnboardingStatus({
   }, [onShowPanel, isActive, walkthrough, markDoneTaskAsComplete, organization]);
 
   useEffect(() => {
-    if (totalRemainingTasks !== 0 || skipQuickStart || quickStartCompleted) {
+    if (!allTasksCompleted || skipQuickStart || quickStartCompleted) {
       return;
     }
 
@@ -123,11 +122,11 @@ export function NewOnboardingStatus({
 
     setQuickStartCompleted(true);
   }, [
-    totalRemainingTasks,
     organization,
     skipQuickStart,
     quickStartCompleted,
     setQuickStartCompleted,
+    allTasksCompleted,
   ]);
 
   useEffect(() => {
diff --git a/static/app/components/sidebar/rollback/banner.tsx b/static/app/components/sidebar/rollback/banner.tsx
new file mode 100644
index 00000000000000..6ef90af4f6c51e
--- /dev/null
+++ b/static/app/components/sidebar/rollback/banner.tsx
@@ -0,0 +1,97 @@
+import styled from '@emotion/styled';
+
+import {Button, LinkButton} from 'sentry/components/button';
+import Panel from 'sentry/components/panels/panel';
+import {IconClose, IconOpen} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import type {Organization} from 'sentry/types/organization';
+
+type RollbackBannerProps = {
+  organization: Organization;
+  className?: string;
+  handleDismiss?: () => void;
+};
+
+export function RollbackBanner({
+  className,
+  handleDismiss,
+  organization,
+}: RollbackBannerProps) {
+  return (
+    <StyledPanel className={className}>
+      <Title>🥳 {t('Your 2024 Rollback')}</Title>
+      <Description>
+        {t("See what you did (and didn't do) with %s this year.", organization.name)}
+      </Description>
+      <RollbackButton
+        external
+        href={`https://rollback.sentry.io/${organization.slug}/`}
+        icon={<IconOpen />}
+        priority="primary"
+        size="xs"
+        analyticsEventKey="rollback.sidebar_view_clicked"
+        analyticsEventName="Rollback: Sidebar View Clicked"
+      >
+        {t('View My Rollback')}
+      </RollbackButton>
+      {handleDismiss ? (
+        <DismissButton
+          icon={<IconClose />}
+          aria-label={t('Dismiss')}
+          onClick={handleDismiss}
+          size="xs"
+          borderless
+          analyticsEventKey="rollback.sidebar_dismiss_clicked"
+          analyticsEventName="Rollback: Sidebar Dismiss Clicked"
+        />
+      ) : null}
+    </StyledPanel>
+  );
+}
+
+const StyledPanel = styled(Panel)`
+  position: relative;
+  background: linear-gradient(
+    269.35deg,
+    ${p => p.theme.backgroundTertiary} 0.32%,
+    rgba(245, 243, 247, 0) 99.69%
+  );
+  padding: ${space(1)};
+  margin: ${space(1)};
+  color: ${p => p.theme.textColor};
+`;
+
+const Title = styled('p')`
+  font-size: ${p => p.theme.fontSizeSmall};
+  font-weight: ${p => p.theme.fontWeightBold};
+  margin: 0;
+`;
+
+const Description = styled('p')`
+  font-size: ${p => p.theme.fontSizeSmall};
+  margin: ${space(0.5)} 0;
+`;
+
+const RollbackButton = styled(LinkButton)`
+  background: #ff45a8;
+  border-color: #ff45a8;
+  margin: 0 auto;
+  width: 100%;
+
+  &:hover {
+    border-color: #ff45a8;
+  }
+`;
+
+const DismissButton = styled(Button)`
+  position: absolute;
+  top: 0;
+  right: 0;
+
+  color: currentColor;
+
+  &:hover {
+    color: currentColor;
+  }
+`;
diff --git a/static/app/components/sidebar/rollback/dismissableBanner.tsx b/static/app/components/sidebar/rollback/dismissableBanner.tsx
new file mode 100644
index 00000000000000..3aaf0a4eef5971
--- /dev/null
+++ b/static/app/components/sidebar/rollback/dismissableBanner.tsx
@@ -0,0 +1,50 @@
+import styled from '@emotion/styled';
+
+import {RollbackBanner} from 'sentry/components/sidebar/rollback/banner';
+import {useRollbackPrompts} from 'sentry/components/sidebar/rollback/useRollbackPrompts';
+import ConfigStore from 'sentry/stores/configStore';
+import {useLegacyStore} from 'sentry/stores/useLegacyStore';
+import {space} from 'sentry/styles/space';
+import type {Organization} from 'sentry/types/organization';
+
+type DismissableRollbackBannerProps = {collapsed: boolean; organization: Organization};
+
+export function DismissableRollbackBanner({
+  collapsed,
+  organization,
+}: DismissableRollbackBannerProps) {
+  const config = useLegacyStore(ConfigStore);
+
+  const isDarkMode = config.theme === 'dark';
+
+  const {shouldShowSidebarBanner, onDismissSidebarBanner} = useRollbackPrompts({
+    collapsed,
+    organization,
+  });
+
+  if (!shouldShowSidebarBanner || !organization) {
+    return null;
+  }
+
+  return (
+    <Wrapper>
+      <TranslucentBackgroundBanner
+        organization={organization}
+        isDarkMode={isDarkMode}
+        handleDismiss={onDismissSidebarBanner}
+      />
+    </Wrapper>
+  );
+}
+
+const Wrapper = styled('div')`
+  padding: 0 ${space(1)};
+`;
+
+const TranslucentBackgroundBanner = styled(RollbackBanner)<{isDarkMode: boolean}>`
+  position: relative;
+  background: rgba(245, 243, 247, ${p => (p.isDarkMode ? 0.05 : 0.1)});
+  border: 1px solid rgba(245, 243, 247, ${p => (p.isDarkMode ? 0.1 : 0.15)});
+  color: ${p => (p.isDarkMode ? p.theme.textColor : '#ebe6ef')};
+  margin: ${space(0.5)} ${space(1)};
+`;
diff --git a/static/app/components/sidebar/rollback/notificationDot.tsx b/static/app/components/sidebar/rollback/notificationDot.tsx
new file mode 100644
index 00000000000000..d24af3f84d60f9
--- /dev/null
+++ b/static/app/components/sidebar/rollback/notificationDot.tsx
@@ -0,0 +1,15 @@
+import styled from '@emotion/styled';
+
+export function RollbackNotificationDot() {
+  return <Dot data-test-id="rollback-notification-dot" />;
+}
+
+const Dot = styled('div')`
+  width: 11px;
+  height: 11px;
+  border-radius: 50%;
+  position: absolute;
+  background-color: #ff45a8;
+  left: 25px;
+  top: -2px;
+`;
diff --git a/static/app/components/sidebar/rollback/useRollback.tsx b/static/app/components/sidebar/rollback/useRollback.tsx
new file mode 100644
index 00000000000000..172dab7c616c45
--- /dev/null
+++ b/static/app/components/sidebar/rollback/useRollback.tsx
@@ -0,0 +1,11 @@
+import type {Organization} from 'sentry/types/organization';
+import {useApiQuery} from 'sentry/utils/queryClient';
+
+export function useRollback({organization}: {organization: Organization | null}) {
+  return useApiQuery([`/organizations/${organization?.slug}/user-rollback/`], {
+    staleTime: Infinity,
+    retry: false,
+    enabled: organization?.features.includes('sentry-rollback-2024') ?? false,
+    retryOnMount: false,
+  });
+}
diff --git a/static/app/components/sidebar/rollback/useRollbackPrompts.tsx b/static/app/components/sidebar/rollback/useRollbackPrompts.tsx
new file mode 100644
index 00000000000000..df19cb1928fab7
--- /dev/null
+++ b/static/app/components/sidebar/rollback/useRollbackPrompts.tsx
@@ -0,0 +1,53 @@
+import {usePrompt} from 'sentry/actionCreators/prompts';
+import {useRollback} from 'sentry/components/sidebar/rollback/useRollback';
+import type {Organization} from 'sentry/types/organization';
+
+export function useRollbackPrompts({
+  collapsed,
+  organization,
+}: {
+  collapsed: boolean;
+  organization: Organization | null;
+}) {
+  const hasRollback = organization?.features.includes('sentry-rollback-2024') ?? false;
+  const {data} = useRollback({organization});
+
+  const {
+    isPromptDismissed: isSidebarPromptDismissed,
+    dismissPrompt: dismissSidebarPrompt,
+  } = usePrompt({
+    feature: 'rollback_2024_sidebar',
+    organization,
+    options: {enabled: hasRollback},
+  });
+
+  const {
+    isPromptDismissed: isDropdownPromptDismissed,
+    dismissPrompt: dismissDropdownPrompt,
+  } = usePrompt({
+    feature: 'rollback_2024_dropdown',
+    organization,
+    options: {enabled: hasRollback},
+  });
+
+  return {
+    shouldShowSidebarBanner:
+      hasRollback && data && !collapsed && isSidebarPromptDismissed === false,
+    shouldShowDropdownBanner: hasRollback && data,
+    shouldShowDot:
+      hasRollback &&
+      data &&
+      isDropdownPromptDismissed === false &&
+      (collapsed || isSidebarPromptDismissed),
+    onOpenOrgDropdown: () => {
+      if (
+        hasRollback &&
+        isSidebarPromptDismissed === true &&
+        isDropdownPromptDismissed === false
+      ) {
+        dismissDropdownPrompt();
+      }
+    },
+    onDismissSidebarBanner: dismissSidebarPrompt,
+  };
+}
diff --git a/static/app/components/sidebar/sidebarDropdown/index.tsx b/static/app/components/sidebar/sidebarDropdown/index.tsx
index 495e4a8baf1ff6..5242fc5bd47d9a 100644
--- a/static/app/components/sidebar/sidebarDropdown/index.tsx
+++ b/static/app/components/sidebar/sidebarDropdown/index.tsx
@@ -9,6 +9,9 @@ import DeprecatedDropdownMenu from 'sentry/components/deprecatedDropdownMenu';
 import Hook from 'sentry/components/hook';
 import IdBadge from 'sentry/components/idBadge';
 import Link from 'sentry/components/links/link';
+import {RollbackBanner} from 'sentry/components/sidebar/rollback/banner';
+import {RollbackNotificationDot} from 'sentry/components/sidebar/rollback/notificationDot';
+import {useRollbackPrompts} from 'sentry/components/sidebar/rollback/useRollbackPrompts';
 import SidebarDropdownMenu from 'sentry/components/sidebar/sidebarDropdownMenu.styled';
 import SidebarMenuItem, {menuItemStyles} from 'sentry/components/sidebar/sidebarMenuItem';
 import SidebarOrgSummary from 'sentry/components/sidebar/sidebarOrgSummary';
@@ -54,6 +57,13 @@ export default function SidebarDropdown({orientation, collapsed, hideOrgLinks}:
   const hasTeamRead = org?.access?.includes('team:read');
   const canCreateOrg = ConfigStore.get('features').has('organizations:create');
 
+  const {onOpenOrgDropdown, shouldShowDropdownBanner, shouldShowDot} = useRollbackPrompts(
+    {
+      collapsed: collapsed || orientation === 'top',
+      organization: org,
+    }
+  );
+
   function handleLogout() {
     logout(api);
   }
@@ -75,7 +85,7 @@ export default function SidebarDropdown({orientation, collapsed, hideOrgLinks}:
     );
 
   return (
-    <DeprecatedDropdownMenu>
+    <DeprecatedDropdownMenu onOpen={onOpenOrgDropdown}>
       {({isOpen, getRootProps, getActorProps, getMenuProps}) => (
         <SidebarDropdownRoot {...getRootProps()}>
           <SidebarDropdownActor
@@ -83,7 +93,10 @@ export default function SidebarDropdown({orientation, collapsed, hideOrgLinks}:
             data-test-id="sidebar-dropdown"
             {...getActorProps({})}
           >
-            {avatar}
+            <AvatarWrapper>
+              {avatar}
+              {shouldShowDot ? <RollbackNotificationDot /> : null}
+            </AvatarWrapper>
             {!collapsed && orientation !== 'top' && (
               <OrgAndUserWrapper>
                 <OrgOrUserName>
@@ -102,6 +115,9 @@ export default function SidebarDropdown({orientation, collapsed, hideOrgLinks}:
               {hasOrganization && (
                 <Fragment>
                   <SidebarOrgSummary organization={org} projectCount={projects.length} />
+                  {org && shouldShowDropdownBanner ? (
+                    <RollbackBanner organization={org} />
+                  ) : null}
                   {!hideOrgLinks && (
                     <Fragment>
                       {hasOrgRead && (
@@ -263,3 +279,7 @@ const OrgAndUserMenu = styled('div')`
 const StyledChevron = styled(Chevron)`
   transform: translateY(${space(0.25)});
 `;
+
+const AvatarWrapper = styled('div')`
+  position: relative;
+`;
diff --git a/static/app/components/sidebar/sidebarItem.tsx b/static/app/components/sidebar/sidebarItem.tsx
index 0d517daaed29f6..b03d510f79ba92 100644
--- a/static/app/components/sidebar/sidebarItem.tsx
+++ b/static/app/components/sidebar/sidebarItem.tsx
@@ -390,7 +390,8 @@ const getActiveStyle = ({
 };
 
 const StyledSidebarItem = styled(Link, {
-  shouldForwardProp: p => !['isInFloatingAccordion', 'hasNewNav', 'index'].includes(p),
+  shouldForwardProp: p =>
+    !['isInFloatingAccordion', 'hasNewNav', 'index', 'organization'].includes(p),
 })`
   display: flex;
   color: ${p => (p.isInFloatingAccordion ? p.theme.gray400 : 'inherit')};
diff --git a/static/app/components/sidebar/types.tsx b/static/app/components/sidebar/types.tsx
index 5fe8c9728688c2..91f826cda24e98 100644
--- a/static/app/components/sidebar/types.tsx
+++ b/static/app/components/sidebar/types.tsx
@@ -9,6 +9,7 @@ export enum SidebarPanelKey {
   PROFILING_ONBOARDING = 'profiling_onboarding',
   METRICS_ONBOARDING = 'metrics_onboarding',
   FEEDBACK_ONBOARDING = 'feedback_onboarding',
+  FEATURE_FLAG_ONBOARDING = 'flag_onboarding',
 }
 
 export type CommonSidebarProps = {
diff --git a/static/app/components/slideOverPanel.tsx b/static/app/components/slideOverPanel.tsx
index c848b99f5b51ba..e0e83419acd882 100644
--- a/static/app/components/slideOverPanel.tsx
+++ b/static/app/components/slideOverPanel.tsx
@@ -13,11 +13,13 @@ const PANEL_HEIGHT = '50vh';
 const OPEN_STYLES = {
   bottom: {opacity: 1, x: 0, y: 0},
   right: {opacity: 1, x: 0, y: 0},
+  left: {opacity: 1, x: 0, y: 0},
 };
 
 const COLLAPSED_STYLES = {
   bottom: {opacity: 0, x: 0, y: PANEL_HEIGHT},
   right: {opacity: 0, x: PANEL_WIDTH, y: 0},
+  left: {opacity: 0, x: -200, y: 0},
 };
 
 type SlideOverPanelProps = {
@@ -25,8 +27,9 @@ type SlideOverPanelProps = {
   collapsed: boolean;
   ariaLabel?: string;
   className?: string;
+  'data-test-id'?: string;
   onOpen?: () => void;
-  slidePosition?: 'right' | 'bottom';
+  slidePosition?: 'right' | 'bottom' | 'left';
   transitionProps?: AnimationProps['transition'];
 };
 
@@ -34,6 +37,7 @@ export default forwardRef(SlideOverPanel);
 
 function SlideOverPanel(
   {
+    'data-test-id': testId,
     ariaLabel,
     collapsed,
     children,
@@ -73,6 +77,7 @@ function SlideOverPanel(
       aria-hidden={collapsed}
       aria-label={ariaLabel ?? 'slide out drawer'}
       className={className}
+      data-test-id={testId}
     >
       {children}
     </_SlideOverPanel>
@@ -84,7 +89,7 @@ const _SlideOverPanel = styled(motion.div, {
     ['initial', 'animate', 'exit', 'transition'].includes(prop) ||
     (prop !== 'collapsed' && isPropValid(prop)),
 })<{
-  slidePosition?: 'right' | 'bottom';
+  slidePosition?: 'right' | 'bottom' | 'left';
 }>`
   position: fixed;
 
@@ -118,16 +123,28 @@ const _SlideOverPanel = styled(motion.div, {
             bottom: 0;
             left: 0;
           `
-        : css`
-            position: fixed;
-
-            width: ${PANEL_WIDTH};
-            height: 100%;
-
-            top: 0;
-            right: 0;
-            bottom: 0;
-            left: auto;
-          `}
+        : p.slidePosition === 'right'
+          ? css`
+              position: fixed;
+
+              width: ${PANEL_WIDTH};
+              height: 100%;
+
+              top: 0;
+              right: 0;
+              bottom: 0;
+              left: auto;
+            `
+          : css`
+              position: relative;
+
+              width: ${PANEL_WIDTH};
+              height: 100%;
+
+              top: 0;
+              right: auto;
+              bottom: 0;
+              left: auto;
+            `}
   }
 `;
diff --git a/static/app/components/stream/group.tsx b/static/app/components/stream/group.tsx
index f0cbf9ebba7b28..7d897d25ea75a9 100644
--- a/static/app/components/stream/group.tsx
+++ b/static/app/components/stream/group.tsx
@@ -844,6 +844,7 @@ const CheckboxLabel = styled('label')<{hasNewLayout: boolean}>`
 `;
 
 const CountsWrapper = styled('div')`
+  position: relative;
   display: flex;
   flex-direction: column;
 `;
diff --git a/static/app/components/timeRangeSelector/dateRange.tsx b/static/app/components/timeRangeSelector/dateRange.tsx
index 7326d541b8a729..e84b45be46932b 100644
--- a/static/app/components/timeRangeSelector/dateRange.tsx
+++ b/static/app/components/timeRangeSelector/dateRange.tsx
@@ -189,7 +189,7 @@ class BaseDateRange extends Component<Props, State> {
     // Subtract additional day  because we force the end date to be inclusive,
     // so when you pick Jan 1 the time becomes Jan 1 @ 23:59:59,
     // (or really, Jan 2 @ 00:00:00 - 1 second), while the start time is at 00:00
-    let minDate = getStartOfPeriodAgo('days', (maxPickableDays ?? MAX_PICKABLE_DAYS) - 2);
+    let minDate = getStartOfPeriodAgo('days', (maxPickableDays ?? MAX_PICKABLE_DAYS) - 1);
 
     let maxDate = new Date();
 
diff --git a/static/app/components/tooltip.tsx b/static/app/components/tooltip.tsx
index 022283ca042b54..9c0903fb5b07d4 100644
--- a/static/app/components/tooltip.tsx
+++ b/static/app/components/tooltip.tsx
@@ -1,5 +1,6 @@
 import {createContext, Fragment, useContext, useEffect} from 'react';
 import {createPortal} from 'react-dom';
+import isPropValid from '@emotion/is-prop-valid';
 import type {SerializedStyles} from '@emotion/react';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
@@ -23,14 +24,18 @@ export const TooltipContext = createContext<TooltipContextProps>({container: nul
 
 interface TooltipProps extends UseHoverOverlayProps {
   /**
-   * The content to show in the tooltip popover
+   * The content to show in the tooltip popover.
    */
   title: React.ReactNode;
   children?: React.ReactNode;
   /**
-   * Disable the tooltip display entirely
+   * Disable the tooltip display entirely.
    */
   disabled?: boolean;
+  /**
+   * The max width the tooltip is allowed to grow.
+   */
+  maxWidth?: number;
   /**
    * Additional style rules for the tooltip content.
    */
@@ -42,6 +47,7 @@ function Tooltip({
   overlayStyle,
   title,
   disabled = false,
+  maxWidth,
   ...hoverOverlayProps
 }: TooltipProps) {
   const {container} = useContext(TooltipContext);
@@ -63,6 +69,7 @@ function Tooltip({
   const tooltipContent = isOpen && (
     <PositionWrapper zIndex={theme.zIndex.tooltip} {...overlayProps}>
       <TooltipContent
+        maxWidth={maxWidth}
         animated
         arrowProps={arrowProps}
         originPoint={arrowData}
@@ -85,10 +92,12 @@ function Tooltip({
   );
 }
 
-const TooltipContent = styled(Overlay)`
+const TooltipContent = styled(Overlay, {shouldForwardProp: isPropValid})<{
+  maxWidth?: number;
+}>`
   padding: ${space(1)} ${space(1.5)};
   overflow-wrap: break-word;
-  max-width: 225px;
+  max-width: ${p => p.maxWidth ?? 225}px;
   color: ${p => p.theme.textColor};
   font-size: ${p => p.theme.fontSizeSmall};
   line-height: 1.2;
diff --git a/static/app/components/versionHoverCard.spec.tsx b/static/app/components/versionHoverCard.spec.tsx
new file mode 100644
index 00000000000000..2cb53e47b536f2
--- /dev/null
+++ b/static/app/components/versionHoverCard.spec.tsx
@@ -0,0 +1,75 @@
+import {DeployFixture} from 'sentry-fixture/deploy';
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {ProjectFixture} from 'sentry-fixture/project';
+import {ReleaseFixture} from 'sentry-fixture/release';
+import {RepositoryFixture} from 'sentry-fixture/repository';
+
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import VersionHoverCard from './versionHoverCard';
+
+describe('VersionHoverCard', () => {
+  const organization = OrganizationFixture();
+  const project = ProjectFixture();
+  const release = ReleaseFixture();
+  const repository = RepositoryFixture();
+  const deploy = DeployFixture();
+
+  beforeEach(() => {
+    MockApiClient.clearMockResponses();
+    MockApiClient.addMockResponse({
+      url: `/organizations/${organization.slug}/repos/`,
+      body: [repository],
+    });
+    MockApiClient.addMockResponse({
+      url: `/projects/${organization.slug}/${project.slug}/releases/${encodeURIComponent(release.version)}/`,
+      body: release,
+    });
+    MockApiClient.addMockResponse({
+      url: `/organizations/${organization.slug}/releases/${encodeURIComponent(release.version)}/deploys/`,
+      body: [deploy],
+    });
+  });
+
+  it('renders', async () => {
+    render(
+      <VersionHoverCard
+        organization={organization}
+        projectSlug={project.slug}
+        releaseVersion={release.version}
+      >
+        <div>{release.version}</div>
+      </VersionHoverCard>
+    );
+
+    expect(await screen.findByText(release.version)).toBeInTheDocument();
+    await userEvent.hover(screen.getByText(release.version));
+
+    expect(await screen.findByText(deploy.environment)).toBeInTheDocument();
+  });
+
+  it('renders authors without ids', async () => {
+    const noIdAuthorRelease = ReleaseFixture({
+      authors: [
+        {name: 'Test Author', email: 'test@sentry.io'},
+        {name: 'Test Author 2', email: 'test2@sentry.io'},
+      ],
+    });
+    MockApiClient.addMockResponse({
+      url: `/projects/${organization.slug}/${project.slug}/releases/${encodeURIComponent(noIdAuthorRelease.version)}/`,
+      body: noIdAuthorRelease,
+    });
+
+    render(
+      <VersionHoverCard
+        organization={organization}
+        projectSlug={project.slug}
+        releaseVersion={release.version}
+      >
+        <div>{release.version}</div>
+      </VersionHoverCard>
+    );
+
+    expect(await screen.findByText(release.version)).toBeInTheDocument();
+  });
+});
diff --git a/static/app/components/versionHoverCard.tsx b/static/app/components/versionHoverCard.tsx
index 4e10ef7af421a4..11b22b3171ca95 100644
--- a/static/app/components/versionHoverCard.tsx
+++ b/static/app/components/versionHoverCard.tsx
@@ -1,6 +1,6 @@
+import {useMemo} from 'react';
 import styled from '@emotion/styled';
 
-import type {Client} from 'sentry/api';
 import AvatarList from 'sentry/components/avatar/avatarList';
 import Tag from 'sentry/components/badge/tag';
 import {LinkButton} from 'sentry/components/button';
@@ -14,48 +14,50 @@ import TimeSince from 'sentry/components/timeSince';
 import Version from 'sentry/components/version';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {Repository} from 'sentry/types/integrations';
+import type {Actor} from 'sentry/types/core';
 import type {Organization} from 'sentry/types/organization';
-import type {Deploy, Release} from 'sentry/types/release';
+import type {User} from 'sentry/types/user';
 import {defined} from 'sentry/utils';
-import withApi from 'sentry/utils/withApi';
-import withRelease from 'sentry/utils/withRelease';
-import withRepositories from 'sentry/utils/withRepositories';
+import {uniqueId} from 'sentry/utils/guid';
+import {useDeploys} from 'sentry/utils/useDeploys';
+import {useRelease} from 'sentry/utils/useRelease';
+import {useRepositories} from 'sentry/utils/useRepositories';
 
 interface Props extends React.ComponentProps<typeof Hovercard> {
-  api: Client;
   organization: Organization;
   projectSlug: string;
-
   releaseVersion: string;
-  deploys?: Array<Deploy>;
-  deploysError?: Error;
-  deploysLoading?: boolean;
-  release?: Release;
-  releaseError?: Error;
-  releaseLoading?: boolean;
-  repositories?: Array<Repository>;
-  repositoriesError?: Error;
-  repositoriesLoading?: boolean;
 }
 
 function VersionHoverCard({
-  api: _api,
-  projectSlug: _projectSlug,
-  deploysLoading,
-  deploysError,
-  release,
-  releaseLoading,
-  releaseError,
-  repositories,
-  repositoriesLoading,
-  repositoriesError,
   organization,
-  deploys,
+  projectSlug,
   releaseVersion,
-  children,
   ...hovercardProps
 }: Props) {
+  const {
+    data: repositories,
+    isPending: isRepositoriesLoading,
+    isError: isRepositoriesError,
+  } = useRepositories({orgSlug: organization.slug});
+  const {
+    data: release,
+    isPending: isReleaseLoading,
+    isError: isReleaseError,
+  } = useRelease({
+    orgSlug: organization.slug,
+    projectSlug,
+    releaseVersion,
+  });
+  const {
+    data: deploys,
+    isPending: isDeploysLoading,
+    isError: isDeploysError,
+  } = useDeploys({
+    orgSlug: organization.slug,
+    releaseVersion,
+  });
+
   function getRepoLink() {
     const orgSlug = organization.slug;
     return {
@@ -76,6 +78,19 @@ function VersionHoverCard({
     };
   }
 
+  const authors = useMemo(
+    () =>
+      release?.authors.map<Actor | User>(author =>
+        // Add a unique id if missing
+        ({
+          ...author,
+          type: 'user',
+          id: 'id' in author ? author.id : uniqueId(),
+        })
+      ),
+    [release?.authors]
+  );
+
   function getBody() {
     if (release === undefined || !defined(deploys)) {
       return {header: null, body: null};
@@ -105,7 +120,7 @@ function VersionHoverCard({
                 {release.authors.length !== 1 ? t('authors') : t('author')}{' '}
               </h6>
               <AvatarList
-                users={release.authors}
+                users={authors}
                 avatarSize={25}
                 tooltipOptions={{container: 'body'} as any}
                 typeAvatars="authors"
@@ -143,8 +158,8 @@ function VersionHoverCard({
   let header: React.ReactNode = null;
   let body: React.ReactNode = null;
 
-  const loading = !!(deploysLoading || releaseLoading || repositoriesLoading);
-  const error = deploysError ?? releaseError ?? repositoriesError;
+  const loading = !!(isDeploysLoading || isReleaseLoading || isRepositoriesLoading);
+  const error = isDeploysError ?? isReleaseError ?? isRepositoriesError;
   const hasRepos = repositories && repositories.length > 0;
 
   if (loading) {
@@ -158,11 +173,7 @@ function VersionHoverCard({
     body = renderObj.body;
   }
 
-  return (
-    <Hovercard {...hovercardProps} header={header} body={body}>
-      {children}
-    </Hovercard>
-  );
+  return <Hovercard {...hovercardProps} header={header} body={body} />;
 }
 
 interface VersionHoverHeaderProps {
@@ -186,7 +197,7 @@ function VersionHoverHeader({releaseVersion}: VersionHoverHeaderProps) {
   );
 }
 
-export default withApi(withRelease(withRepositories(VersionHoverCard)));
+export default VersionHoverCard;
 
 const ConnectRepo = styled('div')`
   padding: ${space(2)};
diff --git a/static/app/constants/chartPalette.tsx b/static/app/constants/chartPalette.tsx
index 09715edccec76e..be738abb6bc395 100644
--- a/static/app/constants/chartPalette.tsx
+++ b/static/app/constants/chartPalette.tsx
@@ -8,7 +8,7 @@ export const CHART_PALETTE = [
   ['#444674', '#f2b712'],
   ['#444674', '#d6567f', '#f2b712'],
   ['#444674', '#a35488', '#ef7061', '#f2b712'],
-  ['#444674', '#895289', '#d6567f', '#f38150', '#f2b712', '#a397f7'],
+  ['#444674', '#895289', '#d6567f', '#f38150', '#f2b712'],
   ['#444674', '#7a5088', '#b85586', '#e9626e', '#f58c46', '#f2b712'],
   ['#444674', '#704f87', '#a35488', '#d6567f', '#ef7061', '#f59340', '#f2b712'],
   [
diff --git a/static/app/constants/index.tsx b/static/app/constants/index.tsx
index d06f4941e8a4bc..0d6200f2773da9 100644
--- a/static/app/constants/index.tsx
+++ b/static/app/constants/index.tsx
@@ -333,7 +333,7 @@ export const DATA_CATEGORY_INFO = {
     apiName: 'span',
     plural: 'spans',
     displayName: 'span',
-    titleName: t('Spans'),
+    titleName: t('Spans'), // TODO(DS Spans): Update name
     productName: t('Tracing'),
     uid: 12,
     isBilledCategory: true,
@@ -348,6 +348,16 @@ export const DATA_CATEGORY_INFO = {
     uid: 13,
     isBilledCategory: true,
   },
+  [DataCategoryExact.SPAN_INDEXED]: {
+    name: DataCategoryExact.SPAN_INDEXED,
+    apiName: 'span_indexed',
+    plural: 'spansIndexed',
+    displayName: 'stored span',
+    titleName: t('Stored Spans'),
+    productName: t('Tracing'),
+    uid: 16,
+    isBilledCategory: false,
+  },
   [DataCategoryExact.PROFILE_DURATION]: {
     name: DataCategoryExact.PROFILE_DURATION,
     apiName: 'profile_duration',
diff --git a/static/app/data/forms/organizationGeneralSettings.tsx b/static/app/data/forms/organizationGeneralSettings.tsx
index d3dbe605e95786..fa724690b85200 100644
--- a/static/app/data/forms/organizationGeneralSettings.tsx
+++ b/static/app/data/forms/organizationGeneralSettings.tsx
@@ -43,21 +43,6 @@ const formGroups: JsonFormObject[] = [
         }),
         visible: () => !ConfigStore.get('isSelfHostedErrorsOnly'),
       },
-      {
-        name: 'aiSuggestedSolution',
-        type: 'boolean',
-        label: t('AI Suggested Solution'),
-        help: tct(
-          'Opt-in to [link:ai suggested solution] to get AI help on how to solve an issue.',
-          {
-            link: (
-              <ExternalLink href="https://docs.sentry.io/product/issues/issue-details/ai-suggested-solution/" />
-            ),
-          }
-        ),
-        visible: ({features}) =>
-          !ConfigStore.get('isSelfHostedErrorsOnly') && !features.has('autofix'),
-      },
       {
         name: 'uptimeAutodetection',
         type: 'boolean',
diff --git a/static/app/data/forms/projectSecurityAndPrivacyGroups.tsx b/static/app/data/forms/projectSecurityAndPrivacyGroups.tsx
index c498340ecce4a1..d9416cfc08eb67 100644
--- a/static/app/data/forms/projectSecurityAndPrivacyGroups.tsx
+++ b/static/app/data/forms/projectSecurityAndPrivacyGroups.tsx
@@ -1,6 +1,9 @@
+import {hasEveryAccess} from 'sentry/components/acl/access';
 import type {JsonFormObject} from 'sentry/components/forms/types';
 import Link from 'sentry/components/links/link';
 import {t, tct} from 'sentry/locale';
+import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
 import {convertMultilineFieldValue, extractMultilineFields} from 'sentry/utils';
 import {
   formatStoreCrashReports,
@@ -11,12 +14,46 @@ import {
 // Export route to make these forms searchable by label/help
 export const route = '/settings/:orgId/projects/:projectId/security-and-privacy/';
 
-const ORG_DISABLED_REASON = t(
-  "This option is enforced by your organization's settings and cannot be customized per-project."
-);
-
 // Check if a field has been set AND IS TRUTHY at the organization level.
-const hasOrgOverride = ({organization, name}) => organization[name];
+const hasOrgOverride = ({
+  organization,
+  name,
+}: {
+  name: string;
+  organization: Organization;
+}) => organization[name];
+
+function hasProjectWriteAndOrgOverride({
+  organization,
+  project,
+  name,
+}: {
+  name: string;
+  organization: Organization;
+  project: Project;
+}) {
+  if (hasOrgOverride({organization, name})) {
+    return true;
+  }
+
+  return !hasEveryAccess(['project:write'], {organization, project});
+}
+
+function projectWriteAndOrgOverrideDisabledReason({
+  organization,
+  name,
+}: {
+  name: string;
+  organization: Organization;
+}) {
+  if (hasOrgOverride({organization, name})) {
+    return t(
+      "This option is enforced by your organization's settings and cannot be customized per-project."
+    );
+  }
+
+  return null;
+}
 
 const formGroups: JsonFormObject[] = [
   {
@@ -63,8 +100,8 @@ const formGroups: JsonFormObject[] = [
         name: 'dataScrubber',
         type: 'boolean',
         label: t('Data Scrubber'),
-        disabled: hasOrgOverride,
-        disabledReason: ORG_DISABLED_REASON,
+        disabled: hasProjectWriteAndOrgOverride,
+        disabledReason: projectWriteAndOrgOverrideDisabledReason,
         help: t('Enable server-side data scrubbing'),
         'aria-label': t('Enable server-side data scrubbing'),
         // `props` are the props given to FormField
@@ -76,8 +113,8 @@ const formGroups: JsonFormObject[] = [
       {
         name: 'dataScrubberDefaults',
         type: 'boolean',
-        disabled: hasOrgOverride,
-        disabledReason: ORG_DISABLED_REASON,
+        disabled: hasProjectWriteAndOrgOverride,
+        disabledReason: projectWriteAndOrgOverrideDisabledReason,
         label: t('Use Default Scrubbers'),
         help: t(
           'Apply default scrubbers to prevent things like passwords and credit cards from being stored'
@@ -94,8 +131,8 @@ const formGroups: JsonFormObject[] = [
       {
         name: 'scrubIPAddresses',
         type: 'boolean',
-        disabled: hasOrgOverride,
-        disabledReason: ORG_DISABLED_REASON,
+        disabled: hasProjectWriteAndOrgOverride,
+        disabledReason: projectWriteAndOrgOverrideDisabledReason,
         // `props` are the props given to FormField
         setValue: (val, props) => props.organization?.[props.name] || val,
         label: t('Prevent Storing of IP Addresses'),
diff --git a/static/app/data/platformCategories.tsx b/static/app/data/platformCategories.tsx
index 22e25ad2ccdd88..200e4611e9fcf5 100644
--- a/static/app/data/platformCategories.tsx
+++ b/static/app/data/platformCategories.tsx
@@ -562,6 +562,36 @@ export const feedbackOnboardingPlatforms: readonly PlatformKey[] = [
   ...feedbackCrashApiPlatforms,
 ];
 
+// Feature flag onboarding platforms
+export const featureFlagOnboardingPlatforms: readonly PlatformKey[] = [
+  'javascript',
+  'python',
+  'javascript-angular',
+  'javascript-astro',
+  'javascript-ember',
+  'javascript-gatsby',
+  'javascript-nextjs',
+  'javascript-nuxt',
+  'javascript-react',
+  'javascript-remix',
+  'javascript-solid',
+  'javascript-solidstart',
+  'javascript-svelte',
+  'javascript-sveltekit',
+  'javascript-vue',
+  'python-aiohttp',
+  'python-bottle',
+  'python-django',
+  'python-falcon',
+  'python-fastapi',
+  'python-flask',
+  'python-pyramid',
+  'python-quart',
+  'python-sanic',
+  'python-starlette',
+  'python-tornado',
+];
+
 const customMetricBackendPlatforms: readonly PlatformKey[] = [
   'bun',
   'dart',
diff --git a/static/app/data/platformPickerCategories.tsx b/static/app/data/platformPickerCategories.tsx
index 2a8e73c4111a7e..9d706d400d17ae 100644
--- a/static/app/data/platformPickerCategories.tsx
+++ b/static/app/data/platformPickerCategories.tsx
@@ -13,6 +13,7 @@ const popularPlatformCategories: Set<PlatformKey> = new Set([
   'javascript',
   'javascript-angular',
   'javascript-nextjs',
+  'javascript-nuxt',
   'javascript-react',
   'javascript-vue',
   'node',
diff --git a/static/app/gettingStartedDocs/javascript/angular.tsx b/static/app/gettingStartedDocs/javascript/angular.tsx
index ff202bfe24d682..69ce7090e61b91 100644
--- a/static/app/gettingStartedDocs/javascript/angular.tsx
+++ b/static/app/gettingStartedDocs/javascript/angular.tsx
@@ -31,6 +31,7 @@ import {
   getReplayConfigureDescription,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 export enum AngularConfigType {
@@ -473,6 +474,7 @@ const docs: Docs<PlatformOptions> = {
   crashReportOnboarding,
   platformOptions,
   profilingOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/astro.tsx b/static/app/gettingStartedDocs/javascript/astro.tsx
index 1c20b807619d07..cdb2b2ae12948f 100644
--- a/static/app/gettingStartedDocs/javascript/astro.tsx
+++ b/static/app/gettingStartedDocs/javascript/astro.tsx
@@ -23,6 +23,7 @@ import {
   getReplaySDKSetupSnippet,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -378,6 +379,7 @@ const docs: Docs = {
   replayOnboarding,
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/ember.tsx b/static/app/gettingStartedDocs/javascript/ember.tsx
index fbe114f9a4ec29..2f015dcf5a0fdb 100644
--- a/static/app/gettingStartedDocs/javascript/ember.tsx
+++ b/static/app/gettingStartedDocs/javascript/ember.tsx
@@ -27,6 +27,7 @@ import {
   getReplayConfigureDescription,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -292,6 +293,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/gatsby.tsx b/static/app/gettingStartedDocs/javascript/gatsby.tsx
index 0605bd549dbf39..f09be5ea3a51c8 100644
--- a/static/app/gettingStartedDocs/javascript/gatsby.tsx
+++ b/static/app/gettingStartedDocs/javascript/gatsby.tsx
@@ -27,6 +27,7 @@ import {
   getReplayConfigureDescription,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -321,6 +322,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/javascript.tsx b/static/app/gettingStartedDocs/javascript/javascript.tsx
index 7266d26701e4f0..12894d782401e0 100644
--- a/static/app/gettingStartedDocs/javascript/javascript.tsx
+++ b/static/app/gettingStartedDocs/javascript/javascript.tsx
@@ -1,5 +1,6 @@
 import {css} from '@emotion/react';
 
+import {IntegrationOptions} from 'sentry/components/events/featureFlags/utils';
 import ExternalLink from 'sentry/components/links/externalLink';
 import crashReportCallout from 'sentry/components/onboarding/gettingStartedDoc/feedback/crashReportCallout';
 import widgetCallout from 'sentry/components/onboarding/gettingStartedDoc/feedback/widgetCallout';
@@ -61,6 +62,35 @@ const platformOptions = {
 
 type PlatformOptions = typeof platformOptions;
 type Params = DocsParams<PlatformOptions>;
+type FlagOptions = {
+  importStatement: string; // feature flag SDK import
+  integration: string; // what's in the integrations array
+  sdkInit: string; // code to register with feature flag SDK
+};
+
+const FLAG_OPTIONS: Record<IntegrationOptions, FlagOptions> = {
+  [IntegrationOptions.LAUNCHDARKLY]: {
+    importStatement: `import * as LaunchDarkly from 'launchdarkly-js-client-sdk';`,
+    integration: 'launchDarklyIntegration()',
+    sdkInit: `const ldClient = LaunchDarkly.initialize(
+    'my-client-ID',
+    {kind: 'user', key: 'my-user-context-key'},
+    {inspectors: [Sentry.buildLaunchDarklyFlagUsedHandler()]}
+);
+
+// Evaluates a flag
+const flagVal = ldClient.variation('my-flag', false);`,
+  },
+  [IntegrationOptions.OPENFEATURE]: {
+    importStatement: `import { OpenFeature } from '@openfeature/web-sdk';`,
+    integration: 'openFeatureIntegration()',
+    sdkInit: `const client = OpenFeature.getClient();
+client.addHooks(new Sentry.OpenFeatureIntegrationHook());
+
+// Evaluating flags will record the result on the Sentry client.
+const result = client.getBooleanValue('my-flag', false);`,
+  },
+};
 
 const isAutoInstall = (params: Params) =>
   params.platformOptions.installationMode === InstallationMode.AUTO;
@@ -612,6 +642,44 @@ const profilingOnboarding: OnboardingConfig<PlatformOptions> = {
   introduction: params => <MaybeBrowserProfilingBetaWarning {...params} />,
 };
 
+export const featureFlagOnboarding: OnboardingConfig = {
+  install: () => [],
+  configure: ({featureFlagOptions = {integration: ''}, dsn}) => [
+    {
+      type: StepType.CONFIGURE,
+      description: tct(
+        'Add [name] to your integrations list, and then register with your feature flag SDK.',
+        {
+          name: (
+            <code>{`${FLAG_OPTIONS[featureFlagOptions.integration].integration}`}</code>
+          ),
+        }
+      ),
+      configurations: [
+        {
+          language: 'JavaScript',
+          code: `
+${FLAG_OPTIONS[featureFlagOptions.integration].importStatement}
+
+// Register with Sentry
+Sentry.init({
+  dsn: "${dsn.public}",
+  integrations: [
+    Sentry.${FLAG_OPTIONS[featureFlagOptions.integration].integration},
+  ],
+});
+
+// Register with your feature flag SDK
+${FLAG_OPTIONS[featureFlagOptions.integration].sdkInit}
+`,
+        },
+      ],
+    },
+  ],
+  verify: () => [],
+  nextSteps: () => [],
+};
+
 const docs: Docs<PlatformOptions> = {
   onboarding,
   feedbackOnboardingNpm: feedbackOnboarding,
@@ -622,6 +690,7 @@ const docs: Docs<PlatformOptions> = {
   crashReportOnboarding,
   platformOptions,
   profilingOnboarding,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/nextjs.tsx b/static/app/gettingStartedDocs/javascript/nextjs.tsx
index 00e24eb868a253..f66cf459579809 100644
--- a/static/app/gettingStartedDocs/javascript/nextjs.tsx
+++ b/static/app/gettingStartedDocs/javascript/nextjs.tsx
@@ -27,6 +27,7 @@ import {
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
 import TextCopyInput from 'sentry/components/textCopyInput';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
@@ -424,6 +425,7 @@ const docs: Docs = {
   }),
   performanceOnboarding,
   crashReportOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/nuxt.spec.tsx b/static/app/gettingStartedDocs/javascript/nuxt.spec.tsx
index ab3a3f8578e521..c3796f6848e834 100644
--- a/static/app/gettingStartedDocs/javascript/nuxt.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/nuxt.spec.tsx
@@ -11,75 +11,33 @@ describe('javascript-nuxt onboarding docs', function () {
     renderWithOnboardingLayout(docs);
 
     // Renders main headings
-    expect(screen.getByRole('heading', {name: 'Install'})).toBeInTheDocument();
-    expect(screen.getByRole('heading', {name: 'Configure SDK'})).toBeInTheDocument();
-    expect(screen.getByRole('heading', {name: 'Upload Source Maps'})).toBeInTheDocument();
-    expect(screen.getByRole('heading', {name: 'Verify'})).toBeInTheDocument();
-
-    // Includes 2 import statements
-    expect(
-      screen.getAllByText(
-        textWithMarkupMatcher(/import \* as Sentry from "@sentry\/nuxt"/)
-      )
-    ).toHaveLength(2);
-  });
-
-  it('displays sample rates by default', () => {
-    renderWithOnboardingLayout(docs, {
-      selectedProducts: [
-        ProductSolution.ERROR_MONITORING,
-        ProductSolution.PERFORMANCE_MONITORING,
-        ProductSolution.SESSION_REPLAY,
-      ],
-    });
-
-    expect(screen.getAllByText(textWithMarkupMatcher(/tracesSampleRate/))).toHaveLength(
-      2
-    ); // client and server
     expect(
-      screen.getByText(textWithMarkupMatcher(/replaysSessionSampleRate/))
-    ).toBeInTheDocument(); // only client
+      screen.getByRole('heading', {name: 'Automatic Configuration (Recommended)'})
+    ).toBeInTheDocument();
+    // Renders main headings
     expect(
-      screen.getByText(textWithMarkupMatcher(/replaysOnErrorSampleRate/))
-    ).toBeInTheDocument(); // only client
-  });
-
-  it('enables performance setting the tracesSampleRate to 1', () => {
-    renderWithOnboardingLayout(docs, {
-      selectedProducts: [
-        ProductSolution.ERROR_MONITORING,
-        ProductSolution.PERFORMANCE_MONITORING,
-      ],
-    });
+      screen.getByRole('heading', {name: 'Manual Configuration'})
+    ).toBeInTheDocument();
+    // Renders main headings
+    expect(screen.getByRole('heading', {name: 'Verify'})).toBeInTheDocument();
 
+    // Includes configure statement
     expect(
-      screen.getAllByText(textWithMarkupMatcher(/tracesSampleRate: 1\.0/))
-    ).toHaveLength(2);
+      screen.getByText(textWithMarkupMatcher(/npx @sentry\/wizard@latest -i nuxt/))
+    ).toBeInTheDocument();
   });
 
-  it('enables replay by setting replay samplerates', () => {
+  it('displays the verify instructions', () => {
     renderWithOnboardingLayout(docs, {
       selectedProducts: [
         ProductSolution.ERROR_MONITORING,
+        ProductSolution.PERFORMANCE_MONITORING,
         ProductSolution.SESSION_REPLAY,
       ],
     });
 
     expect(
-      screen.getByText(textWithMarkupMatcher(/replaysSessionSampleRate: 0\.1/))
-    ).toBeInTheDocument();
-    expect(
-      screen.getByText(textWithMarkupMatcher(/replaysOnErrorSampleRate: 1\.0/))
+      screen.queryByText(textWithMarkupMatcher(/sentry-example-page/))
     ).toBeInTheDocument();
   });
-
-  it('enables profiling by setting profiling sample rates', () => {
-    renderWithOnboardingLayout(docs, {
-      selectedProducts: [ProductSolution.ERROR_MONITORING, ProductSolution.PROFILING],
-    });
-
-    expect(
-      screen.getAllByText(textWithMarkupMatcher(/profilesSampleRate: 1\.0/))
-    ).toHaveLength(2);
-  });
 });
diff --git a/static/app/gettingStartedDocs/javascript/nuxt.tsx b/static/app/gettingStartedDocs/javascript/nuxt.tsx
index bc4a3d78b190a6..09d11fe6157697 100644
--- a/static/app/gettingStartedDocs/javascript/nuxt.tsx
+++ b/static/app/gettingStartedDocs/javascript/nuxt.tsx
@@ -1,8 +1,8 @@
 import {Fragment} from 'react';
-import styled from '@emotion/styled';
 
-import Alert from 'sentry/components/alert';
 import ExternalLink from 'sentry/components/links/externalLink';
+import List from 'sentry/components/list/';
+import ListItem from 'sentry/components/list/listItem';
 import crashReportCallout from 'sentry/components/onboarding/gettingStartedDoc/feedback/crashReportCallout';
 import widgetCallout from 'sentry/components/onboarding/gettingStartedDoc/feedback/widgetCallout';
 import TracePropagationMessage from 'sentry/components/onboarding/gettingStartedDoc/replay/tracePropagationMessage';
@@ -17,88 +17,50 @@ import {
   getCrashReportModalConfigDescription,
   getCrashReportModalIntroduction,
   getFeedbackConfigureDescription,
+  getFeedbackSDKSetupSnippet,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding';
 import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
 import {MaybeBrowserProfilingBetaWarning} from 'sentry/components/onboarding/gettingStartedDoc/utils/profilingOnboarding';
 import {
-  getReplayConfigOptions,
   getReplayConfigureDescription,
+  getReplaySDKSetupSnippet,
+  getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
-import {t, tct} from 'sentry/locale';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
+import {t, tct, tctCode} from 'sentry/locale';
 
 type Params = DocsParams;
 
-const getNuxtModuleSnippet = () => `
-export default defineNuxtConfig({
-  modules: ["@sentry/nuxt/module"],
-});
-`;
+const getConfigStep = ({isSelfHosted, organization, projectSlug}: Params) => {
+  const urlParam = isSelfHosted ? '--saas' : '--saas';
 
-const getSdkClientSetupSnippet = (params: Params) => `
-import * as Sentry from "@sentry/nuxt";
-
-Sentry.init({
-  // If set up, you can use your runtime config here
-  // dsn: useRuntimeConfig().public.sentry.dsn,
-  dsn: "${params.dsn.public}",${
-    params.isReplaySelected
-      ? `
-  integrations: [Sentry.replayIntegration(${getReplayConfigOptions(params.replayOptions)})],`
-      : ''
-  }${
-    params.isPerformanceSelected
-      ? `
-  // Tracing
-  // We recommend adjusting this value in production, or using a tracesSampler for finer control.
-  tracesSampleRate: 1.0, //  Capture 100% of the transactions
-  // Set 'tracePropagationTargets' to control for which URLs distributed tracing should be enabled
-  tracePropagationTargets: ["localhost", /^https:\\/\\/yourserver\\.io\\/api/],`
-      : ''
-  }${
-    params.isReplaySelected
-      ? `
-  // Session Replay
-  replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production.
-  replaysOnErrorSampleRate: 1.0, // If you're not already sampling the entire session, change the sample rate to 100% when sampling sessions where errors occur.`
-      : ''
-  }${
-    params.isProfilingSelected
-      ? `
-  // Set profilesSampleRate to 1.0 to profile every transaction.
-  // Since profilesSampleRate is relative to tracesSampleRate,
-  // the final profiling rate can be computed as tracesSampleRate * profilesSampleRate
-  // For example, a tracesSampleRate of 0.5 and profilesSampleRate of 0.5 would
-  // results in 25% of transactions being profiled (0.5*0.5=0.25)
-  profilesSampleRate: 1.0,`
-      : ''
-  }
-});
-`;
-
-const getSdkServerSetupSnippet = (params: Params) => `
-import * as Sentry from "@sentry/nuxt";
+  return [
+    {
+      type: StepType.INSTALL,
+      description: tct(
+        'Configure your app automatically by running the [wizardLink:Sentry wizard] in the root of your project.',
+        {
+          wizardLink: (
+            <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/nuxt/#install" />
+          ),
+        }
+      ),
+      configurations: [
+        {
+          language: 'bash',
+          code: `npx @sentry/wizard@latest -i nuxt ${urlParam}  --org ${organization.slug} --project ${projectSlug}`,
+        },
+      ],
+    },
+  ];
+};
 
-Sentry.init({
-  dsn: "${params.dsn.public}",${
-    params.isPerformanceSelected
-      ? `
-  // Tracing
-  // We recommend adjusting this value in production, or using a tracesSampler for finer control.
-  tracesSampleRate: 1.0, // Capture 100% of the transactions`
-      : ''
-  }${
-    params.isProfilingSelected
-      ? `
-    // Set profilesSampleRate to 1.0 to profile every transaction.
-    // Since profilesSampleRate is relative to tracesSampleRate,
-    // the final profiling rate can be computed as tracesSampleRate * profilesSampleRate
-    // For example, a tracesSampleRate of 0.5 and profilesSampleRate of 0.5 would
-    // results in 25% of transactions being profiled (0.5*0.5=0.25)
-    profilesSampleRate: 1.0,`
-      : ''
-  }
-});
-`;
+const getInstallConfig = (params: Params) => [
+  {
+    type: StepType.INSTALL,
+    configurations: getConfigStep(params),
+  },
+];
 
 const getVerifyNuxtSnippet = () => `
 <script setup>
@@ -111,140 +73,60 @@ const getVerifyNuxtSnippet = () => `
   <button id="errorBtn" @click="triggerError">Trigger Error</button>
 </template>`;
 
-const getInstallConfig = () => [
-  {
-    language: 'bash',
-    code: [
-      {
-        label: 'npm',
-        value: 'npm',
-        language: 'bash',
-        code: 'npm install --save @sentry/nuxt',
-      },
-      {
-        label: 'yarn',
-        value: 'yarn',
-        language: 'bash',
-        code: 'yarn add @sentry/nuxt',
-      },
-      {
-        label: 'pnpm',
-        value: 'pnpm',
-        language: 'bash',
-        code: `pnpm add @sentry/nuxt`,
-      },
-    ],
-  },
-];
-
 const onboarding: OnboardingConfig = {
-  introduction: params => (
-    <Fragment>
-      <MaybeBrowserProfilingBetaWarning {...params} />
-      <p>
-        {tct(
-          'In this quick guide you’ll use [strong:npm], [strong:yarn] or [strong:pnpm] to set up:',
-          {
-            strong: <strong />,
-          }
-        )}
-      </p>
-    </Fragment>
-  ),
-  install: () => [
+  install: (params: Params) => [
     {
-      type: StepType.INSTALL,
-      description: t(
-        'Add the Sentry Nuxt SDK as a dependency using your preferred package manager:'
-      ),
-      configurations: getInstallConfig(),
+      title: t('Automatic Configuration (Recommended)'),
+      configurations: getConfigStep(params),
     },
   ],
-  configure: (params: Params) => [
+  configure: () => [
     {
-      type: StepType.CONFIGURE,
-      configurations: [
-        {
-          description: tct(
-            'Add the Sentry Nuxt module in your [code:nuxt.config.ts] file:',
-            {code: <code />}
-          ),
-          code: [
-            {
-              label: 'TypeScript',
-              value: 'typescript',
-              language: 'typescript',
-              filename: 'nuxt.config.ts',
-              code: getNuxtModuleSnippet(),
-            },
-          ],
-        },
+      title: t('Manual Configuration'),
+      collapsible: true,
+      description: tct(
+        'Alternatively, you can also [manualSetupLink:set up the SDK manually], by following these steps:',
         {
-          description: tct(
-            'For the client, create a [codeFile:sentry.client.config.ts] file in your project root and initialize the Sentry SDK:',
-            {codeFile: <code />}
+          manualSetupLink: (
+            <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/nuxt/manual-setup/" />
           ),
-          code: [
-            {
-              label: 'TypeScript',
-              value: 'typescript',
-              language: 'typescript',
-              filename: 'sentry.client.config.ts',
-              code: getSdkClientSetupSnippet(params),
-            },
-          ],
-        },
+        }
+      ),
+      configurations: [
         {
           description: (
-            <Fragment>
-              <p>
-                {tct(
-                  'For the server, create a [codeFile:sentry.server.config.ts] file in your project root and initialize the Sentry SDK:',
-                  {codeFile: <code />}
+            <List symbol="bullet">
+              <ListItem>
+                {tctCode('Add [code:@sentry/nuxt/module] to your [code:nuxt.config.ts].')}
+              </ListItem>
+              <ListItem>
+                {tctCode(
+                  'Create or update [code:sentry.client.config.ts] and [code:sentry.server.config.ts] with the default [code:Sentry.init] call.'
                 )}
-              </p>
-
-              <StyledAlert type="info" showIcon>
-                {tct(
-                  'To complete the server-side setup, follow the [link:Sentry Nuxt docs] for guidance. Nuxt compiles your code in ESM on the server side as well, so the deployment setup can get tricky depending on where you deploy your application.',
-                  {
-                    link: (
-                      <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/nuxt/#server-side-setup" />
-                    ),
-                  }
+              </ListItem>
+              <ListItem>
+                {tctCode(
+                  'Configure source maps upload options in your [code:nuxt.config.ts].'
                 )}
-              </StyledAlert>
-            </Fragment>
+              </ListItem>
+            </List>
           ),
-          code: [
-            {
-              label: 'TypeScript',
-              value: 'typescript',
-              language: 'typescript',
-              filename: 'sentry.server.config.ts',
-              code: getSdkServerSetupSnippet(params),
-            },
-          ],
         },
       ],
     },
-    {
-      title: t('Upload Source Maps'),
-      description: tct(
-        'To upload source maps to Sentry, follow the [link:instructions in our documentation].',
-        {
-          link: (
-            <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/nuxt/#add-readable-stack-traces-to-errors" />
-          ),
-        }
-      ),
-    },
   ],
   verify: () => [
     {
       type: StepType.VERIFY,
-      description: t(
-        "This snippet contains an intentional error and can be used as a test to make sure that everything's working as expected."
+      description: (
+        <Fragment>
+          <p>
+            {tctCode(
+              'Build and run your application and visit [code:/sentry-example-page] if you have set it up. Click the button to trigger a test error.'
+            )}
+          </p>
+          <p>{t('Or, throw an error in a simple vue component.')}</p>
+        </Fragment>
       ),
       configurations: [
         {
@@ -258,6 +140,9 @@ const onboarding: OnboardingConfig = {
           ],
         },
       ],
+      additionalInfo: t(
+        'If you see an issue in your Sentry dashboard, you have successfully set up Sentry.'
+      ),
     },
   ],
   nextSteps: () => [
@@ -271,21 +156,10 @@ const onboarding: OnboardingConfig = {
 };
 
 const replayOnboarding: OnboardingConfig = {
-  install: () => [
-    {
-      type: StepType.INSTALL,
-      description: tct(
-        'You need a minimum version 8.9.1 of [code:@sentry/nuxt] in order to use Session Replay. You do not need to install any additional packages.',
-        {
-          code: <code />,
-        }
-      ),
-      configurations: getInstallConfig(),
-    },
-  ],
+  install: (params: Params) => getInstallConfig(params),
   configure: (params: Params) => [
     {
-      type: StepType.CONFIGURE,
+      type: StepType.INSTALL,
       description: getReplayConfigureDescription({
         link: 'https://docs.sentry.io/platforms/javascript/guides/nuxt/session-replay/',
       }),
@@ -296,20 +170,25 @@ const replayOnboarding: OnboardingConfig = {
               label: 'JavaScript',
               value: 'javascript',
               language: 'javascript',
-              code: getSdkClientSetupSnippet(params),
+              code: getReplaySDKSetupSnippet({
+                importStatement: `import * as Sentry from "@sentry/nuxt";`,
+                dsn: params.dsn.public,
+                mask: params.replayOptions?.mask,
+                block: params.replayOptions?.block,
+              }),
             },
           ],
-          additionalInfo: <TracePropagationMessage />,
         },
       ],
+      additionalInfo: <TracePropagationMessage />,
     },
   ],
-  verify: () => [],
+  verify: getReplayVerifyStep(),
   nextSteps: () => [],
 };
 
 const feedbackOnboarding: OnboardingConfig = {
-  install: () => [
+  install: (params: Params) => [
     {
       type: StepType.INSTALL,
       description: tct(
@@ -318,7 +197,7 @@ const feedbackOnboarding: OnboardingConfig = {
           code: <code />,
         }
       ),
-      configurations: getInstallConfig(),
+      configurations: getInstallConfig(params),
     },
   ],
   configure: (params: Params) => [
@@ -337,13 +216,17 @@ const feedbackOnboarding: OnboardingConfig = {
               label: 'JavaScript',
               value: 'javascript',
               language: 'javascript',
-              code: getSdkClientSetupSnippet(params),
+              code: getFeedbackSDKSetupSnippet({
+                importStatement: `import * as Sentry from "@sentry/nuxt";`,
+                dsn: params.dsn.public,
+                feedbackOptions: params.feedbackOptions,
+              }),
             },
           ],
         },
       ],
       additionalInfo: crashReportCallout({
-        link: 'https://docs.sentry.io/platforms/nuxt/guides/nuxt/user-feedback/#crash-report-modal',
+        link: 'https://docs.sentry.io/platforms/javascript/guides/nuxt/user-feedback/#crash-report-modal',
       }),
     },
   ],
@@ -381,10 +264,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
-const StyledAlert = styled(Alert)`
-  margin-bottom: 0;
-`;
-
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/react.tsx b/static/app/gettingStartedDocs/javascript/react.tsx
index ea0c80a2724d8c..6768b95d467ea3 100644
--- a/static/app/gettingStartedDocs/javascript/react.tsx
+++ b/static/app/gettingStartedDocs/javascript/react.tsx
@@ -28,6 +28,7 @@ import {
   getReplayConfigureDescription,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -430,6 +431,7 @@ const docs: Docs = {
   performanceOnboarding,
   crashReportOnboarding,
   profilingOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/remix.tsx b/static/app/gettingStartedDocs/javascript/remix.tsx
index cb997be850ad98..10005884f88ea9 100644
--- a/static/app/gettingStartedDocs/javascript/remix.tsx
+++ b/static/app/gettingStartedDocs/javascript/remix.tsx
@@ -25,6 +25,7 @@ import {
   getReplaySDKSetupSnippet,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -288,6 +289,7 @@ const docs: Docs = {
   replayOnboarding,
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/solid.tsx b/static/app/gettingStartedDocs/javascript/solid.tsx
index 3079da0512b81e..08f96fa3bde531 100644
--- a/static/app/gettingStartedDocs/javascript/solid.tsx
+++ b/static/app/gettingStartedDocs/javascript/solid.tsx
@@ -27,6 +27,7 @@ import {
   getReplayConfigureDescription,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -323,6 +324,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/solidstart.tsx b/static/app/gettingStartedDocs/javascript/solidstart.tsx
index 1c3fe7bb1b8358..610cd710478cf9 100644
--- a/static/app/gettingStartedDocs/javascript/solidstart.tsx
+++ b/static/app/gettingStartedDocs/javascript/solidstart.tsx
@@ -27,6 +27,7 @@ import {
   getReplayConfigureDescription,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -502,6 +503,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/svelte.tsx b/static/app/gettingStartedDocs/javascript/svelte.tsx
index 546ebe7db6be3b..37f72b7c8be392 100644
--- a/static/app/gettingStartedDocs/javascript/svelte.tsx
+++ b/static/app/gettingStartedDocs/javascript/svelte.tsx
@@ -27,6 +27,7 @@ import {
   getReplayConfigureDescription,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -318,6 +319,7 @@ const docs: Docs = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/sveltekit.tsx b/static/app/gettingStartedDocs/javascript/sveltekit.tsx
index 42c6e4e4e2c778..29e364a3baf97c 100644
--- a/static/app/gettingStartedDocs/javascript/sveltekit.tsx
+++ b/static/app/gettingStartedDocs/javascript/sveltekit.tsx
@@ -25,6 +25,7 @@ import {
   getReplaySDKSetupSnippet,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -255,6 +256,7 @@ const docs: Docs = {
   replayOnboarding,
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/vue.tsx b/static/app/gettingStartedDocs/javascript/vue.tsx
index eaefd0ae751e2c..691b1b5b8788a1 100644
--- a/static/app/gettingStartedDocs/javascript/vue.tsx
+++ b/static/app/gettingStartedDocs/javascript/vue.tsx
@@ -28,6 +28,7 @@ import {
   getReplayConfigureDescription,
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
+import {featureFlagOnboarding} from 'sentry/gettingStartedDocs/javascript/javascript';
 import {t, tct} from 'sentry/locale';
 
 export enum VueVersion {
@@ -361,6 +362,7 @@ const docs: Docs<PlatformOptions> = {
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
   profilingOnboarding,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/aiohttp.tsx b/static/app/gettingStartedDocs/python/aiohttp.tsx
index 39a5786f8e33f7..a64fcd7874bef4 100644
--- a/static/app/gettingStartedDocs/python/aiohttp.tsx
+++ b/static/app/gettingStartedDocs/python/aiohttp.tsx
@@ -11,6 +11,7 @@ import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoa
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
+  featureFlagOnboarding,
 } from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
@@ -44,7 +45,7 @@ sentry_sdk.init(
           ? `
     _experiments={
         # Set continuous_profiling_auto_start to True
-        # to automatically start the profiler on when
+        # to automatically start the profiler when
         # possible.
         "continuous_profiling_auto_start": True,
     },`
@@ -106,16 +107,7 @@ const onboarding: OnboardingConfig = {
       configurations: [
         {
           language: 'python',
-          code: `
-${getSdkSetupSnippet(params)}
-async def hello(request):
-   return web.Response(text="Hello, world")
-
-app = web.Application()
-app.add_routes([web.get('/', hello)])
-
-web.run_app(app)
-`,
+          code: getSdkSetupSnippet(params),
         },
       ],
       additionalInfo: params.isProfilingSelected &&
@@ -124,7 +116,7 @@ web.run_app(app)
         ),
     },
   ],
-  verify: (params: Params) => [
+  verify: () => [
     {
       type: StepType.VERIFY,
       description: t(
@@ -135,7 +127,6 @@ web.run_app(app)
           language: 'python',
 
           code: `
-${getSdkSetupSnippet(params)}
 async def hello(request):
     1/0  # raises an error
     return web.Response(text="Hello, world")
@@ -177,6 +168,7 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/bottle.tsx b/static/app/gettingStartedDocs/python/bottle.tsx
index f33045da82b1ed..3d9e0eefd04a27 100644
--- a/static/app/gettingStartedDocs/python/bottle.tsx
+++ b/static/app/gettingStartedDocs/python/bottle.tsx
@@ -11,6 +11,7 @@ import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoa
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
+  featureFlagOnboarding,
 } from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
@@ -159,6 +160,7 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/django.tsx b/static/app/gettingStartedDocs/python/django.tsx
index b5de87ac2cf95c..fd17c37fd4bcf2 100644
--- a/static/app/gettingStartedDocs/python/django.tsx
+++ b/static/app/gettingStartedDocs/python/django.tsx
@@ -11,6 +11,7 @@ import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoa
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
+  featureFlagOnboarding,
 } from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
@@ -229,6 +230,7 @@ const docs: Docs = {
   }),
   performanceOnboarding,
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/falcon.tsx b/static/app/gettingStartedDocs/python/falcon.tsx
index ac9925a897dd9d..8e83c85db10bf5 100644
--- a/static/app/gettingStartedDocs/python/falcon.tsx
+++ b/static/app/gettingStartedDocs/python/falcon.tsx
@@ -11,6 +11,7 @@ import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoa
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
+  featureFlagOnboarding,
 } from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
@@ -159,6 +160,7 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/fastapi.tsx b/static/app/gettingStartedDocs/python/fastapi.tsx
index 098706639548ac..6097b8ab64781e 100644
--- a/static/app/gettingStartedDocs/python/fastapi.tsx
+++ b/static/app/gettingStartedDocs/python/fastapi.tsx
@@ -13,6 +13,7 @@ import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoa
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
+  featureFlagOnboarding,
 } from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
@@ -169,6 +170,7 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/flask.tsx b/static/app/gettingStartedDocs/python/flask.tsx
index 1b9da724b43d66..45165f5adf5b8f 100644
--- a/static/app/gettingStartedDocs/python/flask.tsx
+++ b/static/app/gettingStartedDocs/python/flask.tsx
@@ -13,6 +13,7 @@ import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoa
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
+  featureFlagOnboarding,
 } from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
@@ -240,6 +241,7 @@ const docs: Docs = {
   }),
   performanceOnboarding,
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/pyramid.tsx b/static/app/gettingStartedDocs/python/pyramid.tsx
index a697d03da5e4ae..12a7503f3d0bd4 100644
--- a/static/app/gettingStartedDocs/python/pyramid.tsx
+++ b/static/app/gettingStartedDocs/python/pyramid.tsx
@@ -7,7 +7,10 @@ import type {
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
 import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
-import {crashReportOnboardingPython} from 'sentry/gettingStartedDocs/python/python';
+import {
+  crashReportOnboardingPython,
+  featureFlagOnboarding,
+} from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -106,6 +109,7 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/python.tsx b/static/app/gettingStartedDocs/python/python.tsx
index df866857112aca..0c0401b95f7996 100644
--- a/static/app/gettingStartedDocs/python/python.tsx
+++ b/static/app/gettingStartedDocs/python/python.tsx
@@ -1,3 +1,4 @@
+import {IntegrationOptions} from 'sentry/components/events/featureFlags/utils';
 import ExternalLink from 'sentry/components/links/externalLink';
 import {StepType} from 'sentry/components/onboarding/gettingStartedDoc/step';
 import {
@@ -16,6 +17,22 @@ import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
 
+type FlagImports = {
+  integration: string; // what's in the integrations array
+  module: string; // what's imported from sentry_sdk.integrations
+};
+
+const FLAG_OPTION_TO_IMPORT: Record<IntegrationOptions, FlagImports> = {
+  [IntegrationOptions.LAUNCHDARKLY]: {
+    module: 'launchdarkly',
+    integration: 'LaunchDarklyIntegration',
+  },
+  [IntegrationOptions.OPENFEATURE]: {
+    module: 'openfeature',
+    integration: 'OpenFeatureIntegration',
+  },
+};
+
 const getInstallSnippet = () => `pip install --upgrade sentry-sdk`;
 
 const getSdkSetupSnippet = (params: Params) => `
@@ -44,10 +61,22 @@ sentry_sdk.init(
   params.profilingOptions?.defaultProfilingMode === 'continuous'
     ? `
 
+def slow_function():
+    import time
+    time.sleep(0.1)
+    return "done"
+
+def fast_function():
+    import time
+    time.sleep(0.05)
+    return "done"
+
 # Manually call start_profiler and stop_profiler
 # to profile the code in between
 sentry_sdk.profiler.start_profiler()
-# this code will be profiled
+for i in range(0, 10):
+    slow_function()
+    fast_function()
 #
 # Calls to stop_profiler are optional - if you don't stop the profiler, it will keep profiling
 # your application until the process exits or stop_profiler is called.
@@ -214,6 +243,37 @@ export function AlternativeConfiguration() {
   );
 }
 
+export const featureFlagOnboarding: OnboardingConfig = {
+  install: () => [],
+  configure: ({featureFlagOptions = {integration: ''}, dsn}) => [
+    {
+      type: StepType.CONFIGURE,
+      description: tct('Add [name] to your integrations list.', {
+        name: (
+          <code>{`${FLAG_OPTION_TO_IMPORT[featureFlagOptions.integration].integration}()`}</code>
+        ),
+      }),
+      configurations: [
+        {
+          language: 'python',
+          code: `
+import sentry-sdk
+from sentry_sdk.integrations.${FLAG_OPTION_TO_IMPORT[featureFlagOptions.integration].module} import ${FLAG_OPTION_TO_IMPORT[featureFlagOptions.integration].integration}
+
+sentry_sdk.init(
+  dsn="${dsn.public}",
+  integrations=[
+    ${FLAG_OPTION_TO_IMPORT[featureFlagOptions.integration].integration}(),
+  ]
+)`,
+        },
+      ],
+    },
+  ],
+  verify: () => [],
+  nextSteps: () => [],
+};
+
 const docs: Docs = {
   onboarding,
   performanceOnboarding,
@@ -221,6 +281,7 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/quart.tsx b/static/app/gettingStartedDocs/python/quart.tsx
index 3f7b41d8499dbf..8dd51d2648eff1 100644
--- a/static/app/gettingStartedDocs/python/quart.tsx
+++ b/static/app/gettingStartedDocs/python/quart.tsx
@@ -11,6 +11,7 @@ import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoa
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
+  featureFlagOnboarding,
 } from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
@@ -156,6 +157,7 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/sanic.tsx b/static/app/gettingStartedDocs/python/sanic.tsx
index 9a47574bc77ad4..349c78cc984e8c 100644
--- a/static/app/gettingStartedDocs/python/sanic.tsx
+++ b/static/app/gettingStartedDocs/python/sanic.tsx
@@ -7,7 +7,10 @@ import type {
 } from 'sentry/components/onboarding/gettingStartedDoc/types';
 import {getPythonMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
 import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
-import {crashReportOnboardingPython} from 'sentry/gettingStartedDocs/python/python';
+import {
+  crashReportOnboardingPython,
+  featureFlagOnboarding,
+} from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
 type Params = DocsParams;
@@ -116,6 +119,7 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/starlette.tsx b/static/app/gettingStartedDocs/python/starlette.tsx
index 13bb696ecba92c..6d274e8851e602 100644
--- a/static/app/gettingStartedDocs/python/starlette.tsx
+++ b/static/app/gettingStartedDocs/python/starlette.tsx
@@ -11,6 +11,7 @@ import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoa
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
+  featureFlagOnboarding,
 } from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
@@ -156,6 +157,7 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/python/tornado.tsx b/static/app/gettingStartedDocs/python/tornado.tsx
index 106b5e11bd3ff6..77caab3e6b849f 100644
--- a/static/app/gettingStartedDocs/python/tornado.tsx
+++ b/static/app/gettingStartedDocs/python/tornado.tsx
@@ -11,6 +11,7 @@ import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoa
 import {
   AlternativeConfiguration,
   crashReportOnboardingPython,
+  featureFlagOnboarding,
 } from 'sentry/gettingStartedDocs/python/python';
 import {t, tct} from 'sentry/locale';
 
@@ -177,6 +178,7 @@ const docs: Docs = {
     installSnippet: getInstallSnippet(),
   }),
   crashReportOnboarding: crashReportOnboardingPython,
+  featureFlagOnboarding: featureFlagOnboarding,
 };
 
 export default docs;
diff --git a/static/app/icons/iconGlobe.tsx b/static/app/icons/iconGlobe.tsx
new file mode 100644
index 00000000000000..c0450a6ee4f83c
--- /dev/null
+++ b/static/app/icons/iconGlobe.tsx
@@ -0,0 +1,19 @@
+import {forwardRef} from 'react';
+
+import type {SVGIconProps} from './svgIcon';
+import {SvgIcon} from './svgIcon';
+
+const IconGlobe = forwardRef<SVGSVGElement, SVGIconProps>((props, ref) => {
+  return (
+    <SvgIcon {...props} ref={ref}>
+      <path d="M8,15.98C3.6,15.98.02,12.4.02,8S3.6.02,8,.02s7.98,3.58,7.98,7.98-3.58,7.98-7.98,7.98ZM8,1.52c-3.57,0-6.48,2.91-6.48,6.48s2.91,6.48,6.48,6.48,6.48-2.91,6.48-6.48S11.57,1.52,8,1.52Z" />
+      <path d="M8,15.98c-2.34,0-3.56-4.02-3.56-7.98S5.66.02,8,.02s3.56,4.02,3.56,7.98-1.22,7.98-3.56,7.98ZM8,1.52c-.82,0-2.06,2.59-2.06,6.48s1.24,6.48,2.06,6.48,2.06-2.59,2.06-6.48-1.24-6.48-2.06-6.48Z" />
+      <rect x="1.07" y="5.21" width="13.87" height="1.5" />
+      <rect x="1.06" y="9.29" width="13.87" height="1.5" />
+    </SvgIcon>
+  );
+});
+
+IconGlobe.displayName = 'IconGlobe';
+
+export {IconGlobe};
diff --git a/static/app/icons/iconGrid.tsx b/static/app/icons/iconGrid.tsx
new file mode 100644
index 00000000000000..ffdbbcf3fe590c
--- /dev/null
+++ b/static/app/icons/iconGrid.tsx
@@ -0,0 +1,19 @@
+import {forwardRef} from 'react';
+
+import type {SVGIconProps} from './svgIcon';
+import {SvgIcon} from './svgIcon';
+
+const IconGrid = forwardRef<SVGSVGElement, SVGIconProps>((props, ref) => {
+  return (
+    <SvgIcon {...props} ref={ref}>
+      <path d="M5.67,7.2H1.47C.64,7.2-.03,6.52-.03,5.7V1.49C-.03.66.64,0,1.47,0h4.2c.83,0,1.5.67,1.5,1.5v4.2c0,.83-.67,1.5-1.5,1.5ZM1.47,1.49v4.2h4.21V1.49H1.47Z" />
+      <path d="M5.67,16.02H1.47c-.83,0-1.5-.67-1.5-1.5v-4.2c0-.83.67-1.5,1.5-1.5h4.2c.83,0,1.5.67,1.5,1.5v4.2c0,.83-.67,1.5-1.5,1.5ZM1.47,10.31v4.2h4.2v-4.2s-4.2,0-4.2,0Z" />
+      <path d="M14.51,7.2h-4.21c-.83,0-1.5-.67-1.5-1.5V1.49C8.8.66,9.47,0,10.3,0h4.21c.83,0,1.5.67,1.5,1.5v4.2c0,.83-.67,1.5-1.5,1.5ZM10.3,1.49v4.2h4.21V1.49h-4.21Z" />
+      <path d="M14.51,16.02h-4.21c-.83,0-1.5-.67-1.5-1.5v-4.2c0-.83.67-1.5,1.5-1.5h4.21c.83,0,1.5.67,1.5,1.5v4.2c0,.83-.67,1.5-1.5,1.5ZM10.3,10.31v4.2h4.2v-4.2s-4.2,0-4.2,0Z" />
+    </SvgIcon>
+  );
+});
+
+IconGrid.displayName = 'IconGrid';
+
+export {IconGrid};
diff --git a/static/app/icons/iconSeer.tsx b/static/app/icons/iconSeer.tsx
deleted file mode 100644
index 1a34c204d24aec..00000000000000
--- a/static/app/icons/iconSeer.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import {forwardRef} from 'react';
-
-import type {SVGIconProps} from './svgIcon';
-import {SvgIcon} from './svgIcon';
-
-const IconSeer = forwardRef<SVGSVGElement, SVGIconProps>((props, ref) => {
-  return (
-    <SvgIcon {...props} ref={ref} viewBox="0 0 30 30">
-      <defs>
-        <style>
-          {`.cls-1 {
-            fill: none;
-            stroke: currentColor;
-            stroke-linecap: round;
-            stroke-linejoin: round;
-            stroke-width: 2px;
-          }`}
-        </style>
-      </defs>
-      <path
-        className="cls-1"
-        d="M14.0407,3.1458L3.5742,17.0376c-.2989.3967-.2327.9584.1501,1.2748l10.4917,8.6705c.3436.284.8405.2838,1.1839-.0005l10.4717-8.6691c.3827-.3169.4483-.8788.1488-1.2753L15.5235,3.1448c-.3719-.4922-1.1115-.4917-1.4828.001Z"
-      />
-      <path
-        className="cls-1"
-        d="M14.1483,12.3135l-5.1122,4.0552c-.3332.2643-.314.6812.0426.9278l5.1121,3.5339c.3337.2307.8482.2312,1.1828.0012l5.1412-3.534c.359-.2468.3782-.6657.0427-.9303l-5.1411-4.0551c-.3449-.272-.9243-.2714-1.2682.0013Z"
-      />
-      <line className="cls-1" x1="14.7558" y1="15.9343" x2="14.7558" y2="17.2053" />
-    </SvgIcon>
-  );
-});
-
-IconSeer.displayName = 'IconSeer';
-
-export {IconSeer};
diff --git a/static/app/icons/icons.stories.tsx b/static/app/icons/icons.stories.tsx
index 2d04d604db7181..a14635ac797f5e 100644
--- a/static/app/icons/icons.stories.tsx
+++ b/static/app/icons/icons.stories.tsx
@@ -147,13 +147,6 @@ const SECTIONS: TSection[] = [
         name: 'Timer',
         defaultProps: {},
       },
-      {
-        id: 'seer',
-        groups: ['product'],
-        keywords: ['ai'],
-        name: 'Seer',
-        defaultProps: {},
-      },
     ],
   },
   {
@@ -1127,6 +1120,18 @@ const SECTIONS: TSection[] = [
         name: 'Table',
         defaultProps: {},
       },
+      {
+        id: 'grid',
+        name: 'Grid',
+        keywords: ['squares', 'layout'],
+        defaultProps: {},
+      },
+      {
+        id: 'globe',
+        name: 'Globe',
+        keywords: ['map', 'international'],
+        defaultProps: {},
+      },
     ],
   },
   {
diff --git a/static/app/icons/index.tsx b/static/app/icons/index.tsx
index 0a2363b29fb18a..f92cb813107e36 100644
--- a/static/app/icons/index.tsx
+++ b/static/app/icons/index.tsx
@@ -42,9 +42,11 @@ export {IconFocus} from './iconFocus';
 export {IconGeneric} from './iconGeneric';
 export {IconGithub} from './iconGithub';
 export {IconGitlab} from './iconGitlab';
+export {IconGlobe} from './iconGlobe';
 export {IconGoogle} from './iconGoogle';
 export {IconGrabbable} from './iconGrabbable';
 export {IconGraph} from './iconGraph';
+export {IconGrid} from './iconGrid';
 export {IconGroup} from './iconGroup';
 export {IconHappy} from './iconHappy';
 export {IconInfo} from './iconInfo';
@@ -88,7 +90,6 @@ export {IconReturn} from './iconReturn';
 export {IconRewind10} from './iconRewind10';
 export {IconSad} from './iconSad';
 export {IconSearch} from './iconSearch';
-export {IconSeer} from './iconSeer';
 export {IconSentry} from './iconSentry';
 export {IconSettings} from './iconSettings';
 export {IconShow} from './iconShow';
diff --git a/static/app/locale.tsx b/static/app/locale.tsx
index 703ca56c691686..566e7cfc82b34f 100644
--- a/static/app/locale.tsx
+++ b/static/app/locale.tsx
@@ -407,6 +407,14 @@ export function gettextComponentTemplate(
   return mark(renderTemplate(parsedTemplate, components) as JSX.Element);
 }
 
+/**
+ * Helper over `gettextComponentTemplate` with a pre-populated `<code />` component that
+ * is commonly used.
+ */
+export function tctCode(template: string, components: ComponentMap = {}) {
+  return gettextComponentTemplate(template, {code: <code />, ...components});
+}
+
 /**
  * Shorthand versions should primarily be used.
  */
diff --git a/static/app/plugins/registry.tsx b/static/app/plugins/registry.tsx
index a7d566866fafef..52635e140063b1 100644
--- a/static/app/plugins/registry.tsx
+++ b/static/app/plugins/registry.tsx
@@ -22,57 +22,18 @@ export default class Registry {
     data: Plugin,
     callback: (instance: DefaultIssuePlugin | DefaultPlugin | SessionStackPlugin) => void
   ) {
-    let remainingAssets = data.assets.length;
     // TODO(dcramer): we should probably register all valid plugins
-    const finishLoad = () => {
-      if (!defined(this.plugins[data.id])) {
-        if (data.type === 'issue-tracking') {
-          this.plugins[data.id] = DefaultIssuePlugin;
-        } else {
-          this.plugins[data.id] = DefaultPlugin;
-        }
-      }
-      console.info(
-        '[plugins] Loaded ' + data.id + ' as {' + this.plugins[data.id].name + '}'
-      );
-      callback(this.get(data));
-    };
-
-    if (remainingAssets === 0) {
-      finishLoad();
-      return;
-    }
-
-    const onAssetLoaded = function () {
-      remainingAssets--;
-      if (remainingAssets === 0) {
-        finishLoad();
-      }
-    };
-
-    const onAssetFailed = function (asset: {url: string}) {
-      remainingAssets--;
-      console.error('[plugins] Failed to load asset ' + asset.url);
-      if (remainingAssets === 0) {
-        finishLoad();
-      }
-    };
-
-    // TODO(dcramer): what do we do on failed asset loading?
-    data.assets.forEach(asset => {
-      if (!defined(this.assetCache[asset.url])) {
-        console.info('[plugins] Loading asset for ' + data.id + ': ' + asset.url);
-        const s = document.createElement('script');
-        s.src = asset.url;
-        s.onload = onAssetLoaded.bind(this);
-        s.onerror = onAssetFailed.bind(this, asset);
-        s.async = true;
-        document.body.appendChild(s);
-        this.assetCache[asset.url] = s;
+    if (!defined(this.plugins[data.id])) {
+      if (data.type === 'issue-tracking') {
+        this.plugins[data.id] = DefaultIssuePlugin;
       } else {
-        onAssetLoaded();
+        this.plugins[data.id] = DefaultPlugin;
       }
-    });
+    }
+    console.info(
+      '[plugins] Loaded ' + data.id + ' as {' + this.plugins[data.id].name + '}'
+    );
+    callback(this.get(data));
   }
 
   get(data: Plugin) {
diff --git a/static/app/routes.tsx b/static/app/routes.tsx
index c00999ddb135f5..1a4fb363043170 100644
--- a/static/app/routes.tsx
+++ b/static/app/routes.tsx
@@ -19,6 +19,7 @@ import {BACKEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/backend/sett
 import {FRONTEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/frontend/settings';
 import {MOBILE_LANDING_SUB_PATH} from 'sentry/views/insights/pages/mobile/settings';
 import {DOMAIN_VIEW_BASE_URL} from 'sentry/views/insights/pages/settings';
+import {getModuleView} from 'sentry/views/insights/pages/utils';
 import {INSIGHTS_BASE_URL} from 'sentry/views/insights/settings';
 import {ModuleName} from 'sentry/views/insights/types';
 import {GroupEventDetailsLoading} from 'sentry/views/issueDetails/groupEventDetails/groupEventDetailsLoading';
@@ -966,6 +967,21 @@ function buildRoutes() {
         name={t('Dynamic Sampling')}
         component={make(() => import('sentry/views/settings/dynamicSampling'))}
       />
+      <Route path="feature-flags/" name={t('Feature Flags')}>
+        <IndexRoute
+          component={make(() => import('sentry/views/settings/featureFlags'))}
+        />
+        <Route
+          path="new-provider/"
+          name={t('Add New Provider')}
+          component={make(
+            () =>
+              import(
+                'sentry/views/settings/featureFlags/organizationFeatureFlagsNewSecret'
+              )
+          )}
+        />
+      </Route>
     </Route>
   );
 
@@ -1069,6 +1085,17 @@ function buildRoutes() {
             )}
             key="orgless-dashboards-new-route"
           >
+            {/* New widget builder routes */}
+            <Route
+              path="widget-builder/widget/:widgetIndex/edit/"
+              component={make(() => import('sentry/views/dashboards/view'))}
+            />
+            <Route
+              path="widget-builder/widget/new/"
+              component={make(() => import('sentry/views/dashboards/view'))}
+            />
+
+            {/* Old widget builder routes */}
             <Route
               path="widget/:widgetIndex/edit/"
               component={make(() => import('sentry/views/dashboards/widgetBuilder'))}
@@ -1086,6 +1113,17 @@ function buildRoutes() {
           )}
           key="org-dashboards-new"
         >
+          {/* New widget builder routes */}
+          <Route
+            path="widget-builder/widget/:widgetIndex/edit/"
+            component={make(() => import('sentry/views/dashboards/view'))}
+          />
+          <Route
+            path="widget-builder/widget/new/"
+            component={make(() => import('sentry/views/dashboards/view'))}
+          />
+
+          {/* Old widget builder routes */}
           <Route
             path="widget/:widgetIndex/edit/"
             component={make(() => import('sentry/views/dashboards/widgetBuilder'))}
@@ -1136,6 +1174,17 @@ function buildRoutes() {
         component={make(() => import('sentry/views/dashboards/view'))}
         withOrgPath
       >
+        {/* New widget builder routes */}
+        <Route
+          path="widget-builder/widget/:widgetIndex/edit/"
+          component={make(() => import('sentry/views/dashboards/view'))}
+        />
+        <Route
+          path="widget-builder/widget/new/"
+          component={make(() => import('sentry/views/dashboards/view'))}
+        />
+
+        {/* Old widget builder routes */}
         <Route
           path="widget/:widgetIndex/edit/"
           component={make(() => import('sentry/views/dashboards/widgetBuilder'))}
@@ -1450,6 +1499,22 @@ function buildRoutes() {
     />
   );
 
+  const moduleUrlToModule: Record<keyof typeof MODULE_BASE_URLS, ModuleName> = {
+    'mobile-screens': ModuleName.MOBILE_SCREENS,
+    'mobile-ui': ModuleName.MOBILE_UI,
+    'screen-rendering': ModuleName.SCREEN_RENDERING,
+    ai: ModuleName.AI,
+    app_start: ModuleName.APP_START,
+    cache: ModuleName.CACHE,
+    db: ModuleName.DB,
+    http: ModuleName.HTTP,
+    queue: ModuleName.QUEUE,
+    resource: ModuleName.RESOURCE,
+    screen_load: ModuleName.SCREEN_LOAD,
+    other: ModuleName.OTHER,
+    vital: ModuleName.VITAL,
+  };
+
   const insightsRedirects = Object.values(MODULE_BASE_URLS)
     .map(
       moduleBaseURL =>
@@ -1457,176 +1522,12 @@ function buildRoutes() {
           <Redirect
             key={moduleBaseURL}
             from={`${moduleBaseURL}/*`}
-            to={`/${INSIGHTS_BASE_URL}/${moduleBaseURL}/:splat`}
+            to={`/${DOMAIN_VIEW_BASE_URL}/${getModuleView(moduleUrlToModule[moduleBaseURL])}${moduleBaseURL}/:splat`}
           />
         )
     )
     .filter(Boolean);
 
-  const insightsRoutes = (
-    <Route path={`/${INSIGHTS_BASE_URL}/`} withOrgPath>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.DB]}/`}>
-        <IndexRoute
-          component={make(
-            () => import('sentry/views/insights/database/views/databaseLandingPage')
-          )}
-        />
-        <Route
-          path="spans/span/:groupId/"
-          component={make(
-            () => import('sentry/views/insights/database/views/databaseSpanSummaryPage')
-          )}
-        />
-      </Route>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.HTTP]}/`}>
-        <IndexRoute
-          component={make(
-            () => import('sentry/views/insights/http/views/httpLandingPage')
-          )}
-        />
-        <Route
-          path="domains/"
-          component={make(
-            () => import('sentry/views/insights/http/views/httpDomainSummaryPage')
-          )}
-        />
-      </Route>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.CACHE]}/`}>
-        <IndexRoute
-          component={make(
-            () => import('sentry/views/insights/cache/views/cacheLandingPage')
-          )}
-        />
-      </Route>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.VITAL]}/`}>
-        <IndexRoute
-          component={make(
-            () =>
-              import('sentry/views/insights/browser/webVitals/views/webVitalsLandingPage')
-          )}
-        />
-        <Route
-          path="overview/"
-          component={make(
-            () => import('sentry/views/insights/browser/webVitals/views/pageOverview')
-          )}
-        />
-      </Route>
-      <Redirect
-        from="browser/resources/"
-        to={`${MODULE_BASE_URLS[ModuleName.RESOURCE]}/`}
-      />
-      <Route path={`${MODULE_BASE_URLS[ModuleName.RESOURCE]}/`}>
-        <IndexRoute
-          component={make(
-            () =>
-              import('sentry/views/insights/browser/resources/views/resourcesLandingPage')
-          )}
-        />
-        <Route
-          path="spans/span/:groupId/"
-          component={make(
-            () =>
-              import('sentry/views/insights/browser/resources/views/resourceSummaryPage')
-          )}
-        />
-      </Route>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.QUEUE]}/`}>
-        <IndexRoute
-          component={make(
-            () => import('sentry/views/insights/queues/views/queuesLandingPage')
-          )}
-        />
-        <Route
-          path="destination/"
-          component={make(
-            () => import('sentry/views/insights/queues/views/destinationSummaryPage')
-          )}
-        />
-      </Route>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.SCREEN_LOAD]}/`}>
-        <IndexRoute
-          component={make(
-            () =>
-              import(
-                'sentry/views/insights/mobile/screenload/views/screenloadLandingPage'
-              )
-          )}
-        />
-        <Route
-          path="spans/"
-          component={make(
-            () =>
-              import('sentry/views/insights/mobile/screenload/views/screenLoadSpansPage')
-          )}
-        />
-      </Route>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.APP_START]}/`}>
-        <IndexRoute
-          component={make(
-            () =>
-              import('sentry/views/insights/mobile/appStarts/views/appStartsLandingPage')
-          )}
-        />
-        <Route
-          path="spans/"
-          component={make(
-            () => import('sentry/views/insights/mobile/appStarts/views/screenSummaryPage')
-          )}
-        />
-      </Route>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.MOBILE_UI]}/`}>
-        <IndexRoute
-          component={make(
-            () => import('sentry/views/insights/mobile/ui/views/uiLandingPage')
-          )}
-        />
-        <Route
-          path="spans/"
-          component={make(
-            () => import('sentry/views/insights/mobile/ui/views/screenSummaryPage')
-          )}
-        />
-      </Route>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.MOBILE_SCREENS]}/`}>
-        <IndexRoute
-          component={make(
-            () => import('sentry/views/insights/mobile/screens/views/screensLandingPage')
-          )}
-        />
-        <Route
-          path="details/"
-          component={make(
-            () => import('sentry/views/insights/mobile/screens/views/screenDetailsPage')
-          )}
-        />
-      </Route>
-      <Redirect
-        from="mobile/app-startup/"
-        to={`/${INSIGHTS_BASE_URL}/${MODULE_BASE_URLS[ModuleName.APP_START]}/`}
-      />
-      <Redirect
-        from="mobile/screens/"
-        to={`/${INSIGHTS_BASE_URL}/${MODULE_BASE_URLS[ModuleName.SCREEN_LOAD]}/`}
-      />
-      <Route path={`${MODULE_BASE_URLS[ModuleName.AI]}/`}>
-        <IndexRoute
-          component={make(
-            () =>
-              import('sentry/views/insights/llmMonitoring/views/llmMonitoringLandingPage')
-          )}
-        />
-        <Route
-          path="pipeline-type/:groupId/"
-          component={make(
-            () =>
-              import('sentry/views/insights/llmMonitoring/views/llmMonitoringDetailsPage')
-          )}
-        />
-      </Route>
-    </Route>
-  );
-
   const transactionSummaryRoutes = (
     <Route path="summary/">
       <IndexRoute
@@ -1690,6 +1591,180 @@ function buildRoutes() {
     </Route>
   );
 
+  const moduleRoutes = [
+    <Route key={ModuleName.HTTP} path={`${MODULE_BASE_URLS[ModuleName.HTTP]}/`}>
+      <IndexRoute
+        component={make(() => import('sentry/views/insights/http/views/httpLandingPage'))}
+      />
+      <Route
+        path="domains/"
+        component={make(
+          () => import('sentry/views/insights/http/views/httpDomainSummaryPage')
+        )}
+      />
+    </Route>,
+    <Route key={ModuleName.VITAL} path={`${MODULE_BASE_URLS[ModuleName.VITAL]}/`}>
+      <IndexRoute
+        component={make(
+          () =>
+            import('sentry/views/insights/browser/webVitals/views/webVitalsLandingPage')
+        )}
+      />
+      <Route
+        path="overview/"
+        component={make(
+          () => import('sentry/views/insights/browser/webVitals/views/pageOverview')
+        )}
+      />
+    </Route>,
+    <Route key={ModuleName.RESOURCE} path={`${MODULE_BASE_URLS[ModuleName.RESOURCE]}/`}>
+      <IndexRoute
+        component={make(
+          () =>
+            import('sentry/views/insights/browser/resources/views/resourcesLandingPage')
+        )}
+      />
+      <Route
+        path="spans/span/:groupId/"
+        component={make(
+          () =>
+            import('sentry/views/insights/browser/resources/views/resourceSummaryPage')
+        )}
+      />
+    </Route>,
+    <Route key={ModuleName.DB} path={`${MODULE_BASE_URLS[ModuleName.DB]}/`}>
+      <IndexRoute
+        component={make(
+          () => import('sentry/views/insights/database/views/databaseLandingPage')
+        )}
+      />
+      <Route
+        path="spans/span/:groupId/"
+        component={make(
+          () => import('sentry/views/insights/database/views/databaseSpanSummaryPage')
+        )}
+      />
+    </Route>,
+    <Route key={ModuleName.CACHE} path={`${MODULE_BASE_URLS[ModuleName.CACHE]}/`}>
+      <IndexRoute
+        component={make(
+          () => import('sentry/views/insights/cache/views/cacheLandingPage')
+        )}
+      />
+    </Route>,
+    <Route key={ModuleName.QUEUE} path={`${MODULE_BASE_URLS[ModuleName.QUEUE]}/`}>
+      <IndexRoute
+        component={make(
+          () => import('sentry/views/insights/queues/views/queuesLandingPage')
+        )}
+      />
+      <Route
+        path="destination/"
+        component={make(
+          () => import('sentry/views/insights/queues/views/destinationSummaryPage')
+        )}
+      />
+    </Route>,
+    <Route
+      key={ModuleName.MOBILE_SCREENS}
+      path={`${MODULE_BASE_URLS[ModuleName.MOBILE_SCREENS]}/`}
+    >
+      <IndexRoute
+        component={make(
+          () => import('sentry/views/insights/mobile/screens/views/screensLandingPage')
+        )}
+      />
+      <Route
+        path="details/"
+        component={make(
+          () => import('sentry/views/insights/mobile/screens/views/screenDetailsPage')
+        )}
+      />
+    </Route>,
+    <Route
+      key={ModuleName.SCREEN_RENDERING}
+      path={`${MODULE_BASE_URLS[ModuleName.SCREEN_RENDERING]}/`}
+    >
+      <IndexRoute
+        component={make(
+          () =>
+            import(
+              'sentry/views/insights/mobile/screenRendering/screenRenderingLandingPage'
+            )
+        )}
+      />
+      <Route
+        path={`${SUMMARY_PAGE_BASE_URL}/`}
+        component={make(
+          () =>
+            import(
+              'sentry/views/insights/mobile/screenRendering/screenRenderingSummaryPage'
+            )
+        )}
+      />
+    </Route>,
+    <Route key={ModuleName.APP_START} path={`${MODULE_BASE_URLS[ModuleName.APP_START]}/`}>
+      <IndexRoute
+        component={make(
+          () =>
+            import('sentry/views/insights/mobile/appStarts/views/appStartsLandingPage')
+        )}
+      />
+      <Route
+        path="spans/"
+        component={make(
+          () => import('sentry/views/insights/mobile/appStarts/views/screenSummaryPage')
+        )}
+      />
+    </Route>,
+    <Route key={ModuleName.MOBILE_UI} path={`${MODULE_BASE_URLS[ModuleName.MOBILE_UI]}/`}>
+      <IndexRoute
+        component={make(
+          () => import('sentry/views/insights/mobile/ui/views/uiLandingPage')
+        )}
+      />
+      <Route
+        path="spans/"
+        component={make(
+          () => import('sentry/views/insights/mobile/ui/views/screenSummaryPage')
+        )}
+      />
+    </Route>,
+    <Route
+      key={ModuleName.SCREEN_LOAD}
+      path={`${MODULE_BASE_URLS[ModuleName.SCREEN_LOAD]}/`}
+    >
+      <IndexRoute
+        component={make(
+          () =>
+            import('sentry/views/insights/mobile/screenload/views/screenloadLandingPage')
+        )}
+      />
+      <Route
+        path="spans/"
+        component={make(
+          () =>
+            import('sentry/views/insights/mobile/screenload/views/screenLoadSpansPage')
+        )}
+      />
+    </Route>,
+    <Route key={ModuleName.AI} path={`${MODULE_BASE_URLS[ModuleName.AI]}/`}>
+      <IndexRoute
+        component={make(
+          () =>
+            import('sentry/views/insights/llmMonitoring/views/llmMonitoringLandingPage')
+        )}
+      />
+      <Route
+        path="pipeline-type/:groupId/"
+        component={make(
+          () =>
+            import('sentry/views/insights/llmMonitoring/views/llmMonitoringDetailsPage')
+        )}
+      />
+    </Route>,
+  ];
+
   const domainViewRoutes = (
     <Route path={`/${DOMAIN_VIEW_BASE_URL}/`} withOrgPath>
       <Route path={`${FRONTEND_LANDING_SUB_PATH}/`}>
@@ -1707,54 +1782,7 @@ function buildRoutes() {
           path="trends/"
           component={make(() => import('sentry/views/performance/trends'))}
         />
-        <Route path={`${MODULE_BASE_URLS[ModuleName.HTTP]}/`}>
-          <IndexRoute
-            component={make(
-              () => import('sentry/views/insights/http/views/httpLandingPage')
-            )}
-          />
-          <Route
-            path="domains/"
-            component={make(
-              () => import('sentry/views/insights/http/views/httpDomainSummaryPage')
-            )}
-          />
-        </Route>
-        <Route path={`${MODULE_BASE_URLS[ModuleName.VITAL]}/`}>
-          <IndexRoute
-            component={make(
-              () =>
-                import(
-                  'sentry/views/insights/browser/webVitals/views/webVitalsLandingPage'
-                )
-            )}
-          />
-          <Route
-            path="overview/"
-            component={make(
-              () => import('sentry/views/insights/browser/webVitals/views/pageOverview')
-            )}
-          />
-        </Route>
-        <Route path={`${MODULE_BASE_URLS[ModuleName.RESOURCE]}/`}>
-          <IndexRoute
-            component={make(
-              () =>
-                import(
-                  'sentry/views/insights/browser/resources/views/resourcesLandingPage'
-                )
-            )}
-          />
-          <Route
-            path="spans/span/:groupId/"
-            component={make(
-              () =>
-                import(
-                  'sentry/views/insights/browser/resources/views/resourceSummaryPage'
-                )
-            )}
-          />
-        </Route>
+        {moduleRoutes}
       </Route>
       <Route path={`${BACKEND_LANDING_SUB_PATH}/`}>
         <IndexRoute
@@ -1771,52 +1799,7 @@ function buildRoutes() {
           path="trends/"
           component={make(() => import('sentry/views/performance/trends'))}
         />
-        <Route path={`${MODULE_BASE_URLS[ModuleName.DB]}/`}>
-          <IndexRoute
-            component={make(
-              () => import('sentry/views/insights/database/views/databaseLandingPage')
-            )}
-          />
-          <Route
-            path="spans/span/:groupId/"
-            component={make(
-              () => import('sentry/views/insights/database/views/databaseSpanSummaryPage')
-            )}
-          />
-        </Route>
-        <Route path={`${MODULE_BASE_URLS[ModuleName.HTTP]}/`}>
-          <IndexRoute
-            component={make(
-              () => import('sentry/views/insights/http/views/httpLandingPage')
-            )}
-          />
-          <Route
-            path="domains/"
-            component={make(
-              () => import('sentry/views/insights/http/views/httpDomainSummaryPage')
-            )}
-          />
-        </Route>
-        <Route path={`${MODULE_BASE_URLS[ModuleName.CACHE]}/`}>
-          <IndexRoute
-            component={make(
-              () => import('sentry/views/insights/cache/views/cacheLandingPage')
-            )}
-          />
-        </Route>
-        <Route path={`${MODULE_BASE_URLS[ModuleName.QUEUE]}/`}>
-          <IndexRoute
-            component={make(
-              () => import('sentry/views/insights/queues/views/queuesLandingPage')
-            )}
-          />
-          <Route
-            path="destination/"
-            component={make(
-              () => import('sentry/views/insights/queues/views/destinationSummaryPage')
-            )}
-          />
-        </Route>
+        {moduleRoutes}
       </Route>
       <Route path={`${MOBILE_LANDING_SUB_PATH}/`}>
         <IndexRoute
@@ -1833,88 +1816,7 @@ function buildRoutes() {
           path="trends/"
           component={make(() => import('sentry/views/performance/trends'))}
         />
-        <Route path={`${MODULE_BASE_URLS[ModuleName.MOBILE_SCREENS]}/`}>
-          <IndexRoute
-            component={make(
-              () =>
-                import('sentry/views/insights/mobile/screens/views/screensLandingPage')
-            )}
-          />
-          <Route
-            path="details/"
-            component={make(
-              () => import('sentry/views/insights/mobile/screens/views/screenDetailsPage')
-            )}
-          />
-        </Route>
-        <Route path={`${MODULE_BASE_URLS[ModuleName.SCREEN_RENDERING]}/`}>
-          <IndexRoute
-            component={make(
-              () =>
-                import(
-                  'sentry/views/insights/mobile/screenRendering/screenRenderingLandingPage'
-                )
-            )}
-          />
-          <Route
-            path={`${SUMMARY_PAGE_BASE_URL}/`}
-            component={make(
-              () =>
-                import(
-                  'sentry/views/insights/mobile/screenRendering/screenRenderingSummaryPage'
-                )
-            )}
-          />
-        </Route>
-        <Route path={`${MODULE_BASE_URLS[ModuleName.APP_START]}/`}>
-          <IndexRoute
-            component={make(
-              () =>
-                import(
-                  'sentry/views/insights/mobile/appStarts/views/appStartsLandingPage'
-                )
-            )}
-          />
-          <Route
-            path="spans/"
-            component={make(
-              () =>
-                import('sentry/views/insights/mobile/appStarts/views/screenSummaryPage')
-            )}
-          />
-        </Route>
-        <Route path={`${MODULE_BASE_URLS[ModuleName.MOBILE_UI]}/`}>
-          <IndexRoute
-            component={make(
-              () => import('sentry/views/insights/mobile/ui/views/uiLandingPage')
-            )}
-          />
-          <Route
-            path="spans/"
-            component={make(
-              () => import('sentry/views/insights/mobile/ui/views/screenSummaryPage')
-            )}
-          />
-        </Route>
-        <Route path={`${MODULE_BASE_URLS[ModuleName.SCREEN_LOAD]}/`}>
-          <IndexRoute
-            component={make(
-              () =>
-                import(
-                  'sentry/views/insights/mobile/screenload/views/screenloadLandingPage'
-                )
-            )}
-          />
-          <Route
-            path="spans/"
-            component={make(
-              () =>
-                import(
-                  'sentry/views/insights/mobile/screenload/views/screenLoadSpansPage'
-                )
-            )}
-          />
-        </Route>
+        {moduleRoutes}
       </Route>
       <Route path={`${AI_LANDING_SUB_PATH}/`}>
         <IndexRoute
@@ -1929,25 +1831,7 @@ function buildRoutes() {
           path="trends/"
           component={make(() => import('sentry/views/performance/trends'))}
         />
-        <Route path={`${MODULE_BASE_URLS[ModuleName.AI]}/`}>
-          <IndexRoute
-            component={make(
-              () =>
-                import(
-                  'sentry/views/insights/llmMonitoring/views/llmMonitoringLandingPage'
-                )
-            )}
-          />
-          <Route
-            path="pipeline-type/:groupId/"
-            component={make(
-              () =>
-                import(
-                  'sentry/views/insights/llmMonitoring/views/llmMonitoringDetailsPage'
-                )
-            )}
-          />
-        </Route>
+        {moduleRoutes}
       </Route>
     </Route>
   );
@@ -2411,7 +2295,6 @@ function buildRoutes() {
       {performanceRoutes}
       {domainViewRoutes}
       {tracesRoutes}
-      {insightsRoutes}
       {llmMonitoringRedirects}
       {profilingRoutes}
       {metricsRoutes}
diff --git a/static/app/stores/organizationStore.tsx b/static/app/stores/organizationStore.tsx
index deede8ceac1cdd..14fa7dcaf1e921 100644
--- a/static/app/stores/organizationStore.tsx
+++ b/static/app/stores/organizationStore.tsx
@@ -6,7 +6,6 @@ import type RequestError from 'sentry/utils/requestError/requestError';
 
 import HookStore from './hookStore';
 import LatestContextStore from './latestContextStore';
-import ReleaseStore from './releaseStore';
 import type {StrictStoreDefinition} from './types';
 
 type State = {
@@ -65,7 +64,6 @@ const storeConfig: OrganizationStoreDefinition = {
     };
     this.trigger(this.get());
 
-    ReleaseStore.updateOrganization(organization);
     LatestContextStore.onUpdateOrganization(organization);
     HookStore.getCallback(
       'react-hook:route-activated',
diff --git a/static/app/stores/releaseStore.tsx b/static/app/stores/releaseStore.tsx
deleted file mode 100644
index e03bd02a8d7910..00000000000000
--- a/static/app/stores/releaseStore.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-import type {StoreDefinition} from 'reflux';
-import {createStore} from 'reflux';
-
-import type {Organization} from 'sentry/types/organization';
-import type {Deploy, Release} from 'sentry/types/release';
-
-type StoreRelease = Map<string, Release>;
-type StoreDeploys = Map<string, Array<Deploy>>;
-type StoreLoading = Map<string, boolean>;
-type StoreError = Map<string, Error>;
-
-interface ReleaseStoreDefinition extends StoreDefinition {
-  get(
-    projectSlug: string,
-    releaseVersion: string
-  ): {
-    deploys: Array<Deploy> | undefined;
-    deploysError: Error | undefined;
-    deploysLoading: boolean | undefined;
-    release: Release | undefined;
-    releaseError: Error | undefined;
-    releaseLoading: boolean | undefined;
-  };
-
-  loadDeploys(orgSlug: string, projectSlug: string, releaseVersion: string): void;
-
-  loadDeploysError(projectSlug: string, releaseVersion: string, error: Error): void;
-  loadDeploysSuccess(
-    projectSlug: string,
-    releaseVersion: string,
-    data: Deploy[] | null
-  ): void;
-  loadRelease(orgSlug: string, projectSlug: string, releaseVersion: string): void;
-  loadReleaseError(projectSlug: string, releaseVersion: string, error: Error): void;
-  loadReleaseSuccess(
-    projectSlug: string,
-    releaseVersion: string,
-    data: Release | null
-  ): void;
-  reset(): void;
-  state: {
-    deploys: StoreDeploys;
-    deploysError: StoreError;
-    deploysLoading: StoreLoading;
-    orgSlug: string | undefined;
-    release: StoreRelease;
-    releaseError: StoreError;
-    releaseLoading: StoreLoading;
-  };
-  updateOrganization(org: Organization): void;
-}
-
-export const getReleaseStoreKey = (projectSlug: string, releaseVersion: string) =>
-  `${projectSlug}${releaseVersion}`;
-
-const storeConfig: ReleaseStoreDefinition = {
-  state: {
-    orgSlug: undefined,
-    release: new Map() as StoreRelease,
-    releaseLoading: new Map() as StoreLoading,
-    releaseError: new Map() as StoreError,
-    deploys: new Map() as StoreDeploys,
-    deploysLoading: new Map() as StoreLoading,
-    deploysError: new Map() as StoreError,
-  },
-
-  init() {
-    // XXX: Do not use `this.listenTo` in this store. We avoid usage of reflux
-    // listeners due to their leaky nature in tests.
-
-    this.reset();
-  },
-
-  reset() {
-    this.state = {
-      orgSlug: undefined,
-      release: new Map() as StoreRelease,
-      releaseLoading: new Map() as StoreLoading,
-      releaseError: new Map() as StoreError,
-      deploys: new Map() as StoreDeploys,
-      deploysLoading: new Map() as StoreLoading,
-      deploysError: new Map() as StoreError,
-    };
-    this.trigger(this.state);
-  },
-
-  updateOrganization(org) {
-    this.reset();
-    this.state.orgSlug = org.slug;
-    this.trigger(this.state);
-  },
-
-  loadRelease(orgSlug, projectSlug, releaseVersion) {
-    // Wipe entire store if the user switched organizations
-    if (!this.orgSlug || this.orgSlug !== orgSlug) {
-      this.reset();
-      this.orgSlug = orgSlug;
-    }
-
-    const releaseKey = getReleaseStoreKey(projectSlug, releaseVersion);
-    const {releaseLoading, releaseError, ...state} = this.state;
-
-    this.state = {
-      ...state,
-      releaseLoading: {
-        ...releaseLoading,
-        [releaseKey]: true,
-      },
-      releaseError: {
-        ...releaseError,
-        [releaseKey]: undefined,
-      },
-    };
-    this.trigger(this.state);
-  },
-
-  loadReleaseError(projectSlug, releaseVersion, error) {
-    const releaseKey = getReleaseStoreKey(projectSlug, releaseVersion);
-    const {releaseLoading, releaseError, ...state} = this.state;
-
-    this.state = {
-      ...state,
-      releaseLoading: {
-        ...releaseLoading,
-        [releaseKey]: false,
-      },
-      releaseError: {
-        ...releaseError,
-        [releaseKey]: error,
-      },
-    };
-    this.trigger(this.state);
-  },
-
-  loadReleaseSuccess(projectSlug, releaseVersion, data) {
-    const releaseKey = getReleaseStoreKey(projectSlug, releaseVersion);
-    const {release, releaseLoading, releaseError, ...state} = this.state;
-    this.state = {
-      ...state,
-      release: {
-        ...release,
-        [releaseKey]: data,
-      },
-      releaseLoading: {
-        ...releaseLoading,
-        [releaseKey]: false,
-      },
-      releaseError: {
-        ...releaseError,
-        [releaseKey]: undefined,
-      },
-    };
-    this.trigger(this.state);
-  },
-
-  loadDeploys(orgSlug, projectSlug, releaseVersion) {
-    // Wipe entire store if the user switched organizations
-    if (!this.orgSlug || this.orgSlug !== orgSlug) {
-      this.reset();
-      this.orgSlug = orgSlug;
-    }
-
-    const releaseKey = getReleaseStoreKey(projectSlug, releaseVersion);
-    const {deploysLoading, deploysError, ...state} = this.state;
-
-    this.state = {
-      ...state,
-      deploysLoading: {
-        ...deploysLoading,
-        [releaseKey]: true,
-      },
-      deploysError: {
-        ...deploysError,
-        [releaseKey]: undefined,
-      },
-    };
-    this.trigger(this.state);
-  },
-
-  loadDeploysError(projectSlug, releaseVersion, error) {
-    const releaseKey = getReleaseStoreKey(projectSlug, releaseVersion);
-    const {deploysLoading, deploysError, ...state} = this.state;
-
-    this.state = {
-      ...state,
-      deploysLoading: {
-        ...deploysLoading,
-        [releaseKey]: false,
-      },
-      deploysError: {
-        ...deploysError,
-        [releaseKey]: error,
-      },
-    };
-    this.trigger(this.state);
-  },
-
-  loadDeploysSuccess(projectSlug, releaseVersion, data) {
-    const releaseKey = getReleaseStoreKey(projectSlug, releaseVersion);
-    const {deploys, deploysLoading, deploysError, ...state} = this.state;
-
-    this.state = {
-      ...state,
-      deploys: {
-        ...deploys,
-        [releaseKey]: data,
-      },
-      deploysLoading: {
-        ...deploysLoading,
-        [releaseKey]: false,
-      },
-      deploysError: {
-        ...deploysError,
-        [releaseKey]: undefined,
-      },
-    };
-    this.trigger(this.state);
-  },
-
-  get(projectSlug, releaseVersion) {
-    const releaseKey = getReleaseStoreKey(projectSlug, releaseVersion);
-
-    return {
-      release: this.state.release[releaseKey],
-      releaseLoading: this.state.releaseLoading[releaseKey],
-      releaseError: this.state.releaseError[releaseKey],
-      deploys: this.state.deploys[releaseKey],
-      deploysLoading: this.state.deploysLoading[releaseKey],
-      deploysError: this.state.deploysError[releaseKey],
-    };
-  },
-};
-
-const ReleaseStore = createStore(storeConfig);
-export default ReleaseStore;
diff --git a/static/app/stores/useSentryAppComponentsData.tsx b/static/app/stores/useSentryAppComponentsData.tsx
index 677f786b164c5f..6ed5a609f0624f 100644
--- a/static/app/stores/useSentryAppComponentsData.tsx
+++ b/static/app/stores/useSentryAppComponentsData.tsx
@@ -7,7 +7,7 @@ import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
 
 interface Props {
-  projectId: string;
+  projectId: string | undefined;
 }
 
 export default function useSentryAppComponentsData({projectId}: Props) {
diff --git a/static/app/types/core.tsx b/static/app/types/core.tsx
index 64f6299d063638..b0ba1f5fde2347 100644
--- a/static/app/types/core.tsx
+++ b/static/app/types/core.tsx
@@ -80,6 +80,8 @@ export enum DataCategory {
   MONITOR_SEATS = 'monitorSeats',
   PROFILE_DURATION = 'profileDuration',
   SPANS = 'spans',
+  SPANS_INDEXED = 'spansIndexed',
+  PROFILE_CHUNKS = 'profileChunks',
 }
 
 /**
@@ -93,12 +95,14 @@ export enum DataCategoryExact {
   ATTACHMENT = 'attachment',
   PROFILE = 'profile',
   REPLAY = 'replay',
+  // TODO: Update processed and indexed transactions to camel case"
   TRANSACTION_PROCESSED = 'transaction_processed',
   TRANSACTION_INDEXED = 'transaction_indexed',
   MONITOR = 'monitor',
   MONITOR_SEAT = 'monitorSeat',
   PROFILE_DURATION = 'profileDuration',
   SPAN = 'span',
+  SPAN_INDEXED = 'spanIndexed',
 }
 
 export interface DataCategoryInfo {
diff --git a/static/app/types/echarts.tsx b/static/app/types/echarts.tsx
index d095eb511a81cf..16c957d6972d23 100644
--- a/static/app/types/echarts.tsx
+++ b/static/app/types/echarts.tsx
@@ -6,6 +6,8 @@ import type {
 } from 'echarts';
 import type ReactEchartsCore from 'echarts-for-react/lib/core';
 
+import type {Confidence} from 'sentry/types/organization';
+
 export type SeriesDataUnit = {
   // number because we sometimes use timestamps
   name: string | number;
@@ -24,6 +26,7 @@ export type Series = {
     opacity: number;
   };
   color?: string;
+  confidence?: Confidence;
   id?: string;
   lineStyle?: AxisPointerComponentOption['lineStyle'];
   // https://echarts.apache.org/en/option.html#series-line.z
diff --git a/static/app/types/event.tsx b/static/app/types/event.tsx
index e95a322cc3b93d..070a1369c83750 100644
--- a/static/app/types/event.tsx
+++ b/static/app/types/event.tsx
@@ -336,17 +336,17 @@ export interface EntryRequestDataDefault {
   apiTarget: null;
   method: string;
   url: string;
-  cookies?: [key: string, value: string][];
+  cookies?: Array<[key: string, value: string] | null>;
   data?: string | null | Record<string, any> | [key: string, value: any][];
   env?: Record<string, string>;
   fragment?: string | null;
-  headers?: [key: string, value: string][];
+  headers?: Array<[key: string, value: string] | null>;
   inferredContentType?:
     | null
     | 'application/json'
     | 'application/x-www-form-urlencoded'
     | 'multipart/form-data';
-  query?: [key: string, value: string][] | string;
+  query?: Array<[key: string, value: string] | null> | string;
 }
 
 export interface EntryRequestDataGraphQl
@@ -642,8 +642,9 @@ export interface ResponseContext {
   type: 'response';
 }
 
-export type FeatureFlag = {flag: string; result: boolean};
-export type Flags = {values: FeatureFlag[]};
+// event.contexts.flags can be overriden by the user so the type is not strict
+export type FeatureFlag = {flag?: string; result?: boolean};
+export type Flags = {values?: FeatureFlag[]};
 
 export type EventContexts = {
   'Current Culture'?: CultureContext;
diff --git a/static/app/types/hooks.tsx b/static/app/types/hooks.tsx
index 5c5157fe25aa43..2fa80a1a74dc4a 100644
--- a/static/app/types/hooks.tsx
+++ b/static/app/types/hooks.tsx
@@ -72,7 +72,9 @@ export type RouteHooks = {
  * Component specific hooks for DateRange and SelectorItems
  * These components have plan specific overrides in getsentry
  */
-type AutofixSetupConsentStepProps = {hasConsented: boolean};
+type AiSetupDataConsentProps = {
+  groupId: string;
+};
 type DateRangeProps = React.ComponentProps<typeof DateRange>;
 
 type SelectorItemsProps = React.ComponentProps<typeof SelectorItems>;
@@ -184,7 +186,7 @@ export type MembershipSettingsProps = {
  * Component wrapping hooks
  */
 export type ComponentHooks = {
-  'component:autofix-setup-step-consent': () => React.ComponentType<AutofixSetupConsentStepProps> | null;
+  'component:ai-setup-data-consent': () => React.ComponentType<AiSetupDataConsentProps> | null;
   'component:codecov-integration-settings-link': () => React.ComponentType<CodecovLinkProps>;
   'component:confirm-account-close': () => React.ComponentType<AttemptCloseAttemptProps>;
   'component:crons-list-page-header': () => React.ComponentType<CronsBillingBannerProps>;
@@ -685,6 +687,11 @@ type InviteModalCustomizationHook = () => React.ComponentType<{
      * invites may currently be sent.
      */
     canSend: boolean;
+    /**
+     * Indicates that the account has reached the maximum member limit. Future invitations
+     * are limited to Billing roles
+     */
+    isOverMemberLimit: boolean;
     /**
      * Trigger sending invites
      */
diff --git a/static/app/types/integrations.tsx b/static/app/types/integrations.tsx
index 76c2b232410e88..7966525949b72e 100644
--- a/static/app/types/integrations.tsx
+++ b/static/app/types/integrations.tsx
@@ -263,7 +263,7 @@ export type SentryAppComponent<
   };
   type: 'issue-link' | 'alert-rule-action' | 'issue-media' | 'stacktrace-link';
   uuid: string;
-  error?: boolean;
+  error?: string | boolean;
 };
 
 export type SentryAppWebhookRequest = {
@@ -457,7 +457,6 @@ export type IntegrationIssueConfig = {
  * Project Plugins
  */
 export type PluginNoProject = {
-  assets: Array<{url: string}>;
   canDisable: boolean;
   // TODO(ts)
   contexts: any[];
diff --git a/static/app/types/organization.tsx b/static/app/types/organization.tsx
index ff84ef8761b917..e5ab6cc57b600e 100644
--- a/static/app/types/organization.tsx
+++ b/static/app/types/organization.tsx
@@ -18,7 +18,6 @@ import type {User} from './user';
  * Organization summaries are sent when you request a list of all organizations
  */
 export interface OrganizationSummary {
-  aiSuggestedSolution: boolean;
   avatar: Avatar;
   codecovAccess: boolean;
   dateCreated: string;
@@ -294,11 +293,16 @@ export type SavedQueryState = {
   savedQueries: SavedQuery[];
 };
 
+export type Confidence = 'high' | 'low' | null;
+
 export type EventsStatsData = [number, {count: number; comparisonCount?: number}[]][];
 
+export type ConfidenceStatsData = [number, {count: Confidence}[]][];
+
 // API response format for a single series
 export type EventsStats = {
   data: EventsStatsData;
+  confidence?: ConfidenceStatsData;
   end?: number;
   isExtrapolatedData?: boolean;
   isMetricsData?: boolean;
diff --git a/static/app/types/project.tsx b/static/app/types/project.tsx
index d5bd5dcf76c278..0381bb57ddfb58 100644
--- a/static/app/types/project.tsx
+++ b/static/app/types/project.tsx
@@ -20,9 +20,6 @@ export type Project = {
   digestsMinDelay: number;
   dynamicSamplingBiases: DynamicSamplingBias[] | null;
   environments: string[];
-  eventProcessing: {
-    symbolicationDegraded: boolean;
-  };
   features: string[];
   firstEvent: string | null;
   firstTransactionEvent: boolean;
@@ -67,6 +64,9 @@ export type Project = {
   verifySSL: boolean;
   builtinSymbolSources?: string[];
   defaultEnvironment?: string;
+  eventProcessing?: {
+    symbolicationDegraded?: boolean;
+  };
   hasUserReports?: boolean;
   highlightContext?: Record<string, string[]>;
   highlightPreset?: {
diff --git a/static/app/types/release.tsx b/static/app/types/release.tsx
index 9e6f80cd468bda..a4f57da7bd4b61 100644
--- a/static/app/types/release.tsx
+++ b/static/app/types/release.tsx
@@ -76,7 +76,7 @@ export interface ReleaseWithHealth extends BaseRelease, ReleaseData {
 }
 
 interface ReleaseData {
-  authors: User[];
+  authors: Array<User | {email: string; name: string}>;
   commitCount: number;
   currentProjectMeta: {
     firstReleaseVersion: string | null;
diff --git a/static/app/utils/analytics.tsx b/static/app/utils/analytics.tsx
index b75623dfdd22c2..35bd66487781cf 100644
--- a/static/app/utils/analytics.tsx
+++ b/static/app/utils/analytics.tsx
@@ -22,8 +22,6 @@ import {
   type StatsEventParameters,
 } from 'sentry/utils/analytics/statsAnalyticsEvents';
 
-import type {AiSuggestedSolutionEventParameters} from './analytics/aiSuggestedSolutionAnalyticsEvents';
-import {aiSuggestedSolutionEventMap} from './analytics/aiSuggestedSolutionAnalyticsEvents';
 import type {CoreUIEventParameters} from './analytics/coreuiAnalyticsEvents';
 import {coreUIEventMap} from './analytics/coreuiAnalyticsEvents';
 import type {DashboardsEventParameters} from './analytics/dashboardsAnalyticsEvents';
@@ -94,7 +92,6 @@ interface EventParameters
     DynamicSamplingEventParameters,
     OnboardingEventParameters,
     StackTraceEventParameters,
-    AiSuggestedSolutionEventParameters,
     EcosystemEventParameters,
     IntegrationEventParameters,
     ProjectCreationEventParameters,
@@ -127,7 +124,6 @@ const allEventMap: Record<string, string | null> = {
   ...dynamicSamplingEventMap,
   ...onboardingEventMap,
   ...stackTraceEventMap,
-  ...aiSuggestedSolutionEventMap,
   ...ecosystemEventMap,
   ...integrationEventMap,
   ...projectCreationEventMap,
diff --git a/static/app/utils/analytics/aiSuggestedSolutionAnalyticsEvents.tsx b/static/app/utils/analytics/aiSuggestedSolutionAnalyticsEvents.tsx
deleted file mode 100644
index 52095f3e973daa..00000000000000
--- a/static/app/utils/analytics/aiSuggestedSolutionAnalyticsEvents.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import type {BaseEventAnalyticsParams} from 'sentry/utils/analytics/workflowAnalyticsEvents';
-
-export type AiSuggestedSolutionEventParameters = {
-  'ai_suggested_solution.feedback_helpful_kinda_button_clicked': {
-    project_id: string;
-    group_id?: string;
-  } & BaseEventAnalyticsParams;
-  'ai_suggested_solution.feedback_helpful_nope_button_clicked': {
-    project_id: string;
-    group_id?: string;
-  } & BaseEventAnalyticsParams;
-  'ai_suggested_solution.feedback_helpful_yes_button_clicked': {
-    project_id: string;
-    group_id?: string;
-  } & BaseEventAnalyticsParams;
-  'ai_suggested_solution.hide_details_button_clicked': {
-    project_id: string;
-    group_id?: string;
-  } & BaseEventAnalyticsParams;
-  'ai_suggested_solution.hide_suggestion_button_clicked': {
-    project_id: string;
-    group_id?: string;
-  } & BaseEventAnalyticsParams;
-  'ai_suggested_solution.show_details_button_clicked': {
-    project_id: string;
-    group_id?: string;
-  } & BaseEventAnalyticsParams;
-  'ai_suggested_solution.view_suggestion_button_clicked': {
-    project_id: string;
-    group_id?: string;
-  } & BaseEventAnalyticsParams;
-};
-
-export const aiSuggestedSolutionEventMap: Record<
-  keyof AiSuggestedSolutionEventParameters,
-  string
-> = {
-  'ai_suggested_solution.view_suggestion_button_clicked':
-    'AI Suggested Solution: View Suggestion Button Clicked',
-  'ai_suggested_solution.feedback_helpful_yes_button_clicked':
-    'AI Suggested Solution: Helpful - Yes Button Clicked',
-  'ai_suggested_solution.feedback_helpful_kinda_button_clicked':
-    'AI Suggested Solution: Helpful - Kinda Button Clicked',
-  'ai_suggested_solution.feedback_helpful_nope_button_clicked':
-    'AI Suggested Solution: Helpful - Nope Button Clicked',
-  'ai_suggested_solution.hide_suggestion_button_clicked':
-    'AI Suggested Solution: Hide Suggestion Button Clicked',
-  'ai_suggested_solution.hide_details_button_clicked':
-    'AI Suggested Solution: Hide Details Button Clicked',
-  'ai_suggested_solution.show_details_button_clicked':
-    'AI Suggested Solution: Show Details Button Clicked',
-};
diff --git a/static/app/utils/analytics/dashboardsAnalyticsEvents.tsx b/static/app/utils/analytics/dashboardsAnalyticsEvents.tsx
index 529f1a601716a7..7c5bf97e4af1f9 100644
--- a/static/app/utils/analytics/dashboardsAnalyticsEvents.tsx
+++ b/static/app/utils/analytics/dashboardsAnalyticsEvents.tsx
@@ -1,3 +1,5 @@
+import type {DashboardsLayout} from 'sentry/views/dashboards/manage';
+
 // Used in the full-page widget builder
 type DashboardsEventParametersWidgetBuilder = {
   'dashboards_views.widget_builder.change': {
@@ -39,8 +41,8 @@ export type DashboardsEventParameters = {
     sort: string;
   };
   'dashboards_manage.create.start': {};
-  'dashboards_manage.delete': {dashboard_id: number};
-  'dashboards_manage.duplicate': {dashboard_id: number};
+  'dashboards_manage.delete': {dashboard_id: number; view_type: DashboardsLayout};
+  'dashboards_manage.duplicate': {dashboard_id: number; view_type: DashboardsLayout};
   'dashboards_manage.paginate': {};
   'dashboards_manage.search': {};
   'dashboards_manage.templates.add': {
diff --git a/static/app/utils/analytics/featureFlagAnalyticsEvents.tsx b/static/app/utils/analytics/featureFlagAnalyticsEvents.tsx
index 813662657d8726..dfe3902ae6e288 100644
--- a/static/app/utils/analytics/featureFlagAnalyticsEvents.tsx
+++ b/static/app/utils/analytics/featureFlagAnalyticsEvents.tsx
@@ -1,15 +1,17 @@
 export type FeatureFlagEventParameters = {
+  'flags.cta_dismissed': {type: string};
+  'flags.cta_setup_button_clicked': {};
   'flags.event_and_suspect_flags_found': {
     numEventFlags: number;
     numSuspectFlags: number;
     numTotalFlags: number;
   };
-  'flags.setup_modal_opened': {};
   'flags.sort_flags': {sortMethod: string};
   'flags.table_rendered': {
     numFlags: number;
   };
   'flags.view-all-clicked': {};
+  'flags.view-setup-sidebar': {};
 };
 
 export type FeatureFlagEventKey = keyof FeatureFlagEventParameters;
@@ -18,6 +20,8 @@ export const featureFlagEventMap: Record<FeatureFlagEventKey, string | null> = {
   'flags.view-all-clicked': 'Clicked View All Flags',
   'flags.sort_flags': 'Sorted Flags',
   'flags.event_and_suspect_flags_found': 'Number of Event and Suspect Flags',
-  'flags.setup_modal_opened': 'Flag Setup Integration Modal Opened',
   'flags.table_rendered': 'Flag Table Rendered',
+  'flags.cta_setup_button_clicked': 'Flag CTA Setup Button Clicked',
+  'flags.cta_dismissed': 'Flag CTA Dismissed',
+  'flags.view-setup-sidebar': 'Viewed Feature Flag Onboarding Sidebar',
 };
diff --git a/static/app/utils/analytics/insightAnalyticEvents.tsx b/static/app/utils/analytics/insightAnalyticEvents.tsx
index 389bfc2090f581..983728444af24b 100644
--- a/static/app/utils/analytics/insightAnalyticEvents.tsx
+++ b/static/app/utils/analytics/insightAnalyticEvents.tsx
@@ -1,3 +1,5 @@
+import type {DomainView} from 'sentry/views/insights/pages/useFilters';
+
 export type InsightEventParameters = {
   'insight.app_start.select_start_type': {type: string};
   'insight.app_start.spans.filter_by_device_class': {filter: string};
@@ -23,16 +25,16 @@ export type InsightEventParameters = {
     field: string;
     source: string;
   };
-  'insight.page_loads.ai': {has_ever_sent_data: boolean};
-  'insight.page_loads.app_start': {has_ever_sent_data: boolean};
-  'insight.page_loads.assets': {has_ever_sent_data: boolean};
-  'insight.page_loads.cache': {has_ever_sent_data: boolean};
-  'insight.page_loads.db': {has_ever_sent_data: boolean};
-  'insight.page_loads.http': {has_ever_sent_data: boolean};
-  'insight.page_loads.queue': {has_ever_sent_data: boolean};
-  'insight.page_loads.screen_load': {has_ever_sent_data: boolean};
-  'insight.page_loads.screen_rendering': {has_ever_sent_data: boolean};
-  'insight.page_loads.vital': {has_ever_sent_data: boolean};
+  'insight.page_loads.ai': {has_ever_sent_data: boolean; view: DomainView};
+  'insight.page_loads.app_start': {has_ever_sent_data: boolean; view: DomainView};
+  'insight.page_loads.assets': {has_ever_sent_data: boolean; view: DomainView};
+  'insight.page_loads.cache': {has_ever_sent_data: boolean; view: DomainView};
+  'insight.page_loads.db': {has_ever_sent_data: boolean; view: DomainView};
+  'insight.page_loads.http': {has_ever_sent_data: boolean; view: DomainView};
+  'insight.page_loads.queue': {has_ever_sent_data: boolean; view: DomainView};
+  'insight.page_loads.screen_load': {has_ever_sent_data: boolean; view: DomainView};
+  'insight.page_loads.screen_rendering': {has_ever_sent_data: boolean; view: DomainView};
+  'insight.page_loads.vital': {has_ever_sent_data: boolean; view: DomainView};
   'insight.screen_load.spans.filter_by_device_class': {filter: string};
   'insight.screen_load.spans.filter_by_operation': {filter: string};
   'insight.vital.overview.open_full_waterfall': {};
diff --git a/static/app/utils/analytics/issueAnalyticsEvents.tsx b/static/app/utils/analytics/issueAnalyticsEvents.tsx
index ee2a519fd4ffa8..2dc29354e9d35b 100644
--- a/static/app/utils/analytics/issueAnalyticsEvents.tsx
+++ b/static/app/utils/analytics/issueAnalyticsEvents.tsx
@@ -53,7 +53,7 @@ export type IssueEventParameters = {
     projectId: string;
     setup_gen_ai_consent: boolean;
     setup_integration: boolean;
-    setup_write_integration: boolean;
+    setup_write_integration?: boolean;
   };
   'breadcrumbs.drawer.action': {control: string; value?: string};
   'breadcrumbs.issue_details.change_time_display': {value: string};
@@ -90,9 +90,11 @@ export type IssueEventParameters = {
   };
   'issue-details.replay-cta-dismiss': {type: string};
   'issue.search_sidebar_clicked': {};
+  'issue.share_from_icon': {};
   'issue.shared_publicly': {};
-  'issue_details.comment_created': {};
-  'issue_details.comment_deleted': {};
+  'issue_details.comment_created': {streamline: boolean};
+  'issue_details.comment_deleted': {streamline: boolean};
+  'issue_details.comment_updated': {streamline: boolean};
   'issue_details.copy_event_link_clicked': GroupEventParams;
   'issue_details.escalating_feedback_received': {
     group_id: string;
@@ -105,10 +107,16 @@ export type IssueEventParameters = {
   };
   'issue_details.event_details_clicked': GroupEventParams;
   'issue_details.event_dropdown_option_selected': EventDropdownParams;
+  'issue_details.event_navigation_selected': {
+    content: string;
+  };
   'issue_details.external_issue_created': ExternalIssueParams;
   'issue_details.external_issue_loaded': ExternalIssueParams & {success: boolean};
   'issue_details.external_issue_modal_opened': ExternalIssueParams;
   'issue_details.header_view_replay_clicked': GroupEventParams;
+  'issue_details.issue_content_selected': {
+    content: string;
+  };
   'issue_details.issue_status_docs_clicked': {};
   'issue_details.performance.autogrouped_siblings_toggle': {};
   'issue_details.performance.hidden_spans_expanded': {};
@@ -362,6 +370,8 @@ export const issueEventMap: Record<IssueEventKey, string | null> = {
     'Issue Details: Escalating Feedback Received',
   'issue_details.escalating_issues_banner_feedback_received':
     'Issue Details: Escalating Issues Banner Feedback Received',
+  'issue_details.event_navigation_selected': 'Issue Details: Event Navigation Selected',
+  'issue_details.issue_content_selected': 'Issue Details: Issue Content Selected',
   'issue_details.similar_issues.diff_clicked':
     'Issue Details: Similar Issues: Diff Clicked',
   'issue_details.similar_issues.similarity_embeddings_feedback_recieved':
@@ -412,6 +422,7 @@ export const issueEventMap: Record<IssueEventKey, string | null> = {
   'issues_stream.sort_changed': 'Changed Sort on Issues Stream',
   'issues_stream.paginate': 'Paginate Issues Stream',
   'issue.shared_publicly': 'Issue Shared Publicly',
+  'issue.share_from_icon': 'Issue Share Opened from Icon',
   'issue_group_details.stack_traces.setup_source_maps_alert.clicked':
     'Issue Group Details: Setup Source Maps Alert Clicked',
   resolve_issue: 'Resolve Issue',
@@ -468,5 +479,6 @@ export const issueEventMap: Record<IssueEventKey, string | null> = {
   'issue_details.section_fold': 'Issue Details: Section Fold',
   'issue_details.comment_created': 'Issue Details: Comment Created',
   'issue_details.comment_deleted': 'Issue Details: Comment Deleted',
+  'issue_details.comment_updated': 'Issue Details: Comment Updated',
   'whats_new.link_clicked': "What's New: Link Clicked",
 };
diff --git a/static/app/utils/analytics/tracingEventMap.tsx b/static/app/utils/analytics/tracingEventMap.tsx
index 3b338511413c66..d6fc7a76436f4c 100644
--- a/static/app/utils/analytics/tracingEventMap.tsx
+++ b/static/app/utils/analytics/tracingEventMap.tsx
@@ -7,9 +7,10 @@ export type TracingEventParameters = {
   'trace.explorer.metadata': {
     columns: string[];
     columns_count: number;
-    has_results: boolean;
     query_status: 'success' | 'error';
-    results_mode: 'sample' | 'aggregate';
+    result_length: number;
+    result_missing_root: number;
+    result_mode: 'trace samples' | 'span samples' | 'aggregates';
     user_queries: string;
     user_queries_count: number;
     visualizes: Visualize[];
@@ -83,8 +84,12 @@ export type TracingEventParameters = {
   };
   'trace_explorer.add_span_condition': {};
   'trace_explorer.open_in_issues': {};
-  'trace_explorer.open_trace': {};
-  'trace_explorer.open_trace_span': {};
+  'trace_explorer.open_trace': {
+    source: 'trace explorer' | 'new explore';
+  };
+  'trace_explorer.open_trace_span': {
+    source: 'trace explorer' | 'new explore';
+  };
   'trace_explorer.remove_span_condition': {};
   'trace_explorer.search_failure': {
     error: string;
@@ -102,6 +107,7 @@ export type TracingEventParameters = {
   };
   'trace_explorer.toggle_trace_details': {
     expanded: boolean;
+    source: 'trace explorer' | 'new explore';
   };
 };
 
diff --git a/static/app/utils/discover/eventView.tsx b/static/app/utils/discover/eventView.tsx
index 5da719802fb108..e0dadd3768fe57 100644
--- a/static/app/utils/discover/eventView.tsx
+++ b/static/app/utils/discover/eventView.tsx
@@ -1200,10 +1200,18 @@ class EventView {
         sort,
         per_page: DEFAULT_PER_PAGE,
         query: queryString,
-        dataset: this.dataset,
+        dataset:
+          this.dataset === DiscoverDatasets.SPANS_EAP_RPC
+            ? DiscoverDatasets.SPANS_EAP
+            : this.dataset,
+        useRpc: this.dataset === DiscoverDatasets.SPANS_EAP_RPC ? '1' : undefined,
       }
     ) as EventQuery & LocationQuery;
 
+    if (eventQuery.useRpc !== '1') {
+      delete eventQuery.useRpc;
+    }
+
     if (eventQuery.team && !eventQuery.team.length) {
       delete eventQuery.team;
     }
diff --git a/static/app/utils/discover/fieldRenderers.tsx b/static/app/utils/discover/fieldRenderers.tsx
index 9b2a55a19cdb4e..674c933c411364 100644
--- a/static/app/utils/discover/fieldRenderers.tsx
+++ b/static/app/utils/discover/fieldRenderers.tsx
@@ -302,24 +302,28 @@ export const FIELD_FORMATTERS: FieldFormatters = {
         : defined(data[field])
           ? data[field]
           : emptyValue;
+
       if (isUrl(value)) {
         return (
-          <Container>
-            <ExternalLink href={value} data-test-id="group-tag-url">
-              {value}
-            </ExternalLink>
-          </Container>
+          <Tooltip title={value} containerDisplayMode="block" showOnlyOnOverflow>
+            <Container>
+              <ExternalLink href={value} data-test-id="group-tag-url">
+                {value}
+              </ExternalLink>
+            </Container>
+          </Tooltip>
         );
       }
 
-      const content =
-        value && typeof value === 'string' ? (
-          <span title={value}>{nullableValue(value)}</span>
-        ) : (
-          nullableValue(value)
+      if (value && typeof value === 'string') {
+        return (
+          <Tooltip title={value} containerDisplayMode="block" showOnlyOnOverflow>
+            <Container>{nullableValue(value)}</Container>
+          </Tooltip>
         );
+      }
 
-      return <Container>{content}</Container>;
+      return <Container>{nullableValue(value)}</Container>;
     },
   },
   array: {
@@ -360,8 +364,8 @@ type SpecialFields = {
   project: SpecialField;
   release: SpecialField;
   replayId: SpecialField;
+  'span.description': SpecialField;
   'span.status_code': SpecialField;
-  span_id: SpecialField;
   team_key_transaction: SpecialField;
   'timestamp.to_day': SpecialField;
   'timestamp.to_hour': SpecialField;
@@ -477,15 +481,27 @@ const SPECIAL_FIELDS: SpecialFields = {
       return <Container>{getShortEventId(id)}</Container>;
     },
   },
-  span_id: {
-    sortField: 'span_id',
+  'span.description': {
+    sortField: 'span.description',
     renderFunc: data => {
-      const spanId: string | unknown = data?.span_id;
-      if (typeof spanId !== 'string') {
-        return null;
-      }
+      const value = data['span.description'];
 
-      return <Container>{getShortEventId(spanId)}</Container>;
+      return (
+        <Tooltip
+          title={value}
+          containerDisplayMode="block"
+          showOnlyOnOverflow
+          maxWidth={400}
+        >
+          <Container>
+            {isUrl(value) ? (
+              <ExternalLink href={value}>{value}</ExternalLink>
+            ) : (
+              nullableValue(value)
+            )}
+          </Container>
+        </Tooltip>
+      );
     },
   },
   trace: {
@@ -530,7 +546,7 @@ const SPECIAL_FIELDS: SpecialFields = {
     sortField: 'profile.id',
     renderFunc: data => {
       const id: string | unknown = data?.['profile.id'];
-      if (typeof id !== 'string') {
+      if (typeof id !== 'string' || id === '') {
         return emptyValue;
       }
 
diff --git a/static/app/utils/discover/fields.tsx b/static/app/utils/discover/fields.tsx
index 7d7968074329b2..ed83e3d96f6954 100644
--- a/static/app/utils/discover/fields.tsx
+++ b/static/app/utils/discover/fields.tsx
@@ -19,6 +19,7 @@ import {
   AggregationKey,
   DISCOVER_FIELDS,
   FieldKey,
+  FieldKind,
   FieldValueType,
   getFieldDefinition,
   MEASUREMENT_FIELDS,
@@ -1639,12 +1640,19 @@ export const COMBINED_DATASET_FILTER_KEY_SECTIONS: FilterKeySection[] = [
 // will take in a project platform key, and output only the relevant filter key sections.
 // This way, users will not be suggested mobile fields for a backend transaction, for example.
 
-export const TYPED_TAG_KEY_RE = /tags\[(.*),(.*)\]/;
+export const TYPED_TAG_KEY_RE = /tags\[([^\s]*),([^\s]*)\]/;
 
-export function formatParsedFunction(func: ParsedFunction) {
-  const args = func.arguments.map(arg => {
-    const result = arg.match(TYPED_TAG_KEY_RE);
-    return result?.[1] ?? arg;
-  });
+export function classifyTagKey(key: string): FieldKind {
+  const result = key.match(TYPED_TAG_KEY_RE);
+  return result?.[2] === 'number' ? FieldKind.MEASUREMENT : FieldKind.TAG;
+}
+
+export function prettifyTagKey(key: string): string {
+  const result = key.match(TYPED_TAG_KEY_RE);
+  return result?.[1] ?? key;
+}
+
+export function prettifyParsedFunction(func: ParsedFunction) {
+  const args = func.arguments.map(prettifyTagKey);
   return `${func.name}(${args.join(',')})`;
 }
diff --git a/static/app/utils/discover/genericDiscoverQuery.tsx b/static/app/utils/discover/genericDiscoverQuery.tsx
index 71cd6e95add5de..4bcae74255cf67 100644
--- a/static/app/utils/discover/genericDiscoverQuery.tsx
+++ b/static/app/utils/discover/genericDiscoverQuery.tsx
@@ -445,7 +445,7 @@ export function useGenericDiscoverQuery<T, P>(props: Props<T, P>) {
   };
 }
 
-const parseError = (error: any): QueryError | null => {
+export const parseError = (error: any): QueryError | null => {
   if (!error) {
     return null;
   }
diff --git a/static/app/utils/discover/types.tsx b/static/app/utils/discover/types.tsx
index ddae415137a6f0..33e4e63bda9495 100644
--- a/static/app/utils/discover/types.tsx
+++ b/static/app/utils/discover/types.tsx
@@ -20,6 +20,7 @@ export enum DiscoverDatasets {
   METRICS_ENHANCED = 'metricsEnhanced',
   ISSUE_PLATFORM = 'issuePlatform',
   SPANS_EAP = 'spans',
+  SPANS_EAP_RPC = 'spansRpc',
   SPANS_INDEXED = 'spansIndexed',
   SPANS_METRICS = 'spansMetrics',
   TRANSACTIONS = 'transactions',
diff --git a/static/app/utils/events.tsx b/static/app/utils/events.tsx
index 15fee91e6c2c63..50ffc2e58506a2 100644
--- a/static/app/utils/events.tsx
+++ b/static/app/utils/events.tsx
@@ -386,7 +386,7 @@ export function getAnalyticsDataForEvent(event?: Event | null): BaseEventAnalyti
     num_in_app_stack_frames: event ? getNumberOfInAppStackFrames(event) : 0,
     num_threads_with_names: event ? getNumberOfThreadsWithNames(event) : 0,
     event_platform: event?.platform,
-    event_runtime: event?.tags?.find(tag => tag.key === 'runtime')?.value,
+    event_runtime: event?.tags?.find(tag => tag.key === 'runtime.name')?.value,
     event_type: event?.type,
     has_release: !!event?.release,
     has_exception_group: event ? eventHasExceptionGroup(event) : false,
diff --git a/static/app/utils/featureObserver.ts b/static/app/utils/featureObserver.ts
index 7ce5a198b76ad2..0d3a66043ce9d3 100644
--- a/static/app/utils/featureObserver.ts
+++ b/static/app/utils/featureObserver.ts
@@ -1,4 +1,5 @@
-import type {Flags} from 'sentry/types/event';
+import type {FeatureFlagContext} from '@sentry/types/build/types/context';
+
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 
@@ -22,7 +23,7 @@ export default class FeatureObserver {
   }
 
   private _bufferSize = 0;
-  private FEATURE_FLAGS: Flags = {values: []};
+  private FEATURE_FLAGS: FeatureFlagContext = {values: []};
 
   constructor({bufferSize}: {bufferSize: number}) {
     this._bufferSize = bufferSize;
diff --git a/static/app/utils/fields/index.ts b/static/app/utils/fields/index.ts
index 2216ec4ed708fc..f132702b693703 100644
--- a/static/app/utils/fields/index.ts
+++ b/static/app/utils/fields/index.ts
@@ -81,6 +81,8 @@ export enum FieldKey {
   OS_BUILD = 'os.build',
   OS_KERNEL_VERSION = 'os.kernel_version',
   OS_NAME = 'os.name',
+  OS_DISTRIBUTION_NAME = 'os.distribution_name',
+  OS_DISTRIBUTION_VERSION = 'os.distribution_version',
   PLATFORM = 'platform',
   PLATFORM_NAME = 'platform.name',
   PROFILE_ID = 'profile.id',
@@ -816,17 +818,17 @@ export const ALLOWED_EXPLORE_VISUALIZE_FIELDS: SpanIndexedField[] = [
 ];
 
 export const ALLOWED_EXPLORE_VISUALIZE_AGGREGATES: AggregationKey[] = [
-  AggregationKey.COUNT,
-  AggregationKey.MIN,
-  AggregationKey.MAX,
   AggregationKey.AVG,
-  AggregationKey.SUM,
+  AggregationKey.COUNT,
   AggregationKey.P50,
   AggregationKey.P75,
   AggregationKey.P90,
   AggregationKey.P95,
   AggregationKey.P99,
   AggregationKey.P100,
+  AggregationKey.SUM,
+  AggregationKey.MIN,
+  AggregationKey.MAX,
 ];
 
 export const SPAN_AGGREGATION_FIELDS: Record<AggregationKey, FieldDefinition> = {
@@ -1523,6 +1525,16 @@ const EVENT_FIELD_DEFINITIONS: Record<AllEventFieldKeys, FieldDefinition> = {
     kind: FieldKind.FIELD,
     valueType: FieldValueType.STRING,
   },
+  [FieldKey.OS_DISTRIBUTION_NAME]: {
+    desc: t('Distribution name'),
+    kind: FieldKind.FIELD,
+    valueType: FieldValueType.STRING,
+  },
+  [FieldKey.OS_DISTRIBUTION_VERSION]: {
+    desc: t('Distribution version number'),
+    kind: FieldKind.FIELD,
+    valueType: FieldValueType.STRING,
+  },
   [FieldKey.PLATFORM]: {
     desc: t('Name of the platform'),
     kind: FieldKind.FIELD,
@@ -1837,6 +1849,8 @@ export const ISSUE_EVENT_PROPERTY_FIELDS: FieldKey[] = [
   FieldKey.MESSAGE,
   FieldKey.OS_BUILD,
   FieldKey.OS_KERNEL_VERSION,
+  FieldKey.OS_DISTRIBUTION_NAME,
+  FieldKey.OS_DISTRIBUTION_VERSION,
   FieldKey.PLATFORM_NAME,
   FieldKey.RELEASE_BUILD,
   FieldKey.RELEASE_PACKAGE,
@@ -1905,6 +1919,8 @@ export const ISSUE_EVENT_FIELDS_THAT_MAY_CONFLICT_WITH_TAGS: Set<FieldKey> = new
   FieldKey.MESSAGE,
   FieldKey.OS_BUILD,
   FieldKey.OS_KERNEL_VERSION,
+  FieldKey.OS_DISTRIBUTION_NAME,
+  FieldKey.OS_DISTRIBUTION_VERSION,
   FieldKey.PLATFORM_NAME,
   FieldKey.RELEASE_BUILD,
   FieldKey.RELEASE_PACKAGE,
@@ -1967,6 +1983,8 @@ export const DISCOVER_FIELDS = [
   FieldKey.HTTP_URL,
   FieldKey.OS_BUILD,
   FieldKey.OS_KERNEL_VERSION,
+  FieldKey.OS_DISTRIBUTION_NAME,
+  FieldKey.OS_DISTRIBUTION_VERSION,
   FieldKey.DEVICE_NAME,
   FieldKey.DEVICE_BRAND,
   FieldKey.DEVICE_LOCALE,
diff --git a/static/app/utils/issueTypeConfig/cronConfig.tsx b/static/app/utils/issueTypeConfig/cronConfig.tsx
index 22d5a31c05d06c..a498e27e571475 100644
--- a/static/app/utils/issueTypeConfig/cronConfig.tsx
+++ b/static/app/utils/issueTypeConfig/cronConfig.tsx
@@ -23,7 +23,6 @@ const cronConfig: IssueCategoryConfigMapping = {
     },
     attachments: {enabled: false},
     autofix: false,
-    aiSuggestedSolution: false,
     mergedIssues: {enabled: false},
     replays: {enabled: false},
     similarIssues: {enabled: false},
diff --git a/static/app/utils/issueTypeConfig/errorConfig.tsx b/static/app/utils/issueTypeConfig/errorConfig.tsx
index 2673f52435fb1b..e9ff527557ded7 100644
--- a/static/app/utils/issueTypeConfig/errorConfig.tsx
+++ b/static/app/utils/issueTypeConfig/errorConfig.tsx
@@ -22,7 +22,6 @@ export const errorConfig: IssueCategoryConfigMapping = {
     },
     attachments: {enabled: true},
     autofix: true,
-    aiSuggestedSolution: true,
     mergedIssues: {enabled: true},
     replays: {enabled: true},
     similarIssues: {enabled: true},
diff --git a/static/app/utils/issueTypeConfig/index.tsx b/static/app/utils/issueTypeConfig/index.tsx
index b7ea3754b7e13c..063fddb4dc214d 100644
--- a/static/app/utils/issueTypeConfig/index.tsx
+++ b/static/app/utils/issueTypeConfig/index.tsx
@@ -36,7 +36,6 @@ const BASE_CONFIG: IssueTypeConfig = {
   },
   attachments: {enabled: false},
   autofix: false,
-  aiSuggestedSolution: false,
   events: {enabled: true},
   mergedIssues: {enabled: false},
   filterAndSearchHeader: {enabled: true},
diff --git a/static/app/utils/issueTypeConfig/replayConfig.tsx b/static/app/utils/issueTypeConfig/replayConfig.tsx
index 9a082fcf3bfdef..853c06ccb9a20f 100644
--- a/static/app/utils/issueTypeConfig/replayConfig.tsx
+++ b/static/app/utils/issueTypeConfig/replayConfig.tsx
@@ -5,16 +5,24 @@ const replayConfig: IssueCategoryConfigMapping = {
   _categoryDefaults: {
     actions: {
       archiveUntilOccurrence: {enabled: true},
-      delete: {enabled: false},
-      deleteAndDiscard: {enabled: false},
-      merge: {enabled: false},
+      delete: {
+        enabled: false,
+        disabledReason: t('Not yet supported for replay issues'),
+      },
+      deleteAndDiscard: {
+        enabled: false,
+        disabledReason: t('Not yet supported for replay issues'),
+      },
+      merge: {
+        enabled: false,
+        disabledReason: t('Not supported for replay issues'),
+      },
       ignore: {enabled: true},
       resolveInRelease: {enabled: true},
       share: {enabled: true},
     },
     attachments: {enabled: false},
     autofix: false,
-    aiSuggestedSolution: false,
     events: {enabled: true},
     mergedIssues: {enabled: false},
     regression: {enabled: false},
diff --git a/static/app/utils/issueTypeConfig/types.tsx b/static/app/utils/issueTypeConfig/types.tsx
index 2531b9c6ea3153..ff4fce12991c18 100644
--- a/static/app/utils/issueTypeConfig/types.tsx
+++ b/static/app/utils/issueTypeConfig/types.tsx
@@ -24,10 +24,6 @@ export type IssueTypeConfig = {
     resolveInRelease: DisabledWithReasonConfig;
     share: DisabledWithReasonConfig;
   };
-  /**
-   * Should show AI Suggested Fix for this issue type
-   */
-  aiSuggestedSolution: boolean;
   /**
    * Is the Attachments tab shown for this issue
    */
diff --git a/static/app/utils/issueTypeConfig/uptimeConfig.tsx b/static/app/utils/issueTypeConfig/uptimeConfig.tsx
index 69fbffe26bc193..b25cb2d5d346a1 100644
--- a/static/app/utils/issueTypeConfig/uptimeConfig.tsx
+++ b/static/app/utils/issueTypeConfig/uptimeConfig.tsx
@@ -14,7 +14,6 @@ const uptimeConfig: IssueCategoryConfigMapping = {
     attachments: {enabled: false},
     resources: null,
     autofix: false,
-    aiSuggestedSolution: false,
     mergedIssues: {enabled: false},
     replays: {enabled: false},
     similarIssues: {enabled: false},
diff --git a/static/app/utils/marked.spec.tsx b/static/app/utils/marked.spec.tsx
index 7968bb67e7555a..50ab55b382386f 100644
--- a/static/app/utils/marked.spec.tsx
+++ b/static/app/utils/marked.spec.tsx
@@ -12,6 +12,10 @@ describe('marked', function () {
       ['[x](http://example.com)', '<a href="http://example.com">x</a>'],
       ['[x](https://example.com)', '<a href="https://example.com">x</a>'],
       ['[x](mailto:foo@example.com)', '<a href="mailto:foo@example.com">x</a>'],
+      [
+        '[x](https://example.com "Example Title")',
+        '<a href="https://example.com" title="Example Title">x</a>',
+      ],
     ]) {
       expectMarkdown(test);
     }
@@ -44,13 +48,19 @@ describe('marked', function () {
     }
   });
 
-  it('escapes XSS and removes invalid attributes on img', function () {
+  it('escapes injections', function () {
     [
       [
-        `[test](http://example.com\""#><img/onerror='alert\(location\)'/src=>)
-![test](http://example.com"/onerror='alert\(location\)'/)`,
-        `<a href="http://example.com"><img src="">"&gt;test</a>
-<img alt="test" src="http://example.com">`,
+        '[x<b>Bold</b>](https://evil.example.com)',
+        '<a href="https://evil.example.com">x&lt;b&gt;Bold&lt;/b&gt;</a>',
+      ],
+      [
+        '[x](https://evil.example.com"class="foo)',
+        '<a href="https://evil.example.com%22class=%22foo">x</a>',
+      ],
+      [
+        '[x](https://evil.example.com "class=\\"bar")',
+        '<a href="https://evil.example.com" title="class=&quot;bar">x</a>',
       ],
       [
         '<script> <img <script> src=x onerror=alert(1) />',
diff --git a/static/app/utils/marked.tsx b/static/app/utils/marked.tsx
index 75955c47065379..4188831d4252a4 100644
--- a/static/app/utils/marked.tsx
+++ b/static/app/utils/marked.tsx
@@ -29,7 +29,7 @@ class SafeRenderer extends marked.Renderer {
       return href;
     }
 
-    const out = `<a href="${href}"${title ? ` title="${title}"` : ''}>${text}</a>`;
+    const out = super.link(href, title, text);
     return dompurify.sanitize(out);
   }
 
@@ -39,7 +39,7 @@ class SafeRenderer extends marked.Renderer {
       return '';
     }
 
-    return `<img src="${href}" alt="${text}"${title ? ` title="${title}"` : ''} />`;
+    return super.image(href, title, text);
   }
 }
 
diff --git a/static/app/utils/metrics/features.tsx b/static/app/utils/metrics/features.tsx
index a191d281f1f383..a3d514d4d69550 100644
--- a/static/app/utils/metrics/features.tsx
+++ b/static/app/utils/metrics/features.tsx
@@ -1,6 +1,5 @@
 import type {Organization} from 'sentry/types/organization';
 import {Dataset} from 'sentry/views/alerts/rules/metric/types';
-import type {AlertType} from 'sentry/views/alerts/wizard/options';
 
 export function hasMetricsExperimentalFeature(organization: Organization) {
   return organization.features.includes('custom-metrics-experimental');
@@ -26,12 +25,9 @@ export function hasMetricsNewInputs(organization: Organization) {
  */
 export function getForceMetricsLayerQueryExtras(
   organization: Organization,
-  alertDataset: Dataset,
-  alertType: AlertType
+  alertDataset: Dataset
 ): {forceMetricsLayer: 'true'} | Record<string, never> {
-  return hasCustomMetrics(organization) &&
-    alertDataset === Dataset.GENERIC_METRICS &&
-    alertType !== 'insights_metrics'
+  return hasCustomMetrics(organization) && alertDataset === Dataset.GENERIC_METRICS
     ? {forceMetricsLayer: 'true'}
     : {};
 }
diff --git a/static/app/utils/metrics/mri.tsx b/static/app/utils/metrics/mri.tsx
index 5f5256ebf2397d..3b60451cec8d3b 100644
--- a/static/app/utils/metrics/mri.tsx
+++ b/static/app/utils/metrics/mri.tsx
@@ -7,15 +7,11 @@ import type {
   UseCase,
 } from 'sentry/types/metrics';
 import {parseFunction} from 'sentry/utils/discover/fields';
-import {SPAN_DURATION_MRI} from 'sentry/utils/metrics/constants';
-import {INSIGHTS_METRICS_OPERATIONS} from 'sentry/views/alerts/rules/metric/utils/isInsightsMetricAlert';
 
 export const DEFAULT_MRI: MRI = 'c:custom/sentry_metric@none';
 export const DEFAULT_SPAN_MRI: MRI = 'c:custom/span_attribute_0@none';
-export const DEFAULT_INSIGHTS_MRI: MRI = 'd:spans/duration@millisecond';
 // This is a workaround as the alert builder requires a valid aggregate to be set
 export const DEFAULT_METRIC_ALERT_FIELD = `sum(${DEFAULT_MRI})`;
-export const DEFAULT_INSIGHTS_METRICS_ALERT_FIELD = `sum(${DEFAULT_INSIGHTS_MRI})`;
 
 export const DEFAULT_EAP_FIELD = 'span.duration';
 export const DEFAULT_EAP_METRICS_ALERT_FIELD = `count(${DEFAULT_EAP_FIELD})`;
@@ -122,19 +118,6 @@ export function isMRIField(field: string): boolean {
 // convenience function to get the MRI from a field, returns defaut MRI if it fails
 export function getMRI(field: string): MRI {
   const parsed = parseField(field);
-  // Insights functions don't always take an MRI as an argument.
-  // In these cases, we need to default to a specific MRI.
-  if (parsed?.aggregation) {
-    const operation = INSIGHTS_METRICS_OPERATIONS.find(({value}) => {
-      return value === parsed?.aggregation;
-    });
-    if (operation) {
-      if (operation.mri) {
-        return operation.mri as MRI;
-      }
-      return SPAN_DURATION_MRI;
-    }
-  }
   return parsed?.mri ?? DEFAULT_MRI;
 }
 
diff --git a/static/app/utils/profiling/gl/utils.ts b/static/app/utils/profiling/gl/utils.ts
index fba9800c86b6ab..d1a84794cecfcb 100644
--- a/static/app/utils/profiling/gl/utils.ts
+++ b/static/app/utils/profiling/gl/utils.ts
@@ -835,12 +835,10 @@ export function useResizeCanvasObserver(
     }
 
     const observer = watchForResize(canvases as HTMLCanvasElement[], entries => {
-      const contentRect =
-        entries[0].contentRect ?? entries[0].target.getBoundingClientRect();
-
-      setCanvasBounds(
-        new Rect(contentRect.x, contentRect.y, contentRect.width, contentRect.height)
-      );
+      // We cannot use the resize observer's reported rect because it does not report x
+      // coordinate that is required to do edge detection.
+      const rect = entries[0].target.getBoundingClientRect();
+      setCanvasBounds(new Rect(rect.x, rect.y, rect.width, rect.height));
 
       canvas.initPhysicalSpace();
       if (view) {
diff --git a/static/app/utils/profiling/hooks/types.tsx b/static/app/utils/profiling/hooks/types.tsx
index eb0f0e58041401..aa47ed754126de 100644
--- a/static/app/utils/profiling/hooks/types.tsx
+++ b/static/app/utils/profiling/hooks/types.tsx
@@ -41,6 +41,7 @@ export type FunctionTrend = {
   breakpoint: number;
   change: TrendType;
   'count()': number;
+  examples: FunctionExample[];
   fingerprint: number;
   function: string;
   package: string;
@@ -49,7 +50,6 @@ export type FunctionTrend = {
   trend_difference: number;
   trend_percentage: number;
   unweighted_p_value: number;
-  worst: FunctionExample[];
 };
 
 type EpochTime = number;
@@ -62,4 +62,4 @@ type FunctionTrendStats = {
   start: number;
 };
 
-type FunctionExample = [EpochTime, string];
+type FunctionExample = [EpochTime, Profiling.BaseProfileReference];
diff --git a/static/app/utils/profiling/hooks/useDifferentialFlamegraphQuery.ts b/static/app/utils/profiling/hooks/useDifferentialFlamegraphQuery.ts
index a98744f43a6699..56f5ac8023c3d7 100644
--- a/static/app/utils/profiling/hooks/useDifferentialFlamegraphQuery.ts
+++ b/static/app/utils/profiling/hooks/useDifferentialFlamegraphQuery.ts
@@ -2,7 +2,6 @@ import {useMemo} from 'react';
 
 import {RELATIVE_DAYS_WINDOW} from 'sentry/components/events/eventStatisticalDetector/consts';
 import {useRelativeDateTime} from 'sentry/utils/profiling/hooks/useRelativeDateTime';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 
 import type {AggregateFlamegraphQueryParameters} from './useAggregateFlamegraphQuery';
 import {useAggregateFlamegraphQuery} from './useAggregateFlamegraphQuery';
@@ -12,7 +11,6 @@ interface DifferentialFlamegraphQueryParameters {
   environments: AggregateFlamegraphQueryParameters['environments'];
   fingerprint: string | undefined;
   projectID: number | null;
-  transaction: string;
 }
 
 export interface DifferentialFlamegraphQueryResult {
@@ -23,32 +21,17 @@ export interface DifferentialFlamegraphQueryResult {
 export function useDifferentialFlamegraphQuery(
   params: DifferentialFlamegraphQueryParameters
 ): DifferentialFlamegraphQueryResult {
-  const query = useMemo(() => {
-    // TODO: this should contain the user query
-    // wait util we fully switch over to the transactions dataset
-    const conditions = new MutableSearch('');
-    conditions.setFilterValues('transaction', [params.transaction]);
-    return conditions.formatString();
-  }, [params.transaction]);
-
   const sharedAggregateQueryParams: AggregateFlamegraphQueryParameters = useMemo(() => {
     const p: Exclude<AggregateFlamegraphQueryParameters, 'datetime'> = {
-      query,
+      query: '',
       environments: params.environments,
       fingerprint: params.fingerprint,
       projects:
         params.projectID === null || isNaN(params.projectID) ? [] : [params.projectID],
-      enabled: !!params.transaction,
     };
 
     return p;
-  }, [
-    query,
-    params.environments,
-    params.projectID,
-    params.fingerprint,
-    params.transaction,
-  ]);
+  }, [params.environments, params.projectID, params.fingerprint]);
 
   const regressionDateRange = useRelativeDateTime({
     anchor: params.breakpoint,
diff --git a/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx b/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx
index 4be746eee5b2d3..dbbb4e3e6a231d 100644
--- a/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx
+++ b/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx
@@ -52,7 +52,7 @@ describe('useProfileEvents', function () {
       match: [
         MockApiClient.matchQuery({
           dataset: 'discover',
-          query: 'has:profile.id (transaction:foo)',
+          query: '(has:profile.id OR (has:profiler.id has:thread.id)) (transaction:foo)',
         }),
       ],
     });
diff --git a/static/app/utils/profiling/hooks/useProfileEvents.tsx b/static/app/utils/profiling/hooks/useProfileEvents.tsx
index 8696daa42f5a4e..700a5f2e571128 100644
--- a/static/app/utils/profiling/hooks/useProfileEvents.tsx
+++ b/static/app/utils/profiling/hooks/useProfileEvents.tsx
@@ -14,7 +14,6 @@ export interface UseProfileEventsOptions<F extends string = ProfilingFieldType>
   fields: readonly F[];
   referrer: string;
   sort: Sort<F>;
-  continuousProfilingCompat?: boolean;
   cursor?: string;
   datetime?: PageFilters['datetime'];
   enabled?: boolean;
@@ -30,7 +29,6 @@ export function useProfileEvents<F extends string>({
   referrer,
   query,
   sort,
-  continuousProfilingCompat,
   cursor,
   enabled = true,
   refetchOnMount = true,
@@ -40,11 +38,7 @@ export function useProfileEvents<F extends string>({
   const organization = useOrganization();
   const {selection} = usePageFilters();
 
-  if (continuousProfilingCompat) {
-    query = `(has:profile.id OR (has:profiler.id has:thread.id)) ${query ? `(${query})` : ''}`;
-  } else {
-    query = `has:profile.id ${query ? `(${query})` : ''}`;
-  }
+  query = `(has:profile.id OR (has:profiler.id has:thread.id)) ${query ? `(${query})` : ''}`;
 
   const path = `/organizations/${organization.slug}/events/`;
   const endpointOptions = {
diff --git a/static/app/utils/profiling/hooks/useProfileEventsStats.spec.tsx b/static/app/utils/profiling/hooks/useProfileEventsStats.spec.tsx
index 6bc922b82f9ff9..7735fcb0f999e5 100644
--- a/static/app/utils/profiling/hooks/useProfileEventsStats.spec.tsx
+++ b/static/app/utils/profiling/hooks/useProfileEventsStats.spec.tsx
@@ -74,7 +74,7 @@ describe('useProfileEvents', function () {
       match: [
         MockApiClient.matchQuery({
           dataset: 'discover',
-          query: 'has:profile.id (transaction:foo)',
+          query: '(has:profile.id OR (has:profiler.id has:thread.id)) (transaction:foo)',
         }),
       ],
     });
@@ -135,7 +135,7 @@ describe('useProfileEvents', function () {
       match: [
         MockApiClient.matchQuery({
           dataset: 'discover',
-          query: 'has:profile.id (transaction:foo)',
+          query: '(has:profile.id OR (has:profiler.id has:thread.id)) (transaction:foo)',
         }),
       ],
     });
@@ -197,7 +197,7 @@ describe('useProfileEvents', function () {
       match: [
         MockApiClient.matchQuery({
           dataset: 'discover',
-          query: 'has:profile.id (transaction:foo)',
+          query: '(has:profile.id OR (has:profiler.id has:thread.id)) (transaction:foo)',
         }),
       ],
     });
diff --git a/static/app/utils/profiling/hooks/useProfileEventsStats.tsx b/static/app/utils/profiling/hooks/useProfileEventsStats.tsx
index 4ef093b755d4b7..1bec0042bf2cff 100644
--- a/static/app/utils/profiling/hooks/useProfileEventsStats.tsx
+++ b/static/app/utils/profiling/hooks/useProfileEventsStats.tsx
@@ -11,7 +11,6 @@ interface UseProfileEventsStatsOptions<F> {
   dataset: 'discover' | 'profiles' | 'profileFunctions';
   referrer: string;
   yAxes: readonly F[];
-  continuousProfilingCompat?: boolean;
   datetime?: PageFilters['datetime'];
   enabled?: boolean;
   interval?: string;
@@ -19,7 +18,6 @@ interface UseProfileEventsStatsOptions<F> {
 }
 
 export function useProfileEventsStats<F extends string>({
-  continuousProfilingCompat,
   dataset,
   datetime,
   interval,
@@ -38,11 +36,7 @@ export function useProfileEventsStats<F extends string>({
   }
 
   if (dataset === 'discover') {
-    if (continuousProfilingCompat) {
-      query = `(has:profile.id OR (has:profiler.id has:thread.id)) ${query ? `(${query})` : ''}`;
-    } else {
-      query = `has:profile.id ${query ? `(${query})` : ''}`;
-    }
+    query = `(has:profile.id OR (has:profiler.id has:thread.id)) ${query ? `(${query})` : ''}`;
   }
 
   const path = `/organizations/${organization.slug}/events-stats/`;
diff --git a/static/app/utils/profiling/hooks/useProfileTopEventsStats.tsx b/static/app/utils/profiling/hooks/useProfileTopEventsStats.tsx
index e91518054e5a22..0048851ca23e79 100644
--- a/static/app/utils/profiling/hooks/useProfileTopEventsStats.tsx
+++ b/static/app/utils/profiling/hooks/useProfileTopEventsStats.tsx
@@ -5,7 +5,9 @@ import type {PageFilters} from 'sentry/types/core';
 import type {EventsStatsSeries} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
 import {transformSingleSeries} from 'sentry/utils/profiling/hooks/utils';
+import type {UseApiQueryResult} from 'sentry/utils/queryClient';
 import {useApiQuery} from 'sentry/utils/queryClient';
+import type RequestError from 'sentry/utils/requestError/requestError';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 
@@ -19,6 +21,7 @@ interface UseProfileTopEventsStatsOptions<F> {
   datetime?: PageFilters['datetime'];
   enabled?: boolean;
   interval?: string;
+  projects?: PageFilters['projects'];
   query?: string;
 }
 
@@ -29,11 +32,15 @@ export function useProfileTopEventsStats<F extends string>({
   interval,
   others,
   query,
+  projects,
   referrer,
   topEvents,
   yAxes,
   enabled = true,
-}: UseProfileTopEventsStatsOptions<F>) {
+}: UseProfileTopEventsStatsOptions<F>): UseApiQueryResult<
+  EventsStatsSeries<F>,
+  RequestError
+> {
   const organization = useOrganization();
   const {selection} = usePageFilters();
 
@@ -43,7 +50,7 @@ export function useProfileTopEventsStats<F extends string>({
       dataset,
       field: fields,
       referrer,
-      project: selection.projects,
+      project: projects ?? selection.projects,
       environment: selection.environments,
       ...normalizeDateTimeParams(datetime ?? selection.datetime),
       yAxis: yAxes,
@@ -54,20 +61,20 @@ export function useProfileTopEventsStats<F extends string>({
     },
   };
 
-  const {data, ...rest} = useApiQuery<any>([path, endpointOptions], {
+  const result = useApiQuery<any>([path, endpointOptions], {
     staleTime: Infinity,
     enabled,
   });
 
-  const transformed = useMemo(
-    () => data && transformTopEventsStatsResponse(dataset, yAxes, data),
-    [yAxes, data, dataset]
+  const transformed: EventsStatsSeries<F> = useMemo(
+    () => transformTopEventsStatsResponse(dataset, yAxes, result.data),
+    [yAxes, result.data, dataset]
   );
 
   return {
+    ...result,
     data: transformed,
-    ...rest,
-  };
+  } as UseApiQueryResult<EventsStatsSeries<F>, RequestError>;
 }
 
 function transformTopEventsStatsResponse<F extends string>(
@@ -77,7 +84,7 @@ function transformTopEventsStatsResponse<F extends string>(
 ): EventsStatsSeries<F> {
   // the events stats endpoint has a legacy response format so here we transform it
   // into the proposed update for forward compatibility and ease of use
-  if (yAxes.length === 0) {
+  if (!rawData || yAxes.length === 0) {
     return {
       data: [],
       meta: {
diff --git a/static/app/utils/profiling/hooks/useProfilingFunctionMetrics.tsx b/static/app/utils/profiling/hooks/useProfilingFunctionMetrics.tsx
deleted file mode 100644
index 83a2352e024883..00000000000000
--- a/static/app/utils/profiling/hooks/useProfilingFunctionMetrics.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import {useMemo} from 'react';
-
-import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
-import type {EventsStatsData} from 'sentry/types/organization';
-import {useApiQuery, type UseApiQueryResult} from 'sentry/utils/queryClient';
-import type RequestError from 'sentry/utils/requestError/requestError';
-import useOrganization from 'sentry/utils/useOrganization';
-import usePageFilters from 'sentry/utils/usePageFilters';
-
-interface UseProfilingFunctionMetricsProps {
-  fingerprint: Profiling.FunctionMetric['fingerprint'];
-  projects: number[];
-}
-
-export function useProfilingFunctionMetrics(
-  props: UseProfilingFunctionMetricsProps
-): UseApiQueryResult<{data: EventsStatsData}, RequestError> {
-  const organization = useOrganization();
-  const {selection} = usePageFilters();
-
-  const path = `/organizations/${organization.slug}/events-stats/`;
-  const endpointOptions = useMemo(() => {
-    const params: {
-      query: Record<string, any>;
-    } = {
-      query: {
-        project: props.projects,
-        environment: selection.environments ?? selection.environments,
-        dataset: 'profileFunctionsMetrics',
-        query: `fingerprint:${props.fingerprint}`,
-        ...normalizeDateTimeParams(selection.datetime ?? selection.datetime),
-      },
-    };
-    return params;
-  }, [props.fingerprint, props.projects, selection.datetime, selection.environments]);
-
-  return useApiQuery<{data: EventsStatsData}>([path, endpointOptions], {
-    enabled: !!props.fingerprint,
-    staleTime: 0,
-  });
-}
diff --git a/static/app/utils/reactRouter6Compat/router.tsx b/static/app/utils/reactRouter6Compat/router.tsx
index 23b6c383dabd44..379f3e4dbe2f69 100644
--- a/static/app/utils/reactRouter6Compat/router.tsx
+++ b/static/app/utils/reactRouter6Compat/router.tsx
@@ -1,4 +1,4 @@
-import {Children, isValidElement} from 'react';
+import {Children, isValidElement, useEffect} from 'react';
 import {
   Navigate,
   type NavigateProps,
@@ -6,6 +6,7 @@ import {
   type RouteObject,
   useOutletContext,
 } from 'react-router-dom';
+import * as Sentry from '@sentry/react';
 
 import {USING_CUSTOMER_DOMAIN} from 'sentry/constants';
 import replaceRouterParams from 'sentry/utils/replaceRouterParams';
@@ -75,6 +76,21 @@ interface RedirectProps extends Omit<NavigateProps, 'to'> {
  */
 function Redirect({to, ...rest}: RedirectProps) {
   const params = useParams();
+  const routes = useRoutes();
+
+  // Capture sentry error for this redirect. This will help us understand if we
+  // have redirects that are unused or used too much.
+  useEffect(() => {
+    const routePath = routes
+      .map(route => route.path ?? '')
+      .filter(path => path !== '')
+      .join('/');
+
+    Sentry.captureMessage('Redirect route used', {
+      level: 'info',
+      tags: {routePath},
+    });
+  }, [routes]);
 
   return <Navigate to={replaceRouterParams(to, params)} {...rest} />;
 }
diff --git a/static/app/utils/replays/createHiddenPlayer.tsx b/static/app/utils/replays/createHiddenPlayer.tsx
index cc1df8401ebdc0..5d901b3175ee34 100644
--- a/static/app/utils/replays/createHiddenPlayer.tsx
+++ b/static/app/utils/replays/createHiddenPlayer.tsx
@@ -26,16 +26,24 @@ export function createHiddenPlayer(rrwebEvents: RecordingFrame[]): {
     hiddenIframe.contentDocument.body.appendChild(domRoot);
   }
 
-  const replayer = new Replayer(rrwebEvents, {
-    root: domRoot,
-    loadTimeout: 1,
-    showWarning: false,
-    blockClass: 'sentry-block',
-    speed: 99999,
-    skipInactive: true,
-    triggerFocus: false,
-    mouseTail: false,
-  });
+  const replayer = new Replayer(
+    // We need to deep clone the events since `Replayer` can mutate the event
+    // objects. This means that having multiple Replayer instances (e.g. the
+    // Replay details player and a hidden player via `replayStepper`) can cause
+    // playback issues as the object references are the same, even though the
+    // arrays are not.
+    structuredClone(rrwebEvents),
+    {
+      root: domRoot,
+      loadTimeout: 1,
+      showWarning: false,
+      blockClass: 'sentry-block',
+      speed: 99999,
+      skipInactive: true,
+      triggerFocus: false,
+      mouseTail: false,
+    }
+  );
 
   const cleanupReplayer = () => {
     hiddenIframe.remove();
diff --git a/static/app/utils/replays/extractHtml.tsx b/static/app/utils/replays/extractDomNodes.tsx
similarity index 82%
rename from static/app/utils/replays/extractHtml.tsx
rename to static/app/utils/replays/extractDomNodes.tsx
index aedc99f40d6a1a..2c6b74ee7bbaf1 100644
--- a/static/app/utils/replays/extractHtml.tsx
+++ b/static/app/utils/replays/extractDomNodes.tsx
@@ -1,6 +1,7 @@
 import type {Mirror} from '@sentry-internal/rrweb-snapshot';
 
 import type {ReplayFrame} from 'sentry/utils/replays/types';
+import {getNodeIds} from 'sentry/utils/replays/types';
 import constructSelector from 'sentry/views/replays/deadRageClick/constructSelector';
 
 export type Extraction = {
@@ -10,7 +11,27 @@ export type Extraction = {
   timestamp: number;
 };
 
-export default function extractHtmlAndSelector(
+const extractDomNodes = {
+  shouldVisitFrame: frame => {
+    const nodeIds = getNodeIds(frame);
+    return nodeIds.filter(nodeId => nodeId !== -1).length > 0;
+  },
+  onVisitFrame: (frame, collection, replayer) => {
+    const mirror = replayer.getMirror();
+    const nodeIds = getNodeIds(frame);
+    const {html, selectors} = extractHtmlAndSelector((nodeIds ?? []) as number[], mirror);
+    collection.set(frame as ReplayFrame, {
+      frame,
+      html,
+      selectors,
+      timestamp: frame.timestampMs,
+    });
+  },
+};
+
+export default extractDomNodes;
+
+function extractHtmlAndSelector(
   nodeIds: number[],
   mirror: Mirror
 ): {html: string[]; selectors: Map<number, string>} {
diff --git a/static/app/utils/replays/hooks/useExtractDiffMutations.tsx b/static/app/utils/replays/hooks/useExtractDiffMutations.tsx
new file mode 100644
index 00000000000000..6cf8e68caa527e
--- /dev/null
+++ b/static/app/utils/replays/hooks/useExtractDiffMutations.tsx
@@ -0,0 +1,222 @@
+import {useQuery, type UseQueryResult} from 'sentry/utils/queryClient';
+import replayerStepper from 'sentry/utils/replays/replayerStepper';
+import type ReplayReader from 'sentry/utils/replays/replayReader';
+import {
+  EventType,
+  IncrementalSource,
+  type RecordingFrame,
+  type ReplayFrame,
+} from 'sentry/utils/replays/types';
+
+type DiffMutation = Record<
+  number,
+  {
+    adds: Record<string, unknown>;
+    attributes: Record<string, unknown>;
+    offset: number;
+    removes: Record<string, unknown>;
+  }
+>;
+
+type Args = {
+  rangeEndTimestampMs: number;
+  rangeStartTimestampMs: number;
+  replay: ReplayReader;
+};
+
+async function extractDiffMutations({
+  rangeEndTimestampMs,
+  rangeStartTimestampMs,
+  replay,
+}: Args): Promise<Map<RecordingFrame, DiffMutation>> {
+  let hasStartedVisiting = false;
+  let hasFinishedVisiting = false;
+  let lastFrame: null | RecordingFrame = null;
+
+  const startTimestampMs = replay.getReplay().started_at.getTime() ?? 0;
+
+  const results = await replayerStepper<RecordingFrame, DiffMutation>({
+    frames: replay.getRRWebFrames(),
+    rrwebEvents: replay.getRRWebFrames(),
+    startTimestampMs,
+    shouldVisitFrame: (frame, _replayer) => {
+      const isWithinRange =
+        rangeStartTimestampMs < frame.timestamp && frame.timestamp <= rangeEndTimestampMs;
+
+      // within the range, so we visit.
+      if (isWithinRange) {
+        hasStartedVisiting = true;
+        return (
+          frame.type === EventType.IncrementalSnapshot &&
+          'source' in frame.data &&
+          frame.data.source === IncrementalSource.Mutation
+        );
+      }
+      // if we started, but didn't record that visiting is finished, then this
+      // is the first frame outside of the range. we'll visit it, so we can
+      // consume the lastFrame, but afterwards no more visits will happen.
+      if (hasStartedVisiting && !hasFinishedVisiting) {
+        hasFinishedVisiting = true;
+        return true;
+      }
+      // we either haven't started, or we already finished, not need to visit.
+      return false;
+    },
+    onVisitFrame: (frame, collection, replayer) => {
+      const mirror = replayer.getMirror();
+
+      if (
+        lastFrame &&
+        lastFrame.type === EventType.IncrementalSnapshot &&
+        'source' in lastFrame.data &&
+        lastFrame.data.source === IncrementalSource.Mutation
+      ) {
+        const adds = {};
+        for (const add of lastFrame.data.adds) {
+          const node = mirror.getNode(add.node.id) as HTMLElement | null;
+          if (!node || !node.outerHTML) {
+            continue;
+          }
+          const selector = getSelectorForElem(node);
+          const rootIsAdded = Object.keys(adds).some(key => selector.startsWith(key));
+          if (rootIsAdded) {
+            continue;
+          }
+
+          adds[selector] = {
+            html: node.outerHTML,
+          };
+        }
+
+        const attributes = {};
+        for (const attr of lastFrame.data.attributes) {
+          const node = mirror.getNode(attr.id) as HTMLElement | null;
+          if (!node || !node.outerHTML) {
+            continue;
+          }
+          attributes[getSelectorForElem(node)] = {
+            tag: node.outerHTML.replace(node.innerHTML, '...'),
+            changed: attr.attributes,
+          };
+        }
+
+        const item = collection.get(lastFrame);
+        if (item) {
+          item[lastFrame.timestamp].adds = adds;
+          item[lastFrame.timestamp].attributes = attributes;
+        }
+      }
+
+      if (
+        frame.type === EventType.IncrementalSnapshot &&
+        'source' in frame.data &&
+        frame.data.source === IncrementalSource.Mutation
+      ) {
+        // fill the cache
+        lastFrame = frame;
+
+        const removes = {};
+        for (const removal of frame.data.removes) {
+          const node = mirror.getNode(removal.id) as HTMLElement | null;
+          if (!node || !node.outerHTML) {
+            continue;
+          }
+          const selector = getSelectorForElem(node);
+          const rootIsRemoved = Object.keys(removes).some(key =>
+            selector.startsWith(key)
+          );
+          if (rootIsRemoved) {
+            continue;
+          }
+
+          removes[selector] = {
+            html: node.outerHTML,
+          };
+        }
+
+        collection.set(frame, {
+          [frame.timestamp]: {
+            adds: {},
+            attributes: {},
+            removes,
+            offset: frame.timestamp - startTimestampMs,
+          },
+        });
+      }
+    },
+  });
+  return results;
+}
+
+function getNameForElem(element: HTMLElement) {
+  if (element.id) {
+    return `#${element.id}`;
+  }
+  const parts = [
+    element.tagName.toLowerCase(),
+    element.className && typeof element.className === 'string'
+      ? `.${element.className.split(' ').filter(Boolean).join('.')}`
+      : '',
+  ];
+  const attrs = [
+    'data-sentry-element',
+    'data-sentry-source-file',
+    'data-test-id',
+    'data-testid',
+  ];
+  for (const attr of attrs) {
+    const value = element.getAttribute(attr);
+    if (value) {
+      parts.push(`[${attr}=${value}]`);
+    }
+  }
+  return parts.join('');
+}
+
+// Copy Selector => `#blk_router > div.tsqd-parent-container > div > div`
+// Copy JS Path => `document.querySelector("#blk_router > div.tsqd-parent-container > div > div")`
+// Copy XPath => `//*[@id="blk_router"]/div[2]/div/div`
+// Copy Full XPath => `/html/body/div[1]/div[2]/div/div`
+function getSelectorForElem(element: HTMLElement): string {
+  const parts: string[] = [];
+  let elem: HTMLElement | null =
+    element.nodeType !== Node.ELEMENT_NODE ? element.parentElement : element;
+
+  while (elem) {
+    parts.unshift(getNameForElem(elem));
+    if (elem.id !== '' || (elem.getAttribute('data-sentry-element') ?? '') !== '') {
+      break;
+    }
+    elem = elem.parentElement;
+  }
+  return parts.join(' > ');
+}
+
+interface Props {
+  leftOffsetMs: number;
+  replay: ReplayReader;
+  rightOffsetMs: number;
+}
+
+export default function useExtractDiffMutations({
+  leftOffsetMs,
+  replay,
+  rightOffsetMs,
+}: Props): UseQueryResult<Map<ReplayFrame, DiffMutation>> {
+  const startTimestampMs = replay.getReplay().started_at.getTime();
+  const rangeStartTimestampMs = startTimestampMs + leftOffsetMs;
+  const rangeEndTimestampMs = startTimestampMs + rightOffsetMs;
+
+  return useQuery({
+    queryKey: [
+      'extractDiffMutations',
+      replay,
+      rangeStartTimestampMs,
+      rangeEndTimestampMs,
+    ],
+    queryFn: () =>
+      extractDiffMutations({replay, rangeStartTimestampMs, rangeEndTimestampMs}),
+    enabled: true,
+    gcTime: Infinity,
+  });
+}
diff --git a/static/app/utils/replays/hooks/useExtractDomNodes.tsx b/static/app/utils/replays/hooks/useExtractDomNodes.tsx
index 2d0dfbcc8e13ac..6a676364c119f4 100644
--- a/static/app/utils/replays/hooks/useExtractDomNodes.tsx
+++ b/static/app/utils/replays/hooks/useExtractDomNodes.tsx
@@ -1,5 +1,5 @@
 import {useQuery, type UseQueryResult} from 'sentry/utils/queryClient';
-import type {Extraction} from 'sentry/utils/replays/extractHtml';
+import type {Extraction} from 'sentry/utils/replays/extractDomNodes';
 import type ReplayReader from 'sentry/utils/replays/replayReader';
 import type {ReplayFrame} from 'sentry/utils/replays/types';
 
@@ -10,9 +10,7 @@ export default function useExtractDomNodes({
 }): UseQueryResult<Map<ReplayFrame, Extraction>> {
   return useQuery({
     queryKey: ['getDomNodes', replay],
-    queryFn: () => {
-      return replay?.getExtractDomNodes();
-    },
+    queryFn: () => replay?.getExtractDomNodes(),
     enabled: Boolean(replay),
     gcTime: Infinity,
   });
diff --git a/static/app/utils/replays/hydrateBreadcrumbs.tsx b/static/app/utils/replays/hydrateBreadcrumbs.tsx
index 88399d7a16059f..00612137650dff 100644
--- a/static/app/utils/replays/hydrateBreadcrumbs.tsx
+++ b/static/app/utils/replays/hydrateBreadcrumbs.tsx
@@ -27,8 +27,12 @@ export default function hydrateBreadcrumbs(
         }
         return {
           ...frame,
+          // Logcat and Timber are used for mobile replays and are considered a console frame instead of a custom breadcrumb frame
           // custom frames might not have a defined category, so we need to set one
-          category: frame.category || defaultTitle(frame) || 'custom',
+          category:
+            frame.category === 'Logcat' || frame.category === 'Timber'
+              ? 'console'
+              : frame.category || defaultTitle(frame) || 'custom',
           offsetMs: Math.abs(time.getTime() - startTimestampMs),
           timestamp: time,
           timestampMs: time.getTime(),
diff --git a/static/app/utils/replays/replayReader.tsx b/static/app/utils/replays/replayReader.tsx
index 796500c52f8b2b..d66577036532b8 100644
--- a/static/app/utils/replays/replayReader.tsx
+++ b/static/app/utils/replays/replayReader.tsx
@@ -6,7 +6,7 @@ import {defined} from 'sentry/utils';
 import domId from 'sentry/utils/domId';
 import localStorageWrapper from 'sentry/utils/localStorage';
 import clamp from 'sentry/utils/number/clamp';
-import extractHtmlandSelector from 'sentry/utils/replays/extractHtml';
+import extractDomNodes from 'sentry/utils/replays/extractDomNodes';
 import hydrateBreadcrumbs, {
   replayInitBreadcrumb,
 } from 'sentry/utils/replays/hydrateBreadcrumbs';
@@ -28,7 +28,6 @@ import type {
   MemoryFrame,
   OptionFrame,
   RecordingFrame,
-  ReplayFrame,
   serializedNodeWithId,
   SlowClickFrame,
   SpanFrame,
@@ -38,13 +37,17 @@ import type {
 import {
   BreadcrumbCategories,
   EventType,
-  getNodeIds,
   IncrementalSource,
   isCLSFrame,
+  isConsoleFrame,
   isDeadClick,
   isDeadRageClick,
+  isMetaFrame,
   isPaintFrame,
+  isTouchEndFrame,
+  isTouchStartFrame,
   isWebVitalFrame,
+  NodeType,
 } from 'sentry/utils/replays/types';
 import type {ReplayError, ReplayRecord} from 'sentry/views/replays/types';
 
@@ -148,24 +151,6 @@ function removeDuplicateNavCrumbs(
   return otherBreadcrumbFrames.concat(uniqueNavCrumbs);
 }
 
-const extractDomNodes = {
-  shouldVisitFrame: frame => {
-    const nodeIds = getNodeIds(frame);
-    return nodeIds.filter(nodeId => nodeId !== -1).length > 0;
-  },
-  onVisitFrame: (frame, collection, replayer) => {
-    const mirror = replayer.getMirror();
-    const nodeIds = getNodeIds(frame);
-    const {html, selectors} = extractHtmlandSelector((nodeIds ?? []) as number[], mirror);
-    collection.set(frame as ReplayFrame, {
-      frame,
-      html,
-      selectors,
-      timestamp: frame.timestampMs,
-    });
-  },
-};
-
 export default class ReplayReader {
   static factory({
     attachments,
@@ -493,6 +478,68 @@ export default class ReplayReader {
 
   getRRWebFrames = () => this._sortedRRWebEvents;
 
+  getRRWebFramesWithSnapshots = memoize(() => {
+    const eventsWithSnapshots: RecordingFrame[] = [];
+    const events = this._sortedRRWebEvents;
+    events.forEach((e, index) => {
+      // For taps, sometimes the timestamp difference between TouchStart
+      // and TouchEnd is too small. This clamps the tap to a min time
+      // if the difference is less, so that the rrweb tap is visible and obvious.
+      if (isTouchStartFrame(e) && index < events.length - 2) {
+        const nextEvent = events[index + 1];
+        if (isTouchEndFrame(nextEvent)) {
+          nextEvent.timestamp = Math.max(nextEvent.timestamp, e.timestamp + 500);
+        }
+      }
+      eventsWithSnapshots.push(e);
+      if (isMetaFrame(e)) {
+        // Create a mock full snapshot event, in order to render rrweb gestures properly
+        // Need to add one for every meta event we see
+        // The hardcoded data.node.id here should match the ID of the data being sent
+        // in the `positions` arrays
+        eventsWithSnapshots.push({
+          type: EventType.FullSnapshot,
+          data: {
+            node: {
+              type: NodeType.Document,
+              childNodes: [
+                {
+                  type: NodeType.DocumentType,
+                  id: 1,
+                  name: 'html',
+                  publicId: '',
+                  systemId: '',
+                },
+                {
+                  type: NodeType.Element,
+                  id: 2,
+                  tagName: 'html',
+                  attributes: {
+                    lang: 'en',
+                  },
+                  childNodes: [],
+                },
+              ],
+              id: 0,
+            },
+            initialOffset: {
+              top: 0,
+              left: 0,
+            },
+          },
+          timestamp: e.timestamp,
+        });
+      }
+    });
+    return eventsWithSnapshots;
+  });
+
+  getRRwebTouchEvents = memoize(() =>
+    this.getRRWebFramesWithSnapshots().filter(
+      e => isTouchEndFrame(e) || isTouchStartFrame(e)
+    )
+  );
+
   getBreadcrumbFrames = () => this._sortedBreadcrumbFrames;
 
   getRRWebMutations = () =>
@@ -507,7 +554,7 @@ export default class ReplayReader {
   getErrorFrames = () => this._errors;
 
   getConsoleFrames = memoize(() =>
-    this._sortedBreadcrumbFrames.filter(frame => frame.category === 'console')
+    this._sortedBreadcrumbFrames.filter(frame => isConsoleFrame(frame))
   );
 
   getNavigationFrames = memoize(() =>
diff --git a/static/app/utils/theme.tsx b/static/app/utils/theme.tsx
index 6ac039fa063092..1ccd40caf556b4 100644
--- a/static/app/utils/theme.tsx
+++ b/static/app/utils/theme.tsx
@@ -417,7 +417,7 @@ const dataCategory = {
   [DATA_CATEGORY_INFO.transaction.plural]: CHART_PALETTE[4][2],
   [DATA_CATEGORY_INFO.attachment.plural]: CHART_PALETTE[4][1],
   [DATA_CATEGORY_INFO.replay.plural]: CHART_PALETTE[4][4],
-  [DATA_CATEGORY_INFO.monitorSeat.plural]: CHART_PALETTE[4][5],
+  [DATA_CATEGORY_INFO.monitorSeat.plural]: '#a397f7',
 };
 
 /**
@@ -743,6 +743,9 @@ const commonTheme = {
 
     globalSelectionHeader: 1009,
 
+    // needs to be below sidebar
+    widgetBuilderDrawer: 1016,
+
     settingsSidebarNavMask: 1017,
     settingsSidebarNav: 1018,
     sidebarPanel: 1019,
diff --git a/static/app/utils/url/useLocationQuery.tsx b/static/app/utils/url/useLocationQuery.tsx
index ad7ceeb97388f1..fd211759014868 100644
--- a/static/app/utils/url/useLocationQuery.tsx
+++ b/static/app/utils/url/useLocationQuery.tsx
@@ -10,7 +10,7 @@ import {
 import {useLocation} from 'sentry/utils/useLocation';
 
 type Scalar = string | boolean | number | undefined;
-type Decoder =
+export type Decoder =
   | typeof decodeInteger
   | typeof decodeList
   | typeof decodeScalar
diff --git a/static/app/utils/useDeploys.tsx b/static/app/utils/useDeploys.tsx
new file mode 100644
index 00000000000000..14cbb5981e230a
--- /dev/null
+++ b/static/app/utils/useDeploys.tsx
@@ -0,0 +1,26 @@
+import type {Deploy} from 'sentry/types/release';
+import {type ApiQueryKey, useApiQuery} from 'sentry/utils/queryClient';
+
+function getDeploysQueryKey({
+  orgSlug,
+  releaseVersion,
+}: {
+  orgSlug: string;
+  releaseVersion: string;
+}): ApiQueryKey {
+  return [
+    `/organizations/${orgSlug}/releases/${encodeURIComponent(releaseVersion)}/deploys/`,
+  ];
+}
+
+export function useDeploys({
+  orgSlug,
+  releaseVersion,
+}: {
+  orgSlug: string;
+  releaseVersion: string;
+}) {
+  return useApiQuery<Deploy[]>(getDeploysQueryKey({orgSlug, releaseVersion}), {
+    staleTime: Infinity,
+  });
+}
diff --git a/static/app/utils/useRelease.tsx b/static/app/utils/useRelease.tsx
new file mode 100644
index 00000000000000..39802ed9f4de84
--- /dev/null
+++ b/static/app/utils/useRelease.tsx
@@ -0,0 +1,33 @@
+import type {Release} from 'sentry/types/release';
+import {type ApiQueryKey, useApiQuery} from 'sentry/utils/queryClient';
+
+function getReleaseQueryKey({
+  orgSlug,
+  projectSlug,
+  releaseVersion,
+}: {
+  orgSlug: string;
+  projectSlug: string;
+  releaseVersion: string;
+}): ApiQueryKey {
+  return [
+    `/projects/${orgSlug}/${projectSlug}/releases/${encodeURIComponent(releaseVersion)}/`,
+  ];
+}
+
+export function useRelease({
+  orgSlug,
+  projectSlug,
+  releaseVersion,
+}: {
+  orgSlug: string;
+  projectSlug: string;
+  releaseVersion: string;
+}) {
+  return useApiQuery<Release>(
+    getReleaseQueryKey({orgSlug, projectSlug, releaseVersion}),
+    {
+      staleTime: Infinity,
+    }
+  );
+}
diff --git a/static/app/utils/useReleaseRepositories.tsx b/static/app/utils/useReleaseRepositories.tsx
new file mode 100644
index 00000000000000..47e6108f1ee2b1
--- /dev/null
+++ b/static/app/utils/useReleaseRepositories.tsx
@@ -0,0 +1,46 @@
+import type {Repository} from 'sentry/types/integrations';
+import {
+  type ApiQueryKey,
+  useApiQuery,
+  type UseApiQueryOptions,
+} from 'sentry/utils/queryClient';
+
+function getReleaseRepositoriesQueryKey({
+  orgSlug,
+  projectSlug,
+  release,
+}: {
+  orgSlug: string;
+  projectSlug: string;
+  release: string;
+}): ApiQueryKey {
+  return [
+    `/projects/${orgSlug}/${projectSlug}/releases/${encodeURIComponent(release)}/repositories/`,
+  ];
+}
+
+interface UseReleaseReposProps {
+  orgSlug: string;
+  projectSlug: string;
+  release: string;
+  options?: Partial<UseApiQueryOptions<Repository[]>>;
+}
+
+export function useReleaseRepositories({
+  orgSlug,
+  projectSlug,
+  release,
+  options,
+}: UseReleaseReposProps) {
+  return useApiQuery<Repository[]>(
+    getReleaseRepositoriesQueryKey({
+      orgSlug,
+      projectSlug,
+      release,
+    }),
+    {
+      staleTime: Infinity,
+      ...options,
+    }
+  );
+}
diff --git a/static/app/utils/useRepositories.tsx b/static/app/utils/useRepositories.tsx
new file mode 100644
index 00000000000000..4c7222f1708fe8
--- /dev/null
+++ b/static/app/utils/useRepositories.tsx
@@ -0,0 +1,12 @@
+import type {Repository} from 'sentry/types/integrations';
+import {type ApiQueryKey, useApiQuery} from 'sentry/utils/queryClient';
+
+function getRepositoriesQueryKey({orgSlug}: {orgSlug: string}): ApiQueryKey {
+  return [`/organizations/${orgSlug}/repos/`];
+}
+
+export function useRepositories({orgSlug}: {orgSlug: string}) {
+  return useApiQuery<Repository[]>(getRepositoriesQueryKey({orgSlug}), {
+    staleTime: Infinity,
+  });
+}
diff --git a/static/app/utils/withRelease.spec.tsx b/static/app/utils/withRelease.spec.tsx
deleted file mode 100644
index a81c039e587b7b..00000000000000
--- a/static/app/utils/withRelease.spec.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import {OrganizationFixture} from 'sentry-fixture/organization';
-
-import {render, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import ReleaseStore from 'sentry/stores/releaseStore';
-import withRelease from 'sentry/utils/withRelease';
-
-describe('withRelease HoC', function () {
-  const organization = OrganizationFixture();
-  const orgSlug = organization.slug;
-  const projectSlug = 'myProject';
-  const releaseVersion = 'myRelease';
-
-  const releaseUrl = `/projects/${orgSlug}/${projectSlug}/releases/${encodeURIComponent(
-    releaseVersion
-  )}/`;
-  const deployUrl = `/organizations/${orgSlug}/releases/${encodeURIComponent(
-    releaseVersion
-  )}/deploys/`;
-
-  const api = new MockApiClient();
-  const mockData = {id: '1'};
-
-  beforeEach(() => {
-    MockApiClient.clearMockResponses();
-    MockApiClient.addMockResponse({
-      url: releaseUrl,
-      body: mockData,
-    });
-    MockApiClient.addMockResponse({
-      url: deployUrl,
-      body: [mockData],
-    });
-
-    jest.restoreAllMocks();
-    ReleaseStore.reset();
-  });
-
-  it('adds release/deploys prop', async function () {
-    const Component = jest.fn(() => null);
-    const Container = withRelease(Component);
-    render(
-      <Container
-        api={api}
-        organization={organization}
-        projectSlug={projectSlug}
-        releaseVersion={releaseVersion}
-      />
-    );
-
-    await waitFor(() =>
-      expect(Component).toHaveBeenCalledWith(
-        expect.objectContaining({
-          release: mockData,
-          releaseLoading: false,
-          releaseError: undefined,
-          deploys: [mockData],
-          deploysLoading: false,
-          deploysError: undefined,
-        }),
-        {}
-      )
-    );
-  });
-
-  it('prevents repeated calls', async function () {
-    const Component = jest.fn(() => null);
-    const Container = withRelease(Component);
-
-    jest.spyOn(api, 'requestPromise');
-    jest.spyOn(Container.prototype, 'fetchRelease');
-    jest.spyOn(Container.prototype, 'fetchDeploys');
-
-    // Mount and run component
-    render(
-      <Container
-        api={api}
-        organization={organization}
-        projectSlug={projectSlug}
-        releaseVersion={releaseVersion}
-      />
-    );
-
-    // Mount and run duplicates
-    render(
-      <Container
-        api={api}
-        organization={organization}
-        projectSlug={projectSlug}
-        releaseVersion={releaseVersion}
-      />
-    );
-
-    render(
-      <Container
-        api={api}
-        organization={organization}
-        projectSlug={projectSlug}
-        releaseVersion={releaseVersion}
-      />
-    );
-
-    await waitFor(() => expect(api.requestPromise).toHaveBeenCalledTimes(2)); // 1 for fetchRelease, 1 for fetchDeploys
-    expect(Container.prototype.fetchRelease).toHaveBeenCalledTimes(3);
-    expect(Container.prototype.fetchDeploys).toHaveBeenCalledTimes(3);
-  });
-});
diff --git a/static/app/utils/withRelease.tsx b/static/app/utils/withRelease.tsx
deleted file mode 100644
index cb4dc5caa8db38..00000000000000
--- a/static/app/utils/withRelease.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import {Component} from 'react';
-
-import {getProjectRelease, getReleaseDeploys} from 'sentry/actionCreators/release';
-import type {Client} from 'sentry/api';
-import ReleaseStore from 'sentry/stores/releaseStore';
-import type {Organization} from 'sentry/types/organization';
-import type {Deploy, Release} from 'sentry/types/release';
-import getDisplayName from 'sentry/utils/getDisplayName';
-
-type DependentProps = {
-  api: Client;
-  organization: Organization;
-  projectSlug: string;
-  releaseVersion: string;
-};
-
-type InjectedProps = {
-  deploys?: Array<Deploy>;
-  deploysError?: Error;
-  deploysLoading?: boolean;
-  release?: Release;
-  releaseError?: Error;
-  releaseLoading?: boolean;
-};
-
-function withRelease<P extends DependentProps>(WrappedComponent: React.ComponentType<P>) {
-  class WithRelease extends Component<
-    Omit<P, keyof InjectedProps> & Partial<InjectedProps> & DependentProps,
-    InjectedProps
-  > {
-    static displayName = `withRelease(${getDisplayName(WrappedComponent)})`;
-
-    constructor(props, context) {
-      super(props, context);
-
-      const {projectSlug, releaseVersion} = this.props;
-      const releaseData = ReleaseStore.get(projectSlug, releaseVersion);
-      this.state = {...releaseData};
-    }
-
-    componentDidMount() {
-      this.fetchRelease();
-      this.fetchDeploys();
-    }
-
-    componentWillUnmount() {
-      this.unsubscribe();
-    }
-
-    unsubscribe = ReleaseStore.listen(() => this.onStoreUpdate(), undefined);
-
-    fetchRelease() {
-      const {api, organization, projectSlug, releaseVersion} = this.props;
-      const releaseData = ReleaseStore.get(projectSlug, releaseVersion);
-      const orgSlug = organization.slug;
-
-      if (
-        (!releaseData.release && !releaseData.releaseLoading) ||
-        releaseData.releaseError
-      ) {
-        getProjectRelease(api, {orgSlug, projectSlug, releaseVersion});
-      }
-    }
-
-    fetchDeploys() {
-      const {api, organization, projectSlug, releaseVersion} = this.props;
-      const releaseData = ReleaseStore.get(projectSlug, releaseVersion);
-      const orgSlug = organization.slug;
-
-      if (
-        (!releaseData.deploys && !releaseData.deploysLoading) ||
-        releaseData.deploysError
-      ) {
-        getReleaseDeploys(api, {orgSlug, projectSlug, releaseVersion});
-      }
-    }
-
-    onStoreUpdate() {
-      const {projectSlug, releaseVersion} = this.props;
-      const releaseData = ReleaseStore.get(projectSlug, releaseVersion);
-
-      this.setState({...releaseData});
-    }
-
-    render() {
-      return (
-        <WrappedComponent
-          {...(this.props as P & DependentProps)}
-          {...(this.state as InjectedProps)}
-        />
-      );
-    }
-  }
-  return WithRelease;
-}
-
-export default withRelease;
diff --git a/static/app/utils/withRepositories.spec.tsx b/static/app/utils/withRepositories.spec.tsx
deleted file mode 100644
index aac95f0ca34482..00000000000000
--- a/static/app/utils/withRepositories.spec.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import {OrganizationFixture} from 'sentry-fixture/organization';
-
-import {render, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import RepositoryStore from 'sentry/stores/repositoryStore';
-import withRepositories from 'sentry/utils/withRepositories';
-
-describe('withRepositories HoC', function () {
-  const organization = OrganizationFixture();
-  const orgSlug = organization.slug;
-  const repoUrl = `/organizations/${orgSlug}/repos/`;
-
-  const api = new MockApiClient();
-  const mockData = [{id: '1'}];
-
-  beforeEach(() => {
-    MockApiClient.clearMockResponses();
-    MockApiClient.addMockResponse({
-      url: repoUrl,
-      body: mockData,
-    });
-
-    jest.restoreAllMocks();
-    RepositoryStore.init?.();
-  });
-
-  it('adds repositories prop', async function () {
-    const Component = jest.fn(() => null);
-    const Container = withRepositories(Component);
-    render(<Container api={api} organization={organization} />);
-
-    await waitFor(() =>
-      expect(Component).toHaveBeenCalledWith(
-        expect.objectContaining({
-          repositories: mockData,
-          repositoriesLoading: false,
-          repositoriesError: undefined,
-        }),
-        {}
-      )
-    );
-  });
-
-  it('prevents repeated calls', async function () {
-    function Component() {
-      return null;
-    }
-    const Container = withRepositories(Component);
-
-    jest.spyOn(api, 'requestPromise');
-    jest.spyOn(Container.prototype, 'fetchRepositories');
-
-    // Mount and run component
-    render(<Container api={api} organization={organization} />);
-
-    // Mount and run duplicates
-    render(<Container api={api} organization={organization} />);
-    render(<Container api={api} organization={organization} />);
-
-    await waitFor(() => expect(api.requestPromise).toHaveBeenCalledTimes(1));
-    expect(Container.prototype.fetchRepositories).toHaveBeenCalledTimes(3);
-  });
-
-  /**
-   * Same as 'prevents repeated calls', but with the async fetch/checks
-   * happening on same tick.
-   *
-   * Additionally, this test checks that withRepositories.fetchRepositories does
-   * not check for (store.orgSlug !== orgSlug) as the short-circuit does not
-   * change the value for orgSlug
-   */
-  it('prevents simultaneous calls', async function () {
-    function Component() {
-      return null;
-    }
-    const Container = withRepositories(Component);
-
-    jest.spyOn(api, 'requestPromise');
-    jest.spyOn(Container.prototype, 'componentDidMount');
-
-    // Mount and run duplicates
-    render(<Container api={api} organization={organization} />);
-    render(<Container api={api} organization={organization} />);
-    render(<Container api={api} organization={organization} />);
-
-    await waitFor(() => expect(api.requestPromise).toHaveBeenCalledTimes(1));
-    expect(Container.prototype.componentDidMount).toHaveBeenCalledTimes(3);
-  });
-});
diff --git a/static/app/utils/withRepositories.tsx b/static/app/utils/withRepositories.tsx
deleted file mode 100644
index b2e121ec323350..00000000000000
--- a/static/app/utils/withRepositories.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import {Component} from 'react';
-
-import {getRepositories} from 'sentry/actionCreators/repositories';
-import type {Client} from 'sentry/api';
-import RepositoryStore from 'sentry/stores/repositoryStore';
-import type {Repository} from 'sentry/types/integrations';
-import type {Organization} from 'sentry/types/organization';
-import getDisplayName from 'sentry/utils/getDisplayName';
-
-type DependentProps = {
-  api: Client;
-  organization: Organization;
-};
-
-type InjectedProps = {
-  repositories?: Repository[];
-  repositoriesError?: Error;
-  repositoriesLoading?: boolean;
-};
-
-const INITIAL_STATE: InjectedProps = {
-  repositories: undefined,
-  repositoriesLoading: undefined,
-  repositoriesError: undefined,
-};
-
-function withRepositories<P extends DependentProps>(
-  WrappedComponent: React.ComponentType<P>
-) {
-  class WithRepositories extends Component<P & DependentProps, InjectedProps> {
-    static displayName = `withRepositories(${getDisplayName(WrappedComponent)})`;
-
-    constructor(props: P & DependentProps, context: any) {
-      super(props, context);
-
-      const repoData = RepositoryStore.get();
-
-      this.state =
-        repoData.orgSlug === props.organization.slug
-          ? {...INITIAL_STATE, ...repoData}
-          : {...INITIAL_STATE};
-    }
-
-    componentDidMount() {
-      const {organization} = this.props;
-      const orgSlug = organization.slug;
-      const repoData = RepositoryStore.get();
-
-      if (repoData.orgSlug !== orgSlug) {
-        RepositoryStore.resetRepositories();
-      }
-
-      // XXX(leedongwei): Do not move this function call unless you modify the
-      // unit test named "prevents repeated calls"
-      this.fetchRepositories();
-    }
-    componentWillUnmount() {
-      this.unsubscribe();
-    }
-    unsubscribe = RepositoryStore.listen(() => this.onStoreUpdate(), undefined);
-
-    fetchRepositories() {
-      const {api, organization} = this.props;
-      const orgSlug = organization.slug;
-      const repoData = RepositoryStore.get();
-
-      // XXX(leedongwei): Do not check the orgSlug here. It would have been
-      // verified at `getInitialState`. The short-circuit hack in actionCreator
-      // does not update the orgSlug in the store.
-      if (
-        (!repoData.repositories && !repoData.repositoriesLoading) ||
-        repoData.repositoriesError
-      ) {
-        getRepositories(api, {orgSlug});
-      }
-    }
-
-    onStoreUpdate() {
-      const repoData = RepositoryStore.get();
-      this.setState({...repoData});
-    }
-
-    render() {
-      return <WrappedComponent {...this.props} {...this.state} />;
-    }
-  }
-
-  return WithRepositories;
-}
-
-export default withRepositories;
diff --git a/static/app/views/acceptOrganizationInvite/index.spec.tsx b/static/app/views/acceptOrganizationInvite/index.spec.tsx
index f42ffe00735372..e449adabec9cb4 100644
--- a/static/app/views/acceptOrganizationInvite/index.spec.tsx
+++ b/static/app/views/acceptOrganizationInvite/index.spec.tsx
@@ -100,6 +100,27 @@ describe('AcceptOrganizationInvite', function () {
     expect(browserHistory.replace).toHaveBeenCalledWith('/org-slug/');
   });
 
+  it('renders error message', function () {
+    MockApiClient.addMockResponse({
+      url: '/accept-invite/1/abc/',
+      method: 'GET',
+      statusCode: 400,
+      body: {detail: 'uh oh'},
+    });
+
+    render(
+      <AcceptOrganizationInvite
+        {...RouteComponentPropsFixture()}
+        params={{memberId: '1', token: 'abc'}}
+      />
+    );
+    expect(getJoinButton()).not.toBeInTheDocument();
+
+    expect(
+      screen.getByRole('link', {name: 'sign in with a different account'})
+    ).toBeInTheDocument();
+  });
+
   it('requires authentication to join', function () {
     addMock({
       orgSlug: organization.slug,
diff --git a/static/app/views/acceptOrganizationInvite/index.tsx b/static/app/views/acceptOrganizationInvite/index.tsx
index 6e26939c2f1880..5c8d94391208cd 100644
--- a/static/app/views/acceptOrganizationInvite/index.tsx
+++ b/static/app/views/acceptOrganizationInvite/index.tsx
@@ -65,6 +65,12 @@ class AcceptOrganizationInvite extends DeprecatedAsyncView<Props, State> {
     logout(this.api);
   };
 
+  handleLogoutAndRetry = (e: React.MouseEvent) => {
+    const {memberId, token} = this.props.params;
+    e.preventDefault();
+    logout(this.api, `/accept/${memberId}/${token}/`);
+  };
+
   handleAcceptInvite = async () => {
     const {memberId, token} = this.props.params;
 
@@ -249,10 +255,28 @@ class AcceptOrganizationInvite extends DeprecatedAsyncView<Props, State> {
   }
 
   renderError() {
+    /**
+     * NOTE (mifu67): this error view could show up for multiple reasons, including:
+     * invite link expired, signed into account that is already in the inviting
+     * org, and invite not approved. Previously, the message seemed to indivate that
+     * the link had expired, regardless of which error prompted it, so update the
+     * error message to be a little more helpful.
+     */
     return (
       <NarrowLayout>
         <Alert type="warning">
-          {t('This organization invite link is no longer valid.')}
+          {tct(
+            'This organization invite link is invalid. It may be expired, or you may need to [switchLink:sign in with a different account].',
+            {
+              switchLink: (
+                <Link
+                  to=""
+                  data-test-id="existing-member-link"
+                  onClick={this.handleLogoutAndRetry}
+                />
+              ),
+            }
+          )}
         </Alert>
       </NarrowLayout>
     );
diff --git a/static/app/views/alerts/rules/metric/details/body.tsx b/static/app/views/alerts/rules/metric/details/body.tsx
index b22a7753ca7449..f9bfceb0f5da68 100644
--- a/static/app/views/alerts/rules/metric/details/body.tsx
+++ b/static/app/views/alerts/rules/metric/details/body.tsx
@@ -32,7 +32,6 @@ import {
   TimePeriod,
 } from 'sentry/views/alerts/rules/metric/types';
 import {extractEventTypeFilterFromRule} from 'sentry/views/alerts/rules/metric/utils/getEventTypeFilter';
-import {isInsightsMetricAlert} from 'sentry/views/alerts/rules/metric/utils/isInsightsMetricAlert';
 import {isOnDemandMetricAlert} from 'sentry/views/alerts/rules/metric/utils/onDemandMetricAlert';
 import {getAlertRuleActionCategory} from 'sentry/views/alerts/rules/utils';
 import type {Anomaly, Incident} from 'sentry/views/alerts/types';
@@ -179,7 +178,7 @@ export default function MetricDetailsBody({
 
   return (
     <Fragment>
-      {isCustomMetricAlert(rule.aggregate) && !isInsightsMetricAlert(rule.aggregate) && (
+      {isCustomMetricAlert(rule.aggregate) && (
         <StyledLayoutBody>
           <MetricsBetaEndAlert style={{marginBottom: 0}} organization={organization} />
         </StyledLayoutBody>
diff --git a/static/app/views/alerts/rules/metric/details/metricChart.tsx b/static/app/views/alerts/rules/metric/details/metricChart.tsx
index 62d210986a0a88..5ec93e2e362aae 100644
--- a/static/app/views/alerts/rules/metric/details/metricChart.tsx
+++ b/static/app/views/alerts/rules/metric/details/metricChart.tsx
@@ -579,7 +579,6 @@ class MetricChart extends PureComponent<Props, State> {
       }
     }
 
-    const alertType = getAlertTypeFromAggregateDataset(rule);
     const queryExtras: Record<string, string> = {
       ...getMetricDatasetQueryExtras({
         organization,
@@ -588,7 +587,7 @@ class MetricChart extends PureComponent<Props, State> {
         newAlertOrQuery: false,
         useOnDemandMetrics: isOnDemandAlert,
       }),
-      ...getForceMetricsLayerQueryExtras(organization, dataset, alertType),
+      ...getForceMetricsLayerQueryExtras(organization, dataset),
     };
 
     if (shouldUseErrorsDataset(dataset, query)) {
diff --git a/static/app/views/alerts/rules/metric/eapField.spec.tsx b/static/app/views/alerts/rules/metric/eapField.spec.tsx
index 7960443457f89d..55ed3e3ea220ec 100644
--- a/static/app/views/alerts/rules/metric/eapField.spec.tsx
+++ b/static/app/views/alerts/rules/metric/eapField.spec.tsx
@@ -2,7 +2,9 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 
 import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
+import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import EAPField from 'sentry/views/alerts/rules/metric/eapField';
+import {SpanTagsProvider} from 'sentry/views/explore/contexts/spanTagsContext';
 
 describe('EAPField', () => {
   const organization = OrganizationFixture();
@@ -16,7 +18,11 @@ describe('EAPField', () => {
   });
 
   it('renders', () => {
-    render(<EAPField aggregate={'count(span.duration)'} onChange={() => {}} />);
+    render(
+      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+        <EAPField aggregate={'count(span.duration)'} onChange={() => {}} />
+      </SpanTagsProvider>
+    );
     expect(fieldsMock).toHaveBeenCalledWith(
       `/organizations/${organization.slug}/spans/fields/`,
       expect.objectContaining({
@@ -35,7 +41,11 @@ describe('EAPField', () => {
 
   it('should call onChange with the new aggregate string when switching aggregates', async () => {
     const onChange = jest.fn();
-    render(<EAPField aggregate={'count(span.duration)'} onChange={onChange} />);
+    render(
+      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+        <EAPField aggregate={'count(span.duration)'} onChange={onChange} />
+      </SpanTagsProvider>
+    );
     expect(fieldsMock).toHaveBeenCalledWith(
       `/organizations/${organization.slug}/spans/fields/`,
       expect.objectContaining({
diff --git a/static/app/views/alerts/rules/metric/eapField.tsx b/static/app/views/alerts/rules/metric/eapField.tsx
index 908a4983a39ae0..864de1a1d6abed 100644
--- a/static/app/views/alerts/rules/metric/eapField.tsx
+++ b/static/app/views/alerts/rules/metric/eapField.tsx
@@ -5,16 +5,12 @@ import SelectControl from 'sentry/components/forms/controls/selectControl';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {parseFunction} from 'sentry/utils/discover/fields';
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {ALLOWED_EXPLORE_VISUALIZE_AGGREGATES} from 'sentry/utils/fields';
 import {
   DEFAULT_EAP_FIELD,
   DEFAULT_EAP_METRICS_ALERT_FIELD,
 } from 'sentry/utils/metrics/mri';
-import {
-  SpanTagsProvider,
-  useSpanTags,
-} from 'sentry/views/explore/contexts/spanTagsContext';
+import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
 
 interface Props {
   aggregate: string;
@@ -30,11 +26,7 @@ const OPERATIONS = [
 ];
 
 function EAPFieldWrapper({aggregate, onChange}: Props) {
-  return (
-    <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP}>
-      <EAPField aggregate={aggregate} onChange={onChange} />
-    </SpanTagsProvider>
-  );
+  return <EAPField aggregate={aggregate} onChange={onChange} />;
 }
 
 function EAPField({aggregate, onChange}: Props) {
@@ -102,9 +94,11 @@ function EAPField({aggregate, onChange}: Props) {
     [fieldsArray]
   );
 
+  const fieldName = fieldsArray.find(f => f.key === field)?.name;
+
   // When using the async variant of SelectControl, we need to pass in an option object instead of just the value
   const selectedOption = field && {
-    label: field,
+    label: fieldName,
     value: field,
   };
 
@@ -126,7 +120,6 @@ function EAPField({aggregate, onChange}: Props) {
         async
         defaultOptions={getFieldOptions('')}
         loadOptions={searchText => Promise.resolve(getFieldOptions(searchText))}
-        filterOption={() => true}
         value={selectedOption}
         onChange={handleFieldChange}
       />
diff --git a/static/app/views/alerts/rules/metric/insightsMetricField.spec.tsx b/static/app/views/alerts/rules/metric/insightsMetricField.spec.tsx
deleted file mode 100644
index f542bac8837076..00000000000000
--- a/static/app/views/alerts/rules/metric/insightsMetricField.spec.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import {initializeOrg} from 'sentry-test/initializeOrg';
-import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import InsightsMetricField from 'sentry/views/alerts/rules/metric/insightsMetricField';
-
-describe('InsightsMetricField', () => {
-  let metaMock;
-  beforeEach(() => {
-    metaMock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/metrics/meta/',
-      body: [
-        {
-          type: 'd',
-          name: 'exclusive_time',
-          unit: 'millisecond',
-          mri: 'd:spans/exclusive_time@millisecond',
-          operations: [
-            'avg',
-            'count',
-            'histogram',
-            'max',
-            'max_timestamp',
-            'min',
-            'min_timestamp',
-            'p50',
-            'p75',
-            'p90',
-            'p95',
-            'p99',
-            'sum',
-          ],
-          projectIds: [1],
-          blockingStatus: [],
-        },
-      ],
-    });
-  });
-
-  it('renders', async () => {
-    const {project} = initializeOrg();
-    render(
-      <InsightsMetricField
-        aggregate={'avg(d:spans/exclusive_time@millisecond)'}
-        onChange={() => {}}
-        project={project}
-      />
-    );
-    await waitFor(() => {
-      expect(metaMock).toHaveBeenCalledWith(
-        '/organizations/org-slug/metrics/meta/',
-        expect.objectContaining({
-          query: {
-            project: [2],
-            useCase: ['spans'],
-          },
-        })
-      );
-    });
-    screen.getByText('avg');
-    screen.getByText('span.exclusive_time');
-  });
-
-  it('should call onChange with the new aggregate string when switching aggregates', async () => {
-    const {project} = initializeOrg();
-    const onChange = jest.fn();
-    render(
-      <InsightsMetricField
-        aggregate={'avg(d:spans/exclusive_time@millisecond)'}
-        onChange={onChange}
-        project={project}
-      />
-    );
-    await userEvent.click(screen.getByText('avg'));
-    await userEvent.click(await screen.findByText('sum'));
-    await waitFor(() =>
-      expect(onChange).toHaveBeenCalledWith('sum(d:spans/exclusive_time@millisecond)', {})
-    );
-  });
-
-  it('should call onChange using the spm function with no arguments when switching to spm', async () => {
-    const {project} = initializeOrg();
-    const onChange = jest.fn();
-    render(
-      <InsightsMetricField
-        aggregate={'avg(d:spans/exclusive_time@millisecond)'}
-        onChange={onChange}
-        project={project}
-      />
-    );
-    await userEvent.click(screen.getByText('avg'));
-    await userEvent.click(await screen.findByText('spm'));
-    await waitFor(() => expect(onChange).toHaveBeenCalledWith('spm()', {}));
-  });
-
-  it('should call onChange using the http_response_rate function defaulting with argument 3 when switching to http_response_rate', async () => {
-    const {project} = initializeOrg();
-    const onChange = jest.fn();
-    render(
-      <InsightsMetricField
-        aggregate={'avg(d:spans/exclusive_time@millisecond)'}
-        onChange={onChange}
-        project={project}
-      />
-    );
-    await userEvent.click(screen.getByText('avg'));
-    await userEvent.click(await screen.findByText('http_response_rate'));
-    await waitFor(() =>
-      expect(onChange).toHaveBeenCalledWith('http_response_rate(3)', {})
-    );
-  });
-});
diff --git a/static/app/views/alerts/rules/metric/insightsMetricField.tsx b/static/app/views/alerts/rules/metric/insightsMetricField.tsx
deleted file mode 100644
index f8eb1be128b255..00000000000000
--- a/static/app/views/alerts/rules/metric/insightsMetricField.tsx
+++ /dev/null
@@ -1,266 +0,0 @@
-import {Fragment, useCallback, useEffect, useMemo} from 'react';
-import styled from '@emotion/styled';
-
-import Tag from 'sentry/components/badge/tag';
-import SelectControl from 'sentry/components/forms/controls/selectControl';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {MetricAggregation, MetricMeta, ParsedMRI} from 'sentry/types/metrics';
-import type {Project} from 'sentry/types/project';
-import {parseFunction} from 'sentry/utils/discover/fields';
-import {getDefaultAggregation} from 'sentry/utils/metrics';
-import {getReadableMetricType} from 'sentry/utils/metrics/formatters';
-import {
-  DEFAULT_INSIGHTS_METRICS_ALERT_FIELD,
-  DEFAULT_INSIGHTS_MRI,
-  formatMRI,
-  isMRI,
-  MRIToField,
-  parseMRI,
-} from 'sentry/utils/metrics/mri';
-import {useVirtualizedMetricsMeta} from 'sentry/utils/metrics/useMetricsMeta';
-import {middleEllipsis} from 'sentry/utils/string/middleEllipsis';
-import {
-  INSIGHTS_METRICS,
-  INSIGHTS_METRICS_OPERATIONS,
-  INSIGHTS_METRICS_OPERATIONS_WITH_CUSTOM_ARGS,
-  INSIGHTS_METRICS_OPERATIONS_WITHOUT_ARGS,
-} from 'sentry/views/alerts/rules/metric/utils/isInsightsMetricAlert';
-
-interface Props {
-  aggregate: string;
-  onChange: (value: string, meta: Record<string, any>) => void;
-  project: Project;
-}
-
-// We actually only store a few aggregations for Insights metrics.
-// The `metrics/meta/` endpoint doesn't know this, so hardcode supported aggregations for now.
-const OPERATIONS = [
-  {
-    label: 'avg',
-    value: 'avg',
-  },
-  {
-    label: 'sum',
-    value: 'sum',
-  },
-  {
-    label: 'min',
-    value: 'min',
-  },
-  {
-    label: 'max',
-    value: 'max',
-  },
-  ...INSIGHTS_METRICS_OPERATIONS.map(({label, value}) => ({label, value})),
-];
-
-function aggregateRequiresArgs(aggregation?: string) {
-  return !INSIGHTS_METRICS_OPERATIONS_WITHOUT_ARGS.some(
-    ({value}) => value === aggregation
-  );
-}
-
-function aggregateHasCustomArgs(aggregation?: string) {
-  return INSIGHTS_METRICS_OPERATIONS_WITH_CUSTOM_ARGS.some(
-    ({value}) => value === aggregation
-  );
-}
-
-function InsightsMetricField({aggregate, project, onChange}: Props) {
-  const {data: meta, isLoading} = useVirtualizedMetricsMeta(
-    {projects: [parseInt(project.id, 10)]},
-    ['spans']
-  );
-
-  const metaArr = useMemo(() => {
-    return meta
-      .map(
-        metric =>
-          ({
-            ...metric,
-            ...parseMRI(metric.mri),
-          }) as ParsedMRI & MetricMeta
-      )
-      .filter(metric => INSIGHTS_METRICS.includes(metric.mri));
-  }, [meta]);
-
-  // We parse out the aggregation and field from the aggregate string.
-  // This only works for aggregates with <= 1 argument.
-  const {
-    name: aggregation,
-    arguments: [field],
-  } = parseFunction(aggregate) ?? {arguments: [undefined]};
-
-  const selectedMriMeta = useMemo(() => {
-    return meta.find(metric => metric.mri === field);
-  }, [meta, field]);
-
-  useEffect(() => {
-    if (!aggregateRequiresArgs(aggregation)) {
-      return;
-    }
-    if (aggregation && aggregateHasCustomArgs(aggregation)) {
-      const options = INSIGHTS_METRICS_OPERATIONS_WITH_CUSTOM_ARGS.find(
-        ({value}) => value === aggregation
-      )?.options;
-      if (options && !options.some(({value}) => value === field)) {
-        onChange(`${aggregation}(${options?.[0].value})`, {});
-      }
-      return;
-    }
-    if (field && !selectedMriMeta && !isLoading) {
-      const newSelection = metaArr[0];
-      if (newSelection) {
-        onChange(MRIToField(newSelection.mri, 'avg'), {});
-      } else if (aggregate !== DEFAULT_INSIGHTS_METRICS_ALERT_FIELD) {
-        onChange(DEFAULT_INSIGHTS_METRICS_ALERT_FIELD, {});
-      }
-    }
-  }, [metaArr, onChange, isLoading, aggregate, selectedMriMeta, aggregation, field]);
-
-  const handleMriChange = useCallback(
-    option => {
-      const selectedMeta = meta.find(metric => metric.mri === option.value);
-      if (!selectedMeta) {
-        return;
-      }
-      const newType = parseMRI(option.value)?.type;
-      // If the type is the same, we can keep the current aggregate
-      if (newType === selectedMeta.type && aggregation) {
-        onChange(MRIToField(option.value, aggregation as MetricAggregation), {});
-      } else {
-        onChange(MRIToField(option.value, getDefaultAggregation(option.value)), {});
-      }
-    },
-    [meta, onChange, aggregation]
-  );
-
-  const handleOptionChange = useCallback(
-    option => {
-      if (!option || !aggregation) {
-        return;
-      }
-      onChange(`${aggregation}(${option.value})`, {});
-    },
-    [onChange, aggregation]
-  );
-
-  // As SelectControl does not support an options size limit out of the box
-  // we work around it by using the async variant of the control
-  const getMriOptions = useCallback(
-    (searchText: string) => {
-      const filteredMeta = metaArr.filter(
-        ({name}) =>
-          searchText === '' || name.toLowerCase().includes(searchText.toLowerCase())
-      );
-
-      const options = filteredMeta.splice(0, 100).map<{
-        label: React.ReactNode;
-        value: string;
-        disabled?: boolean;
-        trailingItems?: React.ReactNode;
-      }>(metric => ({
-        label: middleEllipsis(metric.name, 50, /\.|-|_/),
-        value: metric.mri,
-        trailingItems: (
-          <Fragment>
-            <Tag tooltipText={t('Type')}>{getReadableMetricType(metric.type)}</Tag>
-            <Tag tooltipText={t('Unit')}>{metric.unit}</Tag>
-          </Fragment>
-        ),
-      }));
-
-      if (filteredMeta.length > options.length) {
-        options.push({
-          label: (
-            <SizeLimitMessage>{t('Use search to find more options…')}</SizeLimitMessage>
-          ),
-          value: '',
-          disabled: true,
-        });
-      }
-      return options;
-    },
-    [metaArr]
-  );
-
-  // When using the async variant of SelectControl, we need to pass in an option object instead of just the value
-  const selectedOption = field && {
-    label: isMRI(field) ? formatMRI(field) : field,
-    value: field,
-  };
-
-  return (
-    <Wrapper>
-      <StyledSelectControl
-        searchable
-        isDisabled={isLoading}
-        placeholder={t('Select an operation')}
-        options={OPERATIONS}
-        value={aggregation}
-        onChange={option => {
-          if (!aggregateRequiresArgs(option.value)) {
-            onChange(`${option.value}()`, {});
-          } else if (aggregateHasCustomArgs(option.value)) {
-            const options = INSIGHTS_METRICS_OPERATIONS_WITH_CUSTOM_ARGS.find(
-              ({value}) => value === option.value
-            )?.options;
-            onChange(`${option.value}(${options?.[0].value})`, {});
-          } else if (field && isMRI(field)) {
-            onChange(MRIToField(field, option.value), {});
-          } else {
-            onChange(MRIToField(DEFAULT_INSIGHTS_MRI, option.value), {});
-          }
-        }}
-      />
-      {aggregateRequiresArgs(aggregation) &&
-        (aggregateHasCustomArgs(aggregation) ? (
-          <StyledSelectControl
-            searchable
-            placeholder={t('Select an option')}
-            options={
-              INSIGHTS_METRICS_OPERATIONS_WITH_CUSTOM_ARGS.find(
-                ({value}) => value === aggregation
-              )?.options
-            }
-            value={selectedOption}
-            onChange={handleOptionChange}
-          />
-        ) : (
-          <StyledSelectControl
-            searchable
-            isDisabled={isLoading}
-            placeholder={t('Select a metric')}
-            noOptionsMessage={() =>
-              metaArr.length === 0 ? t('No metrics in this project') : t('No options')
-            }
-            async
-            defaultOptions={getMriOptions('')}
-            loadOptions={searchText => Promise.resolve(getMriOptions(searchText))}
-            filterOption={() => true}
-            value={selectedOption}
-            onChange={handleMriChange}
-          />
-        ))}
-    </Wrapper>
-  );
-}
-
-export default InsightsMetricField;
-
-const Wrapper = styled('div')`
-  display: flex;
-  gap: ${space(1)};
-`;
-
-const StyledSelectControl = styled(SelectControl)`
-  width: 200px;
-`;
-
-const SizeLimitMessage = styled('span')`
-  font-size: ${p => p.theme.fontSizeSmall};
-  display: block;
-  width: 100%;
-  text-align: center;
-`;
diff --git a/static/app/views/alerts/rules/metric/ruleConditionsForm.spec.tsx b/static/app/views/alerts/rules/metric/ruleConditionsForm.spec.tsx
index 9c80bc96ac32e9..c38e48b0529bda 100644
--- a/static/app/views/alerts/rules/metric/ruleConditionsForm.spec.tsx
+++ b/static/app/views/alerts/rules/metric/ruleConditionsForm.spec.tsx
@@ -7,11 +7,32 @@ import {AlertRuleComparisonType, Dataset} from 'sentry/views/alerts/rules/metric
 import type {AlertType} from 'sentry/views/alerts/wizard/options';
 
 describe('RuleConditionsForm', () => {
-  it('searches with new searchbar (search-query-builder-alerts)', async () => {
-    const {organization, projects, router} = initializeOrg({
-      organization: {features: ['search-query-builder-alerts']},
-    });
-    ProjectsStore.loadInitialData(projects);
+  const {organization, projects, router} = initializeOrg({
+    organization: {
+      features: ['search-query-builder-alerts', 'alerts-eap'],
+    },
+  });
+  ProjectsStore.loadInitialData(projects);
+
+  const mockSearch = jest.fn();
+
+  const props = {
+    aggregate: 'foo',
+    alertType: 'errors' as AlertType,
+    comparisonType: AlertRuleComparisonType.COUNT,
+    dataset: Dataset.ERRORS,
+    disabled: false,
+    isEditing: true,
+    onComparisonDeltaChange: _ => {},
+    onFilterSearch: mockSearch,
+    onMonitorTypeSelect: _ => {},
+    onTimeWindowChange: _ => {},
+    project: projects[0],
+    thresholdChart: <div>chart</div>,
+    timeWindow: 30,
+  };
+
+  beforeEach(() => {
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/tags/',
       body: [],
@@ -31,24 +52,14 @@ describe('RuleConditionsForm', () => {
       url: '/projects/org-slug/project-slug/environments/',
       body: [],
     });
+  });
 
-    const mockSearch = jest.fn();
+  afterEach(() => {
+    MockApiClient.clearMockResponses();
+    jest.clearAllMocks();
+  });
 
-    const props = {
-      aggregate: 'foo',
-      alertType: 'errors' as AlertType,
-      comparisonType: AlertRuleComparisonType.COUNT,
-      dataset: Dataset.ERRORS,
-      disabled: false,
-      isEditing: true,
-      onComparisonDeltaChange: _ => {},
-      onFilterSearch: mockSearch,
-      onMonitorTypeSelect: _ => {},
-      onTimeWindowChange: _ => {},
-      project: projects[0],
-      thresholdChart: <div>chart</div>,
-      timeWindow: 30,
-    };
+  it('searches with new searchbar (search-query-builder-alerts)', async () => {
     render(
       <RuleConditionsForm {...props} organization={organization} router={router} />,
       {
@@ -67,4 +78,30 @@ describe('RuleConditionsForm', () => {
     expect(mockSearch).toHaveBeenCalledTimes(1);
     expect(mockSearch).toHaveBeenCalledWith('a', true);
   });
+
+  it('renders low confidence warning', async () => {
+    render(
+      <RuleConditionsForm
+        {...props}
+        organization={organization}
+        router={router}
+        isLowConfidenceChartData
+      />,
+      {
+        router,
+        organization: {
+          ...organization,
+          features: ['search-query-builder-alerts', 'alerts-eap'],
+        },
+      }
+    );
+    await screen.findByPlaceholderText(
+      'Filter events by level, message, and other properties\u2026'
+    );
+    expect(
+      screen.getByText(
+        'Your low sample count may impact the accuracy of this alert. Edit your query or increase your sampling rate.'
+      )
+    ).toBeInTheDocument();
+  });
 });
diff --git a/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx b/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx
index a8207076fe5db9..44af1731f2fb9c 100644
--- a/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx
+++ b/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx
@@ -8,6 +8,7 @@ import pick from 'lodash/pick';
 import {addErrorMessage} from 'sentry/actionCreators/indicator';
 import {fetchTagValues} from 'sentry/actionCreators/tags';
 import type {Client} from 'sentry/api';
+import Alert from 'sentry/components/alert';
 import {
   OnDemandMetricAlert,
   OnDemandWarningIcon,
@@ -30,6 +31,7 @@ import {MetricSearchBar} from 'sentry/components/metrics/metricSearchBar';
 import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
 import Panel from 'sentry/components/panels/panel';
 import PanelBody from 'sentry/components/panels/panelBody';
+import {EAPSpanSearchQueryBuilder} from 'sentry/components/performance/spanSearchQueryBuilder';
 import {SearchQueryBuilder} from 'sentry/components/searchQueryBuilder';
 import {InvalidReason} from 'sentry/components/searchSyntax/parser';
 import {t, tct} from 'sentry/locale';
@@ -42,8 +44,14 @@ import type {Organization} from 'sentry/types/organization';
 import type {Environment, Project} from 'sentry/types/project';
 import {defined} from 'sentry/utils';
 import {isAggregateField, isMeasurement} from 'sentry/utils/discover/fields';
+import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {getDisplayName} from 'sentry/utils/environment';
-import {DEVICE_CLASS_TAG_VALUES, FieldKind, isDeviceClass} from 'sentry/utils/fields';
+import {
+  ALLOWED_EXPLORE_VISUALIZE_AGGREGATES,
+  DEVICE_CLASS_TAG_VALUES,
+  FieldKind,
+  isDeviceClass,
+} from 'sentry/utils/fields';
 import {
   getMeasurements,
   type MeasurementCollection,
@@ -63,6 +71,11 @@ import {
 } from 'sentry/views/alerts/utils';
 import type {AlertType} from 'sentry/views/alerts/wizard/options';
 import {getSupportedAndOmittedTags} from 'sentry/views/alerts/wizard/options';
+import {
+  SpanTagsContext,
+  SpanTagsProvider,
+} from 'sentry/views/explore/contexts/spanTagsContext';
+import {hasEAPAlerts} from 'sentry/views/insights/common/utils/hasEAPAlerts';
 
 import {getProjectOptions} from '../utils';
 
@@ -114,6 +127,7 @@ type Props = {
   isErrorMigration?: boolean;
   isExtrapolatedChartData?: boolean;
   isForLlmMetric?: boolean;
+  isLowConfidenceChartData?: boolean;
   isTransactionMigration?: boolean;
   loadingProjects?: boolean;
   monitorType?: number;
@@ -250,7 +264,7 @@ class RuleConditionsForm extends PureComponent<Props, State> {
     let options: Record<string, string> = TIME_WINDOW_MAP;
     const {alertType} = this.props;
 
-    if (alertType === 'custom_metrics' || alertType === 'insights_metrics') {
+    if (alertType === 'custom_metrics') {
       // Do not show ONE MINUTE interval as an option for custom_metrics alert
       options = omit(options, TimeWindow.ONE_MINUTE.toString());
     }
@@ -640,6 +654,7 @@ class RuleConditionsForm extends PureComponent<Props, State> {
       aggregate,
       project,
       comparisonType,
+      isLowConfidenceChartData,
     } = this.props;
 
     const {environments, filterKeys} = this.state;
@@ -654,6 +669,8 @@ class RuleConditionsForm extends PureComponent<Props, State> {
         []),
     ];
 
+    const confidenceEnabled = hasEAPAlerts(organization);
+
     return (
       <Fragment>
         <ChartPanel>
@@ -667,156 +684,191 @@ class RuleConditionsForm extends PureComponent<Props, State> {
           </Fragment>
         ) : (
           <Fragment>
-            {isExtrapolatedChartData && (
-              <OnDemandMetricAlert
-                message={t(
-                  'The chart data above is an estimate based on the stored transactions that match the filters specified.'
-                )}
-              />
-            )}
-            {hasActivatedAlerts && this.renderMonitorTypeSelect()}
-            {!isErrorMigration && this.renderInterval()}
-            <StyledListItem>{t('Filter events')}</StyledListItem>
-            <FormRow noMargin columns={1 + (allowChangeEventTypes ? 1 : 0) + 1}>
-              {this.renderProjectSelector()}
-              <SelectField
-                name="environment"
-                placeholder={t('All Environments')}
-                style={{
-                  ...this.formElemBaseStyle,
-                  minWidth: 230,
-                  flex: 1,
-                }}
-                styles={{
-                  singleValue: (base: any) => ({
-                    ...base,
-                  }),
-                  option: (base: any) => ({
-                    ...base,
-                  }),
-                }}
-                options={environmentOptions}
-                isDisabled={
-                  disabled || this.state.environments === null || isErrorMigration
-                }
-                isClearable
-                inline={false}
-                flexibleControlStateSize
-              />
-              {allowChangeEventTypes && this.renderEventTypeFilter()}
-            </FormRow>
-            <FormRow noMargin>
-              <FormField
-                name="query"
-                inline={false}
-                style={{
-                  ...this.formElemBaseStyle,
-                  flex: '6 0 500px',
-                }}
-                flexibleControlStateSize
-              >
-                {({onChange, onBlur, initialData, value}) => {
-                  return (hasCustomMetrics(organization) &&
-                    alertType === 'custom_metrics') ||
-                    alertType === 'insights_metrics' ? (
-                    <MetricSearchBar
-                      mri={getMRI(aggregate)}
-                      projectIds={[project.id]}
-                      placeholder={this.searchPlaceholder}
-                      query={initialData.query}
-                      defaultQuery={initialData?.query ?? ''}
-                      useFormWrapper={false}
-                      searchSource="alert_builder"
-                      onChange={query => {
-                        onFilterSearch(query, true);
-                        onChange(query, {});
-                      }}
-                    />
-                  ) : (
-                    <SearchContainer>
-                      <SearchQueryBuilder
-                        initialQuery={initialData?.query ?? ''}
-                        getTagValues={this.getEventFieldValues}
+            <SpanTagsProvider
+              dataset={DiscoverDatasets.SPANS_EAP}
+              enabled={
+                organization.features.includes('alerts-eap') &&
+                alertType === 'eap_metrics'
+              }
+            >
+              {isExtrapolatedChartData && (
+                <OnDemandMetricAlert
+                  message={t(
+                    'The chart data above is an estimate based on the stored transactions that match the filters specified.'
+                  )}
+                />
+              )}
+              {confidenceEnabled && isLowConfidenceChartData && (
+                <Alert showIcon type="warning">
+                  {t(
+                    'Your low sample count may impact the accuracy of this alert. Edit your query or increase your sampling rate.'
+                  )}
+                </Alert>
+              )}
+              {hasActivatedAlerts && this.renderMonitorTypeSelect()}
+              {!isErrorMigration && this.renderInterval()}
+              <StyledListItem>{t('Filter events')}</StyledListItem>
+              <FormRow noMargin columns={1 + (allowChangeEventTypes ? 1 : 0) + 1}>
+                {this.renderProjectSelector()}
+                <SelectField
+                  name="environment"
+                  placeholder={t('All Environments')}
+                  style={{
+                    ...this.formElemBaseStyle,
+                    minWidth: 230,
+                    flex: 1,
+                  }}
+                  styles={{
+                    singleValue: (base: any) => ({
+                      ...base,
+                    }),
+                    option: (base: any) => ({
+                      ...base,
+                    }),
+                  }}
+                  options={environmentOptions}
+                  isDisabled={
+                    disabled || this.state.environments === null || isErrorMigration
+                  }
+                  isClearable
+                  inline={false}
+                  flexibleControlStateSize
+                />
+                {allowChangeEventTypes && this.renderEventTypeFilter()}
+              </FormRow>
+              <FormRow noMargin>
+                <FormField
+                  name="query"
+                  inline={false}
+                  style={{
+                    ...this.formElemBaseStyle,
+                    flex: '6 0 500px',
+                  }}
+                  flexibleControlStateSize
+                >
+                  {({onChange, onBlur, initialData, value}) => {
+                    return hasCustomMetrics(organization) &&
+                      alertType === 'custom_metrics' ? (
+                      <MetricSearchBar
+                        mri={getMRI(aggregate)}
+                        projectIds={[project.id]}
                         placeholder={this.searchPlaceholder}
+                        query={initialData.query}
+                        defaultQuery={initialData?.query ?? ''}
+                        useFormWrapper={false}
                         searchSource="alert_builder"
-                        filterKeys={filterKeys}
-                        disabled={disabled || isErrorMigration}
-                        onChange={onChange}
-                        invalidMessages={{
-                          [InvalidReason.WILDCARD_NOT_ALLOWED]: t(
-                            'The wildcard operator is not supported here.'
-                          ),
-                          [InvalidReason.FREE_TEXT_NOT_ALLOWED]: t(
-                            'Free text search is not allowed. If you want to partially match transaction names, use glob patterns like "transaction:*transaction-name*"'
-                          ),
-                        }}
-                        onSearch={query => {
+                        onChange={query => {
                           onFilterSearch(query, true);
                           onChange(query, {});
                         }}
-                        onBlur={(query, {parsedQuery}) => {
-                          onFilterSearch(query, parsedQuery);
-                          onBlur(query);
-                        }}
-                        // We only need strict validation for Transaction queries, everything else is fine
-                        disallowUnsupportedFilters={
-                          organization.features.includes('alert-allow-indexed') ||
-                          (hasOnDemandMetricAlertFeature(organization) &&
-                            isOnDemandQueryString(value))
-                            ? false
-                            : dataset === Dataset.GENERIC_METRICS
-                        }
                       />
-                      {isExtrapolatedChartData && isOnDemandQueryString(value) && (
-                        <OnDemandWarningIcon
-                          color="gray500"
-                          msg={tct(
-                            `We don’t routinely collect metrics from [fields]. However, we’ll do so [strong:once this alert has been saved.]`,
-                            {
-                              fields: (
-                                <strong>
-                                  {getOnDemandKeys(value)
-                                    .map(key => `"${key}"`)
-                                    .join(', ')}
-                                </strong>
-                              ),
-                              strong: <strong />,
-                            }
-                          )}
+                    ) : alertType === 'eap_metrics' ? (
+                      <SpanTagsContext.Consumer>
+                        {tags => (
+                          <EAPSpanSearchQueryBuilder
+                            numberTags={tags?.number ?? {}}
+                            stringTags={tags?.string ?? {}}
+                            initialQuery={initialData?.query ?? ''}
+                            searchSource="alerts"
+                            onSearch={(query, {parsedQuery}) => {
+                              onFilterSearch(query, parsedQuery);
+                              onChange(query, {});
+                            }}
+                            onBlur={(query, {parsedQuery}) => {
+                              onFilterSearch(query, parsedQuery);
+                              onBlur(query);
+                            }}
+                            supportedAggregates={ALLOWED_EXPLORE_VISUALIZE_AGGREGATES}
+                            projects={[parseInt(project.id, 10)]}
+                          />
+                        )}
+                      </SpanTagsContext.Consumer>
+                    ) : (
+                      <SearchContainer>
+                        <SearchQueryBuilder
+                          initialQuery={initialData?.query ?? ''}
+                          getTagValues={this.getEventFieldValues}
+                          placeholder={this.searchPlaceholder}
+                          searchSource="alert_builder"
+                          filterKeys={filterKeys}
+                          disabled={disabled || isErrorMigration}
+                          onChange={onChange}
+                          invalidMessages={{
+                            [InvalidReason.WILDCARD_NOT_ALLOWED]: t(
+                              'The wildcard operator is not supported here.'
+                            ),
+                            [InvalidReason.FREE_TEXT_NOT_ALLOWED]: t(
+                              'Free text search is not allowed. If you want to partially match transaction names, use glob patterns like "transaction:*transaction-name*"'
+                            ),
+                          }}
+                          onSearch={query => {
+                            onFilterSearch(query, true);
+                            onChange(query, {});
+                          }}
+                          onBlur={(query, {parsedQuery}) => {
+                            onFilterSearch(query, parsedQuery);
+                            onBlur(query);
+                          }}
+                          // We only need strict validation for Transaction queries, everything else is fine
+                          disallowUnsupportedFilters={
+                            organization.features.includes('alert-allow-indexed') ||
+                            (hasOnDemandMetricAlertFeature(organization) &&
+                              isOnDemandQueryString(value))
+                              ? false
+                              : dataset === Dataset.GENERIC_METRICS
+                          }
                         />
-                      )}
-                    </SearchContainer>
-                  );
-                }}
-              </FormField>
-            </FormRow>
-            <FormRow noMargin>
-              <FormField
-                name="query"
-                inline={false}
-                style={{
-                  ...this.formElemBaseStyle,
-                  flex: '6 0 500px',
-                }}
-                flexibleControlStateSize
-              >
-                {args => {
-                  if (
-                    args.value?.includes('is:unresolved') &&
-                    comparisonType === AlertRuleComparisonType.DYNAMIC
-                  ) {
-                    return (
-                      <OnDemandMetricAlert
-                        message={t(
-                          "'is:unresolved' queries are not supported by Anomaly Detection alerts."
+                        {isExtrapolatedChartData && isOnDemandQueryString(value) && (
+                          <OnDemandWarningIcon
+                            color="gray500"
+                            msg={tct(
+                              `We don’t routinely collect metrics from [fields]. However, we’ll do so [strong:once this alert has been saved.]`,
+                              {
+                                fields: (
+                                  <strong>
+                                    {getOnDemandKeys(value)
+                                      .map(key => `"${key}"`)
+                                      .join(', ')}
+                                  </strong>
+                                ),
+                                strong: <strong />,
+                              }
+                            )}
+                          />
                         )}
-                      />
+                      </SearchContainer>
                     );
-                  }
-                  return null;
-                }}
-              </FormField>
-            </FormRow>
+                  }}
+                </FormField>
+              </FormRow>
+              <FormRow noMargin>
+                <FormField
+                  name="query"
+                  inline={false}
+                  style={{
+                    ...this.formElemBaseStyle,
+                    flex: '6 0 500px',
+                  }}
+                  flexibleControlStateSize
+                >
+                  {args => {
+                    if (
+                      args.value?.includes('is:unresolved') &&
+                      comparisonType === AlertRuleComparisonType.DYNAMIC
+                    ) {
+                      return (
+                        <OnDemandMetricAlert
+                          message={t(
+                            "'is:unresolved' queries are not supported by Anomaly Detection alerts."
+                          )}
+                        />
+                      );
+                    }
+                    return null;
+                  }}
+                </FormField>
+              </FormRow>
+            </SpanTagsProvider>
           </Fragment>
         )}
       </Fragment>
diff --git a/static/app/views/alerts/rules/metric/ruleForm.spec.tsx b/static/app/views/alerts/rules/metric/ruleForm.spec.tsx
index bf85b658b97a09..02332d045fbc2c 100644
--- a/static/app/views/alerts/rules/metric/ruleForm.spec.tsx
+++ b/static/app/views/alerts/rules/metric/ruleForm.spec.tsx
@@ -470,48 +470,6 @@ describe('Incident Rules Form', () => {
       );
     });
 
-    it('creates an insights metric rule', async () => {
-      const rule = MetricRuleFixture();
-      createWrapper({
-        rule: {
-          ...rule,
-          id: undefined,
-          eventTypes: ['transaction'],
-          aggregate: 'avg(d:spans/exclusive_time@millisecond)',
-          dataset: Dataset.GENERIC_METRICS,
-        },
-      });
-
-      // Clear field
-      await userEvent.clear(screen.getByPlaceholderText('Enter Alert Name'));
-
-      // Enter in name so we can submit
-      await userEvent.type(
-        screen.getByPlaceholderText('Enter Alert Name'),
-        'Insights Incident Rule'
-      );
-
-      // Set thresholdPeriod
-      await selectEvent.select(screen.getAllByText('For 1 minute')[0], 'For 10 minutes');
-
-      await userEvent.click(screen.getByLabelText('Save Rule'));
-
-      expect(createRule).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.objectContaining({
-          data: expect.objectContaining({
-            name: 'Insights Incident Rule',
-            projects: ['project-slug'],
-            eventTypes: ['transaction'],
-            thresholdPeriod: 10,
-            alertType: 'insights_metrics',
-            dataset: 'generic_metrics',
-          }),
-        })
-      );
-      expect(metric.startSpan).toHaveBeenCalledWith({name: 'saveAlertRule'});
-    });
-
     it('creates an EAP metric rule', async () => {
       const rule = MetricRuleFixture();
       createWrapper({
diff --git a/static/app/views/alerts/rules/metric/ruleForm.tsx b/static/app/views/alerts/rules/metric/ruleForm.tsx
index 42a58a4d20e659..8c82d5b9f875b2 100644
--- a/static/app/views/alerts/rules/metric/ruleForm.tsx
+++ b/static/app/views/alerts/rules/metric/ruleForm.tsx
@@ -36,6 +36,7 @@ import type {Project} from 'sentry/types/project';
 import {defined} from 'sentry/utils';
 import {metric, trackAnalytics} from 'sentry/utils/analytics';
 import type EventView from 'sentry/utils/discover/eventView';
+import {parseFunction, prettifyParsedFunction} from 'sentry/utils/discover/fields';
 import {AggregationKey} from 'sentry/utils/fields';
 import {
   getForceMetricsLayerQueryExtras,
@@ -54,10 +55,13 @@ import RuleNameOwnerForm from 'sentry/views/alerts/rules/metric/ruleNameOwnerFor
 import ThresholdTypeForm from 'sentry/views/alerts/rules/metric/thresholdTypeForm';
 import Triggers from 'sentry/views/alerts/rules/metric/triggers';
 import TriggersChart, {ErrorChart} from 'sentry/views/alerts/rules/metric/triggers/chart';
+import {
+  determineMultiSeriesConfidence,
+  determineSeriesConfidence,
+} from 'sentry/views/alerts/rules/metric/utils/determineSeriesConfidence';
 import {getEventTypeFilter} from 'sentry/views/alerts/rules/metric/utils/getEventTypeFilter';
 import hasThresholdValue from 'sentry/views/alerts/rules/metric/utils/hasThresholdValue';
 import {isCustomMetricAlert} from 'sentry/views/alerts/rules/metric/utils/isCustomMetricAlert';
-import {isInsightsMetricAlert} from 'sentry/views/alerts/rules/metric/utils/isInsightsMetricAlert';
 import {isOnDemandMetricAlert} from 'sentry/views/alerts/rules/metric/utils/onDemandMetricAlert';
 import {AlertRuleType, type Anomaly} from 'sentry/views/alerts/types';
 import {ruleNeedsErrorMigration} from 'sentry/views/alerts/utils/migrationUi';
@@ -67,6 +71,7 @@ import {
   DatasetMEPAlertQueryTypes,
 } from 'sentry/views/alerts/wizard/options';
 import {getAlertTypeFromAggregateDataset} from 'sentry/views/alerts/wizard/utils';
+import {isEventsStats} from 'sentry/views/insights/common/queries/useSortedTimeSeries';
 import {MetricsBetaEndAlert} from 'sentry/views/metrics/metricsBetaEndAlert';
 import PermissionAlert from 'sentry/views/settings/project/permissionAlert';
 
@@ -153,6 +158,7 @@ type State = {
   chartErrorMessage?: string;
   comparisonDelta?: number;
   isExtrapolatedChartData?: boolean;
+  isLowConfidenceChartData?: boolean;
   monitorType?: MonitorType;
   seasonality?: AlertRuleSeasonality;
 } & DeprecatedAsyncComponent['state'];
@@ -168,6 +174,8 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
     super(props, context);
     this.handleHistoricalTimeSeriesDataFetched =
       this.handleHistoricalTimeSeriesDataFetched.bind(this);
+    this.handleConfidenceTimeSeriesDataFetched =
+      this.handleConfidenceTimeSeriesDataFetched.bind(this);
   }
 
   get isDuplicateRule(): boolean {
@@ -178,9 +186,7 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
     const {alertType, query, eventTypes, dataset} = this.state;
     const eventTypeFilter = getEventTypeFilter(this.state.dataset, eventTypes);
     const queryWithTypeFilter = (
-      !['custom_metrics', 'span_metrics', 'insights_metrics', 'eap_metrics'].includes(
-        alertType
-      )
+      !['custom_metrics', 'span_metrics', 'eap_metrics'].includes(alertType)
         ? query
           ? `(${query}) AND (${eventTypeFilter})`
           : eventTypeFilter
@@ -759,7 +765,6 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
       sensitivity,
       seasonality,
       comparisonType,
-      alertType,
     } = this.state;
     // Remove empty warning trigger
     const sanitizedTriggers = triggers.filter(
@@ -838,7 +843,7 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
             wizardV3: 'true',
             referrer: location?.query?.referrer,
             sessionId,
-            ...getForceMetricsLayerQueryExtras(organization, dataset, alertType),
+            ...getForceMetricsLayerQueryExtras(organization, dataset),
           }
         );
         // if we get a 202 back it means that we have an async task
@@ -1049,6 +1054,18 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
     }
   };
 
+  handleConfidenceTimeSeriesDataFetched(
+    data: EventsStats | MultiSeriesEventsStats | null
+  ) {
+    if (!data) {
+      return;
+    }
+    const confidence = isEventsStats(data)
+      ? determineSeriesConfidence(data)
+      : determineMultiSeriesConfidence(data);
+    this.setState({isLowConfidenceChartData: confidence === 'low'});
+  }
+
   handleHistoricalTimeSeriesDataFetched(
     data: EventsStats | MultiSeriesEventsStats | null
   ) {
@@ -1198,6 +1215,10 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
     if (alertType === 'custom_metrics') {
       formattedAggregate = formatMRIField(aggregate);
     }
+    const func = parseFunction(aggregate);
+    if (func && alertType === 'eap_metrics') {
+      formattedAggregate = prettifyParsedFunction(func);
+    }
 
     const chartProps: ComponentProps<typeof TriggersChart> = {
       organization,
@@ -1221,12 +1242,14 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
       showTotalCount:
         !['custom_metrics', 'span_metrics'].includes(alertType) && !isOnDemand,
       onDataLoaded: this.handleTimeSeriesDataFetched,
+      onConfidenceDataLoaded: this.handleConfidenceTimeSeriesDataFetched,
       includeHistorical: comparisonType === AlertRuleComparisonType.DYNAMIC,
       onHistoricalDataLoaded: this.handleHistoricalTimeSeriesDataFetched,
+      includeConfidence: alertType === 'eap_metrics',
     };
 
     let formattedQuery = `event.type:${eventTypes?.join(',')}`;
-    if (alertType === 'custom_metrics' || alertType === 'insights_metrics') {
+    if (alertType === 'custom_metrics' || alertType === 'eap_metrics') {
       formattedQuery = '';
     }
 
@@ -1280,6 +1303,7 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
       dataset,
       alertType,
       isExtrapolatedChartData,
+      isLowConfidenceChartData,
       triggersHaveChanged,
       activationCondition,
       monitorType,
@@ -1344,10 +1368,9 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
     return (
       <Main fullWidth>
         <PermissionAlert access={['alerts:write']} project={project} />
-        {isCustomMetricAlert(rule.aggregate) &&
-          !isInsightsMetricAlert(rule.aggregate) && (
-            <MetricsBetaEndAlert organization={organization} />
-          )}
+        {isCustomMetricAlert(rule.aggregate) && (
+          <MetricsBetaEndAlert organization={organization} />
+        )}
 
         {eventView && <IncompatibleAlertQuery eventView={eventView} />}
         <Form
@@ -1418,6 +1441,7 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
                 'sum(ai.total_cost)',
               ].includes(aggregate)}
               isTransactionMigration={isMigration && !showErrorMigrationWarning}
+              isLowConfidenceChartData={isLowConfidenceChartData}
               monitorType={monitorType}
               onComparisonDeltaChange={value =>
                 this.handleFieldChange('comparisonDelta', value)
diff --git a/static/app/views/alerts/rules/metric/thresholdTypeForm.tsx b/static/app/views/alerts/rules/metric/thresholdTypeForm.tsx
index c348af38da70e5..2616edddf5ac96 100644
--- a/static/app/views/alerts/rules/metric/thresholdTypeForm.tsx
+++ b/static/app/views/alerts/rules/metric/thresholdTypeForm.tsx
@@ -48,7 +48,6 @@ function ThresholdTypeForm({
     'fid',
     'cls',
     'custom_transactions',
-    'insights_metrics',
   ]);
 
   const hasAnomalyDetection =
diff --git a/static/app/views/alerts/rules/metric/triggers/chart/index.spec.tsx b/static/app/views/alerts/rules/metric/triggers/chart/index.spec.tsx
index b0fe9d82645ec5..967df8630dff52 100644
--- a/static/app/views/alerts/rules/metric/triggers/chart/index.spec.tsx
+++ b/static/app/views/alerts/rules/metric/triggers/chart/index.spec.tsx
@@ -246,9 +246,9 @@ describe('Incident Rules Create', () => {
     );
   });
 
-  it('queries insights metrics using the metricsEnhanced dataset and without the metrics layer', async () => {
+  it('does a 7 day query for confidence data on the EAP dataset', async () => {
     const {organization, project, router} = initializeOrg({
-      organization: {features: ['custom-metrics']},
+      organization: {features: ['alerts-eap']},
     });
 
     render(
@@ -257,10 +257,10 @@ describe('Incident Rules Create', () => {
         location={router.location}
         organization={organization}
         projects={[project]}
-        query="span.module:db"
+        query=""
         timeWindow={1}
-        aggregate="spm()"
-        dataset={Dataset.GENERIC_METRICS}
+        aggregate="count(span.duration)"
+        dataset={Dataset.EVENTS_ANALYTICS_PLATFORM}
         triggers={[]}
         environment={null}
         comparisonType={AlertRuleComparisonType.COUNT}
@@ -270,6 +270,7 @@ describe('Incident Rules Create', () => {
         onDataLoaded={() => {}}
         isQueryValid
         showTotalCount
+        includeConfidence
       />
     );
 
@@ -277,18 +278,13 @@ describe('Incident Rules Create', () => {
     expect(await screen.findByTestId('alert-total-events')).toBeInTheDocument();
 
     expect(eventStatsMock).toHaveBeenCalledWith(
-      expect.anything(),
+      '/organizations/org-slug/events-stats/',
       expect.objectContaining({
-        query: {
-          interval: '1m',
-          project: [2],
-          query: 'span.module:db',
-          statsPeriod: '9998m',
-          yAxis: 'spm()',
-          referrer: 'api.organization-event-stats',
-          forceMetricsLayer: undefined,
-          dataset: 'metricsEnhanced',
-        },
+        query: expect.objectContaining({
+          dataset: 'spans',
+          statsPeriod: '7d',
+          yAxis: 'count(span.duration)',
+        }),
       })
     );
   });
diff --git a/static/app/views/alerts/rules/metric/triggers/chart/index.tsx b/static/app/views/alerts/rules/metric/triggers/chart/index.tsx
index ac58172a50e0e2..2ecad746b2a64d 100644
--- a/static/app/views/alerts/rules/metric/triggers/chart/index.tsx
+++ b/static/app/views/alerts/rules/metric/triggers/chart/index.tsx
@@ -84,8 +84,10 @@ type Props = {
   comparisonDelta?: number;
   formattedAggregate?: string;
   header?: React.ReactNode;
+  includeConfidence?: boolean;
   includeHistorical?: boolean;
   isOnDemandMetricAlert?: boolean;
+  onConfidenceDataLoaded?: (data: EventsStats | MultiSeriesEventsStats | null) => void;
   onDataLoaded?: (data: EventsStats | MultiSeriesEventsStats | null) => void;
   onHistoricalDataLoaded?: (data: EventsStats | MultiSeriesEventsStats | null) => void;
   showTotalCount?: boolean;
@@ -232,6 +234,7 @@ class TriggersChart extends PureComponent<Props, State> {
 
   // Create new API Client so that historical requests aren't automatically deduplicated
   historicalAPI = new Client();
+  confidenceAPI = new Client();
 
   get availableTimePeriods() {
     // We need to special case sessions, because sub-hour windows are available
@@ -277,7 +280,6 @@ class TriggersChart extends PureComponent<Props, State> {
       projects,
       query,
       dataset,
-      aggregate,
     } = this.props;
 
     const statsPeriod = this.getStatsPeriod();
@@ -296,7 +298,6 @@ class TriggersChart extends PureComponent<Props, State> {
       queryDataset = DiscoverDatasets.ERRORS;
     }
 
-    const alertType = getAlertTypeFromAggregateDataset({aggregate, dataset});
     try {
       const totalCount = await fetchTotalCount(api, organization.slug, {
         field: [],
@@ -305,7 +306,7 @@ class TriggersChart extends PureComponent<Props, State> {
         statsPeriod,
         environment: environment ? [environment] : [],
         dataset: queryDataset,
-        ...getForceMetricsLayerQueryExtras(organization, dataset, alertType),
+        ...getForceMetricsLayerQueryExtras(organization, dataset),
       });
       this.setState({totalCount});
     } catch (e) {
@@ -453,6 +454,7 @@ class TriggersChart extends PureComponent<Props, State> {
       thresholdType,
       isQueryValid,
       isOnDemandMetricAlert,
+      onConfidenceDataLoaded,
     } = this.props;
 
     const period = this.getStatsPeriod();
@@ -460,8 +462,6 @@ class TriggersChart extends PureComponent<Props, State> {
       organization.features.includes('change-alerts') && comparisonDelta
     );
 
-    const alertType = getAlertTypeFromAggregateDataset({aggregate, dataset});
-
     const queryExtras = {
       ...getMetricDatasetQueryExtras({
         organization,
@@ -469,7 +469,7 @@ class TriggersChart extends PureComponent<Props, State> {
         dataset,
         newAlertOrQuery,
       }),
-      ...getForceMetricsLayerQueryExtras(organization, dataset, alertType),
+      ...getForceMetricsLayerQueryExtras(organization, dataset),
       ...(shouldUseErrorsDiscoverDataset(query, dataset, organization)
         ? {dataset: DiscoverDatasets.ERRORS}
         : {}),
@@ -599,6 +599,10 @@ class TriggersChart extends PureComponent<Props, State> {
       );
     }
 
+    const useRpc =
+      organization.features.includes('eap-alerts-ui-uses-rpc') &&
+      dataset === Dataset.EVENTS_ANALYTICS_PLATFORM;
+
     const baseProps = {
       api,
       organization,
@@ -613,6 +617,7 @@ class TriggersChart extends PureComponent<Props, State> {
       includePrevious: false,
       currentSeriesNames: [formattedAggregate || aggregate],
       partial: false,
+      useRpc,
     };
 
     return (
@@ -631,6 +636,16 @@ class TriggersChart extends PureComponent<Props, State> {
             {noop}
           </EventsRequest>
         ) : null}
+        {this.props.includeConfidence ? (
+          <EventsRequest
+            {...baseProps}
+            api={this.confidenceAPI}
+            period="7d"
+            dataLoadedCallback={onConfidenceDataLoaded}
+          >
+            {noop}
+          </EventsRequest>
+        ) : null}
         <EventsRequest {...baseProps} period={period} dataLoadedCallback={onDataLoaded}>
           {({
             loading,
diff --git a/static/app/views/alerts/rules/metric/utils/determineSeriesConfidence.spec.tsx b/static/app/views/alerts/rules/metric/utils/determineSeriesConfidence.spec.tsx
new file mode 100644
index 00000000000000..c405b67a31f347
--- /dev/null
+++ b/static/app/views/alerts/rules/metric/utils/determineSeriesConfidence.spec.tsx
@@ -0,0 +1,159 @@
+import {determineSeriesConfidence} from 'sentry/views/alerts/rules/metric/utils/determineSeriesConfidence';
+
+describe('determineSeriesConfidence', () => {
+  it('equal null if no data', () => {
+    const confidence = determineSeriesConfidence({
+      data: [],
+    });
+    expect(confidence).toBeNull();
+  });
+
+  it('equal null if no confidence found', () => {
+    const confidence = determineSeriesConfidence({
+      data: [
+        [100, [{count: 100}]],
+        [200, [{count: 200}]],
+      ],
+    });
+    expect(confidence).toBeNull();
+  });
+
+  it('equal null if confidence is empty', () => {
+    const confidence = determineSeriesConfidence({
+      data: [
+        [100, [{count: 100}]],
+        [200, [{count: 200}]],
+      ],
+      confidence: [],
+    });
+    expect(confidence).toBeNull();
+  });
+
+  it('equal null if all confidence null', () => {
+    const confidence = determineSeriesConfidence({
+      data: [
+        [100, [{count: 100}]],
+        [200, [{count: 200}]],
+      ],
+      confidence: [
+        [100, [{count: null}]],
+        [200, [{count: null}]],
+      ],
+    });
+    expect(confidence).toBeNull();
+  });
+
+  it('equal high if all confidence high', () => {
+    const confidence = determineSeriesConfidence({
+      data: [
+        [100, [{count: 100}]],
+        [200, [{count: 200}]],
+      ],
+      confidence: [
+        [100, [{count: 'high'}]],
+        [200, [{count: 'high'}]],
+      ],
+    });
+    expect(confidence).toEqual('high');
+  });
+
+  it('equal high if all confidence high or null', () => {
+    const confidence = determineSeriesConfidence({
+      data: [
+        [100, [{count: 100}]],
+        [200, [{count: 200}]],
+      ],
+      confidence: [
+        [100, [{count: 'high'}]],
+        [200, [{count: null}]],
+      ],
+    });
+    expect(confidence).toEqual('high');
+  });
+
+  it('equal high if <25% is low', () => {
+    const confidence = determineSeriesConfidence({
+      data: [
+        [100, [{count: 100}]],
+        [200, [{count: 200}]],
+        [300, [{count: 300}]],
+        [400, [{count: 400}]],
+        [500, [{count: 500}]],
+        [600, [{count: 600}]],
+        [700, [{count: 700}]],
+      ],
+      confidence: [
+        [100, [{count: 'high'}]],
+        [200, [{count: 'high'}]],
+        [300, [{count: 'high'}]],
+        [400, [{count: 'high'}]],
+        [500, [{count: 'low'}]],
+        [600, [{count: 'high'}]],
+        [700, [{count: null}]],
+      ],
+    });
+    expect(confidence).toEqual('high');
+  });
+
+  it('equal low if >25% is low', () => {
+    const confidence = determineSeriesConfidence({
+      data: [
+        [100, [{count: 100}]],
+        [200, [{count: 200}]],
+        [300, [{count: 300}]],
+        [400, [{count: 400}]],
+        [500, [{count: 500}]],
+      ],
+      confidence: [
+        [100, [{count: 'high'}]],
+        [200, [{count: null}]],
+        [300, [{count: null}]],
+        [400, [{count: 'low'}]],
+        [500, [{count: 'low'}]],
+      ],
+    });
+    expect(confidence).toEqual('low');
+  });
+
+  it('equal low if all low', () => {
+    const confidence = determineSeriesConfidence({
+      data: [
+        [100, [{count: 100}]],
+        [200, [{count: 200}]],
+        [300, [{count: 300}]],
+        [400, [{count: 400}]],
+        [500, [{count: 500}]],
+      ],
+      confidence: [
+        [100, [{count: 'low'}]],
+        [200, [{count: 'low'}]],
+        [300, [{count: 'low'}]],
+        [400, [{count: 'low'}]],
+        [500, [{count: 'low'}]],
+      ],
+    });
+    expect(confidence).toEqual('low');
+  });
+
+  it('equals low if any in bucket is low', () => {
+    const confidence = determineSeriesConfidence({
+      data: [[200, [{count: 100}]]],
+      confidence: [
+        [100, [{count: 'high'}, {count: 'low'}, {count: null}]],
+        [200, [{count: null}, {count: 'low'}, {count: 'high'}]],
+      ],
+    });
+    expect(confidence).toEqual('low');
+  });
+
+  it('equals high if no lows in bucket', () => {
+    const confidence = determineSeriesConfidence({
+      data: [[200, [{count: 100}]]],
+      confidence: [
+        [100, [{count: 'high'}, {count: 'high'}, {count: null}]],
+        [200, [{count: null}, {count: null}, {count: 'high'}]],
+      ],
+    });
+    expect(confidence).toEqual('high');
+  });
+});
diff --git a/static/app/views/alerts/rules/metric/utils/determineSeriesConfidence.tsx b/static/app/views/alerts/rules/metric/utils/determineSeriesConfidence.tsx
new file mode 100644
index 00000000000000..1358a15e7d7e39
--- /dev/null
+++ b/static/app/views/alerts/rules/metric/utils/determineSeriesConfidence.tsx
@@ -0,0 +1,77 @@
+import type {
+  Confidence,
+  EventsStats,
+  MultiSeriesEventsStats,
+} from 'sentry/types/organization';
+import {defined} from 'sentry/utils';
+
+// Timeseries with more than this ratio of low confidence intervals will be considered low confidence
+const LOW_CONFIDENCE_THRESHOLD = 0.25;
+
+export function determineSeriesConfidence(
+  data: EventsStats,
+  threshold = LOW_CONFIDENCE_THRESHOLD
+): Confidence {
+  if (!defined(data.confidence) || data.confidence.length < 1) {
+    return null;
+  }
+
+  const perDataUnitConfidence: Confidence[] = data.confidence.map(unit => {
+    return unit[1].reduce(
+      (acc, entry) => combineConfidence(acc, entry.count),
+      null as Confidence
+    );
+  });
+
+  const {lowConfidence, highConfidence, nullConfidence} = perDataUnitConfidence.reduce(
+    (acc, confidence) => {
+      if (confidence === 'low') {
+        acc.lowConfidence += 1;
+      } else if (confidence === 'high') {
+        acc.highConfidence += 1;
+      } else {
+        acc.nullConfidence += 1;
+      }
+      return acc;
+    },
+    {lowConfidence: 0, highConfidence: 0, nullConfidence: 0}
+  );
+
+  if (lowConfidence <= 0 && highConfidence <= 0 && nullConfidence >= 0) {
+    return null;
+  }
+
+  // Do not divide by (low + high + null) because nulls then can then heavily influence the final confidence
+  if (lowConfidence / (lowConfidence + highConfidence) > threshold) {
+    return 'low';
+  }
+
+  return 'high';
+}
+
+export function determineMultiSeriesConfidence(
+  data: MultiSeriesEventsStats,
+  threshold = LOW_CONFIDENCE_THRESHOLD
+): Confidence {
+  return Object.values(data).reduce(
+    (acc, eventsStats) =>
+      combineConfidence(acc, determineSeriesConfidence(eventsStats, threshold)),
+    null as Confidence
+  );
+}
+
+export function combineConfidence(a: Confidence, b: Confidence): Confidence {
+  if (!defined(a)) {
+    return b;
+  }
+
+  if (!defined(b)) {
+    return a;
+  }
+
+  if (a === 'low' || b === 'low') {
+    return 'low';
+  }
+
+  return 'high';
+}
diff --git a/static/app/views/alerts/rules/metric/utils/getMetricDatasetQueryExtras.tsx b/static/app/views/alerts/rules/metric/utils/getMetricDatasetQueryExtras.tsx
index 2edf5fce4b49fc..f4aa1dead0d1b3 100644
--- a/static/app/views/alerts/rules/metric/utils/getMetricDatasetQueryExtras.tsx
+++ b/static/app/views/alerts/rules/metric/utils/getMetricDatasetQueryExtras.tsx
@@ -5,7 +5,6 @@ import {hasCustomMetrics} from 'sentry/utils/metrics/features';
 import {hasOnDemandMetricAlertFeature} from 'sentry/utils/onDemandMetrics/features';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {getMEPAlertsDataset} from 'sentry/views/alerts/wizard/options';
-import {hasInsightsAlerts} from 'sentry/views/insights/common/utils/hasInsightsAlerts';
 
 import {Dataset, type MetricRule} from '../types';
 
@@ -32,8 +31,7 @@ export function getMetricDatasetQueryExtras({
     hasOnDemandMetricAlertFeature(organization) ||
     hasCustomMetrics(organization) ||
     organization.features.includes('mep-rollout-flag') ||
-    organization.features.includes('dashboards-metrics-transition') ||
-    hasInsightsAlerts(organization);
+    organization.features.includes('dashboards-metrics-transition');
   const disableMetricDataset =
     decodeScalar(location?.query?.disableMetricDataset) === 'true';
 
diff --git a/static/app/views/alerts/rules/metric/utils/isInsightsMetricAlert.tsx b/static/app/views/alerts/rules/metric/utils/isInsightsMetricAlert.tsx
deleted file mode 100644
index 5fc852478949af..00000000000000
--- a/static/app/views/alerts/rules/metric/utils/isInsightsMetricAlert.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import {parseField} from 'sentry/utils/metrics/mri';
-
-export const INSIGHTS_METRICS_OPERATIONS_WITHOUT_ARGS = [
-  {
-    label: 'spm',
-    value: 'spm',
-    mri: 'd:spans/duration@millisecond',
-  },
-  {
-    label: 'cache_miss_rate',
-    value: 'cache_miss_rate',
-    mri: 'd:spans/duration@millisecond',
-  },
-];
-
-export const INSIGHTS_METRICS_OPERATIONS_WITH_CUSTOM_ARGS = [
-  {
-    label: 'http_response_rate',
-    value: 'http_response_rate',
-    options: [
-      {label: '3', value: '3'},
-      {label: '4', value: '4'},
-      {label: '5', value: '5'},
-    ],
-    mri: 'd:spans/duration@millisecond',
-  },
-  {
-    label: 'performance_score',
-    value: 'performance_score',
-    options: [
-      {label: 'measurements.score.lcp', value: 'measurements.score.lcp'},
-      {label: 'measurements.score.fcp', value: 'measurements.score.fcp'},
-      {label: 'measurements.score.inp', value: 'measurements.score.inp'},
-      {label: 'measurements.score.cls', value: 'measurements.score.cls'},
-      {label: 'measurements.score.ttfb', value: 'measurements.score.ttfb'},
-      {label: 'measurements.score.total', value: 'measurements.score.total'},
-    ],
-    mri: 'd:transactions/measurements.score.total@ratio',
-  },
-];
-
-export const INSIGHTS_METRICS_OPERATIONS = [
-  ...INSIGHTS_METRICS_OPERATIONS_WITH_CUSTOM_ARGS,
-  ...INSIGHTS_METRICS_OPERATIONS_WITHOUT_ARGS,
-];
-
-export const INSIGHTS_METRICS = [
-  'd:spans/webvital.inp@millisecond',
-  'd:spans/duration@millisecond',
-  'd:spans/exclusive_time@millisecond',
-  'd:spans/http.response_content_length@byte',
-  'd:spans/http.decoded_response_content_length@byte',
-  'd:spans/http.response_transfer_size@byte',
-  'd:spans/cache.item_size@byte',
-  'g:spans/messaging.message.receive.latency@millisecond',
-  'g:spans/mobile.frames_delay@second',
-  'g:spans/mobile.total_frames@none',
-  'g:spans/mobile.frozen_frames@none',
-  'g:spans/mobile.slow_frames@none',
-  'c:spans/ai.total_tokens.used@none',
-  'c:spans/ai.total_cost@usd',
-  'd:transactions/measurements.score.lcp@ratio',
-  'd:transactions/measurements.score.fcp@ratio',
-  'd:transactions/measurements.score.cls@ratio',
-  'd:transactions/measurements.score.ttfb@ratio',
-  'd:transactions/measurements.score.inp@ratio',
-  'd:transactions/measurements.score.total@ratio',
-];
-
-export const isInsightsMetricAlert = (aggregate: string) => {
-  const {mri, aggregation} = parseField(aggregate) ?? {};
-  if (
-    INSIGHTS_METRICS.includes(mri as string) ||
-    INSIGHTS_METRICS_OPERATIONS.map(({value}) => value).includes(aggregation as string)
-  ) {
-    return true;
-  }
-  return false;
-};
diff --git a/static/app/views/alerts/rules/metric/utils/onDemandMetricAlert.spec.tsx b/static/app/views/alerts/rules/metric/utils/onDemandMetricAlert.spec.tsx
index f0862f1b7b7c55..d71fb22e1bc074 100644
--- a/static/app/views/alerts/rules/metric/utils/onDemandMetricAlert.spec.tsx
+++ b/static/app/views/alerts/rules/metric/utils/onDemandMetricAlert.spec.tsx
@@ -53,17 +53,4 @@ describe('isOnDemandMetricAlert', () => {
       )
     ).toBeFalsy();
   });
-
-  it('should return false for an alert that uses insights metrics', () => {
-    const dataset = Dataset.GENERIC_METRICS;
-
-    expect(
-      isOnDemandMetricAlert(
-        dataset,
-        'avg(d:spans/exclusive_time@millisecond)',
-        'span.module:db'
-      )
-    ).toBeFalsy();
-    expect(isOnDemandMetricAlert(dataset, 'spm()', 'browser.name:chrome')).toBeFalsy();
-  });
 });
diff --git a/static/app/views/alerts/rules/metric/utils/onDemandMetricAlert.tsx b/static/app/views/alerts/rules/metric/utils/onDemandMetricAlert.tsx
index ee805932b055af..d7c48e89d559e7 100644
--- a/static/app/views/alerts/rules/metric/utils/onDemandMetricAlert.tsx
+++ b/static/app/views/alerts/rules/metric/utils/onDemandMetricAlert.tsx
@@ -1,7 +1,6 @@
 import {isOnDemandAggregate, isOnDemandQueryString} from 'sentry/utils/onDemandMetrics';
 import {Dataset} from 'sentry/views/alerts/rules/metric/types';
 import {isCustomMetricField} from 'sentry/views/alerts/rules/metric/utils/isCustomMetricField';
-import {getAlertTypeFromAggregateDataset} from 'sentry/views/alerts/wizard/utils';
 
 /**
  * We determine that an alert is an on-demand metric alert if the query contains
@@ -12,10 +11,6 @@ export function isOnDemandMetricAlert(
   aggregate: string,
   query: string
 ): boolean {
-  if (getAlertTypeFromAggregateDataset({aggregate, dataset}) === 'insights_metrics') {
-    return false;
-  }
-
   if (isOnDemandAggregate(aggregate)) {
     return true;
   }
diff --git a/static/app/views/alerts/rules/metric/wizardField.tsx b/static/app/views/alerts/rules/metric/wizardField.tsx
index 0100f344a8b140..0f8563fcae09aa 100644
--- a/static/app/views/alerts/rules/metric/wizardField.tsx
+++ b/static/app/views/alerts/rules/metric/wizardField.tsx
@@ -1,6 +1,7 @@
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 
+import FeatureBadge from 'sentry/components/badge/featureBadge';
 import SelectControl from 'sentry/components/forms/controls/selectControl';
 import type {FormFieldProps} from 'sentry/components/forms/formField';
 import FormField from 'sentry/components/forms/formField';
@@ -12,7 +13,6 @@ import type {QueryFieldValue} from 'sentry/utils/discover/fields';
 import {explodeFieldString, generateFieldAsString} from 'sentry/utils/discover/fields';
 import {hasCustomMetrics} from 'sentry/utils/metrics/features';
 import EAPField from 'sentry/views/alerts/rules/metric/eapField';
-import InsightsMetricField from 'sentry/views/alerts/rules/metric/insightsMetricField';
 import MriField from 'sentry/views/alerts/rules/metric/mriField';
 import type {Dataset} from 'sentry/views/alerts/rules/metric/types';
 import type {AlertType} from 'sentry/views/alerts/wizard/options';
@@ -24,11 +24,10 @@ import {QueryField} from 'sentry/views/discover/table/queryField';
 import {FieldValueKind} from 'sentry/views/discover/table/types';
 import {generateFieldOptions} from 'sentry/views/discover/utils';
 import {hasEAPAlerts} from 'sentry/views/insights/common/utils/hasEAPAlerts';
-import {hasInsightsAlerts} from 'sentry/views/insights/common/utils/hasInsightsAlerts';
 
 import {getFieldOptionConfig} from './metricField';
 
-type MenuOption = {label: string; value: AlertType};
+type MenuOption = {label: React.ReactNode; value: AlertType};
 type GroupedMenuOption = {label: string; options: Array<MenuOption>};
 
 type Props = Omit<FormFieldProps, 'children'> & {
@@ -120,18 +119,15 @@ export default function WizardField({
               },
             ]
           : []),
-        ...(hasInsightsAlerts(organization)
-          ? [
-              {
-                label: AlertWizardAlertNames.insights_metrics,
-                value: 'insights_metrics' as const,
-              },
-            ]
-          : []),
         ...(hasEAPAlerts(organization)
           ? [
               {
-                label: AlertWizardAlertNames.eap_metrics,
+                label: (
+                  <span>
+                    {AlertWizardAlertNames.eap_metrics}
+                    <FeatureBadge type="experimental" />
+                  </span>
+                ),
                 value: 'eap_metrics' as const,
               },
             ]
@@ -208,14 +204,6 @@ export default function WizardField({
                 aggregate={aggregate}
                 onChange={newAggregate => onChange(newAggregate, {})}
               />
-            ) : alertType === 'insights_metrics' ? (
-              <InsightsMetricField
-                project={project}
-                aggregate={aggregate}
-                onChange={newAggregate => {
-                  return onChange(newAggregate, {});
-                }}
-              />
             ) : alertType === 'eap_metrics' ? (
               <EAPField
                 aggregate={aggregate}
diff --git a/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx b/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx
index 8adc5980055bf1..f49f860ef51558 100644
--- a/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx
+++ b/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx
@@ -1,3 +1,5 @@
+import {generateSentryTraceHeader} from '@sentry/utils';
+
 import {render} from 'sentry-test/reactTestingLibrary';
 
 import {HTTPSnippet} from './httpSnippet';
@@ -15,13 +17,21 @@ describe('HTTPSnippet', function () {
         method="POST"
         body={'{"key": "value"}'}
         headers={[['X-Something', 'Header Value']]}
+        traceSampling={false}
       />
     );
 
+    expect(jest.mocked(generateSentryTraceHeader)).toHaveBeenCalledWith(
+      undefined,
+      undefined,
+      false
+    );
+
     const expected = [
       'POST /test?query=value HTTP/1.1',
       'Host: example.com',
       'X-Something: Header Value',
+      'User-Agent: SentryUptimeBot/1.0 (+http://docs.sentry.io/product/alerts/uptime-monitoring/',
       'Sentry-Trace: sentry-trace-value',
       'Content-Size: 18',
       ``,
diff --git a/static/app/views/alerts/rules/uptime/httpSnippet.tsx b/static/app/views/alerts/rules/uptime/httpSnippet.tsx
index fcfbdcca37dece..51953fa40ae5cb 100644
--- a/static/app/views/alerts/rules/uptime/httpSnippet.tsx
+++ b/static/app/views/alerts/rules/uptime/httpSnippet.tsx
@@ -1,4 +1,4 @@
-import {useState} from 'react';
+import {useMemo} from 'react';
 import styled from '@emotion/styled';
 import {generateSentryTraceHeader} from '@sentry/utils';
 
@@ -10,12 +10,15 @@ interface Props {
   body: string | null;
   headers: Array<[key: string, value: string]>;
   method: string;
+  traceSampling: boolean;
   url: string;
 }
 
-export function HTTPSnippet({body, headers, method, url}: Props) {
-  const [exampleTrace] = useState(() =>
-    generateSentryTraceHeader(undefined, undefined, true)
+export function HTTPSnippet({body, headers, method, url, traceSampling}: Props) {
+  const exampleTrace = useMemo(
+    () =>
+      generateSentryTraceHeader(undefined, undefined, traceSampling ? undefined : false),
+    [traceSampling]
   );
 
   const urlObject = safeURL(url);
@@ -29,7 +32,14 @@ export function HTTPSnippet({body, headers, method, url}: Props) {
     : urlObject.pathname;
 
   const appendedBody = body ? `\r\n${body}` : '';
-  const additionaLheaders = [...headers, ['Sentry-Trace', exampleTrace]];
+  const additionaLheaders = [
+    ...headers,
+    [
+      'User-Agent',
+      'SentryUptimeBot/1.0 (+http://docs.sentry.io/product/alerts/uptime-monitoring/',
+    ],
+    ['Sentry-Trace', exampleTrace],
+  ];
 
   if (appendedBody !== '') {
     additionaLheaders.push(['Content-Size', new Blob([appendedBody]).size.toString()]);
diff --git a/static/app/views/alerts/rules/uptime/types.tsx b/static/app/views/alerts/rules/uptime/types.tsx
index 79eb43a862f83d..5aab4d2ad8c4e0 100644
--- a/static/app/views/alerts/rules/uptime/types.tsx
+++ b/static/app/views/alerts/rules/uptime/types.tsx
@@ -24,5 +24,6 @@ export interface UptimeRule {
   projectSlug: string;
   status: UptimeMonitorStatus;
   timeoutMs: number;
+  traceSampling: boolean;
   url: string;
 }
diff --git a/static/app/views/alerts/rules/uptime/uptimeAlertForm.spec.tsx b/static/app/views/alerts/rules/uptime/uptimeAlertForm.spec.tsx
index cecf25cf40ad11..3c8b22b78b333c 100644
--- a/static/app/views/alerts/rules/uptime/uptimeAlertForm.spec.tsx
+++ b/static/app/views/alerts/rules/uptime/uptimeAlertForm.spec.tsx
@@ -5,7 +5,7 @@ import {ProjectFixture} from 'sentry-fixture/project';
 import {TeamFixture} from 'sentry-fixture/team';
 import {UptimeRuleFixture} from 'sentry-fixture/uptimeRule';
 
-import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+import {fireEvent, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import selectEvent from 'sentry-test/selectEvent';
 
 import OrganizationStore from 'sentry/stores/organizationStore';
@@ -42,6 +42,9 @@ describe('Uptime Alert Form', function () {
 
     await selectEvent.select(input('Environment'), 'prod');
 
+    const timeout = screen.getByRole('slider', {name: 'Timeout'});
+    fireEvent.change(timeout, {target: {value: '10000'}});
+
     await userEvent.clear(input('URL'));
     await userEvent.type(input('URL'), 'http://example.com');
 
@@ -54,6 +57,8 @@ describe('Uptime Alert Form', function () {
     await userEvent.type(input('Name of header 1'), 'X-Something');
     await userEvent.type(input('Value of X-Something'), 'Header Value');
 
+    await userEvent.click(screen.getByRole('checkbox', {name: 'Allow Sampling'}));
+
     const name = input('Uptime rule name');
     await userEvent.clear(name);
     await userEvent.type(name, 'New Uptime Rule');
@@ -78,7 +83,9 @@ describe('Uptime Alert Form', function () {
           method: 'POST',
           headers: [['X-Something', 'Header Value']],
           body: '{"key": "value"}',
+          traceSampling: true,
           intervalSeconds: 60,
+          timeoutMs: 10_000,
         }),
       })
     );
@@ -96,6 +103,8 @@ describe('Uptime Alert Form', function () {
         ['X-Test2', 'value 2'],
       ],
       body: '{"key": "value"}',
+      traceSampling: true,
+      timeoutMs: 7500,
       owner: ActorFixture(),
     });
     render(
@@ -115,6 +124,8 @@ describe('Uptime Alert Form', function () {
     expect(screen.getByRole('menuitemradio', {name: 'POST'})).toBeChecked();
     await selectEvent.openMenu(input('Environment'));
     expect(screen.getByRole('menuitemradio', {name: 'prod'})).toBeChecked();
+    expect(screen.getByRole('checkbox', {name: 'Allow Sampling'})).toBeChecked();
+    expect(screen.getByRole('slider', {name: 'Timeout'})).toHaveValue('7500');
   });
 
   it('handles simple edits', async function () {
@@ -163,6 +174,7 @@ describe('Uptime Alert Form', function () {
       projectSlug: project.slug,
       url: 'https://existing-url.com',
       owner: ActorFixture(),
+      traceSampling: false,
     });
     render(
       <UptimeAlertForm organization={organization} project={project} rule={rule} />,
@@ -173,6 +185,9 @@ describe('Uptime Alert Form', function () {
     await selectEvent.select(input('Interval'), 'Every 10 minutes');
     await selectEvent.select(input('Environment'), 'dev');
 
+    const timeout = screen.getByRole('slider', {name: 'Timeout'});
+    fireEvent.change(timeout, {target: {value: '7500'}});
+
     await userEvent.clear(input('URL'));
     await userEvent.type(input('URL'), 'http://another-url.com');
 
@@ -188,6 +203,8 @@ describe('Uptime Alert Form', function () {
     await userEvent.type(input('Name of header 2'), 'X-Another');
     await userEvent.type(input('Value of X-Another'), 'Second Value');
 
+    await userEvent.click(screen.getByRole('checkbox', {name: 'Allow Sampling'}));
+
     const name = input('Uptime rule name');
     await userEvent.clear(name);
     await userEvent.type(name, 'Updated name');
@@ -216,6 +233,8 @@ describe('Uptime Alert Form', function () {
           ],
           body: '{"different": "value"}',
           intervalSeconds: 60 * 10,
+          traceSampling: true,
+          timeoutMs: 7500,
         }),
       })
     );
diff --git a/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx b/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx
index a9d81852551288..082b2b030e86a7 100644
--- a/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx
+++ b/static/app/views/alerts/rules/uptime/uptimeAlertForm.tsx
@@ -6,7 +6,9 @@ import {Observer} from 'mobx-react';
 import {Button} from 'sentry/components/button';
 import Confirm from 'sentry/components/confirm';
 import FieldWrapper from 'sentry/components/forms/fieldGroup/fieldWrapper';
+import BooleanField from 'sentry/components/forms/fields/booleanField';
 import HiddenField from 'sentry/components/forms/fields/hiddenField';
+import RangeField from 'sentry/components/forms/fields/rangeField';
 import SelectField from 'sentry/components/forms/fields/selectField';
 import SentryMemberTeamSelectorField from 'sentry/components/forms/fields/sentryMemberTeamSelectorField';
 import SentryProjectSelectorField from 'sentry/components/forms/fields/sentryProjectSelectorField';
@@ -62,6 +64,8 @@ function getFormDataFromRule(rule: UptimeRule) {
     body: rule.body,
     headers: rule.headers,
     intervalSeconds: rule.intervalSeconds,
+    timeoutMs: rule.timeoutMs,
+    traceSampling: rule.traceSampling,
     owner: rule.owner ? `${rule.owner.type}:${rule.owner.id}` : null,
   };
 }
@@ -191,7 +195,19 @@ export function UptimeAlertForm({project, handleDelete, rule}: Props) {
               flexibleControlStateSize
               required
             />
-
+            <RangeField
+              name="timeoutMs"
+              label={t('Timeout')}
+              min={1000}
+              max={30_000}
+              step={250}
+              tickValues={[1_000, 5_000, 10_000, 15_000, 20_000, 25_000, 30_000]}
+              defaultValue={5_000}
+              showTickLabels
+              formatLabel={value => getDuration((value || 0) / 1000, 2, true)}
+              flexibleControlStateSize
+              required
+            />
             <TextField
               name="url"
               label={t('URL')}
@@ -227,6 +243,15 @@ export function UptimeAlertForm({project, handleDelete, rule}: Props) {
               placeholder='{"key": "value"}'
               flexibleControlStateSize
             />
+            <BooleanField
+              name="traceSampling"
+              label={t('Allow Sampling')}
+              showHelpInTooltip
+              help={t(
+                'Allows uptime checks to trigger traces if the checked service is configured with a Sentry SDK.'
+              )}
+              flexibleControlStateSize
+            />
           </ConfigurationPanel>
           <Observer>
             {() => (
@@ -235,6 +260,7 @@ export function UptimeAlertForm({project, handleDelete, rule}: Props) {
                 method={formModel.getValue('method')}
                 headers={formModel.getValue('headers')}
                 body={formModel.getValue('body')}
+                traceSampling={formModel.getValue('traceSampling')}
               />
             )}
           </Observer>
diff --git a/static/app/views/alerts/utils/apiCalls.tsx b/static/app/views/alerts/utils/apiCalls.tsx
index 2bf191ce4f71e4..48719faea3e137 100644
--- a/static/app/views/alerts/utils/apiCalls.tsx
+++ b/static/app/views/alerts/utils/apiCalls.tsx
@@ -30,7 +30,7 @@ export function fetchIncidentsForRule(
       includeSnapshots: true,
       start,
       end,
-      expand: ['activities', 'seen_by', 'original_alert_rule'],
+      expand: ['activities', 'original_alert_rule'],
     },
   });
 }
diff --git a/static/app/views/alerts/wizard/options.tsx b/static/app/views/alerts/wizard/options.tsx
index ebb36bae655377..4c4df842cce060 100644
--- a/static/app/views/alerts/wizard/options.tsx
+++ b/static/app/views/alerts/wizard/options.tsx
@@ -18,7 +18,6 @@ import {
 import {hasCustomMetrics} from 'sentry/utils/metrics/features';
 import {
   DEFAULT_EAP_METRICS_ALERT_FIELD,
-  DEFAULT_INSIGHTS_METRICS_ALERT_FIELD,
   DEFAULT_METRIC_ALERT_FIELD,
 } from 'sentry/utils/metrics/mri';
 import {ON_DEMAND_METRICS_UNSUPPORTED_TAGS} from 'sentry/utils/onDemandMetrics/constants';
@@ -29,7 +28,6 @@ import {
   SessionsAggregate,
 } from 'sentry/views/alerts/rules/metric/types';
 import {hasEAPAlerts} from 'sentry/views/insights/common/utils/hasEAPAlerts';
-import {hasInsightsAlerts} from 'sentry/views/insights/common/utils/hasInsightsAlerts';
 import {MODULE_TITLE as LLM_MONITORING_MODULE_TITLE} from 'sentry/views/insights/llmMonitoring/settings';
 
 export type AlertType =
@@ -49,7 +47,6 @@ export type AlertType =
   | 'custom_metrics'
   | 'llm_tokens'
   | 'llm_cost'
-  | 'insights_metrics'
   | 'uptime_monitor'
   | 'eap_metrics';
 
@@ -95,7 +92,6 @@ export const AlertWizardAlertNames: Record<AlertType, string> = {
   crash_free_users: t('Crash Free User Rate'),
   llm_cost: t('LLM cost'),
   llm_tokens: t('LLM token usage'),
-  insights_metrics: t('Insights Metric'),
   uptime_monitor: t('Uptime Monitor'),
   eap_metrics: t('EAP Metric'),
 };
@@ -105,7 +101,6 @@ export const AlertWizardAlertNames: Record<AlertType, string> = {
  * for adding feature badges or other call-outs for newer alert types.
  */
 export const AlertWizardExtraContent: Partial<Record<AlertType, React.ReactNode>> = {
-  insights_metrics: <FeatureBadge type="alpha" />,
   eap_metrics: <FeatureBadge type="experimental" />,
   uptime_monitor: <FeatureBadge type="beta" />,
 };
@@ -140,7 +135,6 @@ export const getAlertWizardCategories = (org: Organization) => {
         'fid',
         'cls',
         ...(hasCustomMetrics(org) ? (['custom_transactions'] satisfies AlertType[]) : []),
-        ...(hasInsightsAlerts(org) ? ['insights_metrics' as const] : []),
         ...(hasEAPAlerts(org) ? ['eap_metrics' as const] : []),
       ],
     });
@@ -239,11 +233,6 @@ export const AlertWizardRuleTemplates: Record<
     dataset: Dataset.GENERIC_METRICS,
     eventTypes: EventTypes.TRANSACTION,
   },
-  insights_metrics: {
-    aggregate: DEFAULT_INSIGHTS_METRICS_ALERT_FIELD,
-    dataset: Dataset.GENERIC_METRICS,
-    eventTypes: EventTypes.TRANSACTION,
-  },
   crash_free_sessions: {
     aggregate: SessionsAggregate.CRASH_FREE_SESSIONS,
     dataset: Dataset.METRICS,
diff --git a/static/app/views/alerts/wizard/panelContent.tsx b/static/app/views/alerts/wizard/panelContent.tsx
index 6ceb0e4c2567c6..e3271051aab814 100644
--- a/static/app/views/alerts/wizard/panelContent.tsx
+++ b/static/app/views/alerts/wizard/panelContent.tsx
@@ -157,14 +157,6 @@ export const AlertWizardPanelContent: Record<AlertType, PanelContent> = {
     examples: [t('When there are more than $100 used by LLM  within an hour')],
     illustration: diagramCustomMetrics,
   },
-  insights_metrics: {
-    description: t('Alert on insights metrics.'),
-    examples: [
-      t('When your average time in queue exceeds 100ms.'),
-      t('When your app runs more than 1000 queries in a minute.'),
-    ],
-    illustration: diagramCustomMetrics,
-  },
   crash_free_sessions: {
     description: t(
       'A session begins when a user starts the application and ends when it’s closed or sent to the background. A crash is when a session ends due to an error and this type of alert lets you monitor when those crashed sessions exceed a threshold. This lets you get a better picture of the health of your app.'
diff --git a/static/app/views/alerts/wizard/utils.spec.tsx b/static/app/views/alerts/wizard/utils.spec.tsx
index 6692860b9d784e..5a6158351211f5 100644
--- a/static/app/views/alerts/wizard/utils.spec.tsx
+++ b/static/app/views/alerts/wizard/utils.spec.tsx
@@ -137,27 +137,6 @@ describe('Wizard utils', function () {
     ).toBe('custom_transactions');
   });
 
-  it('extracts insights metric alerts', function () {
-    expect(
-      getAlertTypeFromAggregateDataset({
-        aggregate: 'spm()',
-        dataset: Dataset.GENERIC_METRICS,
-      })
-    ).toEqual('insights_metrics');
-    expect(
-      getAlertTypeFromAggregateDataset({
-        aggregate: 'avg(d:spans/exclusive_time@millisecond)',
-        dataset: Dataset.GENERIC_METRICS,
-      })
-    ).toEqual('insights_metrics');
-    expect(
-      getAlertTypeFromAggregateDataset({
-        aggregate: 'avg(g:spans/mobile.slow_frames@none)',
-        dataset: Dataset.GENERIC_METRICS,
-      })
-    ).toEqual('insights_metrics');
-  });
-
   it('extracts eap metric alerts', function () {
     expect(
       getAlertTypeFromAggregateDataset({
diff --git a/static/app/views/alerts/wizard/utils.tsx b/static/app/views/alerts/wizard/utils.tsx
index 59c56788e26d2b..825630383dff81 100644
--- a/static/app/views/alerts/wizard/utils.tsx
+++ b/static/app/views/alerts/wizard/utils.tsx
@@ -1,6 +1,5 @@
 import {getUseCaseFromMRI, parseField} from 'sentry/utils/metrics/mri';
 import {Dataset, SessionsAggregate} from 'sentry/views/alerts/rules/metric/types';
-import {isInsightsMetricAlert} from 'sentry/views/alerts/rules/metric/utils/isInsightsMetricAlert';
 
 import type {MetricAlertType, WizardRuleTemplate} from './options';
 
@@ -59,10 +58,6 @@ export function getAlertTypeFromAggregateDataset({
     return 'eap_metrics';
   }
 
-  if (isInsightsMetricAlert(aggregate)) {
-    return 'insights_metrics';
-  }
-
   if (mri && getUseCaseFromMRI(mri) === 'spans') {
     return 'custom_metrics';
   }
diff --git a/static/app/views/dashboards/contexts/widgetSyncContext.stories.tsx b/static/app/views/dashboards/contexts/widgetSyncContext.stories.tsx
new file mode 100644
index 00000000000000..28c4b8a73421a5
--- /dev/null
+++ b/static/app/views/dashboards/contexts/widgetSyncContext.stories.tsx
@@ -0,0 +1,73 @@
+import {Fragment, useState} from 'react';
+import styled from '@emotion/styled';
+
+import {Button} from 'sentry/components/button';
+import JSXNode from 'sentry/components/stories/jsxNode';
+import SideBySide from 'sentry/components/stories/sideBySide';
+import storyBook from 'sentry/stories/storyBook';
+
+import {LineChartWidget} from '../widgets/lineChartWidget/lineChartWidget';
+import sampleDurationTimeSeries from '../widgets/lineChartWidget/sampleDurationTimeSeries.json';
+import sampleThroughputTimeSeries from '../widgets/lineChartWidget/sampleThroughputTimeSeries.json';
+
+import {WidgetSyncContextProvider} from './widgetSyncContext';
+
+export default storyBook('WidgetSyncContext', story => {
+  story('Getting Started', () => {
+    const [visible, setVisible] = useState<boolean>(false);
+
+    return (
+      <Fragment>
+        <p>
+          <JSXNode name="WidgetSyncContext" /> is a Dashboard Widget Context. All Line
+          Chart widgets within this context will be synchronized via{' '}
+          <code>echarts.connect</code>
+        </p>
+
+        <p>
+          <Button onClick={() => setVisible(true)}>Show Second Chart</Button>{' '}
+          <Button onClick={() => setVisible(false)}>Hide Second Chart</Button>
+        </p>
+
+        <WidgetSyncContextProvider>
+          <SideBySide>
+            <MediumWidget>
+              <LineChartWidget
+                title="span.duration"
+                timeseries={[sampleDurationTimeSeries]}
+                meta={{
+                  fields: {
+                    'span.duration': 'duration',
+                  },
+                  units: {
+                    'span.duration': 'millisecond',
+                  },
+                }}
+              />
+            </MediumWidget>
+            {visible && (
+              <MediumWidget>
+                <LineChartWidget
+                  title="span.duration"
+                  timeseries={[sampleThroughputTimeSeries]}
+                  meta={{
+                    fields: {
+                      'spm()': 'rate',
+                    },
+                    units: {
+                      'spm()': '1/minute',
+                    },
+                  }}
+                />
+              </MediumWidget>
+            )}
+          </SideBySide>
+        </WidgetSyncContextProvider>
+      </Fragment>
+    );
+  });
+});
+const MediumWidget = styled('div')`
+  width: 420px;
+  height: 250px;
+`;
diff --git a/static/app/views/dashboards/contexts/widgetSyncContext.tsx b/static/app/views/dashboards/contexts/widgetSyncContext.tsx
new file mode 100644
index 00000000000000..04f6b54d6ec3b0
--- /dev/null
+++ b/static/app/views/dashboards/contexts/widgetSyncContext.tsx
@@ -0,0 +1,58 @@
+import type {ReactNode} from 'react';
+import type {EChartsType} from 'echarts';
+import * as echarts from 'echarts';
+
+import {uniqueId} from 'sentry/utils/guid';
+import {createDefinedContext} from 'sentry/utils/performance/contexts/utils';
+
+type RegistrationFunction = (chart: EChartsType) => void;
+
+interface WidgetSyncContext {
+  register: RegistrationFunction;
+}
+
+const [_WidgetSyncProvider, _useWidgetSyncContext, WidgetSyncContext] =
+  createDefinedContext<WidgetSyncContext>({
+    name: 'WidgetSyncContext',
+    strict: false,
+  });
+
+interface WidgetSyncContextProviderProps {
+  children: ReactNode;
+  groupName?: string;
+}
+
+export function WidgetSyncContextProvider({
+  children,
+  groupName = uniqueId(),
+}: WidgetSyncContextProviderProps) {
+  const register: RegistrationFunction = chart => {
+    chart.group = groupName;
+    echarts?.connect(groupName);
+  };
+
+  return (
+    <_WidgetSyncProvider
+      value={{
+        register,
+      }}
+    >
+      {children}
+    </_WidgetSyncProvider>
+  );
+}
+
+export {WidgetSyncContext};
+
+export function useWidgetSyncContext(): WidgetSyncContext {
+  const context = _useWidgetSyncContext();
+
+  if (!context) {
+    // The provider was not registered, return a dummy function
+    return {
+      register: (_p: any) => null,
+    };
+  }
+
+  return context;
+}
diff --git a/static/app/views/dashboards/controls.tsx b/static/app/views/dashboards/controls.tsx
index 3be5091d69d56e..5b78f05f53866a 100644
--- a/static/app/views/dashboards/controls.tsx
+++ b/static/app/views/dashboards/controls.tsx
@@ -1,6 +1,7 @@
-import {Fragment} from 'react';
+import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 
+import {updateDashboardFavorite} from 'sentry/actionCreators/dashboards';
 import Feature from 'sentry/components/acl/feature';
 import FeatureDisabled from 'sentry/components/acl/featureDisabled';
 import {Button} from 'sentry/components/button';
@@ -9,12 +10,13 @@ import Confirm from 'sentry/components/confirm';
 import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import {Hovercard} from 'sentry/components/hovercard';
 import {Tooltip} from 'sentry/components/tooltip';
-import {IconAdd, IconDownload, IconEdit} from 'sentry/icons';
+import {IconAdd, IconDownload, IconEdit, IconStar} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {hasCustomMetrics} from 'sentry/utils/metrics/features';
+import useApi from 'sentry/utils/useApi';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useUser} from 'sentry/utils/useUser';
 import {useUserTeams} from 'sentry/utils/useUserTeams';
@@ -55,6 +57,8 @@ function Controls({
   onCancel,
   onAddWidget,
 }: Props) {
+  const [isFavorited, setIsFavorited] = useState(dashboard.isFavorited);
+
   function renderCancelButton(label = t('Cancel')) {
     return (
       <Button
@@ -73,7 +77,7 @@ function Controls({
   const organization = useOrganization();
   const currentUser = useUser();
   const {teams: userTeams} = useUserTeams();
-
+  const api = useApi();
   if ([DashboardState.EDIT, DashboardState.PENDING_DELETE].includes(dashboardState)) {
     return (
       <StyledButtonBar gap={1} key="edit-controls">
@@ -150,10 +154,11 @@ function Controls({
   let hasEditAccess = true;
   if (organization.features.includes('dashboards-edit-access')) {
     hasEditAccess = checkUserHasEditAccess(
-      dashboard,
       currentUser,
       userTeams,
-      organization
+      organization,
+      dashboard.permissions,
+      dashboard.createdBy
     );
   }
 
@@ -177,6 +182,34 @@ function Controls({
                 {t('Export Dashboard')}
               </Button>
             </Feature>
+            <Feature features="dashboards-favourite">
+              <Button
+                size="sm"
+                aria-label={'dashboards-favourite'}
+                icon={
+                  <IconStar
+                    color={isFavorited ? 'yellow300' : 'gray300'}
+                    isSolid={isFavorited}
+                    aria-label={isFavorited ? t('UnFavorite') : t('Favorite')}
+                    data-test-id={isFavorited ? 'yellow-star' : 'empty-star'}
+                  />
+                }
+                onClick={async () => {
+                  try {
+                    setIsFavorited(!isFavorited);
+                    await updateDashboardFavorite(
+                      api,
+                      organization.slug,
+                      dashboard.id,
+                      !isFavorited
+                    );
+                  } catch (error) {
+                    // If the api call fails, revert the state
+                    setIsFavorited(isFavorited);
+                  }
+                }}
+              />
+            </Feature>
             <Feature features="dashboards-edit-access">
               <EditAccessSelector
                 dashboard={dashboard}
@@ -191,7 +224,11 @@ function Controls({
               }}
               icon={<IconEdit />}
               disabled={!hasFeature || hasUnsavedFilters || !hasEditAccess}
-              title={hasUnsavedFilters && UNSAVED_FILTERS_MESSAGE}
+              title={
+                !hasEditAccess
+                  ? t('You do not have permission to edit this dashboard')
+                  : hasUnsavedFilters && UNSAVED_FILTERS_MESSAGE
+              }
               priority="default"
               size="sm"
             >
@@ -225,6 +262,10 @@ function Controls({
                       });
                       onAddWidget(defaultDataset);
                     }}
+                    title={
+                      !hasEditAccess &&
+                      t('You do not have permission to edit this dashboard')
+                    }
                   >
                     {t('Add Widget')}
                   </Button>
diff --git a/static/app/views/dashboards/dashboard.spec.tsx b/static/app/views/dashboards/dashboard.spec.tsx
index cb068c1da3a67a..f6bfd87e6dc6fc 100644
--- a/static/app/views/dashboards/dashboard.spec.tsx
+++ b/static/app/views/dashboards/dashboard.spec.tsx
@@ -2,6 +2,7 @@ import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {RouterFixture} from 'sentry-fixture/routerFixture';
 import {TagsFixture} from 'sentry-fixture/tags';
+import {WidgetFixture} from 'sentry-fixture/widget';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
@@ -85,6 +86,10 @@ describe('Dashboards > Dashboard', () => {
       method: 'POST',
       body: [],
     });
+    MockApiClient.addMockResponse({
+      url: `/organizations/org-slug/releases/stats/`,
+      body: [],
+    });
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/events-stats/',
       method: 'GET',
@@ -294,6 +299,72 @@ describe('Dashboards > Dashboard', () => {
     });
   });
 
+  it('handles duplicate widget in view mode', async () => {
+    const mockOnUpdate = jest.fn();
+    const mockHandleUpdateWidgetList = jest.fn();
+
+    const dashboardWithOneWidget = {
+      ...mockDashboard,
+      widgets: [
+        WidgetFixture({
+          id: '1',
+          layout: {
+            h: 1,
+            w: 1,
+            x: 0,
+            y: 0,
+            minH: 1,
+          },
+        }),
+      ],
+    };
+
+    render(
+      <OrganizationContext.Provider value={initialData.organization}>
+        <MEPSettingProvider forceTransactions={false}>
+          <Dashboard
+            paramDashboardId="1"
+            dashboard={dashboardWithOneWidget}
+            organization={initialData.organization}
+            isEditingDashboard={false}
+            onUpdate={mockOnUpdate}
+            handleUpdateWidgetList={mockHandleUpdateWidgetList}
+            handleAddCustomWidget={() => undefined}
+            router={initialData.router}
+            location={initialData.router.location}
+            widgetLimitReached={false}
+            onSetNewWidget={() => undefined}
+            widgetLegendState={widgetLegendState}
+          />
+        </MEPSettingProvider>
+      </OrganizationContext.Provider>
+    );
+
+    await userEvent.click(await screen.findByLabelText('Widget actions'));
+    await userEvent.click(await screen.findByText('Duplicate Widget'));
+
+    // The new widget is inserted before the duplicated widget
+    const expectedWidgets = [
+      // New Widget
+      expect.objectContaining(
+        WidgetFixture({
+          id: undefined,
+          layout: expect.objectContaining({h: 1, w: 1, x: 0, y: 0, minH: 1}),
+        })
+      ),
+      // Duplicated Widget
+      expect.objectContaining(
+        WidgetFixture({
+          id: '1',
+          layout: expect.objectContaining({h: 1, w: 1, x: 0, y: 1, minH: 1}),
+        })
+      ),
+    ];
+
+    expect(mockHandleUpdateWidgetList).toHaveBeenCalledWith(expectedWidgets);
+    expect(mockOnUpdate).toHaveBeenCalledWith(expectedWidgets);
+  });
+
   describe('Issue Widgets', () => {
     beforeEach(() => {
       MemberListStore.init();
diff --git a/static/app/views/dashboards/dashboard.tsx b/static/app/views/dashboards/dashboard.tsx
index a0c2a877a166a0..18dee93546c5ad 100644
--- a/static/app/views/dashboards/dashboard.tsx
+++ b/static/app/views/dashboards/dashboard.tsx
@@ -95,6 +95,8 @@ type Props = {
   handleChangeSplitDataset?: (widget: Widget, index: number) => void;
   isPreview?: boolean;
   newWidget?: Widget;
+  onAddWidget?: (dataset?: DataSet) => void;
+  onEditWidget?: (widget: Widget) => void;
   onSetNewWidget?: () => void;
   paramDashboardId?: string;
   paramTemplateId?: string;
@@ -222,18 +224,38 @@ class Dashboard extends Component<Props, State> {
   }
 
   handleStartAdd = (dataset?: DataSet) => {
-    const {organization, router, location, paramDashboardId, handleAddMetricWidget} =
-      this.props;
+    const {
+      organization,
+      router,
+      location,
+      paramDashboardId,
+      handleAddMetricWidget,
+      onAddWidget,
+    } = this.props;
 
     if (dataset === DataSet.METRICS) {
       handleAddMetricWidget?.({...this.addWidgetLayout, ...METRIC_WIDGET_MIN_SIZE});
       return;
     }
 
-    if (paramDashboardId) {
+    if (!organization.features.includes('dashboards-widget-builder-redesign')) {
+      if (paramDashboardId) {
+        router.push(
+          normalizeUrl({
+            pathname: `/organizations/${organization.slug}/dashboard/${paramDashboardId}/widget/new/`,
+            query: {
+              ...location.query,
+              source: DashboardWidgetSource.DASHBOARDS,
+              dataset,
+            },
+          })
+        );
+        return;
+      }
+
       router.push(
         normalizeUrl({
-          pathname: `/organizations/${organization.slug}/dashboard/${paramDashboardId}/widget/new/`,
+          pathname: `/organizations/${organization.slug}/dashboards/new/widget/new/`,
           query: {
             ...location.query,
             source: DashboardWidgetSource.DASHBOARDS,
@@ -241,20 +263,11 @@ class Dashboard extends Component<Props, State> {
           },
         })
       );
+
       return;
     }
 
-    router.push(
-      normalizeUrl({
-        pathname: `/organizations/${organization.slug}/dashboards/new/widget/new/`,
-        query: {
-          ...location.query,
-          source: DashboardWidgetSource.DASHBOARDS,
-          dataset,
-        },
-      })
-    );
-
+    onAddWidget?.();
     return;
   };
 
@@ -361,7 +374,7 @@ class Dashboard extends Component<Props, State> {
   };
 
   handleEditWidget = (index: number) => () => {
-    const {organization, router, location, paramDashboardId} = this.props;
+    const {organization, router, location, paramDashboardId, onEditWidget} = this.props;
     const widget = this.props.dashboard.widgets[index];
 
     trackAnalytics('dashboards_views.widget.edit', {
@@ -373,6 +386,11 @@ class Dashboard extends Component<Props, State> {
       return;
     }
 
+    if (organization.features.includes('dashboards-widget-builder-redesign')) {
+      onEditWidget?.(widget);
+      return;
+    }
+
     if (paramDashboardId) {
       router.push(
         normalizeUrl({
@@ -434,6 +452,8 @@ class Dashboard extends Component<Props, State> {
       <div key={key} data-grid={widget.layout}>
         <SortableWidget
           {...widgetProps}
+          dashboardPermissions={dashboard.permissions}
+          dashboardCreator={dashboard.createdBy}
           isMobile={isMobile}
           windowWidth={windowWidth}
           index={String(index)}
diff --git a/static/app/views/dashboards/datasetConfig/base.tsx b/static/app/views/dashboards/datasetConfig/base.tsx
index 7d9f136cbaae86..cad50cc20ca9af 100644
--- a/static/app/views/dashboards/datasetConfig/base.tsx
+++ b/static/app/views/dashboards/datasetConfig/base.tsx
@@ -33,7 +33,6 @@ export type WidgetBuilderSearchBarProps = {
   getFilterWarning: SearchBarProps['getFilterWarning'];
   onClose: SearchBarProps['onClose'];
   onSearch: SearchBarProps['onSearch'];
-  organization: Organization;
   pageFilters: PageFilters;
   widgetQuery: WidgetQuery;
   dataset?: DiscoverDatasets;
diff --git a/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.spec.tsx b/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.spec.tsx
index 3c03fbc91c4209..d65d9bc1fafd85 100644
--- a/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.spec.tsx
+++ b/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.spec.tsx
@@ -160,5 +160,59 @@ describe('utils', () => {
         topEvents: 5,
       });
     });
+
+    it('does not add the orderby field if it is in alias format but the query is not', () => {
+      const widget = WidgetFixture({
+        displayType: DisplayType.LINE,
+        queries: [
+          WidgetQueryFixture({
+            fields: ['title', 'count_unique(user)'],
+            aggregates: ['count_unique(user)'],
+            columns: ['title'],
+            orderby: 'count_unique_user',
+          }),
+        ],
+      });
+      const pageFilters = PageFiltersFixture();
+      const organization = OrganizationFixture();
+
+      const requestData = getSeriesRequestData(
+        widget,
+        0,
+        organization,
+        pageFilters,
+        DiscoverDatasets.ERRORS,
+        'test-referrer'
+      );
+
+      expect(requestData.field).not.toContain('count_unique_user');
+    });
+
+    it('adds the orderby to fields if it is not in fields, columns, or aggregates', () => {
+      const widget = WidgetFixture({
+        displayType: DisplayType.LINE,
+        queries: [
+          WidgetQueryFixture({
+            fields: ['test'],
+            aggregates: [],
+            columns: ['test'],
+            orderby: 'count_unique_user',
+          }),
+        ],
+      });
+      const pageFilters = PageFiltersFixture();
+      const organization = OrganizationFixture();
+
+      const requestData = getSeriesRequestData(
+        widget,
+        0,
+        organization,
+        pageFilters,
+        DiscoverDatasets.ERRORS,
+        'test-referrer'
+      );
+
+      expect(requestData.field).toContain('count_unique_user');
+    });
   });
 });
diff --git a/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.tsx b/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.tsx
index 92b8ed3ea4352e..d18664eae5ec8f 100644
--- a/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.tsx
+++ b/static/app/views/dashboards/datasetConfig/utils/getSeriesRequestData.tsx
@@ -3,7 +3,11 @@ import trimStart from 'lodash/trimStart';
 import type {EventsStatsOptions} from 'sentry/actionCreators/events';
 import type {PageFilters} from 'sentry/types/core';
 import type {Organization} from 'sentry/types/organization';
-import {isEquation, isEquationAlias} from 'sentry/utils/discover/fields';
+import {
+  getAggregateAlias,
+  isEquation,
+  isEquationAlias,
+} from 'sentry/utils/discover/fields';
 import type {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {TOP_N} from 'sentry/utils/discover/types';
 import {DisplayType, type Widget} from 'sentry/views/dashboards/types';
@@ -83,7 +87,7 @@ export function getSeriesRequestData(
       if (
         widgetQuery.orderby &&
         !isEquationAlias(orderby) &&
-        !requestData.field.includes(orderby)
+        !requestData.field.map(getAggregateAlias).includes(getAggregateAlias(orderby))
       ) {
         requestData.field.push(orderby);
       }
diff --git a/static/app/views/dashboards/detail.spec.tsx b/static/app/views/dashboards/detail.spec.tsx
index 5f9d5d2191ff0f..b0a1411671f888 100644
--- a/static/app/views/dashboards/detail.spec.tsx
+++ b/static/app/views/dashboards/detail.spec.tsx
@@ -18,6 +18,7 @@ import {
   within,
 } from 'sentry-test/reactTestingLibrary';
 
+import * as dashboardActions from 'sentry/actionCreators/dashboards';
 import * as modals from 'sentry/actionCreators/modal';
 import ConfigStore from 'sentry/stores/configStore';
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
@@ -25,9 +26,12 @@ import ProjectsStore from 'sentry/stores/projectsStore';
 import TeamStore from 'sentry/stores/teamStore';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import CreateDashboard from 'sentry/views/dashboards/create';
-import {handleUpdateDashboardSplit} from 'sentry/views/dashboards/detail';
+import DashboardDetail, {
+  handleUpdateDashboardSplit,
+} from 'sentry/views/dashboards/detail';
 import EditAccessSelector from 'sentry/views/dashboards/editAccessSelector';
 import * as types from 'sentry/views/dashboards/types';
+import {DashboardState} from 'sentry/views/dashboards/types';
 import ViewEditDashboard from 'sentry/views/dashboards/view';
 import {OrganizationContext} from 'sentry/views/organizationContext';
 
@@ -100,6 +104,10 @@ describe('Dashboards > Detail', function () {
         url: '/organizations/org-slug/releases/',
         body: [],
       });
+      MockApiClient.addMockResponse({
+        url: '/organizations/org-slug/releases/stats/',
+        body: [],
+      });
       MockApiClient.addMockResponse({
         url: '/organizations/org-slug/metrics/meta/',
         body: [],
@@ -368,6 +376,10 @@ describe('Dashboards > Detail', function () {
         url: '/organizations/org-slug/releases/',
         body: [],
       });
+      MockApiClient.addMockResponse({
+        url: '/organizations/org-slug/releases/stats/',
+        body: [],
+      });
       MockApiClient.addMockResponse({
         url: '/organizations/org-slug/sdk-updates/',
         body: [],
@@ -1902,6 +1914,70 @@ describe('Dashboards > Detail', function () {
         }),
       });
 
+      const currentUser = UserFixture({id: '781629', isSuperuser: false});
+      ConfigStore.set('user', currentUser);
+
+      render(
+        <ViewEditDashboard
+          {...RouteComponentPropsFixture()}
+          organization={{
+            ...initialData.organization,
+            features: ['dashboards-edit-access', ...initialData.organization.features],
+            access: ['org:read'],
+          }}
+          params={{orgId: 'org-slug', dashboardId: '1'}}
+          router={initialData.router}
+          location={initialData.router.location}
+        >
+          {null}
+        </ViewEditDashboard>,
+        {
+          router: initialData.router,
+          organization: {
+            features: ['dashboards-edit-access', ...initialData.organization.features],
+            access: ['org:read'],
+          },
+        }
+      );
+
+      await screen.findByText('Edit Access:');
+      expect(screen.getByRole('button', {name: 'Edit Dashboard'})).toBeDisabled();
+      expect(screen.getByRole('button', {name: 'Add Widget'})).toBeDisabled();
+    });
+
+    it('disables widget edit, duplicate, and delete button when user does not have edit perms', async function () {
+      const widget = {
+        displayType: types.DisplayType.TABLE,
+        interval: '1d',
+        queries: [
+          {
+            name: 'Test Widget',
+            fields: ['count()', 'count_unique(user)', 'epm()', 'project'],
+            columns: ['project'],
+            aggregates: ['count()', 'count_unique(user)', 'epm()'],
+            conditions: '',
+            orderby: '',
+          },
+        ],
+        title: 'Transactions',
+        id: '1',
+        widgetType: types.WidgetType.DISCOVER,
+      };
+      const mockDashboard = DashboardFixture([widget], {
+        id: '1',
+        title: 'Custom Errors',
+        createdBy: UserFixture({id: '238900'}),
+        permissions: {isEditableByEveryone: false},
+      });
+      MockApiClient.addMockResponse({
+        url: '/organizations/org-slug/dashboards/',
+        body: mockDashboard,
+      });
+      MockApiClient.addMockResponse({
+        url: '/organizations/org-slug/dashboards/1/',
+        body: mockDashboard,
+      });
+
       const currentUser = UserFixture({id: '781629'});
       ConfigStore.set('user', currentUser);
 
@@ -1911,6 +1987,7 @@ describe('Dashboards > Detail', function () {
           organization={{
             ...initialData.organization,
             features: ['dashboards-edit-access', ...initialData.organization.features],
+            access: ['org:read'],
           }}
           params={{orgId: 'org-slug', dashboardId: '1'}}
           router={initialData.router}
@@ -1922,6 +1999,7 @@ describe('Dashboards > Detail', function () {
           router: initialData.router,
           organization: {
             features: ['dashboards-edit-access', ...initialData.organization.features],
+            access: ['org:read'],
           },
         }
       );
@@ -1929,6 +2007,353 @@ describe('Dashboards > Detail', function () {
       await screen.findByText('Edit Access:');
       expect(screen.getByRole('button', {name: 'Edit Dashboard'})).toBeDisabled();
       expect(screen.getByRole('button', {name: 'Add Widget'})).toBeDisabled();
+      await userEvent.click(await screen.findByLabelText('Widget actions'));
+      expect(
+        screen.getByRole('menuitemradio', {name: 'Duplicate Widget'})
+      ).toHaveAttribute('aria-disabled', 'true');
+      expect(screen.getByRole('menuitemradio', {name: 'Delete Widget'})).toHaveAttribute(
+        'aria-disabled',
+        'true'
+      );
+      expect(screen.getByRole('menuitemradio', {name: 'Edit Widget'})).toHaveAttribute(
+        'aria-disabled',
+        'true'
+      );
+    });
+
+    it('renders favorite button in unfavorited state', async function () {
+      MockApiClient.addMockResponse({
+        url: '/organizations/org-slug/dashboards/1/',
+        body: DashboardFixture([], {id: '1', title: 'Custom Errors', isFavorited: false}),
+      });
+      render(
+        <ViewEditDashboard
+          {...RouteComponentPropsFixture()}
+          organization={initialData.organization}
+          params={{orgId: 'org-slug', dashboardId: '1'}}
+          router={initialData.router}
+          location={initialData.router.location}
+        >
+          {null}
+        </ViewEditDashboard>,
+        {
+          router: initialData.router,
+          organization: {
+            features: ['dashboards-favourite', ...initialData.organization.features],
+          },
+        }
+      );
+
+      const favoriteButton = await screen.findByLabelText('dashboards-favourite');
+      expect(favoriteButton).toBeInTheDocument();
+      expect(await screen.findByLabelText('Favorite')).toBeInTheDocument();
+    });
+
+    it('renders favorite button in favorited state', async function () {
+      MockApiClient.addMockResponse({
+        url: '/organizations/org-slug/dashboards/1/',
+        body: DashboardFixture([], {id: '1', title: 'Custom Errors', isFavorited: true}),
+      });
+      render(
+        <ViewEditDashboard
+          {...RouteComponentPropsFixture()}
+          organization={initialData.organization}
+          params={{orgId: 'org-slug', dashboardId: '1'}}
+          router={initialData.router}
+          location={initialData.router.location}
+        >
+          {null}
+        </ViewEditDashboard>,
+        {
+          router: initialData.router,
+          organization: {
+            features: ['dashboards-favourite', ...initialData.organization.features],
+          },
+        }
+      );
+
+      const favoriteButton = await screen.findByLabelText('dashboards-favourite');
+      expect(favoriteButton).toBeInTheDocument();
+      expect(await screen.findByLabelText('UnFavorite')).toBeInTheDocument();
+    });
+
+    it('toggles favorite button', async function () {
+      MockApiClient.addMockResponse({
+        url: '/organizations/org-slug/dashboards/1/',
+        body: DashboardFixture([], {id: '1', title: 'Custom Errors', isFavorited: true}),
+      });
+      MockApiClient.addMockResponse({
+        url: '/organizations/org-slug/dashboards/1/favorite/',
+        method: 'PUT',
+        body: {isFavorited: false},
+      });
+      render(
+        <ViewEditDashboard
+          {...RouteComponentPropsFixture()}
+          organization={initialData.organization}
+          params={{orgId: 'org-slug', dashboardId: '1'}}
+          router={initialData.router}
+          location={initialData.router.location}
+        >
+          {null}
+        </ViewEditDashboard>,
+        {
+          router: initialData.router,
+          organization: {
+            features: ['dashboards-favourite', ...initialData.organization.features],
+          },
+        }
+      );
+
+      const favoriteButton = await screen.findByLabelText('dashboards-favourite');
+      expect(favoriteButton).toBeInTheDocument();
+
+      expect(await screen.findByLabelText('UnFavorite')).toBeInTheDocument();
+      await userEvent.click(favoriteButton);
+      expect(await screen.findByLabelText('Favorite')).toBeInTheDocument();
+    });
+
+    describe('widget builder redesign', function () {
+      let mockUpdateDashboard;
+      beforeEach(function () {
+        initialData = initializeOrg({
+          organization: OrganizationFixture({
+            features: [
+              'global-views',
+              'dashboards-basic',
+              'dashboards-edit',
+              'discover-query',
+              'performance-discover-dataset-selector',
+              'dashboards-widget-builder-redesign',
+            ],
+          }),
+        });
+
+        // Mock just the updateDashboard function
+        mockUpdateDashboard = jest
+          .spyOn(dashboardActions, 'updateDashboard')
+          .mockResolvedValue({
+            ...DashboardFixture([WidgetFixture({id: '1', title: 'Custom Widget'})]),
+          });
+      });
+
+      afterEach(() => {
+        mockUpdateDashboard.mockRestore();
+      });
+
+      it('opens the widget builder slideout when clicking add widget', async function () {
+        render(
+          <DashboardDetail
+            {...RouteComponentPropsFixture()}
+            initialState={DashboardState.VIEW}
+            dashboard={DashboardFixture([])}
+            dashboards={[]}
+            onDashboardUpdate={jest.fn()}
+            newWidget={undefined}
+            onSetNewWidget={() => {}}
+          />,
+          {organization: initialData.organization}
+        );
+        await userEvent.click(await screen.findByRole('button', {name: 'Add Widget'}));
+        expect(await screen.findByText('Create Custom Widget')).toBeInTheDocument();
+      });
+
+      it('opens the widget builder slideout when clicking add widget in edit mode', async function () {
+        render(
+          <DashboardDetail
+            {...RouteComponentPropsFixture()}
+            initialState={DashboardState.EDIT}
+            dashboard={DashboardFixture([])}
+            dashboards={[]}
+            onDashboardUpdate={jest.fn()}
+            newWidget={undefined}
+            onSetNewWidget={() => {}}
+          />,
+          {organization: initialData.organization}
+        );
+        await userEvent.click(await screen.findByTestId('widget-add'));
+        expect(await screen.findByText('Create Custom Widget')).toBeInTheDocument();
+      });
+
+      it('allows for editing a widget in edit mode', async function () {
+        const mockWidget = WidgetFixture({id: '1', title: 'Custom Widget'});
+        const mockDashboard = DashboardFixture([mockWidget], {
+          id: '1',
+          title: 'Custom Errors',
+        });
+        render(
+          <DashboardDetail
+            {...RouteComponentPropsFixture()}
+            initialState={DashboardState.EDIT}
+            dashboard={mockDashboard}
+            dashboards={[]}
+            onDashboardUpdate={jest.fn()}
+            newWidget={undefined}
+            onSetNewWidget={() => {}}
+          />,
+          {
+            organization: initialData.organization,
+            // Mock the widgetIndex param so it's available when the widget builder opens
+            router: {...initialData.router, params: {widgetIndex: 0}},
+          }
+        );
+
+        expect(await screen.findByText('Custom Widget')).toBeInTheDocument();
+        await userEvent.click(await screen.findByRole('button', {name: 'Edit Widget'}));
+
+        expect(await screen.findByText('Edit Widget')).toBeInTheDocument();
+
+        await userEvent.clear(screen.getByLabelText('Widget Name'));
+        await userEvent.type(screen.getByLabelText('Widget Name'), 'Updated Widget');
+
+        await userEvent.click(screen.getByText('Update Widget'));
+
+        // The widget builder is closed after the widget is updated
+        await waitFor(() => {
+          expect(screen.queryByText('Edit Widget')).not.toBeInTheDocument();
+        });
+
+        // The widget is updated in the dashboard
+        expect(screen.getByText('Updated Widget')).toBeInTheDocument();
+      });
+
+      it('allows for creating a widget in edit mode', async function () {
+        const mockDashboard = DashboardFixture([], {
+          id: '1',
+          title: 'Custom Errors',
+        });
+        render(
+          <DashboardDetail
+            {...RouteComponentPropsFixture()}
+            initialState={DashboardState.EDIT}
+            dashboard={mockDashboard}
+            dashboards={[]}
+            onDashboardUpdate={jest.fn()}
+            newWidget={undefined}
+            onSetNewWidget={() => {}}
+          />,
+          {
+            organization: initialData.organization,
+          }
+        );
+
+        await userEvent.click(await screen.findByTestId('widget-add'));
+
+        expect(await screen.findByText('Create Custom Widget')).toBeInTheDocument();
+
+        await userEvent.clear(screen.getByLabelText('Widget Name'));
+        await userEvent.type(screen.getByLabelText('Widget Name'), 'Totally new widget');
+
+        await userEvent.click(screen.getByText('Add Widget'));
+
+        // The widget builder is closed after the widget is updated
+        await waitFor(() => {
+          expect(screen.queryByText('Create Custom Widget')).not.toBeInTheDocument();
+        });
+
+        // The widget is added in the dashboard
+        expect(screen.getByText('Totally new widget')).toBeInTheDocument();
+      });
+
+      it('allows for editing a widget in view mode', async function () {
+        const mockWidget = WidgetFixture({id: '1', title: 'Custom Widget'});
+        const mockDashboard = DashboardFixture([mockWidget], {
+          id: '1',
+          title: 'Custom Errors',
+        });
+        render(
+          <DashboardDetail
+            {...RouteComponentPropsFixture()}
+            initialState={DashboardState.VIEW}
+            dashboard={mockDashboard}
+            dashboards={[]}
+            onDashboardUpdate={jest.fn()}
+            newWidget={undefined}
+            onSetNewWidget={() => {}}
+          />,
+          {
+            organization: initialData.organization,
+            // Mock the widgetIndex param so it's available when the widget builder opens
+            router: {...initialData.router, params: {widgetIndex: 0}},
+          }
+        );
+
+        expect(await screen.findByText('Custom Widget')).toBeInTheDocument();
+        await userEvent.click(await screen.findByLabelText('Widget actions'));
+        await userEvent.click(
+          await screen.findByRole('menuitemradio', {name: 'Edit Widget'})
+        );
+
+        expect(await screen.findByText('Edit Widget')).toBeInTheDocument();
+
+        await userEvent.clear(screen.getByLabelText('Widget Name'));
+        await userEvent.type(
+          screen.getByLabelText('Widget Name'),
+          'Updated Widget Title'
+        );
+
+        await userEvent.click(screen.getByText('Update Widget'));
+
+        // The widget builder is closed after the widget is updated
+        await waitFor(() => {
+          expect(screen.queryByText('Edit Widget')).not.toBeInTheDocument();
+        });
+
+        // The update action is called with the updated widget
+        expect(mockUpdateDashboard).toHaveBeenCalledWith(
+          expect.anything(),
+          expect.anything(),
+          expect.objectContaining({
+            widgets: [expect.objectContaining({title: 'Updated Widget Title'})],
+          })
+        );
+      });
+
+      it('allows for creating a widget in view mode', async function () {
+        const mockDashboard = DashboardFixture([], {
+          id: '1',
+          title: 'Custom Errors',
+        });
+        render(
+          <DashboardDetail
+            {...RouteComponentPropsFixture()}
+            initialState={DashboardState.VIEW}
+            dashboard={mockDashboard}
+            dashboards={[]}
+            onDashboardUpdate={jest.fn()}
+            newWidget={undefined}
+            onSetNewWidget={() => {}}
+          />,
+          {
+            organization: initialData.organization,
+          }
+        );
+
+        await userEvent.click(await screen.findByRole('button', {name: 'Add Widget'}));
+
+        expect(await screen.findByText('Create Custom Widget')).toBeInTheDocument();
+
+        await userEvent.clear(screen.getByLabelText('Widget Name'));
+        await userEvent.type(screen.getByLabelText('Widget Name'), 'Totally new widget');
+
+        await userEvent.click(
+          await within(screen.getByTestId('widget-slideout')).findByText('Add Widget')
+        );
+
+        // The widget builder is closed after the widget is updated
+        await waitFor(() => {
+          expect(screen.queryByText('Create Custom Widget')).not.toBeInTheDocument();
+        });
+
+        // The update action is called with the new widget
+        expect(mockUpdateDashboard).toHaveBeenCalledWith(
+          expect.anything(),
+          expect.anything(),
+          expect.objectContaining({
+            widgets: [expect.objectContaining({title: 'Totally new widget'})],
+          })
+        );
+      });
     });
 
     describe('discover split', function () {
diff --git a/static/app/views/dashboards/detail.tsx b/static/app/views/dashboards/detail.tsx
index 3eefb7872b7684..e4660388e957f2 100644
--- a/static/app/views/dashboards/detail.tsx
+++ b/static/app/views/dashboards/detail.tsx
@@ -1,9 +1,10 @@
 import {cloneElement, Component, Fragment, isValidElement} from 'react';
 import styled from '@emotion/styled';
-import type {User} from '@sentry/types';
+import type {Location} from 'history';
 import isEqual from 'lodash/isEqual';
 import isEqualWith from 'lodash/isEqualWith';
 import omit from 'lodash/omit';
+import pick from 'lodash/pick';
 
 import {
   createDashboard,
@@ -14,6 +15,7 @@ import {
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {openWidgetViewerModal} from 'sentry/actionCreators/modal';
 import type {Client} from 'sentry/api';
+import {hasEveryAccess} from 'sentry/components/acl/access';
 import {Breadcrumbs} from 'sentry/components/breadcrumbs';
 import HookOrDefault from 'sentry/components/hookOrDefault';
 import * as Layout from 'sentry/components/layouts/thirds';
@@ -31,6 +33,7 @@ import type {PageFilters} from 'sentry/types/core';
 import type {PlainRoute, RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Organization, Team} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
+import type {User} from 'sentry/types/user';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {browserHistory} from 'sentry/utils/browserHistory';
@@ -53,7 +56,9 @@ import {
   isWidgetUsingTransactionName,
   resetPageFilters,
 } from 'sentry/views/dashboards/utils';
+import WidgetBuilderV2 from 'sentry/views/dashboards/widgetBuilder/components/newWidgetBuilder';
 import {DataSet} from 'sentry/views/dashboards/widgetBuilder/utils';
+import {convertWidgetToBuilderStateParams} from 'sentry/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams';
 import WidgetLegendNameEncoderDecoder from 'sentry/views/dashboards/widgetLegendNameEncoderDecoder';
 import {MetricsDataSwitcherAlert} from 'sentry/views/performance/landing/metricsDataSwitcherAlert';
 
@@ -123,6 +128,7 @@ type Props = RouteComponentProps<RouteParams, {}> & {
 
 type State = {
   dashboardState: DashboardState;
+  isWidgetBuilderOpen: boolean;
   modifiedDashboard: DashboardDetails | null;
   widgetLegendState: WidgetLegendSelectionState;
   widgetLimitReached: boolean;
@@ -172,28 +178,63 @@ export function handleUpdateDashboardSplit({
 
 /* Checks if current user has permissions to edit dashboard */
 export function checkUserHasEditAccess(
-  dashboard: DashboardDetails,
   currentUser: User,
   userTeams: Team[],
-  organization: Organization
+  organization: Organization,
+  dashboardPermissions?: DashboardPermissions,
+  dashboardCreator?: User
 ): boolean {
   if (
     !organization.features.includes('dashboards-edit-access') ||
-    !dashboard.permissions ||
-    dashboard.permissions.isEditableByEveryone ||
-    dashboard.createdBy?.id === currentUser.id
+    hasEveryAccess(['org:write'], {organization}) || // Managers and Owners
+    !dashboardPermissions ||
+    dashboardPermissions.isEditableByEveryone ||
+    dashboardCreator?.id === currentUser.id
   ) {
     return true;
   }
-  if (dashboard.permissions.teamsWithEditAccess?.length) {
+  if (dashboardPermissions.teamsWithEditAccess?.length) {
     const userTeamIds = userTeams.map(team => Number(team.id));
-    dashboard.permissions.teamsWithEditAccess.some(teamId =>
+    return dashboardPermissions.teamsWithEditAccess.some(teamId =>
       userTeamIds.includes(teamId)
     );
   }
   return false;
 }
 
+function getDashboardLocation({
+  organization,
+  dashboardId,
+  location,
+}: {
+  location: Location<any>;
+  organization: Organization;
+  dashboardId?: string;
+}) {
+  // Preserve important filter params
+  const filterParams = pick(location.query, [
+    'release',
+    'environment',
+    'project',
+    'statsPeriod',
+    'start',
+    'end',
+  ]);
+
+  const commonPath = defined(dashboardId)
+    ? `/dashboard/${dashboardId}/`
+    : `/dashboards/new/`;
+
+  const dashboardUrl = USING_CUSTOMER_DOMAIN
+    ? commonPath
+    : `/organizations/${organization.slug}${commonPath}`;
+
+  return normalizeUrl({
+    pathname: dashboardUrl,
+    query: filterParams,
+  });
+}
+
 class DashboardDetail extends Component<Props, State> {
   state: State = {
     dashboardState: this.props.initialState,
@@ -208,6 +249,7 @@ class DashboardDetail extends Component<Props, State> {
       location: this.props.location,
       router: this.props.router,
     }),
+    isWidgetBuilderOpen: this.isRedesignedWidgetBuilder,
   };
 
   componentDidMount() {
@@ -273,6 +315,8 @@ class DashboardDetail extends Component<Props, State> {
           totalIssuesCount,
           widgetLegendState: this.state.widgetLegendState,
           dashboardFilters: getDashboardFiltersFromURL(location) ?? dashboard.filters,
+          dashboardPermissions: dashboard.permissions,
+          dashboardCreator: dashboard.createdBy,
           onMetricWidgetEdit: (updatedWidget: Widget) => {
             const widgets = [...dashboard.widgets];
 
@@ -291,6 +335,10 @@ class DashboardDetail extends Component<Props, State> {
           },
           onEdit: () => {
             const widgetIndex = dashboard.widgets.indexOf(widget);
+            if (organization.features.includes('dashboards-widget-builder-redesign')) {
+              this.onEditWidget(widget);
+              return;
+            }
             if (dashboardId) {
               const query = omit(location.query, Object.values(WidgetViewerQueryField));
 
@@ -378,6 +426,35 @@ class DashboardDetail extends Component<Props, State> {
     return widgetBuilderRoutes.includes(location.pathname);
   }
 
+  get isRedesignedWidgetBuilder() {
+    const {organization, location, params} = this.props;
+    const {dashboardId, widgetIndex} = params;
+
+    if (!organization.features.includes('dashboards-widget-builder-redesign')) {
+      return false;
+    }
+
+    const widgetBuilderRoutes = [
+      `/organizations/${organization.slug}/dashboard/new/widget-builder/widget/new/`,
+      `/organizations/${organization.slug}/dashboard/${dashboardId}/widget-builder/widget/new/`,
+      `/organizations/${organization.slug}/dashboard/new/widget-builder/widget/${widgetIndex}/edit/`,
+      `/organizations/${organization.slug}/dashboard/${dashboardId}/widget-builder/widget/${widgetIndex}/edit/`,
+    ];
+
+    if (USING_CUSTOMER_DOMAIN) {
+      widgetBuilderRoutes.push(
+        ...[
+          `/dashboards/new/widget-builder/widget/new/`,
+          `/dashboard/${dashboardId}/widget-builder/widget/new/`,
+          `/dashboards/new/widget-builder/widget/${widgetIndex}/edit/`,
+          `/dashboard/${dashboardId}/widget-builder/widget/${widgetIndex}/edit/`,
+        ]
+      );
+    }
+
+    return widgetBuilderRoutes.includes(location.pathname);
+  }
+
   get dashboardTitle() {
     const {dashboard} = this.props;
     const {modifiedDashboard} = this.state;
@@ -589,7 +666,7 @@ class DashboardDetail extends Component<Props, State> {
     });
   };
 
-  onAddWidget = (dataset: DataSet) => {
+  onAddWidget = (dataset?: DataSet) => {
     const {
       organization,
       dashboard,
@@ -597,11 +674,40 @@ class DashboardDetail extends Component<Props, State> {
       location,
       params: {dashboardId},
     } = this.props;
+    const {modifiedDashboard} = this.state;
 
     if (dataset === DataSet.METRICS) {
       this.handleAddMetricWidget();
       return;
     }
+
+    if (organization.features.includes('dashboards-widget-builder-redesign')) {
+      this.setState(
+        {
+          modifiedDashboard: cloneDashboard(modifiedDashboard ?? dashboard),
+        },
+        () => {
+          this.setState({isWidgetBuilderOpen: true});
+          let pathname = `/organizations/${organization.slug}/dashboard/${dashboardId}/widget-builder/widget/new/`;
+          if (!defined(dashboardId)) {
+            pathname = `/organizations/${organization.slug}/dashboards/new/widget-builder/widget/new/`;
+          }
+          router.push(
+            normalizeUrl({
+              // TODO: Replace with the old widget builder path when swapping over
+              pathname,
+              query: {
+                ...location.query,
+                dataset,
+              },
+            })
+          );
+        }
+      );
+
+      return;
+    }
+
     this.setState(
       {
         modifiedDashboard: cloneDashboard(dashboard),
@@ -623,6 +729,71 @@ class DashboardDetail extends Component<Props, State> {
     );
   };
 
+  onEditWidget = (widget: Widget) => {
+    const {router, organization, params, location, dashboard} = this.props;
+    const {modifiedDashboard} = this.state;
+    const currentDashboard = modifiedDashboard ?? dashboard;
+    const {dashboardId} = params;
+    const widgetIndex = currentDashboard.widgets.indexOf(widget);
+    this.setState({
+      isWidgetBuilderOpen: true,
+    });
+    const path = defined(dashboardId)
+      ? `/organizations/${organization.slug}/dashboard/${dashboardId}/widget-builder/widget/${widgetIndex}/edit/`
+      : `/organizations/${organization.slug}/dashboards/new/widget-builder/widget/${widgetIndex}/edit/`;
+    router.push(
+      normalizeUrl({
+        pathname: path,
+        query: {
+          ...location.query,
+          ...convertWidgetToBuilderStateParams(widget),
+        },
+      })
+    );
+  };
+
+  handleSaveWidget = async ({
+    index,
+    widget,
+  }: {
+    index: number | undefined;
+    widget: Widget;
+  }) => {
+    if (
+      !this.props.organization.features.includes('dashboards-widget-builder-redesign')
+    ) {
+      return;
+    }
+
+    const currentDashboard = this.state.modifiedDashboard ?? this.props.dashboard;
+
+    // Get the "base" widget and merge the changes to persist information like tempIds and layout
+    const baseWidget = defined(index) ? currentDashboard.widgets[index] : {};
+    const mergedWidget = {...baseWidget, ...widget};
+
+    const newWidgets = defined(index)
+      ? [
+          ...currentDashboard.widgets.slice(0, index),
+          mergedWidget,
+          ...currentDashboard.widgets.slice(index + 1),
+        ]
+      : [...currentDashboard.widgets, mergedWidget];
+
+    try {
+      if (!this.isEditingDashboard) {
+        // If we're not in edit mode, send a request to update the dashboard
+        await this.handleUpdateWidgetList(newWidgets);
+      } else {
+        // If we're in edit mode, update the edit state
+        this.onUpdateWidget(newWidgets);
+      }
+
+      this.handleCloseWidgetBuilder();
+    } catch (error) {
+      addErrorMessage(t('Failed to save widget'));
+    }
+  };
+
   /* Handles POST request for Edit Access Selector Changes */
   onChangeEditAccess = (newDashboardPermissions: DashboardPermissions) => {
     const {dashboard, api, organization} = this.props;
@@ -642,6 +813,18 @@ class DashboardDetail extends Component<Props, State> {
     );
   };
 
+  handleCloseWidgetBuilder = () => {
+    const {organization, router, location, params} = this.props;
+    this.setState({isWidgetBuilderOpen: false});
+    router.push(
+      getDashboardLocation({
+        organization,
+        dashboardId: params.dashboardId,
+        location,
+      })
+    );
+  };
+
   onCommit = () => {
     const {api, organization, location, dashboard, onDashboardUpdate} = this.props;
     const {modifiedDashboard, dashboardState} = this.state;
@@ -845,6 +1028,8 @@ class DashboardDetail extends Component<Props, State> {
                 </StyledPageHeader>
                 <HookHeader organization={organization} />
                 <FiltersBar
+                  dashboardPermissions={dashboard.permissions}
+                  dashboardCreator={dashboard.createdBy}
                   filters={{}} // Default Dashboards don't have filters set
                   location={location}
                   hasUnsavedChanges={false}
@@ -1018,6 +1203,8 @@ class DashboardDetail extends Component<Props, State> {
                               ) : null}
                               <FiltersBar
                                 filters={(modifiedDashboard ?? dashboard).filters}
+                                dashboardPermissions={dashboard.permissions}
+                                dashboardCreator={dashboard.createdBy}
                                 location={location}
                                 hasUnsavedChanges={hasUnsavedFilters}
                                 isEditingDashboard={
@@ -1093,23 +1280,38 @@ class DashboardDetail extends Component<Props, State> {
                               />
 
                               <WidgetViewerContext.Provider value={{seriesData, setData}}>
-                                <Dashboard
-                                  paramDashboardId={dashboardId}
-                                  dashboard={modifiedDashboard ?? dashboard}
-                                  organization={organization}
-                                  isEditingDashboard={this.isEditingDashboard}
-                                  widgetLimitReached={widgetLimitReached}
-                                  onUpdate={this.onUpdateWidget}
-                                  handleUpdateWidgetList={this.handleUpdateWidgetList}
-                                  handleAddCustomWidget={this.handleAddCustomWidget}
-                                  handleAddMetricWidget={this.handleAddMetricWidget}
-                                  router={router}
-                                  location={location}
-                                  newWidget={newWidget}
-                                  onSetNewWidget={onSetNewWidget}
-                                  isPreview={this.isPreview}
-                                  widgetLegendState={this.state.widgetLegendState}
-                                />
+                                <Fragment>
+                                  <Dashboard
+                                    paramDashboardId={dashboardId}
+                                    dashboard={modifiedDashboard ?? dashboard}
+                                    organization={organization}
+                                    isEditingDashboard={this.isEditingDashboard}
+                                    widgetLimitReached={widgetLimitReached}
+                                    onUpdate={this.onUpdateWidget}
+                                    handleUpdateWidgetList={this.handleUpdateWidgetList}
+                                    handleAddCustomWidget={this.handleAddCustomWidget}
+                                    handleAddMetricWidget={this.handleAddMetricWidget}
+                                    router={router}
+                                    location={location}
+                                    newWidget={newWidget}
+                                    onSetNewWidget={onSetNewWidget}
+                                    isPreview={this.isPreview}
+                                    widgetLegendState={this.state.widgetLegendState}
+                                    onAddWidget={this.onAddWidget}
+                                    onEditWidget={this.onEditWidget}
+                                  />
+
+                                  <WidgetBuilderV2
+                                    isOpen={this.state.isWidgetBuilderOpen}
+                                    onClose={this.handleCloseWidgetBuilder}
+                                    dashboardFilters={
+                                      getDashboardFiltersFromURL(location) ??
+                                      dashboard.filters
+                                    }
+                                    dashboard={modifiedDashboard ?? dashboard}
+                                    onSave={this.handleSaveWidget}
+                                  />
+                                </Fragment>
                               </WidgetViewerContext.Provider>
                             </MEPSettingProvider>
                           )}
diff --git a/static/app/views/dashboards/editAccessSelector.spec.tsx b/static/app/views/dashboards/editAccessSelector.spec.tsx
index becd22c7b77d35..cb067cd48fac9c 100644
--- a/static/app/views/dashboards/editAccessSelector.spec.tsx
+++ b/static/app/views/dashboards/editAccessSelector.spec.tsx
@@ -1,9 +1,11 @@
 import {DashboardFixture} from 'sentry-fixture/dashboard';
+import {OrganizationFixture} from 'sentry-fixture/organization';
 import {TeamFixture} from 'sentry-fixture/team';
 import {UserFixture} from 'sentry-fixture/user';
 
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
+import OrganizationStore from 'sentry/stores/organizationStore';
 import TeamStore from 'sentry/stores/teamStore';
 import EditAccessSelector from 'sentry/views/dashboards/editAccessSelector';
 
@@ -224,7 +226,15 @@ describe('When EditAccessSelector is rendered with Teams', function () {
   });
 
   it('searches teams', async function () {
+    const org = OrganizationFixture();
+    OrganizationStore.onUpdate(org, {replace: true});
+    MockApiClient.addMockResponse({
+      url: `/organizations/org-slug/teams/`,
+      method: 'GET',
+      body: teams,
+    });
     renderTestComponent();
+
     await userEvent.click(await screen.findByText('Edit Access:'));
     await userEvent.type(screen.getByPlaceholderText('Search Teams'), 'team2');
 
diff --git a/static/app/views/dashboards/editAccessSelector.tsx b/static/app/views/dashboards/editAccessSelector.tsx
index 6c72ed8ea59a96..4b65be81d9583f 100644
--- a/static/app/views/dashboards/editAccessSelector.tsx
+++ b/static/app/views/dashboards/editAccessSelector.tsx
@@ -1,10 +1,14 @@
-import {useState} from 'react';
+import {useCallback, useEffect, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
+import debounce from 'lodash/debounce';
 import isEqual from 'lodash/isEqual';
+import sortBy from 'lodash/sortBy';
 
+import {hasEveryAccess} from 'sentry/components/acl/access';
 import AvatarList from 'sentry/components/avatar/avatarList';
 import TeamAvatar from 'sentry/components/avatar/teamAvatar';
 import Badge from 'sentry/components/badge/badge';
+import FeatureBadge from 'sentry/components/badge/featureBadge';
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
 import {CompactSelect} from 'sentry/components/compactSelect';
@@ -12,17 +16,25 @@ import {CheckWrap} from 'sentry/components/compactSelect/styles';
 import UserBadge from 'sentry/components/idBadge/userBadge';
 import {InnerWrap, LeadingItems} from 'sentry/components/menuListItem';
 import {Tooltip} from 'sentry/components/tooltip';
+import {DEFAULT_DEBOUNCE_DURATION} from 'sentry/constants';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Team} from 'sentry/types/organization';
 import type {User} from 'sentry/types/user';
 import {defined} from 'sentry/utils';
+import useOrganization from 'sentry/utils/useOrganization';
+import {useTeams} from 'sentry/utils/useTeams';
 import {useTeamsById} from 'sentry/utils/useTeamsById';
 import {useUser} from 'sentry/utils/useUser';
-import type {DashboardDetails, DashboardPermissions} from 'sentry/views/dashboards/types';
+import type {
+  DashboardDetails,
+  DashboardListItem,
+  DashboardPermissions,
+} from 'sentry/views/dashboards/types';
 
 interface EditAccessSelectorProps {
-  dashboard: DashboardDetails;
+  dashboard: DashboardDetails | DashboardListItem;
+  listOnly?: boolean;
   onChangeEditAccess?: (newDashboardPermissions: DashboardPermissions) => void;
 }
 
@@ -30,15 +42,46 @@ interface EditAccessSelectorProps {
  * Dropdown multiselect button to enable selective Dashboard editing access to
  * specific users and teams
  */
-function EditAccessSelector({dashboard, onChangeEditAccess}: EditAccessSelectorProps) {
+function EditAccessSelector({
+  dashboard,
+  onChangeEditAccess,
+  listOnly = false,
+}: EditAccessSelectorProps) {
   const currentUser: User = useUser();
   const dashboardCreator: User | undefined = dashboard.createdBy;
-  const isCurrentUserDashboardOwner = dashboardCreator?.id === currentUser.id;
-  const {teams} = useTeamsById();
-  const teamIds: string[] = Object.values(teams).map(team => team.id);
-  const [selectedOptions, setSelectedOptions] = useState<string[]>(getSelectedOptions());
+
+  const organization = useOrganization();
+  const userCanEditDashboardPermissions =
+    dashboardCreator?.id === currentUser.id ||
+    hasEveryAccess(['org:write'], {organization});
+
+  // Retrieves teams from the team store, which may contain only a subset of all teams
+  const {teams: teamsToRender} = useTeamsById();
+  const {onSearch} = useTeams();
+  const teamIds: string[] = Object.values(teamsToRender).map(team => team.id);
+
+  const [selectedOptions, setSelectedOptions] = useState<string[]>([]);
+  const [stagedOptions, setStagedOptions] = useState<string[]>([]);
   const [isMenuOpen, setMenuOpen] = useState<boolean>(false);
-  const [hasUnsavedChanges, setHasUnsavedChanges] = useState<boolean>(false);
+  const {teams: selectedTeam} = useTeamsById({
+    ids:
+      selectedOptions[1] && selectedOptions[1] !== 'allUsers' ? [selectedOptions[1]] : [],
+  });
+
+  // Gets selected options for the dropdown from dashboard object
+  useEffect(() => {
+    const teamIdsList: string[] = Object.values(teamsToRender).map(team => team.id);
+    const selectedOptionsFromDashboard =
+      !defined(dashboard.permissions) || dashboard.permissions.isEditableByEveryone
+        ? ['_creator', '_allUsers', ...teamIdsList]
+        : [
+            '_creator',
+            ...(dashboard.permissions.teamsWithEditAccess?.map(teamId =>
+              String(teamId)
+            ) ?? []),
+          ];
+    setSelectedOptions(selectedOptionsFromDashboard);
+  }, [dashboard, teamsToRender, isMenuOpen]); // isMenuOpen dependency ensures perms are 'refreshed'
 
   // Handles state change when dropdown options are selected
   const onSelectOptions = newSelectedOptions => {
@@ -78,41 +121,34 @@ function EditAccessSelector({dashboard, onChangeEditAccess}: EditAccessSelectorP
         ? []
         : selectedOptions
             .filter(option => option !== '_creator')
-            .map(teamId => parseInt(teamId, 10)),
+            .map(teamId => parseInt(teamId, 10))
+            .sort((a, b) => a - b),
     };
   }
 
-  // Gets selected options for the dropdown from dashboard object
-  function getSelectedOptions(): string[] {
-    if (!defined(dashboard.permissions) || dashboard.permissions.isEditableByEveryone) {
-      return ['_creator', '_allUsers', ...teamIds];
-    }
-    const permittedTeamIds =
-      dashboard.permissions.teamsWithEditAccess?.map(teamId => String(teamId)) ?? [];
-    return ['_creator', ...permittedTeamIds];
-  }
-
-  // Dashboard creator option in the dropdown
-  const makeCreatorOption = () => ({
-    value: '_creator',
-    label: (
-      <UserBadge
-        avatarSize={18}
-        user={dashboardCreator}
-        displayName={
-          <StyledDisplayName>
-            {dashboardCreator?.id === currentUser.id
-              ? tct('You ([email])', {email: currentUser.email})
-              : dashboardCreator?.email ||
-                tct('You ([email])', {email: currentUser.email})}
-          </StyledDisplayName>
-        }
-        displayEmail={t('Creator')}
-      />
-    ),
-    textValue: `creator_${currentUser.email}`,
-    disabled: true,
-  });
+  const makeCreatorOption = useCallback(
+    () => ({
+      value: '_creator',
+      label: (
+        <UserBadge
+          avatarSize={18}
+          user={dashboardCreator}
+          displayName={
+            <StyledDisplayName>
+              {dashboardCreator?.id === currentUser.id
+                ? tct('You ([email])', {email: currentUser.email})
+                : dashboardCreator?.email ||
+                  tct('You ([email])', {email: currentUser.email})}
+            </StyledDisplayName>
+          }
+          displayEmail={t('Creator')}
+        />
+      ),
+      textValue: `creator_${currentUser.email}`,
+      disabled: true,
+    }),
+    [dashboardCreator, currentUser]
+  );
 
   // Single team option in the dropdown
   const makeTeamOption = (team: Team) => ({
@@ -124,48 +160,63 @@ function EditAccessSelector({dashboard, onChangeEditAccess}: EditAccessSelectorP
   // Avatars/Badges in the Edit Access Selector Button
   const triggerAvatars =
     selectedOptions.includes('_allUsers') || !dashboardCreator ? (
-      <StyledBadge key="_all" text={'All'} />
+      <StyledBadge key="_all" text={'All'} size={listOnly ? 26 : 20} />
     ) : selectedOptions.length === 2 ? (
       // Case where we display 1 Creator Avatar + 1 Team Avatar
       <StyledAvatarList
-        key="avatar-list"
+        key="avatar-list-2-badges"
         typeAvatars="users"
         users={[dashboardCreator]}
-        teams={[teams.find(team => team.id === selectedOptions[1])!]}
+        teams={selectedTeam ? selectedTeam : []}
         maxVisibleAvatars={1}
-        avatarSize={25}
+        avatarSize={listOnly ? 30 : 25}
+        renderUsersFirst
+        tooltipOptions={{disabled: !userCanEditDashboardPermissions}}
       />
     ) : (
       // Case where we display 1 Creator Avatar + a Badge with no. of teams selected
       <StyledAvatarList
-        key="avatar-list"
+        key="avatar-list-many-teams"
         typeAvatars="users"
         users={Array(selectedOptions.length).fill(dashboardCreator)}
         maxVisibleAvatars={1}
-        avatarSize={25}
+        avatarSize={listOnly ? 30 : 25}
+        tooltipOptions={{disabled: !userCanEditDashboardPermissions}}
       />
     );
 
-  const allDropdownOptions = [
-    makeCreatorOption(),
-    {
-      value: '_all_users_section',
-      options: [
-        {
-          value: '_allUsers',
-          label: t('All users'),
-          disabled: !isCurrentUserDashboardOwner,
-        },
-      ],
-    },
-    {
-      value: '_teams',
-      label: t('Teams'),
-      options: teams.map(makeTeamOption),
-      showToggleAllButton: isCurrentUserDashboardOwner,
-      disabled: !isCurrentUserDashboardOwner,
-    },
-  ];
+  // Sorting function for team options
+  const listSort = useCallback(
+    (team: Team) => [
+      !stagedOptions.includes(team.id), // selected teams are shown first
+      team.slug, // sort rest alphabetically
+    ],
+    [stagedOptions]
+  );
+
+  const allDropdownOptions = useMemo(
+    () => [
+      makeCreatorOption(),
+      {
+        value: '_all_users_section',
+        options: [
+          {
+            value: '_allUsers',
+            label: t('All users'),
+            disabled: !userCanEditDashboardPermissions,
+          },
+        ],
+      },
+      {
+        value: '_teams',
+        label: t('Teams'),
+        options: sortBy(teamsToRender, listSort).map(makeTeamOption),
+        showToggleAllButton: userCanEditDashboardPermissions,
+        disabled: !userCanEditDashboardPermissions,
+      },
+    ],
+    [userCanEditDashboardPermissions, teamsToRender, makeCreatorOption, listSort]
+  );
 
   // Save and Cancel Buttons
   const dropdownFooterButtons = (
@@ -174,12 +225,8 @@ function EditAccessSelector({dashboard, onChangeEditAccess}: EditAccessSelectorP
         size="sm"
         onClick={() => {
           setMenuOpen(false);
-          if (isMenuOpen) {
-            setSelectedOptions(getSelectedOptions());
-            setHasUnsavedChanges(false);
-          }
         }}
-        disabled={!isCurrentUserDashboardOwner}
+        disabled={!userCanEditDashboardPermissions}
       >
         {t('Cancel')}
       </Button>
@@ -198,7 +245,15 @@ function EditAccessSelector({dashboard, onChangeEditAccess}: EditAccessSelectorP
           setMenuOpen(!isMenuOpen);
         }}
         priority="primary"
-        disabled={!isCurrentUserDashboardOwner || !hasUnsavedChanges}
+        disabled={
+          !userCanEditDashboardPermissions ||
+          isEqual(getDashboardPermissions(), {
+            ...dashboard.permissions,
+            teamsWithEditAccess: dashboard.permissions?.teamsWithEditAccess?.sort(
+              (a, b) => a - b
+            ),
+          })
+        }
       >
         {t('Save Changes')}
       </Button>
@@ -207,33 +262,46 @@ function EditAccessSelector({dashboard, onChangeEditAccess}: EditAccessSelectorP
 
   const dropdownMenu = (
     <StyledCompactSelect
+      data-test-id={'edit-access-dropdown'}
       size="sm"
       onChange={newSelectedOptions => {
         onSelectOptions(newSelectedOptions);
-        setHasUnsavedChanges(true);
       }}
       multiple
       searchable
       options={allDropdownOptions}
       value={selectedOptions}
-      triggerLabel={[t('Edit Access:'), triggerAvatars]}
+      triggerLabel={
+        listOnly
+          ? [triggerAvatars]
+          : [
+              <StyledFeatureBadge
+                key="beta-badge"
+                type="beta"
+                title={t('This feature is available for early adopters and may change')}
+                tooltipProps={{position: 'left', delay: 1000, isHoverable: true}}
+              />,
+              t('Edit Access:'),
+              triggerAvatars,
+            ]
+      }
+      triggerProps={{borderless: listOnly}}
       searchPlaceholder={t('Search Teams')}
       isOpen={isMenuOpen}
       onOpenChange={() => {
+        setStagedOptions(selectedOptions);
         setMenuOpen(!isMenuOpen);
-        if (isMenuOpen) {
-          setSelectedOptions(getSelectedOptions());
-          setHasUnsavedChanges(false);
-        }
       }}
       menuFooter={dropdownFooterButtons}
+      onSearch={debounce(val => void onSearch(val), DEFAULT_DEBOUNCE_DURATION)}
     />
   );
 
-  return isCurrentUserDashboardOwner ? (
-    dropdownMenu
-  ) : (
-    <Tooltip title={t('Only the creator of the dashboard can edit permissions')}>
+  return (
+    <Tooltip
+      title={t('Only the creator of the dashboard can edit permissions')}
+      disabled={userCanEditDashboardPermissions || isMenuOpen}
+    >
       {dropdownMenu}
     </Tooltip>
   );
@@ -261,15 +329,23 @@ const StyledDisplayName = styled('div')`
 
 const StyledAvatarList = styled(AvatarList)`
   margin-left: 10px;
+  margin-right: -3px;
+`;
+
+const StyledFeatureBadge = styled(FeatureBadge)`
+  margin-left: 0px;
+  margin-right: 6px;
 `;
 
-const StyledBadge = styled(Badge)`
+const StyledBadge = styled(Badge)<{size: number}>`
   color: ${p => p.theme.white};
   background: ${p => p.theme.purple300};
-  margin-right: 3px;
   padding: 0;
-  height: 20px;
-  width: 20px;
+  height: ${p => p.size}px;
+  width: ${p => p.size}px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 `;
 
 const FilterButtons = styled(ButtonBar)`
diff --git a/static/app/views/dashboards/filtersBar.tsx b/static/app/views/dashboards/filtersBar.tsx
index 7877a673ff034b..ab18bf062ff885 100644
--- a/static/app/views/dashboards/filtersBar.tsx
+++ b/static/app/views/dashboards/filtersBar.tsx
@@ -10,6 +10,7 @@ import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import type {User} from 'sentry/types/user';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {ToggleOnDemand} from 'sentry/utils/performance/contexts/onDemandControl';
@@ -17,9 +18,12 @@ import {decodeList} from 'sentry/utils/queryString';
 import {ReleasesProvider} from 'sentry/utils/releases/releasesProvider';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
+import {useUser} from 'sentry/utils/useUser';
+import {useUserTeams} from 'sentry/utils/useUserTeams';
+import {checkUserHasEditAccess} from 'sentry/views/dashboards/detail';
 
 import ReleasesSelectControl from './releasesSelectControl';
-import type {DashboardFilters} from './types';
+import type {DashboardFilters, DashboardPermissions} from './types';
 import {DashboardFilterKeys} from './types';
 
 type FiltersBarProps = {
@@ -29,12 +33,16 @@ type FiltersBarProps = {
   isPreview: boolean;
   location: Location;
   onDashboardFilterChange: (activeFilters: DashboardFilters) => void;
+  dashboardCreator?: User;
+  dashboardPermissions?: DashboardPermissions;
   onCancel?: () => void;
   onSave?: () => void;
 };
 
 export default function FiltersBar({
   filters,
+  dashboardPermissions,
+  dashboardCreator,
   hasUnsavedChanges,
   isEditingDashboard,
   isPreview,
@@ -45,6 +53,18 @@ export default function FiltersBar({
 }: FiltersBarProps) {
   const {selection} = usePageFilters();
   const organization = useOrganization();
+  const currentUser = useUser();
+  const {teams: userTeams} = useUserTeams();
+  let hasEditAccess = true;
+  if (organization.features.includes('dashboards-edit-access')) {
+    hasEditAccess = checkUserHasEditAccess(
+      currentUser,
+      userTeams,
+      organization,
+      dashboardPermissions,
+      dashboardCreator
+    );
+  }
 
   const selectedReleases =
     (defined(location.query?.[DashboardFilterKeys.RELEASE])
@@ -100,7 +120,14 @@ export default function FiltersBar({
         </FilterButtons>
         {hasUnsavedChanges && !isEditingDashboard && !isPreview && (
           <FilterButtons>
-            <Button priority="primary" onClick={onSave}>
+            <Button
+              title={
+                !hasEditAccess && t('You do not have permission to edit this dashboard')
+              }
+              priority="primary"
+              onClick={onSave}
+              disabled={!hasEditAccess}
+            >
               {t('Save')}
             </Button>
             <Button onClick={onCancel}>{t('Cancel')}</Button>
diff --git a/static/app/views/dashboards/manage/dashboardCard.tsx b/static/app/views/dashboards/manage/dashboardCard.tsx
index 890a80f8e9cc76..789616b2e81d79 100644
--- a/static/app/views/dashboards/manage/dashboardCard.tsx
+++ b/static/app/views/dashboards/manage/dashboardCard.tsx
@@ -1,20 +1,28 @@
+import {useState} from 'react';
+import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 
+import Feature from 'sentry/components/acl/feature';
 import {ActivityAvatar} from 'sentry/components/activity/item/avatar';
+import {Button} from 'sentry/components/button';
 import Card from 'sentry/components/card';
+import InteractionStateLayer from 'sentry/components/interactionStateLayer';
 import type {LinkProps} from 'sentry/components/links/link';
 import Link from 'sentry/components/links/link';
+import {IconStar} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {User} from 'sentry/types/user';
 
 interface Props {
   detail: React.ReactNode;
+  onFavorite: (isFavorited: boolean) => void;
   renderWidgets: () => React.ReactNode;
   title: string;
   to: LinkProps['to'];
   createdBy?: User;
   dateStatus?: React.ReactNode;
+  isFavorited?: boolean;
   onEventClick?: () => void;
   renderContextMenu?: () => React.ReactNode;
 }
@@ -28,14 +36,29 @@ function DashboardCard({
   to,
   onEventClick,
   renderContextMenu,
+  isFavorited = false,
+  onFavorite,
 }: Props) {
+  const [favorited, setFavorited] = useState<boolean>(isFavorited);
+
   function onClick() {
     onEventClick?.();
   }
 
+  // Fetch the theme to set the `InteractionStateLayer` color. Otherwise it will
+  // use the `currentColor` of the `Link`, which is blue, and not correct
+  const theme = useTheme();
+
   return (
-    <Link data-test-id={`card-${title}`} onClick={onClick} to={to} aria-label={title}>
-      <StyledDashboardCard interactive>
+    <CardWithoutMargin>
+      <CardLink
+        data-test-id={`card-${title}`}
+        onClick={onClick}
+        to={to}
+        aria-label={title}
+      >
+        <InteractionStateLayer as="div" color={theme.textColor} />
+
         <CardHeader>
           <CardContent>
             <Title>{title}</Title>
@@ -60,10 +83,37 @@ function DashboardCard({
               <DateStatus />
             )}
           </DateSelected>
-          {renderContextMenu?.()}
         </CardFooter>
-      </StyledDashboardCard>
-    </Link>
+      </CardLink>
+
+      <ContextMenuWrapper>
+        <Feature features="dashboards-favourite">
+          <StyledButton
+            icon={
+              <IconStar
+                isSolid={favorited}
+                color={favorited ? 'yellow300' : 'gray300'}
+                size="sm"
+                aria-label={favorited ? t('UnFavorite') : t('Favorite')}
+              />
+            }
+            size="zero"
+            borderless
+            aria-label={t('Dashboards Favorite')}
+            onClick={async () => {
+              try {
+                setFavorited(!favorited);
+                await onFavorite(!favorited);
+              } catch (error) {
+                // If the api call fails, revert the state
+                setFavorited(favorited);
+              }
+            }}
+          />
+        </Feature>
+        {renderContextMenu?.()}
+      </ContextMenuWrapper>
+    </CardWithoutMargin>
   );
 }
 
@@ -79,12 +129,31 @@ const CardContent = styled('div')`
   margin-right: ${space(1)};
 `;
 
-const StyledDashboardCard = styled(Card)`
-  justify-content: space-between;
-  height: 100%;
+const CardWithoutMargin = styled(Card)`
+  margin: 0;
+`;
+
+const Title = styled('div')`
+  ${p => p.theme.text.cardTitle};
+  color: ${p => p.theme.headingColor};
+  ${p => p.theme.overflowEllipsis};
+  font-weight: ${p => p.theme.fontWeightNormal};
+`;
+
+const CardLink = styled(Link)`
+  position: relative;
+  display: flex;
+  flex-direction: column;
+
+  color: ${p => p.theme.textColor};
+
   &:focus,
   &:hover {
-    top: -1px;
+    color: ${p => p.theme.textColor};
+
+    ${Title} {
+      text-decoration: underline;
+    }
   }
 `;
 
@@ -93,13 +162,6 @@ const CardHeader = styled('div')`
   padding: ${space(1.5)} ${space(2)};
 `;
 
-const Title = styled('div')`
-  ${p => p.theme.text.cardTitle};
-  color: ${p => p.theme.headingColor};
-  ${p => p.theme.overflowEllipsis};
-  font-weight: ${p => p.theme.fontWeightNormal};
-`;
-
 const Detail = styled('div')`
   font-family: ${p => p.theme.text.familyMono};
   font-size: ${p => p.theme.fontSizeSmall};
@@ -122,6 +184,7 @@ const CardFooter = styled('div')`
   justify-content: space-between;
   align-items: center;
   padding: ${space(1)} ${space(2)};
+  height: 42px;
 `;
 
 const DateSelected = styled('div')`
@@ -137,4 +200,16 @@ const DateStatus = styled('span')`
   padding-left: ${space(1)};
 `;
 
+const ContextMenuWrapper = styled('div')`
+  position: absolute;
+  right: ${space(2)};
+  bottom: ${space(1)};
+  display: flex;
+`;
+
+const StyledButton = styled(Button)`
+  margin-right: -10px;
+  padding: 5px;
+`;
+
 export default DashboardCard;
diff --git a/static/app/views/dashboards/manage/dashboardGrid.spec.tsx b/static/app/views/dashboards/manage/dashboardGrid.spec.tsx
new file mode 100644
index 00000000000000..393a6540ebe3a1
--- /dev/null
+++ b/static/app/views/dashboards/manage/dashboardGrid.spec.tsx
@@ -0,0 +1,385 @@
+import {DashboardListItemFixture} from 'sentry-fixture/dashboard';
+import {LocationFixture} from 'sentry-fixture/locationFixture';
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {UserFixture} from 'sentry-fixture/user';
+
+import {initializeOrg} from 'sentry-test/initializeOrg';
+import {
+  render,
+  renderGlobalModal,
+  screen,
+  userEvent,
+  waitFor,
+  within,
+} from 'sentry-test/reactTestingLibrary';
+
+import DashboardGrid from 'sentry/views/dashboards/manage/dashboardGrid';
+import {type DashboardListItem, DisplayType} from 'sentry/views/dashboards/types';
+
+describe('Dashboards - DashboardGrid', function () {
+  let dashboards: DashboardListItem[];
+  let deleteMock: jest.Mock;
+  let dashboardUpdateMock: jest.Mock;
+  let createMock: jest.Mock;
+  const organization = OrganizationFixture({
+    features: ['global-views', 'dashboards-basic', 'dashboards-edit', 'discover-query'],
+  });
+
+  const {router} = initializeOrg();
+
+  beforeEach(function () {
+    MockApiClient.clearMockResponses();
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/projects/',
+      body: [],
+    });
+    dashboards = [
+      DashboardListItemFixture({
+        id: '1',
+        title: 'Dashboard 1',
+        dateCreated: '2021-04-19T13:13:23.962105Z',
+        createdBy: UserFixture({id: '1'}),
+      }),
+      DashboardListItemFixture({
+        id: '2',
+        title: 'Dashboard 2',
+        dateCreated: '2021-04-19T13:13:23.962105Z',
+        createdBy: UserFixture({id: '1'}),
+        widgetPreview: [
+          {
+            displayType: DisplayType.LINE,
+            layout: null,
+          },
+          {
+            displayType: DisplayType.TABLE,
+            layout: null,
+          },
+        ],
+      }),
+    ];
+    deleteMock = MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/dashboards/2/',
+      method: 'DELETE',
+      statusCode: 200,
+    });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/dashboards/2/',
+      method: 'GET',
+      statusCode: 200,
+      body: {
+        id: '2',
+        title: 'Dashboard Demo',
+        widgets: [
+          {
+            id: '1',
+            title: 'Errors',
+            displayType: 'big_number',
+            interval: '5m',
+          },
+          {
+            id: '2',
+            title: 'Transactions',
+            displayType: 'big_number',
+            interval: '5m',
+          },
+          {
+            id: '3',
+            title: 'p50 of /api/cat',
+            displayType: 'big_number',
+            interval: '5m',
+          },
+        ],
+      },
+    });
+    createMock = MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/dashboards/',
+      method: 'POST',
+      statusCode: 200,
+    });
+    dashboardUpdateMock = jest.fn();
+  });
+
+  it('renders an empty list', async function () {
+    render(
+      <DashboardGrid
+        onDashboardsChange={jest.fn()}
+        organization={organization}
+        dashboards={[]}
+        location={router.location}
+        columnCount={3}
+        rowCount={3}
+      />
+    );
+
+    expect(screen.getByTestId('empty-state')).toBeInTheDocument();
+    expect(
+      await screen.findByText('Sorry, no Dashboards match your filters.')
+    ).toBeInTheDocument();
+  });
+
+  it('renders dashboard list', function () {
+    render(
+      <DashboardGrid
+        onDashboardsChange={jest.fn()}
+        organization={organization}
+        dashboards={dashboards}
+        location={router.location}
+        columnCount={3}
+        rowCount={3}
+      />
+    );
+
+    expect(screen.getByText('Dashboard 1')).toBeInTheDocument();
+    expect(screen.getByText('Dashboard 2')).toBeInTheDocument();
+  });
+
+  it('returns landing page url for dashboards', function () {
+    render(
+      <DashboardGrid
+        onDashboardsChange={jest.fn()}
+        organization={organization}
+        dashboards={dashboards}
+        location={router.location}
+        columnCount={3}
+        rowCount={3}
+      />,
+      {router}
+    );
+
+    expect(screen.getByRole('link', {name: 'Dashboard 1'})).toHaveAttribute(
+      'href',
+      '/organizations/org-slug/dashboard/1/'
+    );
+    expect(screen.getByRole('link', {name: 'Dashboard 2'})).toHaveAttribute(
+      'href',
+      '/organizations/org-slug/dashboard/2/'
+    );
+  });
+
+  it('persists global selection headers', function () {
+    render(
+      <DashboardGrid
+        onDashboardsChange={jest.fn()}
+        organization={organization}
+        dashboards={dashboards}
+        location={{...LocationFixture(), query: {statsPeriod: '7d'}}}
+        columnCount={3}
+        rowCount={3}
+      />,
+      {router}
+    );
+
+    expect(screen.getByRole('link', {name: 'Dashboard 1'})).toHaveAttribute(
+      'href',
+      '/organizations/org-slug/dashboard/1/?statsPeriod=7d'
+    );
+  });
+
+  it('can delete dashboards', async function () {
+    render(
+      <DashboardGrid
+        organization={organization}
+        dashboards={dashboards}
+        location={{...LocationFixture(), query: {}}}
+        onDashboardsChange={dashboardUpdateMock}
+        columnCount={3}
+        rowCount={3}
+      />,
+      {router}
+    );
+    renderGlobalModal();
+
+    await userEvent.click(screen.getAllByRole('button', {name: /dashboard actions/i})[1]);
+    await userEvent.click(screen.getByTestId('dashboard-delete'));
+
+    expect(deleteMock).not.toHaveBeenCalled();
+
+    await userEvent.click(
+      within(screen.getByRole('dialog')).getByRole('button', {name: /confirm/i})
+    );
+
+    await waitFor(() => {
+      expect(deleteMock).toHaveBeenCalled();
+      expect(dashboardUpdateMock).toHaveBeenCalled();
+    });
+  });
+
+  it('cannot delete last dashboard', async function () {
+    const singleDashboard = [
+      DashboardListItemFixture({
+        id: '1',
+        title: 'Dashboard 1',
+        dateCreated: '2021-04-19T13:13:23.962105Z',
+        createdBy: UserFixture({id: '1'}),
+        widgetPreview: [],
+      }),
+    ];
+    render(
+      <DashboardGrid
+        organization={organization}
+        dashboards={singleDashboard}
+        location={LocationFixture()}
+        onDashboardsChange={dashboardUpdateMock}
+        columnCount={3}
+        rowCount={3}
+      />
+    );
+
+    await userEvent.click(screen.getByRole('button', {name: /dashboard actions/i}));
+    expect(screen.getByTestId('dashboard-delete')).toHaveAttribute(
+      'aria-disabled',
+      'true'
+    );
+  });
+
+  it('can duplicate dashboards', async function () {
+    render(
+      <DashboardGrid
+        organization={organization}
+        dashboards={dashboards}
+        location={{...LocationFixture(), query: {}}}
+        onDashboardsChange={dashboardUpdateMock}
+        columnCount={3}
+        rowCount={3}
+      />
+    );
+    renderGlobalModal();
+
+    await userEvent.click(screen.getAllByRole('button', {name: /dashboard actions/i})[1]);
+    await userEvent.click(screen.getByTestId('dashboard-duplicate'));
+
+    expect(createMock).not.toHaveBeenCalled();
+
+    await userEvent.click(
+      within(screen.getByRole('dialog')).getByRole('button', {name: /confirm/i})
+    );
+
+    await waitFor(() => {
+      expect(createMock).toHaveBeenCalled();
+      expect(dashboardUpdateMock).toHaveBeenCalled();
+    });
+  });
+
+  it('does not throw an error if the POST fails during duplication', async function () {
+    const postMock = MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/dashboards/',
+      method: 'POST',
+      statusCode: 404,
+    });
+
+    render(
+      <DashboardGrid
+        organization={organization}
+        dashboards={dashboards}
+        location={{...LocationFixture(), query: {}}}
+        onDashboardsChange={dashboardUpdateMock}
+        columnCount={3}
+        rowCount={3}
+      />
+    );
+    renderGlobalModal();
+
+    await userEvent.click(screen.getAllByRole('button', {name: /dashboard actions/i})[1]);
+    await userEvent.click(screen.getByTestId('dashboard-duplicate'));
+
+    expect(postMock).not.toHaveBeenCalled();
+
+    await userEvent.click(
+      within(screen.getByRole('dialog')).getByRole('button', {name: /confirm/i})
+    );
+
+    await waitFor(() => {
+      expect(postMock).toHaveBeenCalled();
+      // Should not update, and not throw error
+      expect(dashboardUpdateMock).not.toHaveBeenCalled();
+    });
+  });
+
+  it('renders favorite and unfavorite buttons on cards', function () {
+    dashboards = [
+      DashboardListItemFixture({
+        id: '1',
+        title: 'Dashboard 1',
+        createdBy: UserFixture({id: '1'}),
+        isFavorited: true,
+      }),
+      DashboardListItemFixture({
+        id: '2',
+        title: 'Dashboard 2',
+        createdBy: UserFixture({id: '1'}),
+        isFavorited: false,
+      }),
+    ];
+    render(
+      <DashboardGrid
+        onDashboardsChange={jest.fn()}
+        organization={organization}
+        dashboards={dashboards}
+        location={router.location}
+        columnCount={3}
+        rowCount={3}
+      />,
+      {
+        router: router,
+        organization: {
+          features: ['dashboards-favourite', ...organization.features],
+        },
+      }
+    );
+
+    expect(screen.queryAllByLabelText('Dashboards Favorite')).toHaveLength(2);
+    expect(screen.queryAllByLabelText('Favorite')).toHaveLength(1);
+    expect(screen.queryAllByLabelText('UnFavorite')).toHaveLength(1);
+  });
+
+  it('makes PUT requests when favoriting', async function () {
+    const putMock = MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/dashboards/2/favorite/',
+      method: 'PUT',
+      body: {isFavorited: false},
+    });
+
+    dashboards = [
+      DashboardListItemFixture({
+        id: '1',
+        title: 'Dashboard 1',
+        createdBy: UserFixture({id: '1'}),
+        isFavorited: true,
+      }),
+      DashboardListItemFixture({
+        id: '2',
+        title: 'Dashboard 2',
+        createdBy: UserFixture({id: '1'}),
+        isFavorited: false,
+      }),
+    ];
+
+    render(
+      <DashboardGrid
+        onDashboardsChange={jest.fn()}
+        organization={organization}
+        dashboards={dashboards}
+        location={router.location}
+        columnCount={3}
+        rowCount={3}
+      />,
+      {
+        router: router,
+        organization: {
+          features: ['dashboards-favourite', ...organization.features],
+        },
+      }
+    );
+
+    expect(screen.queryAllByLabelText('Favorite')).toHaveLength(1);
+    const favoriteButton = screen.queryAllByLabelText('Favorite')[0];
+    await userEvent.click(favoriteButton);
+
+    await waitFor(() => {
+      expect(putMock).toHaveBeenCalled();
+    });
+
+    expect(screen.queryAllByLabelText('Favorite')).toHaveLength(0);
+  });
+});
diff --git a/static/app/views/dashboards/manage/dashboardList.tsx b/static/app/views/dashboards/manage/dashboardGrid.tsx
similarity index 87%
rename from static/app/views/dashboards/manage/dashboardList.tsx
rename to static/app/views/dashboards/manage/dashboardGrid.tsx
index 3a14e776c7cf94..d937a0bf1fc988 100644
--- a/static/app/views/dashboards/manage/dashboardList.tsx
+++ b/static/app/views/dashboards/manage/dashboardGrid.tsx
@@ -7,6 +7,7 @@ import {
   createDashboard,
   deleteDashboard,
   fetchDashboard,
+  updateDashboardFavorite,
 } from 'sentry/actionCreators/dashboards';
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import type {Client} from 'sentry/api';
@@ -45,7 +46,7 @@ type Props = {
   isLoading?: boolean;
 };
 
-function DashboardList({
+function DashboardGrid({
   api,
   organization,
   location,
@@ -73,6 +74,7 @@ function DashboardList({
         trackAnalytics('dashboards_manage.delete', {
           organization,
           dashboard_id: parseInt(dashboard.id, 10),
+          view_type: 'grid',
         });
         onDashboardsChange();
         addSuccessMessage(t('Dashboard deleted'));
@@ -91,6 +93,7 @@ function DashboardList({
       trackAnalytics('dashboards_manage.duplicate', {
         organization,
         dashboard_id: parseInt(dashboard.id, 10),
+        view_type: 'grid',
       });
       onDashboardsChange();
       addSuccessMessage(t('Dashboard duplicated'));
@@ -99,12 +102,26 @@ function DashboardList({
     }
   }
 
+  async function handleFavorite(dashboard: DashboardListItem, isFavorited: boolean) {
+    try {
+      await updateDashboardFavorite(api, organization.slug, dashboard.id, isFavorited);
+    } catch (error) {
+      throw error;
+    }
+  }
+
   function renderDropdownMenu(dashboard: DashboardListItem) {
     const menuItems: MenuItemProps[] = [
       {
         key: 'dashboard-duplicate',
         label: t('Duplicate'),
-        onAction: () => handleDuplicate(dashboard),
+        onAction: () => {
+          openConfirmModal({
+            message: t('Are you sure you want to duplicate this dashboard?'),
+            priority: 'primary',
+            onConfirm: () => handleDuplicate(dashboard),
+          });
+        },
       },
       {
         key: 'dashboard-delete',
@@ -181,6 +198,8 @@ function DashboardList({
           createdBy={dashboard.createdBy}
           renderWidgets={() => renderGridPreview(dashboard)}
           renderContextMenu={() => renderDropdownMenu(dashboard)}
+          isFavorited={dashboard.isFavorited}
+          onFavorite={isFavorited => handleFavorite(dashboard, isFavorited)}
         />
       );
     });
@@ -203,21 +222,25 @@ function DashboardList({
       : dashboards?.length ?? 0;
 
     return (
-      <DashboardGrid rows={rowCount} columns={columnCount}>
+      <DashboardGridContainer
+        rows={rowCount}
+        columns={columnCount}
+        data-test-id={'dashboard-grid'}
+      >
         {renderMiniDashboards()}
         {isLoading &&
           rowCount * columnCount > numDashboards &&
           new Array(rowCount * columnCount - numDashboards)
             .fill(0)
             .map((_, index) => <Placeholder key={index} height="270px" />)}
-      </DashboardGrid>
+      </DashboardGridContainer>
     );
   }
 
   return <Fragment>{renderDashboardGrid()}</Fragment>;
 }
 
-const DashboardGrid = styled('div')<{columns: number; rows: number}>`
+const DashboardGridContainer = styled('div')<{columns: number; rows: number}>`
   display: grid;
   grid-template-columns: repeat(
     ${props => props.columns},
@@ -231,4 +254,4 @@ const DropdownTrigger = styled(Button)`
   transform: translateX(${space(1)});
 `;
 
-export default withApi(DashboardList);
+export default withApi(DashboardGrid);
diff --git a/static/app/views/dashboards/manage/dashboardList.spec.tsx b/static/app/views/dashboards/manage/dashboardTable.spec.tsx
similarity index 73%
rename from static/app/views/dashboards/manage/dashboardList.spec.tsx
rename to static/app/views/dashboards/manage/dashboardTable.spec.tsx
index 6fff72b93e553d..35cf463d25b5eb 100644
--- a/static/app/views/dashboards/manage/dashboardList.spec.tsx
+++ b/static/app/views/dashboards/manage/dashboardTable.spec.tsx
@@ -13,16 +13,22 @@ import {
   within,
 } from 'sentry-test/reactTestingLibrary';
 
-import DashboardList from 'sentry/views/dashboards/manage/dashboardList';
+import DashboardTable from 'sentry/views/dashboards/manage/dashboardTable';
 import {type DashboardListItem, DisplayType} from 'sentry/views/dashboards/types';
 
-describe('Dashboards - DashboardList', function () {
+describe('Dashboards - DashboardTable', function () {
   let dashboards: DashboardListItem[];
   let deleteMock: jest.Mock;
   let dashboardUpdateMock: jest.Mock;
   let createMock: jest.Mock;
   const organization = OrganizationFixture({
-    features: ['global-views', 'dashboards-basic', 'dashboards-edit', 'discover-query'],
+    features: [
+      'global-views',
+      'dashboards-basic',
+      'dashboards-edit',
+      'discover-query',
+      'dashboards-table-view',
+    ],
   });
 
   const {router} = initializeOrg();
@@ -40,6 +46,10 @@ describe('Dashboards - DashboardList', function () {
         title: 'Dashboard 1',
         dateCreated: '2021-04-19T13:13:23.962105Z',
         createdBy: UserFixture({id: '1'}),
+        permissions: {
+          isEditableByEveryone: false,
+          teamsWithEditAccess: [1],
+        },
       }),
       DashboardListItemFixture({
         id: '2',
@@ -100,30 +110,29 @@ describe('Dashboards - DashboardList', function () {
     dashboardUpdateMock = jest.fn();
   });
 
-  it('renders an empty list', function () {
+  it('renders an empty list', async function () {
     render(
-      <DashboardList
+      <DashboardTable
         onDashboardsChange={jest.fn()}
         organization={organization}
         dashboards={[]}
         location={router.location}
-        columnCount={3}
-        rowCount={3}
       />
     );
 
     expect(screen.getByTestId('empty-state')).toBeInTheDocument();
+    expect(
+      await screen.findByText('Sorry, no Dashboards match your filters.')
+    ).toBeInTheDocument();
   });
 
   it('renders dashboard list', function () {
     render(
-      <DashboardList
+      <DashboardTable
         onDashboardsChange={jest.fn()}
         organization={organization}
         dashboards={dashboards}
         location={router.location}
-        columnCount={3}
-        rowCount={3}
       />
     );
 
@@ -133,13 +142,11 @@ describe('Dashboards - DashboardList', function () {
 
   it('returns landing page url for dashboards', function () {
     render(
-      <DashboardList
+      <DashboardTable
         onDashboardsChange={jest.fn()}
         organization={organization}
         dashboards={dashboards}
         location={router.location}
-        columnCount={3}
-        rowCount={3}
       />,
       {router}
     );
@@ -156,13 +163,11 @@ describe('Dashboards - DashboardList', function () {
 
   it('persists global selection headers', function () {
     render(
-      <DashboardList
+      <DashboardTable
         onDashboardsChange={jest.fn()}
         organization={organization}
         dashboards={dashboards}
         location={{...LocationFixture(), query: {statsPeriod: '7d'}}}
-        columnCount={3}
-        rowCount={3}
       />,
       {router}
     );
@@ -175,20 +180,17 @@ describe('Dashboards - DashboardList', function () {
 
   it('can delete dashboards', async function () {
     render(
-      <DashboardList
+      <DashboardTable
         organization={organization}
         dashboards={dashboards}
         location={{...LocationFixture(), query: {}}}
         onDashboardsChange={dashboardUpdateMock}
-        columnCount={3}
-        rowCount={3}
       />,
       {router}
     );
     renderGlobalModal();
 
-    await userEvent.click(screen.getAllByRole('button', {name: /dashboard actions/i})[1]);
-    await userEvent.click(screen.getByTestId('dashboard-delete'));
+    await userEvent.click(screen.getAllByTestId('dashboard-delete')[1]);
 
     expect(deleteMock).not.toHaveBeenCalled();
 
@@ -202,7 +204,7 @@ describe('Dashboards - DashboardList', function () {
     });
   });
 
-  it('cannot delete last dashboard', async function () {
+  it('cannot delete last dashboard', function () {
     const singleDashboard = [
       DashboardListItemFixture({
         id: '1',
@@ -213,18 +215,15 @@ describe('Dashboards - DashboardList', function () {
       }),
     ];
     render(
-      <DashboardList
+      <DashboardTable
         organization={organization}
         dashboards={singleDashboard}
         location={LocationFixture()}
         onDashboardsChange={dashboardUpdateMock}
-        columnCount={3}
-        rowCount={3}
       />
     );
 
-    await userEvent.click(screen.getByRole('button', {name: /dashboard actions/i}));
-    expect(screen.getByTestId('dashboard-delete')).toHaveAttribute(
+    expect(screen.getAllByTestId('dashboard-delete')[0]).toHaveAttribute(
       'aria-disabled',
       'true'
     );
@@ -232,18 +231,22 @@ describe('Dashboards - DashboardList', function () {
 
   it('can duplicate dashboards', async function () {
     render(
-      <DashboardList
+      <DashboardTable
         organization={organization}
         dashboards={dashboards}
         location={{...LocationFixture(), query: {}}}
         onDashboardsChange={dashboardUpdateMock}
-        columnCount={3}
-        rowCount={3}
       />
     );
+    renderGlobalModal();
+
+    await userEvent.click(screen.getAllByTestId('dashboard-duplicate')[1]);
+
+    expect(createMock).not.toHaveBeenCalled();
 
-    await userEvent.click(screen.getAllByRole('button', {name: /dashboard actions/i})[1]);
-    await userEvent.click(screen.getByTestId('dashboard-duplicate'));
+    await userEvent.click(
+      within(screen.getByRole('dialog')).getByRole('button', {name: /confirm/i})
+    );
 
     await waitFor(() => {
       expect(createMock).toHaveBeenCalled();
@@ -259,18 +262,22 @@ describe('Dashboards - DashboardList', function () {
     });
 
     render(
-      <DashboardList
+      <DashboardTable
         organization={organization}
         dashboards={dashboards}
         location={{...LocationFixture(), query: {}}}
         onDashboardsChange={dashboardUpdateMock}
-        columnCount={3}
-        rowCount={3}
       />
     );
+    renderGlobalModal();
+
+    await userEvent.click(screen.getAllByTestId('dashboard-duplicate')[1]);
+
+    expect(postMock).not.toHaveBeenCalled();
 
-    await userEvent.click(screen.getAllByRole('button', {name: /dashboard actions/i})[1]);
-    await userEvent.click(screen.getByTestId('dashboard-duplicate'));
+    await userEvent.click(
+      within(screen.getByRole('dialog')).getByRole('button', {name: /confirm/i})
+    );
 
     await waitFor(() => {
       expect(postMock).toHaveBeenCalled();
@@ -278,4 +285,31 @@ describe('Dashboards - DashboardList', function () {
       expect(dashboardUpdateMock).not.toHaveBeenCalled();
     });
   });
+
+  it('renders access column', async function () {
+    const organizationWithEditAccess = OrganizationFixture({
+      features: [
+        'global-views',
+        'dashboards-basic',
+        'dashboards-edit',
+        'discover-query',
+        'dashboards-table-view',
+        'dashboards-edit-access',
+      ],
+    });
+
+    render(
+      <DashboardTable
+        onDashboardsChange={jest.fn()}
+        organization={organizationWithEditAccess}
+        dashboards={dashboards}
+        location={router.location}
+      />
+    );
+
+    expect((await screen.findAllByTestId('grid-head-cell')).length).toBe(5);
+    expect(screen.getByText('Access')).toBeInTheDocument();
+    await userEvent.click((await screen.findAllByTestId('edit-access-dropdown'))[0]);
+    expect(screen.getAllByPlaceholderText('Search Teams')[0]).toBeInTheDocument();
+  });
 });
diff --git a/static/app/views/dashboards/manage/dashboardTable.tsx b/static/app/views/dashboards/manage/dashboardTable.tsx
new file mode 100644
index 00000000000000..d1b327dacdc6dd
--- /dev/null
+++ b/static/app/views/dashboards/manage/dashboardTable.tsx
@@ -0,0 +1,275 @@
+import styled from '@emotion/styled';
+import type {Location} from 'history';
+import cloneDeep from 'lodash/cloneDeep';
+
+import {
+  createDashboard,
+  deleteDashboard,
+  fetchDashboard,
+  updateDashboardPermissions,
+} from 'sentry/actionCreators/dashboards';
+import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
+import type {Client} from 'sentry/api';
+import {ActivityAvatar} from 'sentry/components/activity/item/avatar';
+import {Button} from 'sentry/components/button';
+import {openConfirmModal} from 'sentry/components/confirm';
+import EmptyStateWarning from 'sentry/components/emptyStateWarning';
+import GridEditable, {
+  COL_WIDTH_UNDEFINED,
+  type GridColumnOrder,
+} from 'sentry/components/gridEditable';
+import Link from 'sentry/components/links/link';
+import TimeSince from 'sentry/components/timeSince';
+import {IconCopy, IconDelete} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import type {Organization} from 'sentry/types/organization';
+import {trackAnalytics} from 'sentry/utils/analytics';
+import withApi from 'sentry/utils/withApi';
+import EditAccessSelector from 'sentry/views/dashboards/editAccessSelector';
+import type {
+  DashboardDetails,
+  DashboardListItem,
+  DashboardPermissions,
+} from 'sentry/views/dashboards/types';
+
+import {cloneDashboard} from '../utils';
+
+type Props = {
+  api: Client;
+  dashboards: DashboardListItem[] | undefined;
+  location: Location;
+  onDashboardsChange: () => void;
+  organization: Organization;
+  isLoading?: boolean;
+};
+
+enum ResponseKeys {
+  NAME = 'title',
+  WIDGETS = 'widgetDisplay',
+  OWNER = 'createdBy',
+  ACCESS = 'permissions',
+  CREATED = 'dateCreated',
+}
+
+function DashboardTable({
+  api,
+  organization,
+  location,
+  dashboards,
+  onDashboardsChange,
+  isLoading,
+}: Props) {
+  const columnOrder = organization.features.includes('dashboards-edit-access')
+    ? [
+        {key: ResponseKeys.NAME, name: t('Name'), width: COL_WIDTH_UNDEFINED},
+        {key: ResponseKeys.WIDGETS, name: t('Widgets'), width: COL_WIDTH_UNDEFINED},
+        {key: ResponseKeys.OWNER, name: t('Owner'), width: COL_WIDTH_UNDEFINED},
+        {key: ResponseKeys.ACCESS, name: t('Access'), width: COL_WIDTH_UNDEFINED},
+        {key: ResponseKeys.CREATED, name: t('Created'), width: COL_WIDTH_UNDEFINED},
+      ]
+    : [
+        {key: ResponseKeys.NAME, name: t('Name'), width: COL_WIDTH_UNDEFINED},
+        {key: ResponseKeys.WIDGETS, name: t('Widgets'), width: COL_WIDTH_UNDEFINED},
+        {key: ResponseKeys.OWNER, name: t('Owner'), width: COL_WIDTH_UNDEFINED},
+        {key: ResponseKeys.CREATED, name: t('Created'), width: COL_WIDTH_UNDEFINED},
+      ];
+
+  function handleDelete(dashboard: DashboardListItem) {
+    deleteDashboard(api, organization.slug, dashboard.id)
+      .then(() => {
+        trackAnalytics('dashboards_manage.delete', {
+          organization,
+          dashboard_id: parseInt(dashboard.id, 10),
+          view_type: 'table',
+        });
+        onDashboardsChange();
+        addSuccessMessage(t('Dashboard deleted'));
+      })
+      .catch(() => {
+        addErrorMessage(t('Error deleting Dashboard'));
+      });
+  }
+
+  async function handleDuplicate(dashboard: DashboardListItem) {
+    try {
+      const dashboardDetail = await fetchDashboard(api, organization.slug, dashboard.id);
+      const newDashboard = cloneDashboard(dashboardDetail);
+      newDashboard.widgets.map(widget => (widget.id = undefined));
+      await createDashboard(api, organization.slug, newDashboard, true);
+      trackAnalytics('dashboards_manage.duplicate', {
+        organization,
+        dashboard_id: parseInt(dashboard.id, 10),
+        view_type: 'table',
+      });
+      onDashboardsChange();
+      addSuccessMessage(t('Dashboard duplicated'));
+    } catch (e) {
+      addErrorMessage(t('Error duplicating Dashboard'));
+    }
+  }
+
+  // TODO(__SENTRY_USING_REACT_ROUTER_SIX): We can remove this later, react
+  // router 6 handles empty query objects without appending a trailing ?
+  const queryLocation = {
+    ...(location.query && Object.keys(location.query).length > 0
+      ? {query: location.query}
+      : {}),
+  };
+
+  const renderBodyCell = (
+    column: GridColumnOrder<string>,
+    dataRow: DashboardListItem
+  ) => {
+    if (column.key === ResponseKeys.NAME) {
+      return (
+        <Link
+          to={{
+            pathname: `/organizations/${organization.slug}/dashboard/${dataRow.id}/`,
+            ...queryLocation,
+          }}
+        >
+          {dataRow[ResponseKeys.NAME]}
+        </Link>
+      );
+    }
+
+    if (column.key === ResponseKeys.WIDGETS) {
+      return dataRow[ResponseKeys.WIDGETS].length;
+    }
+
+    if (column.key === ResponseKeys.OWNER) {
+      return dataRow[ResponseKeys.OWNER] ? (
+        <ActivityAvatar type="user" user={dataRow[ResponseKeys.OWNER]} size={26} />
+      ) : (
+        <ActivityAvatar type="system" size={26} />
+      );
+    }
+
+    if (
+      column.key === ResponseKeys.ACCESS &&
+      organization.features.includes('dashboards-edit-access')
+    ) {
+      /* Handles POST request for Edit Access Selector Changes */
+      const onChangeEditAccess = (newDashboardPermissions: DashboardPermissions) => {
+        const dashboardCopy = cloneDeep(dataRow);
+        dashboardCopy.permissions = newDashboardPermissions;
+
+        updateDashboardPermissions(api, organization.slug, dashboardCopy).then(
+          (newDashboard: DashboardDetails) => {
+            onDashboardsChange();
+            addSuccessMessage(t('Dashboard Edit Access updated.'));
+            return newDashboard;
+          }
+        );
+      };
+
+      return (
+        <EditAccessSelector
+          dashboard={dataRow}
+          onChangeEditAccess={onChangeEditAccess}
+          listOnly
+        />
+      );
+    }
+
+    if (column.key === ResponseKeys.CREATED) {
+      return (
+        <DateActionsContainer>
+          <DateSelected>
+            {dataRow[ResponseKeys.CREATED] ? (
+              <DateStatus>
+                <TimeSince date={dataRow[ResponseKeys.CREATED]} />
+              </DateStatus>
+            ) : (
+              <DateStatus />
+            )}
+          </DateSelected>
+          <ActionsIconWrapper>
+            <StyledButton
+              onClick={e => {
+                e.stopPropagation();
+                openConfirmModal({
+                  message: t('Are you sure you want to duplicate this dashboard?'),
+                  priority: 'primary',
+                  onConfirm: () => handleDuplicate(dataRow),
+                });
+              }}
+              aria-label={t('Duplicate Dashboard')}
+              data-test-id={'dashboard-duplicate'}
+              icon={<IconCopy />}
+              size="sm"
+            />
+            <StyledButton
+              onClick={e => {
+                e.stopPropagation();
+                openConfirmModal({
+                  message: t('Are you sure you want to delete this dashboard?'),
+                  priority: 'danger',
+                  onConfirm: () => handleDelete(dataRow),
+                });
+              }}
+              aria-label={t('Delete Dashboard')}
+              data-test-id={'dashboard-delete'}
+              icon={<IconDelete />}
+              size="sm"
+              disabled={dashboards && dashboards.length <= 1}
+            />
+          </ActionsIconWrapper>
+        </DateActionsContainer>
+      );
+    }
+
+    return <span>{dataRow[column.key]}</span>;
+  };
+
+  return (
+    <GridEditable
+      data={dashboards ?? []}
+      // necessary for edit access dropdown
+      bodyStyle={{overflow: 'visible'}}
+      columnOrder={columnOrder}
+      columnSortBy={[]}
+      grid={{
+        renderBodyCell,
+      }}
+      isLoading={isLoading}
+      emptyMessage={
+        <EmptyStateWarning>
+          <p>{t('Sorry, no Dashboards match your filters.')}</p>
+        </EmptyStateWarning>
+      }
+    />
+  );
+}
+
+export default withApi(DashboardTable);
+
+const DateSelected = styled('div')`
+  font-size: ${p => p.theme.fontSizeMedium};
+  display: grid;
+  grid-column-gap: ${space(1)};
+  color: ${p => p.theme.textColor};
+  ${p => p.theme.overflowEllipsis};
+`;
+
+const DateStatus = styled('span')`
+  color: ${p => p.theme.textColor};
+  padding-left: ${space(1)};
+`;
+
+const DateActionsContainer = styled('div')`
+  display: flex;
+  gap: ${space(4)};
+  justify-content: space-between;
+  align-items: center;
+`;
+
+const ActionsIconWrapper = styled('div')`
+  display: flex;
+`;
+
+const StyledButton = styled(Button)`
+  border: none;
+  box-shadow: none;
+`;
diff --git a/static/app/views/dashboards/manage/index.spec.tsx b/static/app/views/dashboards/manage/index.spec.tsx
index 3dc5debf17ea17..8d3b8007389d58 100644
--- a/static/app/views/dashboards/manage/index.spec.tsx
+++ b/static/app/views/dashboards/manage/index.spec.tsx
@@ -7,10 +7,13 @@ import {act, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import selectEvent from 'sentry-test/selectEvent';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
+import localStorage from 'sentry/utils/localStorage';
 import {useNavigate} from 'sentry/utils/useNavigate';
-import ManageDashboards from 'sentry/views/dashboards/manage';
+import ManageDashboards, {LAYOUT_KEY} from 'sentry/views/dashboards/manage';
 import {getPaginationPageLink} from 'sentry/views/organizationStats/utils';
 
+jest.mock('sentry/utils/localStorage');
+
 const FEATURES = [
   'global-views',
   'dashboards-basic',
@@ -211,4 +214,32 @@ describe('Dashboards > Detail', function () {
 
     expect(mockNavigate).not.toHaveBeenCalled();
   });
+
+  it('toggles between grid and list view', async function () {
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/dashboards/',
+      body: [DashboardListItemFixture({title: 'Test Dashboard 1'})],
+      headers: {Link: getPaginationPageLink({numRows: 15, pageSize: 9, offset: 0})},
+    });
+
+    render(<ManageDashboards />, {
+      ...RouteComponentPropsFixture(),
+      organization: {
+        ...mockAuthorizedOrg,
+        features: [...FEATURES, 'dashboards-table-view'],
+      },
+    });
+
+    expect(await screen.findByTestId('list')).toBeInTheDocument();
+    await userEvent.click(await screen.findByTestId('list'));
+
+    expect(localStorage.setItem).toHaveBeenCalledWith(LAYOUT_KEY, '"list"');
+    expect(await screen.findByTestId('grid-editable')).toBeInTheDocument();
+
+    expect(await screen.findByTestId('grid')).toBeInTheDocument();
+    await userEvent.click(await screen.findByTestId('grid'));
+
+    expect(localStorage.setItem).toHaveBeenCalledWith(LAYOUT_KEY, '"grid"');
+    expect(await screen.findByTestId('dashboard-grid')).toBeInTheDocument();
+  });
 });
diff --git a/static/app/views/dashboards/manage/index.tsx b/static/app/views/dashboards/manage/index.tsx
index c8797c02ebf372..f34d53614be4a6 100644
--- a/static/app/views/dashboards/manage/index.tsx
+++ b/static/app/views/dashboards/manage/index.tsx
@@ -19,9 +19,10 @@ import NoProjectMessage from 'sentry/components/noProjectMessage';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import Pagination from 'sentry/components/pagination';
 import SearchBar from 'sentry/components/searchBar';
+import {SegmentedControl} from 'sentry/components/segmentedControl';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import Switch from 'sentry/components/switchButton';
-import {IconAdd} from 'sentry/icons';
+import {IconAdd, IconGrid, IconList} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {SelectValue} from 'sentry/types/core';
@@ -37,6 +38,7 @@ import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {DashboardImportButton} from 'sentry/views/dashboards/manage/dashboardImport';
+import DashboardTable from 'sentry/views/dashboards/manage/dashboardTable';
 import {MetricsRemovedAlertsWidgetsAlert} from 'sentry/views/metrics/metricsRemovedAlertsWidgetsAlert';
 import RouteError from 'sentry/views/routeError';
 
@@ -44,12 +46,13 @@ import {getDashboardTemplates} from '../data';
 import {assignDefaultLayout, getInitialColumnDepths} from '../layoutUtils';
 import type {DashboardDetails, DashboardListItem} from '../types';
 
-import DashboardList from './dashboardList';
+import DashboardGrid from './dashboardGrid';
 import {
   DASHBOARD_CARD_GRID_PADDING,
   DASHBOARD_GRID_DEFAULT_NUM_CARDS,
   DASHBOARD_GRID_DEFAULT_NUM_COLUMNS,
   DASHBOARD_GRID_DEFAULT_NUM_ROWS,
+  DASHBOARD_TABLE_NUM_ROWS,
   MINIMUM_DASHBOARD_CARD_WIDTH,
 } from './settings';
 import TemplateCard from './templateCard';
@@ -64,12 +67,25 @@ const SORT_OPTIONS: SelectValue<string>[] = [
 ];
 
 const SHOW_TEMPLATES_KEY = 'dashboards-show-templates';
+export const LAYOUT_KEY = 'dashboards-overview-layout';
+
+const GRID = 'grid';
+const TABLE = 'table';
+
+export type DashboardsLayout = 'grid' | 'table';
 
 function shouldShowTemplates(): boolean {
   const shouldShow = localStorage.getItem(SHOW_TEMPLATES_KEY);
   return shouldShow === 'true' || shouldShow === null;
 }
 
+function getDashboardsOverviewLayout(): DashboardsLayout {
+  const dashboardsLayout = localStorage.getItem(LAYOUT_KEY);
+  return dashboardsLayout === GRID || dashboardsLayout === TABLE
+    ? dashboardsLayout
+    : GRID;
+}
+
 function ManageDashboards() {
   const organization = useOrganization();
   const navigate = useNavigate();
@@ -81,6 +97,10 @@ function ManageDashboards() {
     SHOW_TEMPLATES_KEY,
     shouldShowTemplates()
   );
+  const [dashboardsLayout, setDashboardsLayout] = useLocalStorageState(
+    LAYOUT_KEY,
+    getDashboardsOverviewLayout()
+  );
   const [{rowCount, columnCount}, setGridSize] = useState({
     rowCount: DASHBOARD_GRID_DEFAULT_NUM_ROWS,
     columnCount: DASHBOARD_GRID_DEFAULT_NUM_COLUMNS,
@@ -100,7 +120,8 @@ function ManageDashboards() {
         query: {
           ...pick(location.query, ['cursor', 'query']),
           sort: getActiveSort().value,
-          per_page: rowCount * columnCount,
+          per_page:
+            dashboardsLayout === GRID ? rowCount * columnCount : DASHBOARD_TABLE_NUM_ROWS,
         },
       },
     ],
@@ -230,13 +251,34 @@ function ManageDashboards() {
   function renderActions() {
     const activeSort = getActiveSort();
     return (
-      <StyledActions>
+      <StyledActions listView={organization.features.includes('dashboards-table-view')}>
         <SearchBar
           defaultQuery=""
           query={getQuery()}
           placeholder={t('Search Dashboards')}
           onSearch={query => handleSearch(query)}
         />
+        <Feature features={'organizations:dashboards-table-view'}>
+          <SegmentedControl<DashboardsLayout>
+            onChange={setDashboardsLayout}
+            size="md"
+            value={dashboardsLayout}
+            aria-label={t('Layout Control')}
+          >
+            <SegmentedControl.Item
+              key="grid"
+              textValue="grid"
+              aria-label={t('Grid View')}
+              icon={<IconGrid />}
+            />
+            <SegmentedControl.Item
+              key="list"
+              textValue="list"
+              aria-label={t('List View')}
+              icon={<IconList />}
+            />
+          </SegmentedControl>
+        </Feature>
         <CompactSelect
           triggerProps={{prefix: t('Sort By')}}
           value={activeSort.value}
@@ -257,8 +299,8 @@ function ManageDashboards() {
   }
 
   function renderDashboards() {
-    return (
-      <DashboardList
+    return dashboardsLayout === GRID ? (
+      <DashboardGrid
         api={api}
         dashboards={dashboards}
         organization={organization}
@@ -268,6 +310,15 @@ function ManageDashboards() {
         rowCount={rowCount}
         columnCount={columnCount}
       />
+    ) : (
+      <DashboardTable
+        api={api}
+        dashboards={dashboards}
+        organization={organization}
+        location={location}
+        onDashboardsChange={() => refetchDashboards()}
+        isLoading={isLoading}
+      />
     );
   }
 
@@ -444,9 +495,10 @@ function ManageDashboards() {
   );
 }
 
-const StyledActions = styled('div')`
+const StyledActions = styled('div')<{listView: boolean}>`
   display: grid;
-  grid-template-columns: auto max-content;
+  grid-template-columns: ${p =>
+    p.listView ? 'auto max-content max-content' : 'auto max-content'};
   gap: ${space(2)};
   margin-bottom: ${space(2)};
 
diff --git a/static/app/views/dashboards/manage/settings.tsx b/static/app/views/dashboards/manage/settings.tsx
index 22bcb25fa44da9..6e4fbd97b17944 100644
--- a/static/app/views/dashboards/manage/settings.tsx
+++ b/static/app/views/dashboards/manage/settings.tsx
@@ -5,3 +5,5 @@ export const DASHBOARD_CARD_GRID_PADDING = Number(space(2).replace('px', ''));
 export const DASHBOARD_GRID_DEFAULT_NUM_ROWS = 3;
 export const DASHBOARD_GRID_DEFAULT_NUM_COLUMNS = 3;
 export const DASHBOARD_GRID_DEFAULT_NUM_CARDS = 8;
+
+export const DASHBOARD_TABLE_NUM_ROWS = 25;
diff --git a/static/app/views/dashboards/metrics/widgetCard.tsx b/static/app/views/dashboards/metrics/widgetCard.tsx
index 13a1e70623c01f..0cf6d8ef527976 100644
--- a/static/app/views/dashboards/metrics/widgetCard.tsx
+++ b/static/app/views/dashboards/metrics/widgetCard.tsx
@@ -208,6 +208,7 @@ export function MetricWidgetCard({
                   showContextMenu
                   isPreview={false}
                   widgetLimitReached={false}
+                  hasEditAccess
                   onEdit={() => {
                     router.push({
                       pathname: `${location.pathname}${
diff --git a/static/app/views/dashboards/sortableWidget.tsx b/static/app/views/dashboards/sortableWidget.tsx
index 73587ac0b5fa60..0c3a9080d786a5 100644
--- a/static/app/views/dashboards/sortableWidget.tsx
+++ b/static/app/views/dashboards/sortableWidget.tsx
@@ -3,11 +3,16 @@ import styled from '@emotion/styled';
 
 import {LazyRender} from 'sentry/components/lazyRender';
 import PanelAlert from 'sentry/components/panels/panelAlert';
+import type {User} from 'sentry/types/user';
+import useOrganization from 'sentry/utils/useOrganization';
+import {useUser} from 'sentry/utils/useUser';
+import {useUserTeams} from 'sentry/utils/useUserTeams';
+import {checkUserHasEditAccess} from 'sentry/views/dashboards/detail';
 import WidgetCard from 'sentry/views/dashboards/widgetCard';
 
 import {DashboardsMEPProvider} from './widgetCard/dashboardsMEPContext';
 import {Toolbar} from './widgetCard/toolbar';
-import type {DashboardFilters, Widget} from './types';
+import type {DashboardFilters, DashboardPermissions, Widget} from './types';
 import type WidgetLegendSelectionState from './widgetLegendSelectionState';
 
 const TABLE_ITEM_LIMIT = 20;
@@ -22,7 +27,9 @@ type Props = {
   widget: Widget;
   widgetLegendState: WidgetLegendSelectionState;
   widgetLimitReached: boolean;
+  dashboardCreator?: User;
   dashboardFilters?: DashboardFilters;
+  dashboardPermissions?: DashboardPermissions;
   isMobile?: boolean;
   isPreview?: boolean;
   windowWidth?: number;
@@ -43,12 +50,29 @@ function SortableWidget(props: Props) {
     index,
     dashboardFilters,
     widgetLegendState,
+    dashboardPermissions,
+    dashboardCreator,
   } = props;
 
+  const organization = useOrganization();
+  const currentUser = useUser();
+  const {teams: userTeams} = useUserTeams();
+  let hasEditAccess = true;
+  if (organization.features.includes('dashboards-edit-access')) {
+    hasEditAccess = checkUserHasEditAccess(
+      currentUser,
+      userTeams,
+      organization,
+      dashboardPermissions,
+      dashboardCreator
+    );
+  }
+
   const widgetProps: ComponentProps<typeof WidgetCard> = {
     widget,
     isEditingDashboard,
     widgetLimitReached,
+    hasEditAccess,
     onDelete,
     onEdit,
     onDuplicate,
diff --git a/static/app/views/dashboards/types.tsx b/static/app/views/dashboards/types.tsx
index dd13cb4350ee5d..5b23b0cb23c48b 100644
--- a/static/app/views/dashboards/types.tsx
+++ b/static/app/views/dashboards/types.tsx
@@ -126,6 +126,8 @@ export type DashboardListItem = {
   widgetPreview: WidgetPreview[];
   createdBy?: User;
   dateCreated?: string;
+  isFavorited?: boolean;
+  permissions?: DashboardPermissions;
 };
 
 export enum DashboardFilterKeys {
@@ -149,6 +151,7 @@ export type DashboardDetails = {
   createdBy?: User;
   end?: string;
   environment?: string[];
+  isFavorited?: boolean;
   period?: string;
   permissions?: DashboardPermissions;
   start?: string;
diff --git a/static/app/views/dashboards/utils/getWidgetExploreUrl.spec.tsx b/static/app/views/dashboards/utils/getWidgetExploreUrl.spec.tsx
new file mode 100644
index 00000000000000..cb3b08d87c6404
--- /dev/null
+++ b/static/app/views/dashboards/utils/getWidgetExploreUrl.spec.tsx
@@ -0,0 +1,58 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {PageFiltersFixture} from 'sentry-fixture/pageFilters';
+import {WidgetFixture} from 'sentry-fixture/widget';
+
+import {DisplayType} from 'sentry/views/dashboards/types';
+import {getWidgetExploreUrl} from 'sentry/views/dashboards/utils/getWidgetExploreUrl';
+
+describe('getWidgetExploreUrl', () => {
+  const organization = OrganizationFixture();
+  const selection = PageFiltersFixture();
+
+  it('returns the correct url for table widgets', () => {
+    const widget = WidgetFixture({
+      displayType: DisplayType.TABLE,
+      queries: [
+        {
+          fields: ['span.description', 'avg(span.duration)'],
+          aggregates: ['avg(span.duration)'],
+          columns: ['span.description'],
+          conditions: '',
+          orderby: '',
+          name: '',
+        },
+      ],
+    });
+
+    const url = getWidgetExploreUrl(widget, selection, organization);
+
+    // Note: for table widgets the mode is set to samples and the fields are propagated
+    expect(url).toBe(
+      '/traces/?field=span.description&field=avg%28span.duration%29&groupBy=span.description&interval=30m&mode=samples&query=&statsPeriod=14d&visualize=%7B%22yAxes%22%3A%5B%22avg%28span.duration%29%22%5D%7D'
+    );
+  });
+
+  it('returns the correct url for timeseries widgets', () => {
+    const widget = WidgetFixture({
+      displayType: DisplayType.AREA,
+      queries: [
+        {
+          fields: ['span.description', 'avg(span.duration)'],
+          aggregates: ['avg(span.duration)'],
+          columns: ['span.description'],
+          conditions: '',
+          orderby: '',
+          name: '',
+        },
+      ],
+    });
+
+    const url = getWidgetExploreUrl(widget, selection, organization);
+
+    // Note: for line widgets the mode is set to aggregate
+    // The chart type is set to 1 for area charts
+    expect(url).toBe(
+      '/traces/?field=span.description&field=avg%28span.duration%29&groupBy=span.description&interval=30m&mode=aggregate&query=&statsPeriod=14d&visualize=%7B%22yAxes%22%3A%5B%22avg%28span.duration%29%22%5D%2C%22chartType%22%3A%222%22%7D'
+    );
+  });
+});
diff --git a/static/app/views/dashboards/utils/getWidgetExploreUrl.tsx b/static/app/views/dashboards/utils/getWidgetExploreUrl.tsx
new file mode 100644
index 00000000000000..bca2e043bddf6f
--- /dev/null
+++ b/static/app/views/dashboards/utils/getWidgetExploreUrl.tsx
@@ -0,0 +1,114 @@
+import pick from 'lodash/pick';
+import * as qs from 'query-string';
+
+import type {PageFilters} from 'sentry/types/core';
+import type {Organization} from 'sentry/types/organization';
+import {defined} from 'sentry/utils';
+import {
+  getAggregateAlias,
+  isAggregateFieldOrEquation,
+} from 'sentry/utils/discover/fields';
+import {DisplayType, type Widget} from 'sentry/views/dashboards/types';
+import {
+  eventViewFromWidget,
+  getFieldsFromEquations,
+  getWidgetInterval,
+} from 'sentry/views/dashboards/utils';
+import type {ResultMode} from 'sentry/views/explore/hooks/useResultsMode';
+import {ChartType} from 'sentry/views/insights/common/components/chart';
+
+export function getWidgetExploreUrl(
+  widget: Widget,
+  selection: PageFilters,
+  organization: Organization
+) {
+  const eventView = eventViewFromWidget(widget.title, widget.queries[0], selection);
+  const {query: locationQueryParams} = eventView.getResultsViewUrlTarget(
+    organization.slug,
+    false,
+    undefined
+  );
+
+  // Pull a max of 3 valid Y-Axis from the widget
+  const yAxisOptions = eventView.getYAxisOptions().map(({value}) => value);
+  locationQueryParams.yAxes = [
+    ...new Set(
+      widget.queries[0].aggregates.filter(aggregate => yAxisOptions.includes(aggregate))
+    ),
+  ].slice(0, 3);
+
+  // Visualization specific transforms
+  let exploreMode: ResultMode | undefined = undefined;
+  switch (widget.displayType) {
+    case DisplayType.BAR:
+      exploreMode = 'aggregate';
+      locationQueryParams.chartType = ChartType.BAR.toString();
+      break;
+    case DisplayType.LINE:
+      exploreMode = 'aggregate';
+      locationQueryParams.chartType = ChartType.LINE.toString();
+      break;
+    case DisplayType.AREA:
+      exploreMode = 'aggregate';
+      locationQueryParams.chartType = ChartType.AREA.toString();
+      break;
+    case DisplayType.TABLE:
+    case DisplayType.BIG_NUMBER:
+      exploreMode = 'samples';
+      break;
+    default:
+      break;
+  }
+
+  // Equation fields need to have their terms explicitly selected as columns in the discover table
+  const fields =
+    Array.isArray(locationQueryParams.field) || !defined(locationQueryParams.field)
+      ? locationQueryParams.field
+      : [locationQueryParams.field];
+
+  const query = widget.queries[0];
+  const queryFields = defined(query.fields)
+    ? query.fields
+    : [...query.columns, ...query.aggregates];
+
+  // Updates fields by adding any individual terms from equation fields as a column
+  getFieldsFromEquations(queryFields).forEach(term => {
+    if (Array.isArray(fields) && !fields.includes(term)) {
+      fields.unshift(term);
+    }
+  });
+  locationQueryParams.field = fields;
+
+  const queryParams = {
+    // Page filters should propagate
+    ...pick(locationQueryParams, [
+      'start',
+      'end',
+      'statsPeriod',
+      'project',
+      'environment',
+    ]),
+
+    mode: exploreMode,
+    visualize: JSON.stringify(pick(locationQueryParams, ['yAxes', 'chartType'])),
+    groupBy: fields?.filter(field => !isAggregateFieldOrEquation(field)),
+    field: locationQueryParams.field,
+    query: locationQueryParams.query,
+    sort:
+      defined(fields) && defined(locationQueryParams.sort)
+        ? _getSort(fields, locationQueryParams.sort as string)
+        : undefined,
+    interval:
+      locationQueryParams.interval ??
+      getWidgetInterval(widget.displayType, selection.datetime),
+  };
+
+  return `/traces/?${qs.stringify(queryParams)}`;
+}
+
+function _getSort(fields: string[], sort: string) {
+  const descending = sort.startsWith('-');
+  const rawSort = descending ? sort.slice(1) : sort;
+  const sortedField = fields?.find(field => getAggregateAlias(field) === rawSort);
+  return descending ? `-${sortedField}` : sortedField;
+}
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/columnsStep/index.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/columnsStep/index.tsx
index b211db458d1ece..f2f1852905f185 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/columnsStep/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/columnsStep/index.tsx
@@ -1,9 +1,9 @@
 import ExternalLink from 'sentry/components/links/externalLink';
 import {t, tct} from 'sentry/locale';
 import type {TagCollection} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import type {QueryFieldValue} from 'sentry/utils/discover/fields';
 import useCustomMeasurements from 'sentry/utils/useCustomMeasurements';
+import useOrganization from 'sentry/utils/useOrganization';
 import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
 import type {DisplayType, WidgetQuery, WidgetType} from 'sentry/views/dashboards/types';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
@@ -20,7 +20,6 @@ interface Props {
   handleColumnFieldChange: (newFields: QueryFieldValue[]) => void;
   isOnDemandWidget: boolean;
   onQueryChange: (queryIndex: number, newQuery: WidgetQuery) => void;
-  organization: Organization;
   tags: TagCollection;
   widgetType: WidgetType;
   queryErrors?: Record<string, any>[];
@@ -29,7 +28,6 @@ interface Props {
 export function ColumnsStep({
   dataSet,
   displayType,
-  organization,
   widgetType,
   handleColumnFieldChange,
   queryErrors,
@@ -37,6 +35,7 @@ export function ColumnsStep({
   tags,
   isOnDemandWidget,
 }: Props) {
+  const organization = useOrganization();
   const {customMeasurements} = useCustomMeasurements();
   const datasetConfig = getDatasetConfig(widgetType);
 
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/eventsSearchBar.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/eventsSearchBar.tsx
index 9d072aa10fceff..55b9f77bae59e9 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/eventsSearchBar.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/eventsSearchBar.tsx
@@ -1,28 +1,22 @@
 import type {SearchBarProps} from 'sentry/components/events/searchBar';
 import type {PageFilters} from 'sentry/types/core';
-import type {Organization} from 'sentry/types/organization';
 import {generateAggregateFields} from 'sentry/utils/discover/fields';
 import type {DiscoverDatasets} from 'sentry/utils/discover/types';
 import useCustomMeasurements from 'sentry/utils/useCustomMeasurements';
+import useOrganization from 'sentry/utils/useOrganization';
 import type {WidgetQuery} from 'sentry/views/dashboards/types';
 import {eventViewFromWidget, hasDatasetSelector} from 'sentry/views/dashboards/utils';
 import ResultsSearchQueryBuilder from 'sentry/views/discover/resultsSearchQueryBuilder';
 
 interface Props {
   onClose: SearchBarProps['onClose'];
-  organization: Organization;
   pageFilters: PageFilters;
   widgetQuery: WidgetQuery;
   dataset?: DiscoverDatasets;
 }
 
-export function EventsSearchBar({
-  organization,
-  pageFilters,
-  onClose,
-  widgetQuery,
-  dataset,
-}: Props) {
+export function EventsSearchBar({pageFilters, onClose, widgetQuery, dataset}: Props) {
+  const organization = useOrganization();
   const {customMeasurements} = useCustomMeasurements();
   const eventView = eventViewFromWidget('', widgetQuery, pageFilters);
   const fields = eventView.hasAggregateField()
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx
index 0d250482c580bf..310233b361fba5 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx
@@ -14,7 +14,6 @@ import {IconAdd, IconDelete} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {PageFilters} from 'sentry/types/core';
-import type {Organization} from 'sentry/types/organization';
 import {
   createOnDemandFilterWarning,
   isOnDemandQueryString,
@@ -48,7 +47,6 @@ interface Props {
   onQueryChange: (queryIndex: number, newQuery: WidgetQuery) => void;
   onQueryConditionChange: (isQueryConditionValid: boolean) => void;
   onQueryRemove: (queryIndex: number) => void;
-  organization: Organization;
   queries: WidgetQuery[];
   selection: PageFilters;
   validatedWidgetResponse: UseApiQueryResult<ValidateWidgetResponse, RequestError>;
@@ -66,7 +64,6 @@ export function FilterResultsStep({
   onQueryRemove,
   onAddSearchConditions,
   onQueryChange,
-  organization,
   hideLegendAlias,
   queryErrors,
   widgetType,
@@ -74,6 +71,7 @@ export function FilterResultsStep({
   onQueryConditionChange,
   validatedWidgetResponse,
 }: Props) {
+  const organization = useOrganization();
   const [queryConditionValidity, setQueryConditionValidity] = useState<boolean[]>([]);
 
   const handleSearch = useCallback(
@@ -174,7 +172,6 @@ export function FilterResultsStep({
                       ? getOnDemandFilterWarning
                       : undefined
                   }
-                  organization={organization}
                   pageFilters={selection}
                   onClose={handleClose(queryIndex)}
                   onSearch={handleSearch(queryIndex)}
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/issuesSearchBar.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/issuesSearchBar.tsx
index 29f137b6ba40c4..2efcf3e1d9059a 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/issuesSearchBar.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/issuesSearchBar.tsx
@@ -4,17 +4,17 @@ import styled from '@emotion/styled';
 import type {SearchBarProps} from 'sentry/components/events/searchBar';
 import type {SearchQueryBuilderProps} from 'sentry/components/searchQueryBuilder';
 import {t} from 'sentry/locale';
-import type {Organization} from 'sentry/types/organization';
+import useOrganization from 'sentry/utils/useOrganization';
 import type {WidgetQuery} from 'sentry/views/dashboards/types';
 import IssueListSearchBar from 'sentry/views/issueList/searchBar';
 
 interface Props {
   onClose: SearchBarProps['onClose'];
-  organization: Organization;
   widgetQuery: WidgetQuery;
 }
 
-function IssuesSearchBar({onClose, widgetQuery, organization}: Props) {
+function IssuesSearchBar({onClose, widgetQuery}: Props) {
+  const organization = useOrganization();
   const onChange = useCallback<NonNullable<SearchQueryBuilderProps['onChange']>>(
     (query, state) => {
       onClose?.(query, {validSearch: state.queryIsValid});
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/releaseSearchBar.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/releaseSearchBar.tsx
index b094a5b6c85bfc..2d1eb6c34a1ae9 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/releaseSearchBar.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/releaseSearchBar.tsx
@@ -7,8 +7,8 @@ import {t} from 'sentry/locale';
 import type {PageFilters} from 'sentry/types/core';
 import type {Tag, TagValue} from 'sentry/types/group';
 import {SavedSearchType} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import useApi from 'sentry/utils/useApi';
+import useOrganization from 'sentry/utils/useOrganization';
 import type {WidgetQuery} from 'sentry/views/dashboards/types';
 
 import {SESSION_STATUSES, SESSIONS_FILTER_TAGS} from '../../releaseWidget/fields';
@@ -31,17 +31,12 @@ const invalidMessages = {
 
 interface Props {
   onClose: SearchBarProps['onClose'];
-  organization: Organization;
   pageFilters: PageFilters;
   widgetQuery: WidgetQuery;
 }
 
-export function ReleaseSearchBar({
-  organization,
-  pageFilters,
-  widgetQuery,
-  onClose,
-}: Props) {
+export function ReleaseSearchBar({pageFilters, widgetQuery, onClose}: Props) {
+  const organization = useOrganization();
   const orgSlug = organization.slug;
   const projectIds = pageFilters.projects;
 
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar.spec.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar.spec.tsx
index dda9e3a60a1024..0523c8e28182cf 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar.spec.tsx
@@ -18,7 +18,7 @@ function renderWithProvider({
   onSearch,
 }: ComponentProps<typeof SpansSearchBar>) {
   return render(
-    <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP}>
+    <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
       <SpansSearchBar widgetQuery={widgetQuery} onSearch={onSearch} />
     </SpanTagsProvider>
   );
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/groupBySelector.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/groupBySelector.tsx
index e337e302c51232..0bbaa0c409f995 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/groupBySelector.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/groupBySelector.tsx
@@ -35,6 +35,7 @@ interface Props {
   onChange: (fields: QueryFieldValue[]) => void;
   validatedWidgetResponse: UseApiQueryResult<ValidateWidgetResponse, RequestError>;
   columns?: QueryFieldValue[];
+  style?: React.CSSProperties;
 }
 
 export function GroupBySelector({
@@ -42,6 +43,7 @@ export function GroupBySelector({
   columns = [],
   onChange,
   validatedWidgetResponse,
+  style,
 }: Props) {
   const [activeId, setActiveId] = useState<string | null>(null);
 
@@ -111,7 +113,7 @@ export function GroupBySelector({
 
   return (
     <Fragment>
-      <StyledField inline={false} flexibleControlStateSize stacked>
+      <StyledField inline={false} style={style} flexibleControlStateSize stacked>
         {columns.length === 0 ? (
           <QueryField
             value={EMPTY_FIELD}
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/index.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/index.tsx
index 2a0df964764cc0..864d227adf8e27 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/index.tsx
@@ -1,9 +1,9 @@
 import {t} from 'sentry/locale';
 import type {TagCollection} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import type {QueryFieldValue} from 'sentry/utils/discover/fields';
 import type {UseApiQueryResult} from 'sentry/utils/queryClient';
 import type RequestError from 'sentry/utils/requestError/requestError';
+import useOrganization from 'sentry/utils/useOrganization';
 import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
 import type {ValidateWidgetResponse} from 'sentry/views/dashboards/types';
 
@@ -17,7 +17,6 @@ interface Props {
   columns: QueryFieldValue[];
   dataSet: DataSet;
   onGroupByChange: (newFields: QueryFieldValue[]) => void;
-  organization: Organization;
   tags: TagCollection;
   validatedWidgetResponse: UseApiQueryResult<ValidateWidgetResponse, RequestError>;
 }
@@ -26,10 +25,10 @@ export function GroupByStep({
   dataSet,
   columns,
   onGroupByChange,
-  organization,
   tags,
   validatedWidgetResponse,
 }: Props) {
+  const organization = useOrganization();
   const datasetConfig = getDatasetConfig(DATA_SET_TO_WIDGET_TYPE[dataSet]);
 
   const groupByOptions = datasetConfig.getGroupByFieldOptions
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/sortByStep/index.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/sortByStep/index.tsx
index dce921bbbfb7d1..f1de7cbe062377 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/sortByStep/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/sortByStep/index.tsx
@@ -9,7 +9,6 @@ import {t, tn} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {SelectValue} from 'sentry/types/core';
 import type {TagCollection} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
 import type {WidgetQuery, WidgetType} from 'sentry/views/dashboards/types';
 import {DisplayType} from 'sentry/views/dashboards/types';
@@ -30,7 +29,6 @@ interface Props {
   displayType: DisplayType;
   onLimitChange: (newLimit: number) => void;
   onSortByChange: (newSortBy: string) => void;
-  organization: Organization;
   queries: WidgetQuery[];
   tags: TagCollection;
   widgetType: WidgetType;
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/visualizationStep.spec.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/visualizationStep.spec.tsx
index 46b982616d7782..c26ea73a2093db 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/visualizationStep.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/visualizationStep.spec.tsx
@@ -321,7 +321,6 @@ describe('VisualizationStep', function () {
       <MEPSettingProvider>
         <DashboardsMEPProvider>
           <VisualizationStep
-            organization={organization}
             pageFilters={PageFiltersFixture()}
             displayType={DisplayType.TABLE}
             error={undefined}
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/visualizationStep.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/visualizationStep.tsx
index feab74a93d3815..843a0b7c959334 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/visualizationStep.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/visualizationStep.tsx
@@ -14,8 +14,8 @@ import {DEFAULT_DEBOUNCE_DURATION} from 'sentry/constants';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {PageFilters, SelectValue} from 'sentry/types/core';
-import type {Organization} from 'sentry/types/organization';
 import type {TableDataWithTitle} from 'sentry/utils/discover/discoverQuery';
+import useOrganization from 'sentry/utils/useOrganization';
 import usePrevious from 'sentry/utils/usePrevious';
 import type {DashboardFilters, Widget, WidgetType} from 'sentry/views/dashboards/types';
 import {DisplayType} from 'sentry/views/dashboards/types';
@@ -34,7 +34,6 @@ interface Props {
   isWidgetInvalid: boolean;
   location: Location;
   onChange: (displayType: DisplayType) => void;
-  organization: Organization;
   pageFilters: PageFilters;
   widget: Widget;
   widgetLegendState: WidgetLegendSelectionState;
@@ -45,7 +44,6 @@ interface Props {
 }
 
 export function VisualizationStep({
-  organization,
   pageFilters,
   displayType,
   error,
@@ -58,6 +56,7 @@ export function VisualizationStep({
   onWidgetSplitDecision,
   widgetLegendState,
 }: Props) {
+  const organization = useOrganization();
   const [debouncedWidget, setDebouncedWidget] = useState(widget);
 
   const previousWidget = usePrevious(widget);
@@ -142,12 +141,12 @@ export function VisualizationStep({
           shouldResize={false}
           onLegendSelectChanged={() => {}}
           legendOptions={
-            organization.features.includes('dashboards-releases-on-charts') &&
             widgetLegendState.widgetRequiresLegendUnselection(widget)
               ? {selected: unselectedReleasesForCharts}
               : undefined
           }
           widgetLegendState={widgetLegendState}
+          disableFullscreen
         />
 
         <IndexedEventsSelectionAlert widget={widget} />
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/yAxisStep/index.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/yAxisStep/index.tsx
index c0160f38194149..9d1ef40d9b7b41 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/yAxisStep/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/yAxisStep/index.tsx
@@ -1,6 +1,5 @@
 import {t} from 'sentry/locale';
 import type {TagCollection} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import type {QueryFieldValue} from 'sentry/utils/discover/fields';
 import type {WidgetType} from 'sentry/views/dashboards/types';
 import {DisplayType} from 'sentry/views/dashboards/types';
@@ -15,7 +14,6 @@ interface Props {
   dataSet: DataSet;
   displayType: DisplayType;
   onYAxisChange: (newFields: QueryFieldValue[], newSelectedAggregate?: number) => void;
-  organization: Organization;
   tags: TagCollection;
   widgetType: WidgetType;
   queryErrors?: Record<string, any>[];
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/yAxisStep/yAxisSelector/index.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/yAxisStep/yAxisSelector/index.tsx
index 3d97d2e92edbce..7758e59702da47 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/yAxisStep/yAxisSelector/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/yAxisStep/yAxisSelector/index.tsx
@@ -21,6 +21,8 @@ import {FieldValueKind} from 'sentry/views/discover/table/types';
 import {AddButton} from './addButton';
 import {DeleteButton} from './deleteButton';
 
+export const MAX_NUM_Y_AXES = 3;
+
 interface Props {
   aggregates: QueryFieldValue[];
   displayType: DisplayType;
@@ -107,7 +109,7 @@ export function YAxisSelector({
 
   const hideAddYAxisButtons =
     ([DisplayType.LINE, DisplayType.AREA, DisplayType.BAR].includes(displayType) &&
-      aggregates.length === 3) ||
+      aggregates.length === MAX_NUM_Y_AXES) ||
     (displayType === DisplayType.BIG_NUMBER && widgetType === WidgetType.RELEASE);
 
   let injectedFunctions: Set<string> = new Set();
@@ -169,7 +171,7 @@ export function YAxisSelector({
         <Actions gap={1}>
           <AddButton
             title={
-              displayType === DisplayType.BIG_NUMBER ? t('Add Field') : t('Add Data')
+              displayType === DisplayType.BIG_NUMBER ? t('Add Field') : t('Add Series')
             }
             onAdd={handleAddFields}
           />
diff --git a/static/app/views/dashboards/widgetBuilder/components/datasetSelector.tsx b/static/app/views/dashboards/widgetBuilder/components/datasetSelector.tsx
new file mode 100644
index 00000000000000..6464bde5c91acb
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/datasetSelector.tsx
@@ -0,0 +1,80 @@
+import {Fragment} from 'react';
+import styled from '@emotion/styled';
+
+import FeatureBadge from 'sentry/components/badge/featureBadge';
+import RadioGroup, {type RadioOption} from 'sentry/components/forms/controls/radioGroup';
+import ExternalLink from 'sentry/components/links/externalLink';
+import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import useOrganization from 'sentry/utils/useOrganization';
+import {WidgetType} from 'sentry/views/dashboards/types';
+import {SectionHeader} from 'sentry/views/dashboards/widgetBuilder/components/sectionHeader';
+import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {BuilderStateAction} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+
+function WidgetBuilderDatasetSelector() {
+  const organization = useOrganization();
+  const {state, dispatch} = useWidgetBuilderContext();
+
+  const datasetChoices: RadioOption<WidgetType>[] = [];
+  datasetChoices.push([WidgetType.ERRORS, t('Errors')]);
+  datasetChoices.push([WidgetType.TRANSACTIONS, t('Transactions')]);
+
+  if (organization.features.includes('dashboards-eap')) {
+    datasetChoices.push([
+      WidgetType.SPANS,
+      <FeatureBadgeAlignmentWrapper aria-label={t('Spans')} key={'dataset-choice-spans'}>
+        {t('Spans')} <FeatureBadge type="alpha" />
+      </FeatureBadgeAlignmentWrapper>,
+    ]);
+  }
+  datasetChoices.push([WidgetType.ISSUE, t('Issues')]);
+  datasetChoices.push([WidgetType.RELEASE, t('Releases')]);
+
+  return (
+    <Fragment>
+      <StyledSectionHeader
+        title={t('Dataset')}
+        tooltipText={tct(
+          `This reflects the type of information you want to use. To learn more, [link: read the docs].`,
+          {
+            link: (
+              <ExternalLink href="https://docs.sentry.io/product/dashboards/widget-builder/#choose-your-dataset" />
+            ),
+          }
+        )}
+      />
+      <DatasetChoices
+        label={t('Dataset')}
+        value={state.dataset ?? WidgetType.ERRORS}
+        choices={datasetChoices}
+        onChange={(newValue: WidgetType) =>
+          dispatch({
+            type: BuilderStateAction.SET_DATASET,
+            payload: newValue,
+          })
+        }
+      />
+    </Fragment>
+  );
+}
+
+export default WidgetBuilderDatasetSelector;
+
+const DatasetChoices = styled(RadioGroup<WidgetType>)`
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  gap: ${space(2)};
+`;
+
+const FeatureBadgeAlignmentWrapper = styled('div')`
+  ${FeatureBadge} {
+    position: relative;
+    top: -1px;
+  }
+`;
+
+const StyledSectionHeader = styled(SectionHeader)`
+  margin-bottom: ${space(2)};
+`;
diff --git a/static/app/views/dashboards/widgetBuilder/components/devBuilder.tsx b/static/app/views/dashboards/widgetBuilder/components/devBuilder.tsx
new file mode 100644
index 00000000000000..022e8791c2cfe5
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/devBuilder.tsx
@@ -0,0 +1,328 @@
+import styled from '@emotion/styled';
+
+import RadioGroup from 'sentry/components/forms/controls/radioGroup';
+import SelectControl from 'sentry/components/forms/controls/selectControl';
+import SelectField from 'sentry/components/forms/fields/selectField';
+import Input from 'sentry/components/input';
+import {SearchQueryBuilder} from 'sentry/components/searchQueryBuilder';
+import {space} from 'sentry/styles/space';
+import {CustomMeasurementsProvider} from 'sentry/utils/customMeasurements/customMeasurementsProvider';
+import {type Column, generateFieldAsString} from 'sentry/utils/discover/fields';
+import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
+import useOrganization from 'sentry/utils/useOrganization';
+import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import {ColumnFields} from 'sentry/views/dashboards/widgetBuilder/buildSteps/columnsStep/columnFields';
+import {YAxisSelector} from 'sentry/views/dashboards/widgetBuilder/buildSteps/yAxisStep/yAxisSelector';
+import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {BuilderStateAction} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+import {formatSort} from 'sentry/views/explore/tables/aggregatesTable';
+
+function DevBuilder() {
+  const {state, dispatch} = useWidgetBuilderContext();
+  const [showDevBuilder] = useLocalStorageState('showDevBuilder', false);
+
+  if (!showDevBuilder) {
+    return null;
+  }
+
+  return (
+    <Body>
+      <Section>
+        <h1>Title:</h1>
+        <div style={{flex: 1}}>{state.title}</div>
+        <SimpleInput
+          value={state.title}
+          onChange={e =>
+            dispatch({type: BuilderStateAction.SET_TITLE, payload: e.target.value})
+          }
+        />
+      </Section>
+      <Section>
+        <h1>Description:</h1>
+        <div style={{flex: 1}}>{state.description}</div>
+        <SimpleInput
+          value={state.description}
+          onChange={e =>
+            dispatch({
+              type: BuilderStateAction.SET_DESCRIPTION,
+              payload: e.target.value,
+            })
+          }
+        />
+      </Section>
+      <Section>
+        <h1>Display Type:</h1>
+        <div style={{flex: 1}}>{state.displayType}</div>
+        <SelectField
+          name="displayType"
+          value={state.displayType}
+          options={Object.values(DisplayType).map(value => ({
+            label: value,
+            value,
+          }))}
+          onChange={newValue =>
+            dispatch({
+              type: BuilderStateAction.SET_DISPLAY_TYPE,
+              payload: newValue,
+            })
+          }
+          style={{width: '200px'}}
+        />
+      </Section>
+      <Section>
+        <h1>Dataset:</h1>
+        <div>{state.dataset}</div>
+        <RadioGroup
+          label="Dataset"
+          value={state.dataset ?? null}
+          choices={[
+            [WidgetType.DISCOVER, 'Discover'],
+            [WidgetType.ISSUE, 'Issue'],
+            [WidgetType.RELEASE, 'Release'],
+            [WidgetType.METRICS, 'Metrics'],
+            [WidgetType.ERRORS, 'Errors'],
+            [WidgetType.TRANSACTIONS, 'Transactions'],
+          ]}
+          onChange={newValue =>
+            dispatch({
+              type: BuilderStateAction.SET_DATASET,
+              payload: newValue,
+            })
+          }
+        />
+      </Section>
+      <Section>
+        <h1>Fields:</h1>
+        <div>{state.fields?.map(generateFieldAsString).join(', ')}</div>
+        <ColumnSelector
+          displayType={state.displayType ?? DisplayType.TABLE}
+          dataset={state.dataset ?? WidgetType.DISCOVER}
+          fields={state.fields ?? [{field: '', kind: 'field'}]}
+          onChange={newFields => {
+            dispatch({
+              type: BuilderStateAction.SET_FIELDS,
+              payload: newFields,
+            });
+          }}
+        />
+      </Section>
+      <Section>
+        <h1>Y-Axis:</h1>
+        <div>{state.yAxis?.map(generateFieldAsString).join(', ')}</div>
+        <YAxis
+          displayType={state.displayType ?? DisplayType.TABLE}
+          widgetType={state.dataset ?? WidgetType.DISCOVER}
+          aggregates={state.yAxis ?? [{field: '', kind: 'field'}]}
+          onChange={newAggregates => {
+            dispatch({
+              type: BuilderStateAction.SET_Y_AXIS,
+              payload: newAggregates,
+            });
+          }}
+        />
+      </Section>
+      <Section>
+        <h1>Query:</h1>
+        <ol style={{overflow: 'auto'}}>
+          {state.query?.map((query, index) => <li key={index}>{query}</li>)}
+        </ol>
+        <div>
+          {state.query?.map((query, index) => (
+            <div key={index} style={{display: 'flex', flexDirection: 'row'}}>
+              <QueryField
+                query={query}
+                onSearch={queryString => {
+                  dispatch({
+                    type: BuilderStateAction.SET_QUERY,
+                    payload:
+                      state.query?.map((q, i) => (i === index ? queryString : q)) ?? [],
+                  });
+                }}
+              />
+              <button
+                onClick={() =>
+                  dispatch({
+                    type: BuilderStateAction.SET_QUERY,
+                    payload: state.query?.filter((_, i) => i !== index) ?? [],
+                  })
+                }
+              >
+                Remove
+              </button>
+            </div>
+          ))}
+          <button
+            onClick={() =>
+              dispatch({
+                type: BuilderStateAction.SET_QUERY,
+                payload: [...(state.query ?? []), ''],
+              })
+            }
+          >
+            Add
+          </button>
+        </div>
+      </Section>
+      <Section>
+        <h1>Sort:</h1>
+        <div>{state.sort?.map(formatSort).join(', ')}</div>
+        <SortSelector />
+      </Section>
+    </Body>
+  );
+}
+
+function ColumnSelector({
+  displayType,
+  fields,
+  dataset,
+  onChange,
+}: {
+  dataset: WidgetType;
+  displayType: DisplayType;
+  fields: Column[];
+  onChange: (newFields: Column[]) => void;
+}) {
+  const organization = useOrganization();
+  const datasetConfig = getDatasetConfig(dataset);
+
+  const fieldOptions = datasetConfig.getTableFieldOptions(organization);
+
+  return (
+    <ColumnFields
+      displayType={displayType ?? DisplayType.TABLE}
+      organization={organization}
+      widgetType={dataset ?? WidgetType.DISCOVER}
+      fields={fields ?? []}
+      errors={[]}
+      fieldOptions={fieldOptions}
+      isOnDemandWidget={false}
+      filterAggregateParameters={() => true}
+      filterPrimaryOptions={() => true}
+      onChange={onChange}
+    />
+  );
+}
+
+function YAxis({
+  displayType,
+  widgetType,
+  aggregates,
+  onChange,
+}: {
+  aggregates: Column[];
+  displayType: DisplayType;
+  onChange: (newFields: Column[]) => void;
+  widgetType: WidgetType;
+}) {
+  const organization = useOrganization();
+  return (
+    <CustomMeasurementsProvider organization={organization}>
+      <YAxisSelector
+        widgetType={widgetType}
+        displayType={displayType}
+        aggregates={aggregates}
+        onChange={onChange}
+        tags={{}}
+        errors={[]}
+        selectedAggregate={undefined}
+      />
+    </CustomMeasurementsProvider>
+  );
+}
+
+function QueryField({
+  query,
+  onSearch,
+}: {
+  onSearch: (query: string) => void;
+  query: string;
+}) {
+  return (
+    <SearchQueryBuilder
+      placeholder={'Search'}
+      filterKeys={{}}
+      initialQuery={query ?? ''}
+      onSearch={onSearch}
+      searchSource={'widget_builder'}
+      filterKeySections={[]}
+      getTagValues={() => Promise.resolve([])}
+      showUnsubmittedIndicator
+    />
+  );
+}
+
+function SortSelector() {
+  const {state, dispatch} = useWidgetBuilderContext();
+
+  // There's a SortDirection enum in the widgetBuilder utils, but it's not used anywhere else
+  // so I'd rather just get rid of the dependency and use a new object that uses standard terms
+  const sortDirections = {
+    desc: 'High to low',
+    asc: 'Low to high',
+  };
+  const direction = state.sort?.[0]?.kind;
+  const sortBy = state.sort?.[0]?.field;
+
+  return (
+    <div>
+      <SelectControl
+        name="sortDirection"
+        aria-label={'Sort direction'}
+        menuPlacement="auto"
+        options={Object.keys(sortDirections).map(value => ({
+          label: sortDirections[value],
+          value,
+        }))}
+        value={direction}
+        onChange={option => {
+          dispatch({
+            type: BuilderStateAction.SET_SORT,
+            payload: [{field: sortBy ?? '', kind: option.value}],
+          });
+        }}
+      />
+      <SelectControl
+        name="sortBy"
+        aria-label={'Sort by'}
+        menuPlacement="auto"
+        placeholder={'Sort'}
+        value={sortBy}
+        options={state.fields?.map(field => ({
+          label: generateFieldAsString(field),
+          value: generateFieldAsString(field),
+        }))}
+        onChange={option => {
+          dispatch({
+            type: BuilderStateAction.SET_SORT,
+            payload: [{field: option.value, kind: direction ?? 'asc'}],
+          });
+        }}
+      />
+    </div>
+  );
+}
+
+const Body = styled('div')`
+  margin: ${space(2)};
+  padding: ${space(2)};
+`;
+
+const Section = styled('section')`
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  border: 1px solid ${p => p.theme.border};
+  align-items: center;
+
+  > * {
+    flex: 1;
+  }
+`;
+
+const SimpleInput = styled(Input)`
+  width: 100%;
+`;
+
+export default DevBuilder;
diff --git a/static/app/views/dashboards/widgetBuilder/components/filtersBar.tsx b/static/app/views/dashboards/widgetBuilder/components/filtersBar.tsx
new file mode 100644
index 00000000000000..a0e11b452161b5
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/filtersBar.tsx
@@ -0,0 +1,43 @@
+import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
+import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
+import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
+import PageFiltersContainer from 'sentry/components/organizations/pageFilters/container';
+import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
+import {DEFAULT_STATS_PERIOD} from 'sentry/constants';
+import {ReleasesProvider} from 'sentry/utils/releases/releasesProvider';
+import useOrganization from 'sentry/utils/useOrganization';
+import usePageFilters from 'sentry/utils/usePageFilters';
+import ReleasesSelectControl from 'sentry/views/dashboards/releasesSelectControl';
+
+function WidgetBuilderFilterBar() {
+  const organization = useOrganization();
+  const {selection} = usePageFilters();
+  return (
+    <PageFiltersContainer
+      disablePersistence
+      defaultSelection={{
+        datetime: {
+          start: null,
+          end: null,
+          utc: false,
+          period: DEFAULT_STATS_PERIOD,
+        },
+      }}
+    >
+      <PageFilterBar>
+        <ProjectPageFilter disabled onChange={() => {}} />
+        <EnvironmentPageFilter disabled onChange={() => {}} />
+        <DatePageFilter disabled onChange={() => {}} />
+        <ReleasesProvider organization={organization} selection={selection}>
+          <ReleasesSelectControl
+            isDisabled
+            handleChangeFilter={() => {}}
+            selectedReleases={[]}
+          />
+        </ReleasesProvider>
+      </PageFilterBar>
+    </PageFiltersContainer>
+  );
+}
+
+export default WidgetBuilderFilterBar;
diff --git a/static/app/views/dashboards/widgetBuilder/components/groupBySelector.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/groupBySelector.spec.tsx
new file mode 100644
index 00000000000000..f132041164b254
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/groupBySelector.spec.tsx
@@ -0,0 +1,69 @@
+import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
+
+import {DiscoverDatasets} from 'sentry/utils/discover/types';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import WidgetBuilderGroupBySelector from 'sentry/views/dashboards/widgetBuilder/components/groupBySelector';
+import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {SpanTagsProvider} from 'sentry/views/explore/contexts/spanTagsContext';
+
+jest.mock('sentry/utils/useNavigate', () => ({
+  useNavigate: jest.fn(),
+}));
+
+const mockUseNavigate = jest.mocked(useNavigate);
+
+describe('WidgetBuilderGroupBySelector', function () {
+  beforeEach(function () {
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/spans/fields/',
+      body: [],
+    });
+  });
+
+  it('renders', async function () {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
+
+    render(
+      <WidgetBuilderProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <WidgetBuilderGroupBySelector />
+        </SpanTagsProvider>
+      </WidgetBuilderProvider>
+    );
+
+    expect(await screen.findByText('Group by')).toBeInTheDocument();
+    expect(await screen.findByText('Select group')).toBeInTheDocument();
+    expect(await screen.findByText('Add Group')).toBeInTheDocument();
+  });
+
+  it('renders the group by field and can function', async function () {
+    render(
+      <WidgetBuilderProvider>
+        <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
+          <WidgetBuilderGroupBySelector />
+        </SpanTagsProvider>
+      </WidgetBuilderProvider>
+    );
+
+    expect(await screen.findByText('Group by')).toBeInTheDocument();
+    expect(await screen.findByText('Select group')).toBeInTheDocument();
+    expect(await screen.findByText('Add Group')).toBeInTheDocument();
+
+    await userEvent.click(await screen.findByText('Select group'));
+    await userEvent.click(await screen.findByText('timestamp'));
+
+    await userEvent.click(await screen.findByText('Add Group'));
+    await userEvent.click(await screen.findByText('Select group'));
+    await userEvent.click(await screen.findByText('id'));
+
+    expect(await screen.findAllByLabelText('Remove group')).toHaveLength(2);
+
+    await userEvent.click((await screen.findAllByLabelText('Remove group'))[0]);
+
+    expect(await screen.findByText('id')).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.queryByText('timestamp')).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/components/groupBySelector.tsx b/static/app/views/dashboards/widgetBuilder/components/groupBySelector.tsx
new file mode 100644
index 00000000000000..bbde2b686188ad
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/groupBySelector.tsx
@@ -0,0 +1,67 @@
+import {Fragment} from 'react';
+
+import {t} from 'sentry/locale';
+import type {TagCollection} from 'sentry/types/group';
+import type {QueryFieldValue} from 'sentry/utils/discover/fields';
+import useOrganization from 'sentry/utils/useOrganization';
+import useTags from 'sentry/utils/useTags';
+import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
+import {useValidateWidgetQuery} from 'sentry/views/dashboards/hooks/useValidateWidget';
+import {WidgetType} from 'sentry/views/dashboards/types';
+import {GroupBySelector} from 'sentry/views/dashboards/widgetBuilder/buildSteps/groupByStep/groupBySelector';
+import {SectionHeader} from 'sentry/views/dashboards/widgetBuilder/components/sectionHeader';
+import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {BuilderStateAction} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+import {convertBuilderStateToWidget} from 'sentry/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget';
+import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
+
+function WidgetBuilderGroupBySelector() {
+  const {state, dispatch} = useWidgetBuilderContext();
+
+  const organization = useOrganization();
+
+  let tags: TagCollection = useTags();
+  const numericSpanTags = useSpanTags('number');
+  const stringSpanTags = useSpanTags('string');
+  if (state.dataset === WidgetType.SPANS) {
+    tags = {...numericSpanTags, ...stringSpanTags};
+  }
+
+  const widget = convertBuilderStateToWidget(state);
+
+  const validatedWidgetResponse = useValidateWidgetQuery(widget);
+
+  const datasetConfig = getDatasetConfig(state.dataset);
+  const groupByOptions = datasetConfig.getGroupByFieldOptions
+    ? datasetConfig.getGroupByFieldOptions(organization, tags)
+    : {};
+
+  const handleGroupByChange = (newValue: QueryFieldValue[]) => {
+    dispatch({
+      type: BuilderStateAction.SET_FIELDS,
+      payload: newValue,
+    });
+  };
+
+  return (
+    <Fragment>
+      <SectionHeader
+        title={t('Group by')}
+        tooltipText={t(
+          'Aggregated data by a key attribute to calculate averages, percentiles, count and more'
+        )}
+        optional
+      />
+
+      <GroupBySelector
+        columns={state.fields}
+        fieldOptions={groupByOptions}
+        onChange={handleGroupByChange}
+        validatedWidgetResponse={validatedWidgetResponse}
+        style={{paddingRight: 0}}
+      />
+    </Fragment>
+  );
+}
+
+export default WidgetBuilderGroupBySelector;
diff --git a/static/app/views/dashboards/widgetBuilder/components/nameAndDescFields.tsx b/static/app/views/dashboards/widgetBuilder/components/nameAndDescFields.tsx
new file mode 100644
index 00000000000000..1ebab95abab22f
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/nameAndDescFields.tsx
@@ -0,0 +1,71 @@
+import {Fragment, useState} from 'react';
+import styled from '@emotion/styled';
+
+import {Button} from 'sentry/components/button';
+import TextArea from 'sentry/components/forms/controls/textarea';
+import Input from 'sentry/components/input';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import {SectionHeader} from 'sentry/views/dashboards/widgetBuilder/components/sectionHeader';
+import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {BuilderStateAction} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+
+function WidgetBuilderNameAndDescription() {
+  const {state, dispatch} = useWidgetBuilderContext();
+  const [isDescSelected, setIsDescSelected] = useState(state.description ? true : false);
+
+  return (
+    <Fragment>
+      <SectionHeader title={t('Widget Name & Description')} />
+      <StyledInput
+        size="md"
+        placeholder={t('Name')}
+        title={t('Widget Name')}
+        type="text"
+        aria-label={t('Widget Name')}
+        value={state.title}
+        onChange={e => {
+          dispatch({type: BuilderStateAction.SET_TITLE, payload: e.target.value});
+        }}
+      />
+      {!isDescSelected && (
+        <AddDescriptionButton
+          priority="link"
+          aria-label={t('Add Widget Description')}
+          onClick={() => {
+            setIsDescSelected(true);
+          }}
+          data-test-id={'add-description'}
+        >
+          {t('+ Add Widget Description')}
+        </AddDescriptionButton>
+      )}
+      {isDescSelected && (
+        <DescriptionTextArea
+          placeholder={t('Description')}
+          aria-label={t('Widget Description')}
+          autosize
+          rows={4}
+          value={state.description}
+          onChange={e => {
+            dispatch({type: BuilderStateAction.SET_DESCRIPTION, payload: e.target.value});
+          }}
+        />
+      )}
+    </Fragment>
+  );
+}
+
+export default WidgetBuilderNameAndDescription;
+
+const StyledInput = styled(Input)`
+  margin-bottom: ${space(1)};
+`;
+
+const AddDescriptionButton = styled(Button)`
+  margin-bottom: ${space(1)};
+`;
+
+const DescriptionTextArea = styled(TextArea)`
+  margin: ${space(2)} 0;
+`;
diff --git a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
new file mode 100644
index 00000000000000..1dcabc2b859c7b
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
@@ -0,0 +1,326 @@
+import {DashboardFixture} from 'sentry-fixture/dashboard';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
+import {initializeOrg} from 'sentry-test/initializeOrg';
+import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
+
+import OrganizationStore from 'sentry/stores/organizationStore';
+import PageFiltersStore from 'sentry/stores/pageFiltersStore';
+import ProjectsStore from 'sentry/stores/projectsStore';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import WidgetBuilderV2 from 'sentry/views/dashboards/widgetBuilder/components/newWidgetBuilder';
+
+const {organization, projects, router} = initializeOrg({
+  organization: {features: ['global-views', 'open-membership', 'dashboards-eap']},
+  projects: [
+    {id: '1', slug: 'project-1', isMember: true},
+    {id: '2', slug: 'project-2', isMember: true},
+    {id: '3', slug: 'project-3', isMember: false},
+  ],
+  router: {
+    location: {
+      pathname: '/organizations/org-slug/dashboard/1/',
+      query: {project: '-1'},
+    },
+    params: {},
+  },
+});
+
+jest.mock('sentry/utils/useNavigate', () => ({
+  useNavigate: jest.fn(),
+}));
+
+const mockUseNavigate = jest.mocked(useNavigate);
+
+describe('NewWidgetBuiler', function () {
+  const onCloseMock = jest.fn();
+  const onSaveMock = jest.fn();
+
+  beforeEach(function () {
+    OrganizationStore.init();
+
+    PageFiltersStore.init();
+    PageFiltersStore.onInitializeUrlState(
+      {
+        projects: [],
+        environments: [],
+        datetime: {start: null, end: null, period: '14d', utc: null},
+      },
+      new Set(['projects'])
+    );
+
+    OrganizationStore.onUpdate(organization, {replace: true});
+    ProjectsStore.loadInitialData(projects);
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/releases/',
+      body: [],
+    });
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/dashboard/1/',
+      body: [],
+    });
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/issues/',
+      body: [],
+    });
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/events/',
+      body: [],
+    });
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/events-stats/',
+      body: [],
+    });
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/releases/stats/',
+      body: [],
+    });
+
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/spans/fields/',
+      body: [],
+    });
+  });
+
+  afterEach(() => PageFiltersStore.reset());
+
+  it('renders', async function () {
+    render(
+      <WidgetBuilderV2
+        isOpen
+        onClose={onCloseMock}
+        dashboard={DashboardFixture([])}
+        dashboardFilters={{}}
+        onSave={onSaveMock}
+      />,
+      {
+        router,
+        organization,
+      }
+    );
+
+    expect(await screen.findByText('Create Custom Widget')).toBeInTheDocument();
+
+    expect(await screen.findByLabelText('Close Widget Builder')).toBeInTheDocument();
+
+    expect(await screen.findByRole('button', {name: 'All Projects'})).toBeInTheDocument();
+    expect(await screen.findByRole('button', {name: 'All Envs'})).toBeInTheDocument();
+    expect(await screen.findByRole('button', {name: '14D'})).toBeInTheDocument();
+    expect(await screen.findByRole('button', {name: 'All Releases'})).toBeInTheDocument();
+
+    expect(await screen.findByPlaceholderText('Name')).toBeInTheDocument();
+    expect(await screen.findByText('+ Add Widget Description')).toBeInTheDocument();
+
+    expect(await screen.findByLabelText('Dataset')).toHaveAttribute('role', 'radiogroup');
+    expect(screen.getByText('Errors')).toBeInTheDocument();
+    expect(screen.getByText('Transactions')).toBeInTheDocument();
+    expect(screen.getByText('Spans')).toBeInTheDocument();
+    expect(screen.getByText('Issues')).toBeInTheDocument();
+    expect(screen.getByText('Releases')).toBeInTheDocument();
+
+    expect(screen.getByText('Table')).toBeInTheDocument();
+    // ensure the dropdown input has the default value 'table'
+    expect(screen.getByDisplayValue('table')).toBeInTheDocument();
+
+    expect(screen.getByPlaceholderText('Search')).toBeInTheDocument();
+
+    expect(await screen.findByPlaceholderText('Name')).toBeInTheDocument();
+    expect(await screen.findByTestId('add-description')).toBeInTheDocument();
+
+    expect(screen.getByLabelText('Widget panel')).toBeInTheDocument();
+
+    await waitFor(() => {
+      expect(screen.queryByText('Group by')).not.toBeInTheDocument();
+    });
+  });
+
+  it('edits name and description', async function () {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
+
+    render(
+      <WidgetBuilderV2
+        isOpen
+        onClose={onCloseMock}
+        dashboard={DashboardFixture([])}
+        dashboardFilters={{}}
+        onSave={onSaveMock}
+      />,
+      {
+        router,
+        organization,
+      }
+    );
+
+    await userEvent.type(await screen.findByPlaceholderText('Name'), 'some name');
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        ...router.location,
+        query: expect.objectContaining({title: 'some name'}),
+      })
+    );
+
+    await userEvent.click(await screen.findByTestId('add-description'));
+
+    await userEvent.type(
+      await screen.findByPlaceholderText('Description'),
+      'some description'
+    );
+    expect(mockNavigate).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        ...router.location,
+        query: expect.objectContaining({description: 'some description'}),
+      })
+    );
+  });
+
+  it('changes the dataset', async function () {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
+
+    render(
+      <WidgetBuilderV2
+        isOpen
+        onClose={onCloseMock}
+        dashboard={DashboardFixture([])}
+        dashboardFilters={{}}
+        onSave={onSaveMock}
+      />,
+      {
+        router,
+        organization,
+      }
+    );
+
+    await userEvent.click(await screen.findByLabelText('Issues'));
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        ...router.location,
+        query: expect.objectContaining({dataset: 'issue'}),
+      })
+    );
+  });
+
+  it('changes the visualization type', async function () {
+    const mockNavigate = jest.fn();
+    mockUseNavigate.mockReturnValue(mockNavigate);
+
+    render(
+      <WidgetBuilderV2
+        isOpen
+        onClose={onCloseMock}
+        dashboard={DashboardFixture([])}
+        dashboardFilters={{}}
+        onSave={onSaveMock}
+      />,
+      {
+        router,
+        organization,
+      }
+    );
+
+    // click dropdown
+    await userEvent.click(await screen.findByText('Table'));
+    // select new option
+    await userEvent.click(await screen.findByText('Bar'));
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        ...router.location,
+        query: expect.objectContaining({displayType: 'bar'}),
+      })
+    );
+  });
+
+  it('render the filter alias field and add filter button on chart widgets', async function () {
+    const chartsRouter = RouterFixture({
+      ...router,
+      location: {
+        ...router.location,
+        query: {...router.location.query, displayType: 'line'},
+      },
+    });
+
+    render(
+      <WidgetBuilderV2
+        isOpen
+        onClose={onCloseMock}
+        dashboard={DashboardFixture([])}
+        dashboardFilters={{}}
+        onSave={onSaveMock}
+      />,
+      {
+        router: chartsRouter,
+        organization,
+      }
+    );
+
+    // see if alias field and add button are there
+    expect(screen.getByPlaceholderText('Legend Alias')).toBeInTheDocument();
+    expect(screen.getByText('Add Filter')).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.queryByLabelText('Remove this filter')).not.toBeInTheDocument();
+    });
+    // add a field and see if delete buttons are there
+    await userEvent.click(screen.getByText('Add Filter'));
+    expect(screen.getAllByLabelText('Remove this filter')).toHaveLength(2);
+  });
+
+  it('does not render the filter alias field and add filter button on other widgets', async function () {
+    render(
+      <WidgetBuilderV2
+        isOpen
+        onClose={onCloseMock}
+        dashboard={DashboardFixture([])}
+        dashboardFilters={{}}
+        onSave={onSaveMock}
+      />,
+      {
+        router,
+        organization,
+      }
+    );
+
+    // see if alias field and add button are not there
+    await waitFor(() => {
+      expect(screen.queryByPlaceholderText('Legend Alias')).not.toBeInTheDocument();
+      expect(screen.queryByText('Add Filter')).not.toBeInTheDocument();
+      expect(screen.queryByLabelText('Remove this filter')).not.toBeInTheDocument();
+    });
+  });
+
+  it('renders the group by field on chart widgets', async function () {
+    const chartsRouter = RouterFixture({
+      ...router,
+      location: {
+        ...router.location,
+        query: {...router.location.query, displayType: 'line'},
+      },
+    });
+
+    render(
+      <WidgetBuilderV2
+        isOpen
+        onClose={onCloseMock}
+        dashboard={DashboardFixture([])}
+        dashboardFilters={{}}
+        onSave={onSaveMock}
+      />,
+      {
+        router: chartsRouter,
+        organization,
+      }
+    );
+
+    expect(await screen.findByText('Group by')).toBeInTheDocument();
+    expect(await screen.findByText('Select group')).toBeInTheDocument();
+    expect(await screen.findByText('Add Group')).toBeInTheDocument();
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
new file mode 100644
index 00000000000000..423b916d924c9f
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
@@ -0,0 +1,184 @@
+import {Fragment, useEffect} from 'react';
+import {css} from '@emotion/react';
+import styled from '@emotion/styled';
+import {AnimatePresence, motion} from 'framer-motion';
+
+import EventView from 'sentry/utils/discover/eventView';
+import {DiscoverDatasets} from 'sentry/utils/discover/types';
+import {MetricsCardinalityProvider} from 'sentry/utils/performance/contexts/metricsCardinality';
+import {MEPSettingProvider} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
+import useKeyPress from 'sentry/utils/useKeyPress';
+import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
+import {
+  type DashboardDetails,
+  type DashboardFilters,
+  DisplayType,
+  type Widget,
+} from 'sentry/views/dashboards/types';
+import WidgetBuilderSlideout from 'sentry/views/dashboards/widgetBuilder/components/widgetBuilderSlideout';
+import WidgetPreview from 'sentry/views/dashboards/widgetBuilder/components/widgetPreview';
+import {
+  useWidgetBuilderContext,
+  WidgetBuilderProvider,
+} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {DashboardsMEPProvider} from 'sentry/views/dashboards/widgetCard/dashboardsMEPContext';
+import {SpanTagsProvider} from 'sentry/views/explore/contexts/spanTagsContext';
+import {MetricsDataSwitcher} from 'sentry/views/performance/landing/metricsDataSwitcher';
+
+type WidgetBuilderV2Props = {
+  dashboard: DashboardDetails;
+  dashboardFilters: DashboardFilters;
+  isOpen: boolean;
+  onClose: () => void;
+  onSave: ({index, widget}: {index: number; widget: Widget}) => void;
+};
+
+function WidgetBuilderV2({
+  isOpen,
+  onClose,
+  onSave,
+  dashboardFilters,
+  dashboard,
+}: WidgetBuilderV2Props) {
+  const escapeKeyPressed = useKeyPress('Escape');
+  const organization = useOrganization();
+
+  useEffect(() => {
+    if (escapeKeyPressed) {
+      if (isOpen) {
+        onClose?.();
+      }
+    }
+  }, [escapeKeyPressed, isOpen, onClose]);
+
+  return (
+    <Fragment>
+      {isOpen && <Backdrop style={{opacity: 0.5, pointerEvents: 'auto'}} />}
+      <AnimatePresence>
+        {isOpen && (
+          <WidgetBuilderProvider>
+            <SpanTagsProvider
+              dataset={DiscoverDatasets.SPANS_EAP}
+              enabled={organization.features.includes('dashboards-eap')}
+            >
+              <ContainerWithoutSidebar>
+                <WidgetBuilderContainer>
+                  <WidgetBuilderSlideout
+                    isOpen={isOpen}
+                    onClose={onClose}
+                    onSave={onSave}
+                  />
+                  <WidgetPreviewContainer
+                    dashboardFilters={dashboardFilters}
+                    dashboard={dashboard}
+                  />
+                </WidgetBuilderContainer>
+              </ContainerWithoutSidebar>
+            </SpanTagsProvider>
+          </WidgetBuilderProvider>
+        )}
+      </AnimatePresence>
+    </Fragment>
+  );
+}
+
+export default WidgetBuilderV2;
+
+function WidgetPreviewContainer({
+  dashboardFilters,
+  dashboard,
+}: {
+  dashboard: DashboardDetails;
+  dashboardFilters: DashboardFilters;
+}) {
+  const {state} = useWidgetBuilderContext();
+  const organization = useOrganization();
+  const location = useLocation();
+
+  return (
+    <DashboardsMEPProvider>
+      <MetricsCardinalityProvider organization={organization} location={location}>
+        <MetricsDataSwitcher
+          organization={organization}
+          location={location}
+          hideLoadingIndicator
+          eventView={EventView.fromLocation(location)}
+        >
+          {metricsDataSide => (
+            <MEPSettingProvider
+              location={location}
+              forceTransactions={metricsDataSide.forceTransactionsOnly}
+            >
+              <SampleWidgetCard
+                initial={{opacity: 0, x: '50%', y: 0}}
+                animate={{opacity: 1, x: 0, y: 0}}
+                exit={{opacity: 0, x: '50%', y: 0}}
+                transition={{
+                  type: 'spring',
+                  stiffness: 500,
+                  damping: 50,
+                }}
+                isTable={state.displayType === DisplayType.TABLE}
+              >
+                <WidgetPreview
+                  dashboardFilters={dashboardFilters}
+                  dashboard={dashboard}
+                />
+              </SampleWidgetCard>
+            </MEPSettingProvider>
+          )}
+        </MetricsDataSwitcher>
+      </MetricsCardinalityProvider>
+    </DashboardsMEPProvider>
+  );
+}
+
+const fullPageCss = css`
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+`;
+
+const Backdrop = styled('div')`
+  ${fullPageCss};
+  z-index: ${p => p.theme.zIndex.widgetBuilderDrawer};
+  background: ${p => p.theme.black};
+  will-change: opacity;
+  transition: opacity 200ms;
+  pointer-events: none;
+  opacity: 0;
+`;
+
+const SampleWidgetCard = styled(motion.div)<{isTable: boolean}>`
+  width: 30vw;
+  min-width: 400px;
+  height: ${p => (p.isTable ? 'auto' : '400px')};
+  border: 2px dashed ${p => p.theme.border};
+  border-radius: ${p => p.theme.borderRadius};
+  background-color: ${p => p.theme.background};
+  align-content: center;
+  z-index: ${p => p.theme.zIndex.modal};
+  position: relative;
+  margin: auto;
+`;
+
+const ContainerWithoutSidebar = styled('div')`
+  position: absolute;
+  top: 0;
+  left: 0;
+`;
+
+const WidgetBuilderContainer = styled('div')`
+  z-index: ${p => p.theme.zIndex.widgetBuilderDrawer};
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 100vh;
+  position: fixed;
+  width: -webkit-fill-available; /* Chrome */
+  width: -moz-available; /* Firefox */
+  width: fill-available; /* others */
+`;
diff --git a/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx b/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx
new file mode 100644
index 00000000000000..30ba5ccd283a19
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx
@@ -0,0 +1,156 @@
+import {Fragment} from 'react';
+import styled from '@emotion/styled';
+
+import {Button} from 'sentry/components/button';
+import Input from 'sentry/components/input';
+import {SearchQueryBuilder} from 'sentry/components/searchQueryBuilder';
+import {IconAdd, IconDelete} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import {DisplayType} from 'sentry/views/dashboards/types';
+import {SectionHeader} from 'sentry/views/dashboards/widgetBuilder/components/sectionHeader';
+import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {BuilderStateAction} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+
+function WidgetBuilderQueryFilterBuilder() {
+  const {state, dispatch} = useWidgetBuilderContext();
+
+  const canAddSearchConditions =
+    state.displayType !== DisplayType.TABLE &&
+    state.displayType !== DisplayType.BIG_NUMBER;
+
+  const onAddSearchConditions = () => {
+    // TODO: after hook gets updated with different dispatch types, change this part
+    dispatch({
+      type: BuilderStateAction.SET_QUERY,
+      payload: state.query?.length ? [...state.query, ''] : ['', ''],
+    });
+  };
+
+  return (
+    <Fragment>
+      <SectionHeader
+        title={t('Filter')}
+        tooltipText={
+          canAddSearchConditions
+            ? t(
+                'Filter down your search here. You can add multiple queries to compare data for each overlay'
+              )
+            : t('Filter down your search here')
+        }
+        optional
+      />
+      {!state.query?.length ? (
+        <QueryFieldRowWrapper key={0}>
+          <QueryField
+            query={''}
+            onSearch={queryString => {
+              dispatch({
+                type: BuilderStateAction.SET_QUERY,
+                payload: [queryString],
+              });
+            }}
+          />
+          {canAddSearchConditions && (
+            // TODO: Hook up alias to query hook when it's implemented
+            <LegendAliasInput
+              type="text"
+              name="name"
+              placeholder={t('Legend Alias')}
+              onChange={() => {}}
+            />
+          )}
+        </QueryFieldRowWrapper>
+      ) : (
+        state.query?.map((query, index) => (
+          <QueryFieldRowWrapper key={index}>
+            <QueryField
+              query={query}
+              onSearch={queryString => {
+                dispatch({
+                  type: BuilderStateAction.SET_QUERY,
+                  payload:
+                    state.query?.map((q, i) => (i === index ? queryString : q)) ?? [],
+                });
+              }}
+            />
+            {canAddSearchConditions && (
+              // TODO: Hook up alias to query hook when it's implemented
+              <LegendAliasInput
+                type="text"
+                name="name"
+                placeholder={t('Legend Alias')}
+                onChange={() => {}}
+              />
+            )}
+            {state.query && state.query?.length > 1 && canAddSearchConditions && (
+              <DeleteButton
+                onDelete={() =>
+                  dispatch({
+                    type: BuilderStateAction.SET_QUERY,
+                    payload: state.query?.filter((_, i) => i !== index) ?? [],
+                  })
+                }
+              />
+            )}
+          </QueryFieldRowWrapper>
+        ))
+      )}
+      {canAddSearchConditions && (
+        <Button size="sm" icon={<IconAdd isCircled />} onClick={onAddSearchConditions}>
+          {t('Add Filter')}
+        </Button>
+      )}
+    </Fragment>
+  );
+}
+
+export default WidgetBuilderQueryFilterBuilder;
+
+function QueryField({
+  query,
+  onSearch,
+}: {
+  onSearch: (query: string) => void;
+  query: string;
+}) {
+  return (
+    <SearchQueryBuilder
+      placeholder={t('Search')}
+      filterKeys={{}}
+      initialQuery={query ?? ''}
+      onSearch={onSearch}
+      searchSource={'widget_builder'}
+      filterKeySections={[]}
+      getTagValues={() => Promise.resolve([])}
+      showUnsubmittedIndicator
+    />
+  );
+}
+
+export function DeleteButton({onDelete}: {onDelete: () => void}) {
+  return (
+    <Button
+      size="zero"
+      style={{height: 'fit-content'}}
+      borderless
+      onClick={onDelete}
+      icon={<IconDelete />}
+      title={t('Remove this filter')}
+      aria-label={t('Remove this filter')}
+      name="filter-delete-button"
+    />
+  );
+}
+
+const QueryFieldRowWrapper = styled('div')`
+  display: flex;
+  flex-direction: row;
+  gap: ${space(1)};
+  margin-bottom: ${space(1)};
+  align-items: center;
+`;
+
+const LegendAliasInput = styled(Input)`
+  width: 33%;
+`;
diff --git a/static/app/views/dashboards/widgetBuilder/components/saveButton.tsx b/static/app/views/dashboards/widgetBuilder/components/saveButton.tsx
new file mode 100644
index 00000000000000..954c1f479f1ce1
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/saveButton.tsx
@@ -0,0 +1,31 @@
+import {useCallback} from 'react';
+
+import {Button} from 'sentry/components/button';
+import {t} from 'sentry/locale';
+import {useParams} from 'sentry/utils/useParams';
+import type {Widget} from 'sentry/views/dashboards/types';
+import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {convertBuilderStateToWidget} from 'sentry/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget';
+
+interface SaveButtonProps {
+  isEditing: boolean;
+  onSave: ({index, widget}: {index: number; widget: Widget}) => void;
+}
+
+function SaveButton({isEditing, onSave}: SaveButtonProps) {
+  const {state} = useWidgetBuilderContext();
+  const {widgetIndex} = useParams();
+
+  const handleSave = useCallback(() => {
+    const widget = convertBuilderStateToWidget(state);
+    onSave({index: Number(widgetIndex), widget});
+  }, [onSave, state, widgetIndex]);
+
+  return (
+    <Button priority="primary" onClick={handleSave}>
+      {isEditing ? t('Update Widget') : t('Add Widget')}
+    </Button>
+  );
+}
+
+export default SaveButton;
diff --git a/static/app/views/dashboards/widgetBuilder/components/sectionHeader.tsx b/static/app/views/dashboards/widgetBuilder/components/sectionHeader.tsx
new file mode 100644
index 00000000000000..391a925b17f8fd
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/sectionHeader.tsx
@@ -0,0 +1,53 @@
+import styled from '@emotion/styled';
+
+import {Tooltip} from 'sentry/components/tooltip';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+
+interface SectionHeaderProps {
+  title: React.ReactNode;
+  className?: string;
+  optional?: boolean;
+  tooltipText?: React.ReactNode;
+}
+
+export function SectionHeader({
+  tooltipText,
+  title,
+  optional,
+  className,
+}: SectionHeaderProps) {
+  return (
+    <HeaderWrapper>
+      <Tooltip
+        title={tooltipText}
+        disabled={!tooltipText}
+        position="right-end"
+        delay={200}
+        isHoverable
+        showUnderline
+      >
+        <StyledHeader className={className}>{title}</StyledHeader>
+      </Tooltip>
+      {optional && <OptionalHeader>{t('(optional)')}</OptionalHeader>}
+    </HeaderWrapper>
+  );
+}
+
+const StyledHeader = styled('h6')`
+  font-size: ${p => p.theme.fontSizeLarge};
+  margin-bottom: ${space(1)};
+`;
+
+const OptionalHeader = styled('h6')`
+  font-size: ${p => p.theme.fontSizeLarge};
+  color: ${p => p.theme.subText};
+  font-weight: ${p => p.theme.fontWeightNormal};
+  margin-bottom: ${space(1)};
+`;
+
+const HeaderWrapper = styled('div')`
+  display: flex;
+  flex-direction: row;
+  gap: ${space(0.5)};
+`;
diff --git a/static/app/views/dashboards/widgetBuilder/components/typeSelector.tsx b/static/app/views/dashboards/widgetBuilder/components/typeSelector.tsx
new file mode 100644
index 00000000000000..29f658c6f42ef0
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/typeSelector.tsx
@@ -0,0 +1,86 @@
+import {Fragment} from 'react';
+import {components} from 'react-select';
+import styled from '@emotion/styled';
+
+import SelectControl from 'sentry/components/forms/controls/selectControl';
+import {IconGraph, IconNumber, IconTable} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import {DisplayType} from 'sentry/views/dashboards/types';
+import {SectionHeader} from 'sentry/views/dashboards/widgetBuilder/components/sectionHeader';
+import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {BuilderStateAction} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+
+const typeIcons = {
+  [DisplayType.AREA]: <IconGraph key="area" type="area" />,
+  [DisplayType.BAR]: <IconGraph key="bar" type="bar" />,
+  [DisplayType.LINE]: <IconGraph key="line" type="line" />,
+  [DisplayType.TABLE]: <IconTable key="table" />,
+  [DisplayType.BIG_NUMBER]: <IconNumber key="number" />,
+};
+
+const displayTypes = {
+  [DisplayType.AREA]: t('Area'),
+  [DisplayType.BAR]: t('Bar'),
+  [DisplayType.LINE]: t('Line'),
+  [DisplayType.TABLE]: t('Table'),
+  [DisplayType.BIG_NUMBER]: t('Big Number'),
+};
+
+function WidgetBuilderTypeSelector() {
+  const {state, dispatch} = useWidgetBuilderContext();
+
+  return (
+    <Fragment>
+      <SectionHeader
+        tooltipText={t('This is the type of visualization (ex. line chart)')}
+        title={t('Type')}
+      />
+      <SelectControl
+        name="displayType"
+        value={state.displayType}
+        options={Object.keys(displayTypes).map(value => ({
+          leadingItems: typeIcons[value],
+          label: displayTypes[value],
+          value,
+        }))}
+        clearable={false}
+        onChange={newValue => {
+          dispatch({
+            type: BuilderStateAction.SET_DISPLAY_TYPE,
+            payload: newValue.value,
+          });
+          if (
+            (newValue.value === DisplayType.TABLE ||
+              newValue.value === DisplayType.BIG_NUMBER) &&
+            state.query?.length
+          ) {
+            dispatch({
+              type: BuilderStateAction.SET_QUERY,
+              payload: [state.query[0]],
+            });
+          }
+        }}
+        components={{
+          SingleValue: containerProps => {
+            return (
+              <components.SingleValue {...containerProps}>
+                <SelectionWrapper>
+                  {containerProps.data.leadingItems}
+                  {containerProps.children}
+                </SelectionWrapper>
+              </components.SingleValue>
+            );
+          },
+        }}
+      />
+    </Fragment>
+  );
+}
+
+export default WidgetBuilderTypeSelector;
+
+const SelectionWrapper = styled('div')`
+  display: flex;
+  gap: ${space(1)};
+`;
diff --git a/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx b/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
new file mode 100644
index 00000000000000..acacc118e43f20
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
@@ -0,0 +1,111 @@
+import styled from '@emotion/styled';
+
+import {Button} from 'sentry/components/button';
+import SlideOverPanel from 'sentry/components/slideOverPanel';
+import {IconClose} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import {useParams} from 'sentry/utils/useParams';
+import {DisplayType, type Widget} from 'sentry/views/dashboards/types';
+import WidgetBuilderDatasetSelector from 'sentry/views/dashboards/widgetBuilder/components/datasetSelector';
+import DevBuilder from 'sentry/views/dashboards/widgetBuilder/components/devBuilder';
+import WidgetBuilderFilterBar from 'sentry/views/dashboards/widgetBuilder/components/filtersBar';
+import WidgetBuilderGroupBySelector from 'sentry/views/dashboards/widgetBuilder/components/groupBySelector';
+import WidgetBuilderNameAndDescription from 'sentry/views/dashboards/widgetBuilder/components/nameAndDescFields';
+import WidgetBuilderQueryFilterBuilder from 'sentry/views/dashboards/widgetBuilder/components/queryFilterBuilder';
+import SaveButton from 'sentry/views/dashboards/widgetBuilder/components/saveButton';
+import WidgetBuilderTypeSelector from 'sentry/views/dashboards/widgetBuilder/components/typeSelector';
+import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+
+type WidgetBuilderSlideoutProps = {
+  isOpen: boolean;
+  onClose: () => void;
+  onSave: ({index, widget}: {index: number; widget: Widget}) => void;
+};
+
+function WidgetBuilderSlideout({isOpen, onClose, onSave}: WidgetBuilderSlideoutProps) {
+  const {state} = useWidgetBuilderContext();
+  const {widgetIndex} = useParams();
+  const isEditing = widgetIndex !== undefined;
+  const title = isEditing ? t('Edit Widget') : t('Create Custom Widget');
+  const isChartWidget =
+    state.displayType !== DisplayType.BIG_NUMBER &&
+    state.displayType !== DisplayType.TABLE;
+
+  return (
+    <SlideOverPanel
+      collapsed={!isOpen}
+      slidePosition="left"
+      data-test-id="widget-slideout"
+    >
+      <SlideoutHeaderWrapper>
+        <SlideoutTitle>{title}</SlideoutTitle>
+        <CloseButton
+          priority="link"
+          size="zero"
+          borderless
+          aria-label={t('Close Widget Builder')}
+          icon={<IconClose size="sm" />}
+          onClick={onClose}
+        >
+          {t('Close')}
+        </CloseButton>
+      </SlideoutHeaderWrapper>
+      <SlideoutBodyWrapper>
+        <Section>
+          <WidgetBuilderFilterBar />
+        </Section>
+        <Section>
+          <WidgetBuilderDatasetSelector />
+        </Section>
+        <Section>
+          <WidgetBuilderTypeSelector />
+        </Section>
+        <Section>
+          <WidgetBuilderQueryFilterBuilder />
+        </Section>
+        {isChartWidget && (
+          <Section>
+            <WidgetBuilderGroupBySelector />
+          </Section>
+        )}
+        <Section>
+          <WidgetBuilderNameAndDescription />
+        </Section>
+        <SaveButton isEditing={isEditing} onSave={onSave} />
+        <DevBuilder />
+      </SlideoutBodyWrapper>
+    </SlideOverPanel>
+  );
+}
+
+export default WidgetBuilderSlideout;
+
+const CloseButton = styled(Button)`
+  color: ${p => p.theme.gray300};
+  height: fit-content;
+  &:hover {
+    color: ${p => p.theme.gray400};
+  }
+  z-index: 100;
+`;
+
+const SlideoutTitle = styled('h5')`
+  margin: 0;
+`;
+
+const SlideoutHeaderWrapper = styled('div')`
+  padding: ${space(3)} ${space(4)};
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1px solid ${p => p.theme.border};
+`;
+
+const SlideoutBodyWrapper = styled('div')`
+  padding: ${space(4)};
+`;
+
+const Section = styled('div')`
+  margin-bottom: ${space(4)};
+`;
diff --git a/static/app/views/dashboards/widgetBuilder/components/widgetPreview.tsx b/static/app/views/dashboards/widgetBuilder/components/widgetPreview.tsx
new file mode 100644
index 00000000000000..b46657c63e33ac
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/components/widgetPreview.tsx
@@ -0,0 +1,85 @@
+import PanelAlert from 'sentry/components/panels/panelAlert';
+import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
+import usePageFilters from 'sentry/utils/usePageFilters';
+import useRouter from 'sentry/utils/useRouter';
+import {
+  type DashboardDetails,
+  type DashboardFilters,
+  DisplayType,
+} from 'sentry/views/dashboards/types';
+import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {convertBuilderStateToWidget} from 'sentry/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget';
+import WidgetCard from 'sentry/views/dashboards/widgetCard';
+import WidgetLegendNameEncoderDecoder from 'sentry/views/dashboards/widgetLegendNameEncoderDecoder';
+import WidgetLegendSelectionState from 'sentry/views/dashboards/widgetLegendSelectionState';
+
+interface WidgetPreviewProps {
+  dashboard: DashboardDetails;
+  dashboardFilters: DashboardFilters;
+}
+
+function WidgetPreview({dashboard, dashboardFilters}: WidgetPreviewProps) {
+  const organization = useOrganization();
+  const location = useLocation();
+  const router = useRouter();
+  const pageFilters = usePageFilters();
+
+  const {state} = useWidgetBuilderContext();
+
+  const widget = convertBuilderStateToWidget(state);
+
+  const widgetLegendState = new WidgetLegendSelectionState({
+    location: location,
+    organization,
+    dashboard: dashboard,
+    router: router,
+  });
+
+  // TODO: The way we create the widget here does not propagate a widget ID
+  // to pass to the legend encoder decoder.
+  const unselectedReleasesForCharts = {
+    [WidgetLegendNameEncoderDecoder.encodeSeriesNameForLegend('Releases', undefined)]:
+      false,
+  };
+
+  return (
+    <WidgetCard
+      disableFullscreen
+      shouldResize={state.displayType !== DisplayType.TABLE}
+      organization={organization}
+      selection={pageFilters.selection}
+      widget={widget}
+      dashboardFilters={dashboardFilters}
+      isEditingDashboard={false}
+      widgetLimitReached={false}
+      showContextMenu={false}
+      renderErrorMessage={errorMessage =>
+        typeof errorMessage === 'string' && (
+          <PanelAlert type="error">{errorMessage}</PanelAlert>
+        )
+      }
+      onLegendSelectChanged={() => {}}
+      legendOptions={
+        widgetLegendState.widgetRequiresLegendUnselection(widget)
+          ? {selected: unselectedReleasesForCharts}
+          : undefined
+      }
+      widgetLegendState={widgetLegendState}
+      // TODO: This can only be set once we have the filter bar in place
+      isWidgetInvalid={false}
+      // isWidgetInvalid={!state.queryConditionsValid}
+
+      // TODO: This will be filled in once we start supporting thresholds
+      onDataFetched={() => {}}
+      // onDataFetched={onDataFetched}
+
+      // TODO: This requires the current widget ID and a helper to update the
+      // dashboard state to be added
+      onWidgetSplitDecision={() => {}}
+      // onWidgetSplitDecision={onWidgetSplitDecision}
+    />
+  );
+}
+
+export default WidgetPreview;
diff --git a/static/app/views/dashboards/widgetBuilder/contexts/widgetBuilderContext.tsx b/static/app/views/dashboards/widgetBuilder/contexts/widgetBuilderContext.tsx
new file mode 100644
index 00000000000000..d0d64414a18dbd
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/contexts/widgetBuilderContext.tsx
@@ -0,0 +1,37 @@
+import type React from 'react';
+import {createContext, useContext} from 'react';
+
+import useWidgetBuilderState from '../hooks/useWidgetBuilderState';
+
+const WidgetBuilderContext = createContext<
+  ReturnType<typeof useWidgetBuilderState> | undefined
+>(undefined);
+
+interface WidgetBuilderProviderProps {
+  children: React.ReactNode;
+}
+
+/**
+ * Provider for maintaining a single source of truth for the widget builder state.
+ */
+export function WidgetBuilderProvider({children}: WidgetBuilderProviderProps) {
+  const widgetBuilderState = useWidgetBuilderState();
+  return (
+    <WidgetBuilderContext.Provider value={widgetBuilderState}>
+      {children}
+    </WidgetBuilderContext.Provider>
+  );
+}
+
+/**
+ * Custom hook to get state and dispatch from the WidgetBuilderContext
+ */
+export const useWidgetBuilderContext = () => {
+  const context = useContext(WidgetBuilderContext);
+  if (!context) {
+    throw new Error(
+      'useWidgetBuilderContext must be used within a WidgetBuilderProvider'
+    );
+  }
+  return context;
+};
diff --git a/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.spec.tsx b/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.spec.tsx
new file mode 100644
index 00000000000000..cb196efbee4ec5
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.spec.tsx
@@ -0,0 +1,135 @@
+import {LocationFixture} from 'sentry-fixture/locationFixture';
+
+import {act, renderHook} from 'sentry-test/reactTestingLibrary';
+
+import type {Sort} from 'sentry/utils/discover/fields';
+import {decodeSorts} from 'sentry/utils/queryString';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import {useQueryParamState} from 'sentry/views/dashboards/widgetBuilder/hooks/useQueryParamState';
+import {formatSort} from 'sentry/views/explore/tables/aggregatesTable';
+
+jest.mock('sentry/utils/useLocation');
+jest.mock('sentry/utils/useNavigate');
+
+const mockedUseLocation = jest.mocked(useLocation);
+const mockedUseNavigate = jest.mocked(useNavigate);
+
+describe('useQueryParamState', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('should get the initial value from the query param', () => {
+    mockedUseLocation.mockReturnValue(
+      LocationFixture({query: {testField: 'initial state'}})
+    );
+
+    const {result} = renderHook(() => useQueryParamState({fieldName: 'testField'}));
+
+    expect(result.current[0]).toBe('initial state');
+  });
+
+  it('should update the local state and the query param', () => {
+    const mockedNavigate = jest.fn();
+    mockedUseNavigate.mockReturnValue(mockedNavigate);
+
+    const {result} = renderHook(() => useQueryParamState({fieldName: 'testField'}));
+
+    act(() => {
+      result.current[1]('newValue');
+    });
+
+    // The local state should be updated
+    expect(result.current[0]).toBe('newValue');
+
+    // The query param should not be updated yet
+    expect(mockedNavigate).not.toHaveBeenCalledWith({
+      ...LocationFixture(),
+      query: {testField: 'initial state'},
+    });
+
+    // Run the timers to trigger queued updates
+    jest.runAllTimers();
+
+    // The query param should be updated
+    expect(mockedNavigate).toHaveBeenCalledWith({
+      ...LocationFixture(),
+      query: {testField: 'newValue'},
+    });
+
+    // The local state should be still reflect the new value
+    expect(result.current[0]).toBe('newValue');
+  });
+
+  it('should use the decoder function to decode the query param value if provided', () => {
+    mockedUseLocation.mockReturnValue(
+      LocationFixture({query: {testField: 'initial state'}})
+    );
+
+    const testDeserializer = (value: string) => `${value.toUpperCase()} - decoded`;
+
+    const {result} = renderHook(() =>
+      useQueryParamState({fieldName: 'testField', deserializer: testDeserializer})
+    );
+
+    expect(result.current[0]).toBe('INITIAL STATE - decoded');
+  });
+
+  it('can take any kind of value and serialize it to a string compatible with query params', () => {
+    type TestType = {
+      count: number;
+      isActive: boolean;
+      value: string;
+    };
+
+    const mockedNavigate = jest.fn();
+    mockedUseNavigate.mockReturnValue(mockedNavigate);
+
+    const testSerializer = (value: TestType) =>
+      `${value.value} - ${value.count} - ${value.isActive}`;
+
+    const {result} = renderHook(() =>
+      useQueryParamState({fieldName: 'testField', serializer: testSerializer})
+    );
+
+    act(() => {
+      result.current[1]({value: 'newValue', count: 2, isActive: true});
+    });
+
+    expect(mockedNavigate).toHaveBeenCalledWith({
+      ...LocationFixture(),
+      query: {testField: 'newValue - 2 - true'},
+    });
+  });
+
+  it('can decode and update sorts', () => {
+    mockedUseLocation.mockReturnValue(LocationFixture({query: {sort: '-testField'}}));
+
+    const mockedNavigate = jest.fn();
+    mockedUseNavigate.mockReturnValue(mockedNavigate);
+
+    const {result} = renderHook(() =>
+      useQueryParamState<Sort[]>({
+        fieldName: 'sort',
+        decoder: decodeSorts,
+        serializer: value => value.map(formatSort),
+      })
+    );
+
+    expect(result.current[0]).toEqual([{field: 'testField', kind: 'desc'}]);
+
+    act(() => {
+      result.current[1]([{field: 'testField', kind: 'asc'}]);
+    });
+
+    expect(mockedNavigate).toHaveBeenCalledWith({
+      ...LocationFixture(),
+      query: {sort: ['testField']},
+    });
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.tsx b/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.tsx
new file mode 100644
index 00000000000000..1caf6111e1af8d
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/hooks/useQueryParamState.tsx
@@ -0,0 +1,117 @@
+import {useCallback, useMemo, useState} from 'react';
+import * as Sentry from '@sentry/react';
+import debounce from 'lodash/debounce';
+
+import {DEFAULT_DEBOUNCE_DURATION} from 'sentry/constants';
+import {defined} from 'sentry/utils';
+import {type decodeList, decodeScalar, type decodeSorts} from 'sentry/utils/queryString';
+import useLocationQuery from 'sentry/utils/url/useLocationQuery';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
+
+interface UseQueryParamStateWithScalarDecoder<T> {
+  fieldName: string;
+  decoder?: typeof decodeScalar;
+  deserializer?: (value: ReturnType<typeof decodeScalar>) => T;
+  serializer?: (value: T) => string;
+}
+
+interface UseQueryParamStateWithListDecoder<T> {
+  decoder: typeof decodeList;
+  fieldName: string;
+  deserializer?: (value: ReturnType<typeof decodeList>) => T;
+  serializer?: (value: T) => string[];
+}
+
+interface UseQueryParamStateWithSortsDecoder<T> {
+  decoder: typeof decodeSorts;
+  fieldName: string;
+  serializer: (value: T) => string[];
+  deserializer?: (value: ReturnType<typeof decodeSorts>) => T;
+}
+
+type UseQueryParamStateProps<T> =
+  | UseQueryParamStateWithScalarDecoder<T>
+  | UseQueryParamStateWithListDecoder<T>
+  | UseQueryParamStateWithSortsDecoder<T>;
+
+/**
+ * Hook to manage a state that is synced with a query param in the URL
+ *
+ * @param fieldName - The name of the query param to sync with the state
+ * @param deserializer - A function to transform the query param value into the desired type
+ * @returns A tuple containing the current state and a function to update the state
+ */
+export function useQueryParamState<T = string>({
+  fieldName,
+  decoder,
+  deserializer,
+  serializer,
+}: UseQueryParamStateProps<T>): [T | undefined, (newField: T | undefined) => void] {
+  const navigate = useNavigate();
+  const location = useLocation();
+
+  // The URL query params give us our initial state
+  const parsedQueryParams = useLocationQuery({
+    fields: {
+      [fieldName]: decoder ?? decodeScalar,
+    },
+  });
+  const [localState, setLocalState] = useState<T | undefined>(() => {
+    const decodedValue = parsedQueryParams[fieldName];
+
+    if (!defined(decodedValue)) {
+      return undefined;
+    }
+
+    return deserializer
+      ? deserializer(decodedValue as any)
+      : // TODO(nar): This is a temporary fix to avoid type errors
+        // When the deserializer isn't provided, we should return the value
+        // if T is a string, or else return undefined
+        (decodedValue as T);
+  });
+
+  // Debounce the update to the URL query params
+  // to avoid unnecessary re-renders
+  const updateQueryParam = useMemo(
+    () =>
+      debounce((newURLParamValues: string | string[] | undefined) => {
+        navigate({
+          ...location,
+          query: {...location.query, [fieldName]: newURLParamValues},
+        });
+      }, DEFAULT_DEBOUNCE_DURATION),
+    [location, navigate, fieldName]
+  );
+
+  const updateField = useCallback(
+    (newField: T | undefined) => {
+      setLocalState(newField);
+
+      if (!defined(newField)) {
+        updateQueryParam(undefined);
+      } else if (serializer) {
+        updateQueryParam(serializer(newField));
+      } else {
+        // At this point, only update the query param if the new field is a string, number, boolean, or array
+        if (
+          ['string', 'number', 'boolean'].includes(typeof newField) ||
+          Array.isArray(newField)
+        ) {
+          updateQueryParam(newField as any);
+        } else {
+          Sentry.captureException(
+            new Error(
+              'useQueryParamState: newField is not a primitive value and not provided a serializer'
+            )
+          );
+          updateQueryParam(undefined);
+        }
+      }
+    },
+    [updateQueryParam, serializer]
+  );
+
+  return [localState, updateField];
+}
diff --git a/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.spec.tsx b/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.spec.tsx
new file mode 100644
index 00000000000000..20ef2fe084e354
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.spec.tsx
@@ -0,0 +1,246 @@
+import {LocationFixture} from 'sentry-fixture/locationFixture';
+
+import {act, renderHook} from 'sentry-test/reactTestingLibrary';
+
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import useWidgetBuilderState, {
+  BuilderStateAction,
+} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+
+jest.mock('sentry/utils/useLocation');
+jest.mock('sentry/utils/useNavigate');
+
+const mockedUsedLocation = jest.mocked(useLocation);
+const mockedUseNavigate = jest.mocked(useNavigate);
+
+describe('useWidgetBuilderState', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+    jest.clearAllMocks();
+  });
+
+  it('returns the widget builder state from the query params', () => {
+    mockedUsedLocation.mockReturnValue(
+      LocationFixture({
+        query: {
+          title: 'test',
+          description: 'lalala this is a description',
+        },
+      })
+    );
+
+    const {result} = renderHook(() => useWidgetBuilderState());
+
+    expect(result.current.state.title).toBe('test');
+    expect(result.current.state.description).toBe('lalala this is a description');
+  });
+
+  it('sets the new title and description in the query params', () => {
+    const mockNavigate = jest.fn();
+    mockedUseNavigate.mockReturnValue(mockNavigate);
+
+    const {result} = renderHook(() => useWidgetBuilderState());
+    act(() => {
+      result.current.dispatch({
+        type: BuilderStateAction.SET_TITLE,
+        payload: 'new title',
+      });
+    });
+
+    act(() => {
+      result.current.dispatch({
+        type: BuilderStateAction.SET_DESCRIPTION,
+        payload: 'new description',
+      });
+    });
+
+    jest.runAllTimers();
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      expect.objectContaining({query: expect.objectContaining({title: 'new title'})})
+    );
+    expect(mockNavigate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        query: expect.objectContaining({description: 'new description'}),
+      })
+    );
+  });
+
+  describe('display type', () => {
+    it('returns the display type from the query params', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {displayType: DisplayType.AREA},
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState());
+
+      expect(result.current.state.displayType).toBe(DisplayType.AREA);
+    });
+
+    it('returns a default display type from the query params when the display type is not valid', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {displayType: 'invalid'},
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState());
+
+      expect(result.current.state.displayType).toBe(DisplayType.TABLE);
+    });
+
+    it('sets the display type in the query params', () => {
+      const mockNavigate = jest.fn();
+      mockedUseNavigate.mockReturnValue(mockNavigate);
+
+      const {result} = renderHook(() => useWidgetBuilderState());
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_DISPLAY_TYPE,
+          payload: DisplayType.AREA,
+        });
+      });
+
+      jest.runAllTimers();
+
+      expect(mockNavigate).toHaveBeenCalledWith(
+        expect.objectContaining({
+          query: expect.objectContaining({displayType: DisplayType.AREA}),
+        })
+      );
+    });
+  });
+
+  describe('dataset', () => {
+    it('returns the dataset from the query params', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({query: {dataset: WidgetType.ISSUE}})
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState());
+
+      expect(result.current.state.dataset).toBe(WidgetType.ISSUE);
+    });
+
+    it('sets the dataset in the query params', () => {
+      const mockNavigate = jest.fn();
+      mockedUseNavigate.mockReturnValue(mockNavigate);
+
+      const {result} = renderHook(() => useWidgetBuilderState());
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_DATASET,
+          payload: WidgetType.METRICS,
+        });
+      });
+
+      jest.runAllTimers();
+
+      expect(mockNavigate).toHaveBeenCalledWith(
+        expect.objectContaining({
+          query: expect.objectContaining({dataset: WidgetType.METRICS}),
+        })
+      );
+    });
+
+    it('returns errors as the default dataset', () => {
+      mockedUsedLocation.mockReturnValue(LocationFixture({query: {dataset: 'invalid'}}));
+
+      const {result} = renderHook(() => useWidgetBuilderState());
+
+      expect(result.current.state.dataset).toBe(WidgetType.ERRORS);
+    });
+  });
+
+  describe('fields', () => {
+    it('returns the fields from the query params', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({query: {field: ['event.type', 'potato', 'count()']}})
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState());
+
+      expect(result.current.state.fields).toEqual([
+        {field: 'event.type', alias: undefined, kind: 'field'},
+        {field: 'potato', alias: undefined, kind: 'field'},
+        {
+          alias: undefined,
+          kind: 'function',
+          function: ['count', '', undefined, undefined],
+        },
+      ]);
+    });
+  });
+
+  describe('yAxis', () => {
+    it('does not conflict with fields when setting the state', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            field: ['event.type', 'potato', 'count()'],
+            yAxis: ['count()', 'count_unique(user)'],
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState());
+
+      expect(result.current.state.fields).toEqual([
+        {field: 'event.type', alias: undefined, kind: 'field'},
+        {field: 'potato', alias: undefined, kind: 'field'},
+        {
+          function: ['count', '', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+      expect(result.current.state.yAxis).toEqual([
+        {
+          function: ['count', '', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'user', undefined, undefined],
+          alias: undefined,
+          kind: 'function',
+        },
+      ]);
+    });
+  });
+
+  describe('sort', () => {
+    it('can decode and update sorts', () => {
+      mockedUsedLocation.mockReturnValue(
+        LocationFixture({
+          query: {
+            sort: ['-testField'],
+          },
+        })
+      );
+
+      const {result} = renderHook(() => useWidgetBuilderState());
+
+      expect(result.current.state.sort).toEqual([{field: 'testField', kind: 'desc'}]);
+
+      act(() => {
+        result.current.dispatch({
+          type: BuilderStateAction.SET_SORT,
+          payload: [{field: 'testField', kind: 'asc'}],
+        });
+      });
+
+      expect(result.current.state.sort).toEqual([{field: 'testField', kind: 'asc'}]);
+    });
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.tsx b/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.tsx
new file mode 100644
index 00000000000000..74f5ecdcf0d1a2
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState.tsx
@@ -0,0 +1,191 @@
+import {useCallback, useMemo} from 'react';
+
+import {
+  type Column,
+  explodeField,
+  generateFieldAsString,
+  type Sort,
+} from 'sentry/utils/discover/fields';
+import {decodeList, decodeSorts} from 'sentry/utils/queryString';
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import {useQueryParamState} from 'sentry/views/dashboards/widgetBuilder/hooks/useQueryParamState';
+import {formatSort} from 'sentry/views/explore/tables/aggregatesTable';
+
+export type WidgetBuilderStateQueryParams = {
+  dataset?: WidgetType;
+  description?: string;
+  displayType?: DisplayType;
+  field?: (string | undefined)[];
+  query?: string[];
+  sort?: string[];
+  title?: string;
+  yAxis?: string[];
+};
+
+export const BuilderStateAction = {
+  SET_TITLE: 'SET_TITLE',
+  SET_DESCRIPTION: 'SET_DESCRIPTION',
+  SET_DISPLAY_TYPE: 'SET_DISPLAY_TYPE',
+  SET_DATASET: 'SET_DATASET',
+  SET_FIELDS: 'SET_FIELDS',
+  SET_Y_AXIS: 'SET_Y_AXIS',
+  SET_QUERY: 'SET_QUERY',
+  SET_SORT: 'SET_SORT',
+} as const;
+
+type WidgetAction =
+  | {payload: string; type: typeof BuilderStateAction.SET_TITLE}
+  | {payload: string; type: typeof BuilderStateAction.SET_DESCRIPTION}
+  | {payload: DisplayType; type: typeof BuilderStateAction.SET_DISPLAY_TYPE}
+  | {payload: WidgetType; type: typeof BuilderStateAction.SET_DATASET}
+  | {payload: Column[]; type: typeof BuilderStateAction.SET_FIELDS}
+  | {payload: Column[]; type: typeof BuilderStateAction.SET_Y_AXIS}
+  | {payload: string[]; type: typeof BuilderStateAction.SET_QUERY}
+  | {payload: Sort[]; type: typeof BuilderStateAction.SET_SORT};
+
+export interface WidgetBuilderState {
+  dataset?: WidgetType;
+  description?: string;
+  displayType?: DisplayType;
+  fields?: Column[];
+  query?: string[];
+  sort?: Sort[];
+  title?: string;
+  yAxis?: Column[];
+}
+
+function useWidgetBuilderState(): {
+  dispatch: (action: WidgetAction) => void;
+  state: WidgetBuilderState;
+} {
+  const [title, setTitle] = useQueryParamState<string>({fieldName: 'title'});
+  const [description, setDescription] = useQueryParamState<string>({
+    fieldName: 'description',
+  });
+  const [displayType, setDisplayType] = useQueryParamState<DisplayType>({
+    fieldName: 'displayType',
+    deserializer: deserializeDisplayType,
+  });
+  const [dataset, setDataset] = useQueryParamState<WidgetType>({
+    fieldName: 'dataset',
+    deserializer: deserializeDataset,
+  });
+  const [fields, setFields] = useQueryParamState<Column[]>({
+    fieldName: 'field',
+    decoder: decodeList,
+    deserializer: deserializeFields,
+    serializer: serializeFields,
+  });
+  const [yAxis, setYAxis] = useQueryParamState<Column[]>({
+    fieldName: 'yAxis',
+    decoder: decodeList,
+    deserializer: deserializeFields,
+    serializer: serializeFields,
+  });
+  const [query, setQuery] = useQueryParamState<string[]>({
+    fieldName: 'query',
+    decoder: decodeList,
+  });
+  const [sort, setSort] = useQueryParamState<Sort[]>({
+    fieldName: 'sort',
+    decoder: decodeSorts,
+    serializer: serializeSorts,
+  });
+
+  const state = useMemo(
+    () => ({title, description, displayType, dataset, fields, yAxis, query, sort}),
+    [title, description, displayType, dataset, fields, yAxis, query, sort]
+  );
+
+  const dispatch = useCallback(
+    (action: WidgetAction) => {
+      switch (action.type) {
+        case BuilderStateAction.SET_TITLE:
+          setTitle(action.payload);
+          break;
+        case BuilderStateAction.SET_DESCRIPTION:
+          setDescription(action.payload);
+          break;
+        case BuilderStateAction.SET_DISPLAY_TYPE:
+          setDisplayType(action.payload);
+          break;
+        case BuilderStateAction.SET_DATASET:
+          setDataset(action.payload);
+          break;
+        case BuilderStateAction.SET_FIELDS:
+          setFields(action.payload);
+          break;
+        case BuilderStateAction.SET_Y_AXIS:
+          setYAxis(action.payload);
+          break;
+        case BuilderStateAction.SET_QUERY:
+          setQuery(action.payload);
+          break;
+        case BuilderStateAction.SET_SORT:
+          setSort(action.payload);
+          break;
+        default:
+          break;
+      }
+    },
+    [
+      setTitle,
+      setDescription,
+      setDisplayType,
+      setDataset,
+      setFields,
+      setYAxis,
+      setQuery,
+      setSort,
+    ]
+  );
+
+  return {
+    state,
+    dispatch,
+  };
+}
+
+/**
+ * Decodes the display type from the query params
+ * Returns the default display type if the value is not a valid display type
+ */
+function deserializeDisplayType(value: string): DisplayType {
+  if (Object.values(DisplayType).includes(value as DisplayType)) {
+    return value as DisplayType;
+  }
+  return DisplayType.TABLE;
+}
+
+/**
+ * Decodes the dataset from the query params
+ * Returns the default dataset if the value is not a valid dataset
+ */
+function deserializeDataset(value: string): WidgetType {
+  if (Object.values(WidgetType).includes(value as WidgetType)) {
+    return value as WidgetType;
+  }
+  return WidgetType.ERRORS;
+}
+
+/**
+ * Takes fields from the query params in list form and converts
+ * them into a list of fields and functions
+ */
+function deserializeFields(fields: string[]): Column[] {
+  return fields.map(field => explodeField({field}));
+}
+
+/**
+ * Takes fields in the field and function format and coverts
+ * them into a list of strings compatible with query params
+ */
+function serializeFields(fields: Column[]): string[] {
+  return fields.map(generateFieldAsString);
+}
+
+function serializeSorts(sorts: Sort[]): string[] {
+  return sorts.map(formatSort);
+}
+
+export default useWidgetBuilderState;
diff --git a/static/app/views/dashboards/widgetBuilder/index.tsx b/static/app/views/dashboards/widgetBuilder/index.tsx
index 92db19f009051c..5c8a863d478b9e 100644
--- a/static/app/views/dashboards/widgetBuilder/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/index.tsx
@@ -10,8 +10,7 @@ import WidgetLegendSelectionState from '../widgetLegendSelectionState';
 
 import WidgetBuilder from './widgetBuilder';
 
-interface WidgetBuilderProps
-  extends Omit<React.ComponentProps<typeof WidgetBuilder>, 'organization'> {}
+interface WidgetBuilderProps extends React.ComponentProps<typeof WidgetBuilder> {}
 
 function WidgetBuilderContainer(props: WidgetBuilderProps) {
   const organization = useOrganization();
@@ -26,10 +25,12 @@ function WidgetBuilderContainer(props: WidgetBuilderProps) {
         </Layout.Page>
       )}
     >
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP}>
+      <SpanTagsProvider
+        dataset={DiscoverDatasets.SPANS_EAP}
+        enabled={organization.features.includes('dashboards-eap')}
+      >
         <WidgetBuilder
           {...props}
-          organization={organization}
           widgetLegendState={
             new WidgetLegendSelectionState({
               location: props.location,
diff --git a/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx
new file mode 100644
index 00000000000000..563e27c814516a
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx
@@ -0,0 +1,112 @@
+import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import type {WidgetBuilderState} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+import {convertBuilderStateToWidget} from 'sentry/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget';
+
+describe('convertBuilderStateToWidget', function () {
+  it('returns the default of the dataset config when no widget queries state is provided', function () {
+    const mockState: WidgetBuilderState = {
+      title: 'Test Widget',
+      description: 'Test Description',
+      dataset: WidgetType.ERRORS,
+      displayType: DisplayType.TABLE,
+      fields: [],
+      yAxis: [],
+    };
+
+    const widget = convertBuilderStateToWidget(mockState);
+
+    expect(widget).toEqual({
+      title: 'Test Widget',
+      description: 'Test Description',
+      widgetType: WidgetType.ERRORS,
+      displayType: DisplayType.TABLE,
+      interval: '1h',
+      queries: [
+        {
+          ...getDatasetConfig(WidgetType.ERRORS).defaultWidgetQuery,
+        },
+      ],
+    });
+  });
+
+  it('returns the default of the dataset config when no widget queries state is provided - issues', function () {
+    const mockState: WidgetBuilderState = {
+      title: 'Test Issues Widget',
+      description: 'test description for an issues widget',
+      dataset: WidgetType.ISSUE,
+      displayType: DisplayType.TABLE,
+      fields: [],
+      yAxis: [],
+    };
+
+    const widget = convertBuilderStateToWidget(mockState);
+
+    expect(widget).toEqual({
+      title: 'Test Issues Widget',
+      description: 'test description for an issues widget',
+      widgetType: WidgetType.ISSUE,
+      displayType: DisplayType.TABLE,
+      interval: '1h',
+      queries: [
+        {
+          ...getDatasetConfig(WidgetType.ISSUE).defaultWidgetQuery,
+        },
+      ],
+    });
+  });
+
+  it('returns the widget with the provided widget queries state', function () {
+    const mockState: WidgetBuilderState = {
+      title: 'Test Widget',
+      description: 'Test Description',
+      dataset: WidgetType.ERRORS,
+      displayType: DisplayType.TABLE,
+      fields: [
+        {kind: 'field', field: 'geo.country'},
+        {
+          function: ['count', '', undefined, undefined],
+          kind: 'function',
+        },
+        {
+          function: ['count_unique', 'user', undefined, undefined],
+          kind: 'function',
+        },
+      ],
+      yAxis: [{kind: 'field', field: 'count()'}],
+    };
+
+    const widget = convertBuilderStateToWidget(mockState);
+
+    expect(widget).toEqual({
+      title: 'Test Widget',
+      description: 'Test Description',
+      widgetType: WidgetType.ERRORS,
+      displayType: DisplayType.TABLE,
+      interval: '1h',
+      queries: [
+        {
+          fields: ['geo.country', 'count()', 'count_unique(user)'],
+          fieldAliases: [],
+          aggregates: ['count()'],
+          columns: ['geo.country'],
+          conditions: '',
+          name: '',
+          orderby: 'geo.country',
+        },
+      ],
+    });
+  });
+
+  it('injects the orderby from the sort state into the widget queries', function () {
+    const mockState: WidgetBuilderState = {
+      query: ['transaction.duration:>100', 'transaction.duration:>50'],
+      sort: [{field: 'geo.country', kind: 'desc'}],
+    };
+
+    const widget = convertBuilderStateToWidget(mockState);
+
+    expect(widget.queries[0].orderby).toEqual('-geo.country');
+    expect(widget.queries[1].orderby).toEqual('-geo.country');
+  });
+});
diff --git a/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts
new file mode 100644
index 00000000000000..5ec914b8cc3620
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts
@@ -0,0 +1,55 @@
+import {defined} from 'sentry/utils';
+import {generateFieldAsString} from 'sentry/utils/discover/fields';
+import {getDatasetConfig} from 'sentry/views/dashboards/datasetConfig/base';
+import {
+  DisplayType,
+  type Widget,
+  type WidgetQuery,
+  WidgetType,
+} from 'sentry/views/dashboards/types';
+import {formatSort} from 'sentry/views/explore/tables/aggregatesTable';
+
+import type {WidgetBuilderState} from '../hooks/useWidgetBuilderState';
+
+export function convertBuilderStateToWidget(state: WidgetBuilderState): Widget {
+  const datasetConfig = getDatasetConfig(state.dataset ?? WidgetType.ERRORS);
+  const defaultQuery = datasetConfig.defaultWidgetQuery;
+
+  const queries = defined(state.query) && state.query.length > 0 ? state.query : [''];
+
+  const fields = state.fields?.map(generateFieldAsString);
+  const aggregates = state.yAxis?.map(generateFieldAsString);
+  const columns = state.fields
+    ?.filter(field => 'kind' in field && field.kind === 'field')
+    .map(generateFieldAsString);
+
+  // If there's no sort, use the first field as the default sort
+  const defaultSort = fields?.[0] ?? defaultQuery.orderby;
+  const sort =
+    defined(state.sort) && state.sort.length > 0
+      ? formatSort(state.sort[0])
+      : defaultSort;
+
+  const widgetQueries: WidgetQuery[] = queries.map(query => {
+    return {
+      ...defaultQuery,
+      fields: defined(fields) && fields.length > 0 ? fields : defaultQuery.fields,
+      aggregates:
+        defined(aggregates) && aggregates.length > 0
+          ? aggregates
+          : defaultQuery.aggregates,
+      columns: defined(columns) && columns.length > 0 ? columns : defaultQuery.columns,
+      conditions: query,
+      orderby: sort,
+    };
+  });
+
+  return {
+    title: state.title ?? '',
+    description: state.description,
+    displayType: state.displayType ?? DisplayType.TABLE,
+    interval: '1h', // TODO: Not sure what to put here yet
+    queries: widgetQueries,
+    widgetType: state.dataset,
+  };
+}
diff --git a/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts b/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts
new file mode 100644
index 00000000000000..64424e45792cf1
--- /dev/null
+++ b/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts
@@ -0,0 +1,35 @@
+import {DisplayType, type Widget, WidgetType} from 'sentry/views/dashboards/types';
+import type {WidgetBuilderStateQueryParams} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
+
+/**
+ * Converts a widget to a set of query params that can be used to
+ * restore the widget builder state.
+ */
+export function convertWidgetToBuilderStateParams(
+  widget: Widget
+): WidgetBuilderStateQueryParams {
+  const yAxis = widget.queries.flatMap(q => q.aggregates);
+  const query = widget.queries.flatMap(q => q.conditions);
+  const sort = widget.queries.flatMap(q => q.orderby);
+
+  let field: string[] = [];
+  if (
+    widget.displayType === DisplayType.TABLE ||
+    widget.displayType === DisplayType.BIG_NUMBER
+  ) {
+    field = widget.queries.flatMap(q => q.fields ?? []);
+  } else {
+    field = widget.queries.flatMap(q => q.columns);
+  }
+
+  return {
+    title: widget.title,
+    description: widget.description ?? '',
+    dataset: widget.widgetType ?? WidgetType.ERRORS,
+    displayType: widget.displayType ?? DisplayType.TABLE,
+    field,
+    yAxis,
+    query,
+    sort,
+  };
+}
diff --git a/static/app/views/dashboards/widgetBuilder/widgetBuilder.spec.tsx b/static/app/views/dashboards/widgetBuilder/widgetBuilder.spec.tsx
index fcee0f09421985..3c471ed285e448 100644
--- a/static/app/views/dashboards/widgetBuilder/widgetBuilder.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/widgetBuilder.spec.tsx
@@ -265,6 +265,10 @@ describe('WidgetBuilder', function () {
       url: '/organizations/org-slug/releases/',
       body: [],
     });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/releases/stats/',
+      body: [],
+    });
     MockApiClient.addMockResponse({
       url: `/organizations/org-slug/spans/fields/`,
       body: [],
@@ -581,8 +585,8 @@ describe('WidgetBuilder', function () {
     // Select line chart display
     await userEvent.click(screen.getByText('Line Chart'));
 
-    // Click the Add Data button
-    await userEvent.click(screen.getByLabelText('Add Data'));
+    // Click the Add Series button
+    await userEvent.click(screen.getByLabelText('Add Series'));
     await selectEvent.select(screen.getByText('(Required)'), ['count_unique(…)']);
 
     await userEvent.click(screen.getByLabelText('Add Widget'));
@@ -1259,7 +1263,7 @@ describe('WidgetBuilder', function () {
     expect(await screen.findByText('Area Chart')).toBeInTheDocument();
 
     // Add a group by
-    await userEvent.click(screen.getByText('Add Data'));
+    await userEvent.click(screen.getByText('Add Series'));
     await selectEvent.select(screen.getByText('Select group'), /project/);
 
     // Change the y-axis
@@ -1308,7 +1312,7 @@ describe('WidgetBuilder', function () {
 
     await selectEvent.select(await screen.findByText('Select group'), 'project');
 
-    await userEvent.click(screen.getByText('Add Data'));
+    await userEvent.click(screen.getByText('Add Series'));
     await selectEvent.select(screen.getByText('(Required)'), /count_unique/);
 
     await waitFor(() => {
@@ -1375,7 +1379,7 @@ describe('WidgetBuilder', function () {
     screen.getByText('Limit to 5 results');
 
     await userEvent.click(screen.getByText('Add Query'));
-    await userEvent.click(screen.getByText('Add Data'));
+    await userEvent.click(screen.getByText('Add Series'));
 
     expect(screen.getByText('Limit to 2 results')).toBeInTheDocument();
   });
@@ -2608,7 +2612,7 @@ describe('WidgetBuilder', function () {
         body: [
           {
             key: 'plan',
-            name: 'Plan',
+            name: 'plan',
           },
         ],
         match: [
@@ -2621,12 +2625,12 @@ describe('WidgetBuilder', function () {
         url: `/organizations/org-slug/spans/fields/`,
         body: [
           {
-            key: 'lcp.size',
-            name: 'Lcp.Size',
+            key: 'tags[lcp.size,number]',
+            name: 'lcp.size',
           },
           {
-            key: 'something.else',
-            name: 'Something.Else',
+            key: 'tags[something.else,number]',
+            name: 'something.else',
           },
         ],
         match: [
@@ -2656,7 +2660,7 @@ describe('WidgetBuilder', function () {
       });
       renderTestComponent({
         dashboard,
-        orgFeatures: [...defaultOrgFeatures],
+        orgFeatures: [...defaultOrgFeatures, 'dashboards-eap'],
         params: {
           widgetIndex: '0',
         },
diff --git a/static/app/views/dashboards/widgetBuilder/widgetBuilder.tsx b/static/app/views/dashboards/widgetBuilder/widgetBuilder.tsx
index 6f2b3feed815b1..f9a20b234a3ea0 100644
--- a/static/app/views/dashboards/widgetBuilder/widgetBuilder.tsx
+++ b/static/app/views/dashboards/widgetBuilder/widgetBuilder.tsx
@@ -23,7 +23,6 @@ import {space} from 'sentry/styles/space';
 import type {DateString, PageFilters} from 'sentry/types/core';
 import type {TagCollection} from 'sentry/types/group';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
-import type {Organization} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {CustomMeasurementsProvider} from 'sentry/utils/customMeasurements/customMeasurementsProvider';
@@ -48,6 +47,7 @@ import {
 import {OnRouteLeave} from 'sentry/utils/reactRouter6Compat/onRouteLeave';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
 import useApi from 'sentry/utils/useApi';
+import useOrganization from 'sentry/utils/useOrganization';
 import useTags from 'sentry/utils/useTags';
 import withPageFilters from 'sentry/utils/withPageFilters';
 import {
@@ -142,7 +142,6 @@ interface QueryData {
 interface Props extends RouteComponentProps<RouteParams, {}> {
   dashboard: DashboardDetails;
   onSave: (widgets: Widget[]) => void;
-  organization: Organization;
   selection: PageFilters;
   widgetLegendState: WidgetLegendSelectionState;
   displayType?: DisplayType;
@@ -177,7 +176,6 @@ function WidgetBuilder({
   dashboard,
   params,
   location,
-  organization,
   selection,
   start,
   end,
@@ -187,6 +185,7 @@ function WidgetBuilder({
   updateDashboardSplitDecision,
   widgetLegendState,
 }: Props) {
+  const organization = useOrganization();
   const {widgetIndex, orgId, dashboardId} = params;
   const {source, displayType, defaultTitle, limit, dataset} = location.query;
   const defaultWidgetQuery = getParsedDefaultWidgetQuery(
@@ -341,7 +340,7 @@ function WidgetBuilder({
           displayType: newDisplayType,
           queries: widgetFromDashboard.queries,
           widgetType: widgetFromDashboard.widgetType ?? defaultWidgetType,
-          organization: organization,
+          organization,
         }).map(query => ({
           ...query,
           // Use the last aggregate because that's where the y-axis is stored
@@ -354,7 +353,7 @@ function WidgetBuilder({
           displayType: newDisplayType,
           queries: widgetFromDashboard.queries,
           widgetType: widgetFromDashboard.widgetType ?? defaultWidgetType,
-          organization: organization,
+          organization,
         });
       }
 
@@ -448,7 +447,7 @@ function WidgetBuilder({
             displayType: newDisplayType,
             queries: [{...getDatasetConfig(defaultWidgetType).defaultWidgetQuery}],
             widgetType: defaultWidgetType,
-            organization: organization,
+            organization,
           })
         );
         set(newState, 'dataSet', defaultDataset);
@@ -460,7 +459,7 @@ function WidgetBuilder({
         displayType: newDisplayType,
         queries: prevState.queries,
         widgetType: DATA_SET_TO_WIDGET_TYPE[prevState.dataSet],
-        organization: organization,
+        organization,
       });
 
       if (newDisplayType === DisplayType.TOP_N) {
@@ -1219,7 +1218,6 @@ function WidgetBuilder({
                                     onDataFetched={handleWidgetDataFetched}
                                     widget={currentWidget}
                                     dashboardFilters={dashboard.filters}
-                                    organization={organization}
                                     pageFilters={pageFilters}
                                     displayType={state.displayType}
                                     error={state.errors?.displayType}
@@ -1262,7 +1260,6 @@ function WidgetBuilder({
                                           )}
                                           explodedFields={explodedFields}
                                           tags={tags}
-                                          organization={organization}
                                           isOnDemandWidget={isOnDemandWidget}
                                         />
                                       )}
@@ -1282,14 +1279,12 @@ function WidgetBuilder({
                                         state.queries[0].selectedAggregate
                                       }
                                       tags={tags}
-                                      organization={organization}
                                     />
                                   )}
                                   <FilterResultsStep
                                     queries={state.queries}
                                     hideLegendAlias={hideLegendAlias}
                                     canAddSearchConditions={canAddSearchConditions}
-                                    organization={organization}
                                     queryErrors={state.errors?.queries}
                                     onAddSearchConditions={handleAddSearchConditions}
                                     onQueryChange={handleQueryChange}
@@ -1312,7 +1307,6 @@ function WidgetBuilder({
                                           })
                                         )}
                                       onGroupByChange={handleGroupByChange}
-                                      organization={organization}
                                       validatedWidgetResponse={validatedWidgetResponse}
                                       tags={tags}
                                       dataSet={state.dataSet}
@@ -1327,7 +1321,6 @@ function WidgetBuilder({
                                       error={state.errors?.orderby}
                                       onSortByChange={handleSortByChange}
                                       onLimitChange={handleLimitChange}
-                                      organization={organization}
                                       widgetType={widgetType}
                                       tags={tags}
                                     />
@@ -1355,7 +1348,6 @@ function WidgetBuilder({
                             </MainWrapper>
                             <Side>
                               <WidgetLibrary
-                                organization={organization}
                                 selectedWidgetId={
                                   state.userHasModified ? null : state.prebuiltWidgetId
                                 }
diff --git a/static/app/views/dashboards/widgetBuilder/widgetBuilderDataset.spec.tsx b/static/app/views/dashboards/widgetBuilder/widgetBuilderDataset.spec.tsx
index b4e83ee7ea1a47..9b2f23c241c1d8 100644
--- a/static/app/views/dashboards/widgetBuilder/widgetBuilderDataset.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/widgetBuilderDataset.spec.tsx
@@ -276,6 +276,10 @@ describe('WidgetBuilder', function () {
       url: '/organizations/org-slug/releases/',
       body: [],
     });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/releases/stats/',
+      body: [],
+    });
     MockApiClient.addMockResponse({
       url: `/organizations/org-slug/spans/fields/`,
       body: [],
diff --git a/static/app/views/dashboards/widgetBuilder/widgetBuilderSortBy.spec.tsx b/static/app/views/dashboards/widgetBuilder/widgetBuilderSortBy.spec.tsx
index c072cd51b37aba..19447f3caac89d 100644
--- a/static/app/views/dashboards/widgetBuilder/widgetBuilderSortBy.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/widgetBuilderSortBy.spec.tsx
@@ -236,6 +236,10 @@ describe('WidgetBuilder', function () {
       url: '/organizations/org-slug/releases/',
       body: [],
     });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/releases/stats/',
+      body: [],
+    });
     MockApiClient.addMockResponse({
       url: `/organizations/org-slug/spans/fields/`,
       body: [],
@@ -524,7 +528,7 @@ describe('WidgetBuilder', function () {
       await userEvent.keyboard('{Enter}');
 
       // Add a y-axis
-      await userEvent.click(screen.getByText('Add Data'));
+      await userEvent.click(screen.getByText('Add Series'));
 
       // The equation should still be visible
       expect(screen.getByPlaceholderText('Enter Equation')).toHaveValue(
@@ -662,7 +666,7 @@ describe('WidgetBuilder', function () {
         },
       });
 
-      await userEvent.click(await screen.findByText('Add Data'));
+      await userEvent.click(await screen.findByText('Add Series'));
       await selectEvent.select(screen.getByText('Select group'), 'project');
 
       // Change the sort by to count_unique
diff --git a/static/app/views/dashboards/widgetBuilder/widgetLibrary/index.tsx b/static/app/views/dashboards/widgetBuilder/widgetLibrary/index.tsx
index 4d1c71f78e2f82..581a8271d7dc77 100644
--- a/static/app/views/dashboards/widgetBuilder/widgetLibrary/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/widgetLibrary/index.tsx
@@ -6,7 +6,7 @@ import {openWidgetBuilderOverwriteModal} from 'sentry/actionCreators/modal';
 import type {OverwriteWidgetModalProps} from 'sentry/components/modals/widgetBuilder/overwriteWidgetModal';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {Organization} from 'sentry/types/organization';
+import useOrganization from 'sentry/utils/useOrganization';
 import {DisplayType} from 'sentry/views/dashboards/types';
 import type {WidgetTemplate} from 'sentry/views/dashboards/widgetLibrary/data';
 import {getTopNConvertedDefaultWidgets} from 'sentry/views/dashboards/widgetLibrary/data';
@@ -18,7 +18,6 @@ import {Card} from './card';
 interface Props {
   bypassOverwriteModal: boolean;
   onWidgetSelect: (widget: WidgetTemplate) => void;
-  organization: Organization;
   selectedWidgetId: string | null;
 }
 
@@ -26,9 +25,9 @@ export function WidgetLibrary({
   bypassOverwriteModal,
   onWidgetSelect,
   selectedWidgetId,
-  organization,
 }: Props) {
   const theme = useTheme();
+  const organization = useOrganization();
   const defaultWidgets = getTopNConvertedDefaultWidgets(organization);
 
   function getLibrarySelectionHandler(
diff --git a/static/app/views/dashboards/widgetCard/chart.tsx b/static/app/views/dashboards/widgetCard/chart.tsx
index cd97ae69b8dd97..03ccf4723fbb41 100644
--- a/static/app/views/dashboards/widgetCard/chart.tsx
+++ b/static/app/views/dashboards/widgetCard/chart.tsx
@@ -297,7 +297,6 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
       chartZoomOptions,
       timeseriesResultsTypes,
       shouldResize,
-      organization,
     } = this.props;
 
     if (widget.displayType === 'table') {
@@ -516,7 +515,7 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
                     color: colors[i],
                   };
                 })
-                .filter(Boolean) // NOTE: `timeseriesResults` is a sparse array! We have to filter out the empty slots after the colors are assigned, since the colours are assigned based on sparse array index
+                .filter(Boolean) // NOTE: `timeseriesResults` is a sparse array! We have to filter out the empty slots after the colors are assigned, since the colors are assigned based on sparse array index
             : [];
 
           const seriesStart = series[0]?.data[0]?.name;
@@ -524,8 +523,7 @@ class WidgetCardChart extends Component<WidgetCardChartProps> {
 
           const forwardedRef = this.props.chartGroup ? this.handleRef : undefined;
 
-          return organization.features.includes('dashboards-releases-on-charts') &&
-            widgetLegendState.widgetRequiresLegendUnselection(widget) ? (
+          return widgetLegendState.widgetRequiresLegendUnselection(widget) ? (
             <ReleaseSeries
               end={end}
               start={start}
diff --git a/static/app/views/dashboards/widgetCard/index.spec.tsx b/static/app/views/dashboards/widgetCard/index.spec.tsx
index 43a534ce50b94d..65119b759d3438 100644
--- a/static/app/views/dashboards/widgetCard/index.spec.tsx
+++ b/static/app/views/dashboards/widgetCard/index.spec.tsx
@@ -104,6 +104,10 @@ describe('Dashboards > WidgetCard', function () {
         data: [{title: 'title'}],
       },
     });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/releases/stats/',
+      body: [],
+    });
   });
 
   afterEach(function () {
diff --git a/static/app/views/dashboards/widgetCard/index.tsx b/static/app/views/dashboards/widgetCard/index.tsx
index cf68f4183c3719..2dcdc100d9ec90 100644
--- a/static/app/views/dashboards/widgetCard/index.tsx
+++ b/static/app/views/dashboards/widgetCard/index.tsx
@@ -1,4 +1,4 @@
-import {useState} from 'react';
+import {useContext, useState} from 'react';
 import styled from '@emotion/styled';
 import type {LegendComponentOption} from 'echarts';
 import type {Location} from 'history';
@@ -40,6 +40,7 @@ import type WidgetLegendSelectionState from '../widgetLegendSelectionState';
 import {BigNumberWidget} from '../widgets/bigNumberWidget/bigNumberWidget';
 import type {Meta} from '../widgets/common/types';
 import {WidgetFrame} from '../widgets/common/widgetFrame';
+import {WidgetViewerContext} from '../widgetViewer/widgetViewerContext';
 
 import {useDashboardsMEPContext} from './dashboardsMEPContext';
 import WidgetCardChartContainer from './widgetCardChartContainer';
@@ -67,6 +68,8 @@ type Props = WithRouterProps & {
   widgetLegendState: WidgetLegendSelectionState;
   widgetLimitReached: boolean;
   dashboardFilters?: DashboardFilters;
+  disableFullscreen?: boolean;
+  hasEditAccess?: boolean;
   index?: string;
   isEditingWidget?: boolean;
   isMobile?: boolean;
@@ -99,6 +102,7 @@ type Data = {
 
 function WidgetCard(props: Props) {
   const [data, setData] = useState<Data>();
+  const {setData: setWidgetViewerData} = useContext(WidgetViewerContext);
 
   const onDataFetched = (newData: Data) => {
     if (props.onDataFetched && newData.tableResults) {
@@ -126,6 +130,7 @@ function WidgetCard(props: Props) {
     onSetTransactionsDataset,
     legendOptions,
     widgetLegendState,
+    disableFullscreen,
   } = props;
 
   if (widget.displayType === DisplayType.TOP_N) {
@@ -173,6 +178,14 @@ function WidgetCard(props: Props) {
 
   const onFullScreenViewClick = () => {
     if (!isWidgetViewerPath(location.pathname)) {
+      setWidgetViewerData({
+        pageLinks: data?.pageLinks,
+        seriesData: data?.timeseriesResults,
+        tableData: data?.tableResults,
+        seriesResultsType: data?.timeseriesResultsTypes,
+        totalIssuesCount: data?.totalIssuesCount,
+      });
+
       props.router.push({
         pathname: `${location.pathname}${
           location.pathname.endsWith('/') ? '' : '/'
@@ -219,6 +232,7 @@ function WidgetCard(props: Props) {
         widget,
         Boolean(isMetricsData),
         props.widgetLimitReached,
+        props.hasEditAccess,
         props.onDelete,
         props.onDuplicate,
         props.onEdit
@@ -277,7 +291,9 @@ function WidgetCard(props: Props) {
                   actionsDisabled={actionsDisabled}
                   actionsMessage={actionsMessage}
                   actions={actions}
-                  onFullScreenViewClick={onFullScreenViewClick}
+                  onFullScreenViewClick={
+                    disableFullscreen ? undefined : onFullScreenViewClick
+                  }
                   isLoading={loading}
                   thresholds={widget.thresholds ?? undefined}
                   value={value}
@@ -299,7 +315,7 @@ function WidgetCard(props: Props) {
             error={widgetQueryError}
             actionsMessage={actionsMessage}
             actions={actions}
-            onFullScreenViewClick={onFullScreenViewClick}
+            onFullScreenViewClick={disableFullscreen ? undefined : onFullScreenViewClick}
           >
             <WidgetCardChartContainer
               location={location}
diff --git a/static/app/views/dashboards/widgetCard/releaseWidgetQueries.tsx b/static/app/views/dashboards/widgetCard/releaseWidgetQueries.tsx
index 930bcf82fed464..62af5aaeab263c 100644
--- a/static/app/views/dashboards/widgetCard/releaseWidgetQueries.tsx
+++ b/static/app/views/dashboards/widgetCard/releaseWidgetQueries.tsx
@@ -256,7 +256,7 @@ class ReleaseWidgetQueries extends Component<Props, State> {
         widget.queries.map(q => omit(q, ignoredQueryProps)),
         prevProps.widget.queries.map(q => omit(q, ignoredQueryProps))
       ) ||
-      // If the fields changed (ignore falsy/empty fields -> they can happen after clicking on Add Data)
+      // If the fields changed (ignore falsy/empty fields -> they can happen after clicking on Add Series)
       !isEqual(
         widget.queries.flatMap(q => q.fields?.filter(field => !!field)),
         prevProps.widget.queries.flatMap(q => q.fields?.filter(field => !!field))
diff --git a/static/app/views/dashboards/widgetCard/widgetCardContextMenu.spec.tsx b/static/app/views/dashboards/widgetCard/widgetCardContextMenu.spec.tsx
index 097185d0e9ffac..8ef3fce0568a27 100644
--- a/static/app/views/dashboards/widgetCard/widgetCardContextMenu.spec.tsx
+++ b/static/app/views/dashboards/widgetCard/widgetCardContextMenu.spec.tsx
@@ -87,4 +87,26 @@ describe('WidgetCardContextMenu', () => {
     const $button = screen.getByRole('menuitemradio', {name: 'Duplicate Widget'});
     expect($button).toHaveAttribute('aria-disabled', 'true');
   });
+
+  it('renders the Open in Explore button for span widgets', async function () {
+    render(
+      <MEPSettingProvider>
+        <DashboardsMEPProvider>
+          <WidgetCardContextMenu
+            location={LocationFixture()}
+            organization={OrganizationFixture({})}
+            router={RouterFixture()}
+            selection={PageFiltersFixture()}
+            widget={WidgetFixture({widgetType: WidgetType.SPANS})}
+            widgetLimitReached={false}
+            showContextMenu
+          />
+        </DashboardsMEPProvider>
+      </MEPSettingProvider>
+    );
+
+    await userEvent.click(await screen.findByLabelText('Widget actions'));
+
+    expect(await screen.findByText('Open in Explore')).toBeInTheDocument();
+  });
 });
diff --git a/static/app/views/dashboards/widgetCard/widgetCardContextMenu.tsx b/static/app/views/dashboards/widgetCard/widgetCardContextMenu.tsx
index 92c70ae8f47c35..6ea0c7109b425c 100644
--- a/static/app/views/dashboards/widgetCard/widgetCardContextMenu.tsx
+++ b/static/app/views/dashboards/widgetCard/widgetCardContextMenu.tsx
@@ -33,6 +33,7 @@ import {
   isUsingPerformanceScore,
   performanceScoreTooltip,
 } from 'sentry/views/dashboards/utils';
+import {getWidgetExploreUrl} from 'sentry/views/dashboards/utils/getWidgetExploreUrl';
 
 import type {Widget} from '../types';
 import {WidgetType} from '../types';
@@ -48,6 +49,7 @@ type Props = {
   widget: Widget;
   widgetLimitReached: boolean;
   description?: string;
+  hasEditAccess?: boolean;
   index?: string;
   isPreview?: boolean;
   onDelete?: () => void;
@@ -80,6 +82,7 @@ function WidgetCardContextMenu({
   selection,
   widget,
   widgetLimitReached,
+  hasEditAccess,
   onDelete,
   onDuplicate,
   onEdit,
@@ -191,6 +194,7 @@ function WidgetCardContextMenu({
     widget,
     Boolean(isMetricsData),
     widgetLimitReached,
+    hasEditAccess,
     onDelete,
     onDuplicate,
     onEdit
@@ -267,6 +271,7 @@ export function getMenuOptions(
   widget: Widget,
   isMetricsData: boolean,
   widgetLimitReached: boolean,
+  hasEditAccess: boolean = true,
   onDelete?: () => void,
   onDuplicate?: () => void,
   onEdit?: () => void
@@ -327,6 +332,14 @@ export function getMenuOptions(
     }
   }
 
+  if (widget.widgetType === WidgetType.SPANS) {
+    menuOptions.push({
+      key: 'open-in-explore',
+      label: t('Open in Explore'),
+      to: getWidgetExploreUrl(widget, selection, organization),
+    });
+  }
+
   if (widget.widgetType === WidgetType.ISSUE) {
     const issuesLocation = getWidgetIssueUrl(widget, selection, organization);
 
@@ -352,13 +365,14 @@ export function getMenuOptions(
       key: 'duplicate-widget',
       label: t('Duplicate Widget'),
       onAction: () => onDuplicate?.(),
-      disabled: widgetLimitReached,
+      disabled: widgetLimitReached || !hasEditAccess,
     });
 
     menuOptions.push({
       key: 'edit-widget',
       label: t('Edit Widget'),
       onAction: () => onEdit?.(),
+      disabled: !hasEditAccess,
     });
 
     menuOptions.push({
@@ -372,6 +386,7 @@ export function getMenuOptions(
           onConfirm: () => onDelete?.(),
         });
       },
+      disabled: !hasEditAccess,
     });
   }
 
diff --git a/static/app/views/dashboards/widgetLegendSelectionState.spec.tsx b/static/app/views/dashboards/widgetLegendSelectionState.spec.tsx
index eae0b7d404b9fc..e539bf53ddb284 100644
--- a/static/app/views/dashboards/widgetLegendSelectionState.spec.tsx
+++ b/static/app/views/dashboards/widgetLegendSelectionState.spec.tsx
@@ -49,7 +49,6 @@ describe('WidgetLegend functions util', () => {
       };
       organization = {
         ...OrganizationFixture(),
-        features: ['dashboards-releases-on-charts'],
       };
 
       dashboard = {
diff --git a/static/app/views/dashboards/widgetLegendSelectionState.tsx b/static/app/views/dashboards/widgetLegendSelectionState.tsx
index a88aff96132cae..20ad8817e69986 100644
--- a/static/app/views/dashboards/widgetLegendSelectionState.tsx
+++ b/static/app/views/dashboards/widgetLegendSelectionState.tsx
@@ -121,8 +121,7 @@ class WidgetLegendSelectionState {
 
     return location.query.unselectedSeries
       ? this.decodeLegendQueryParam(widget)
-      : this.widgetRequiresLegendUnselection(widget) &&
-          this.organization.features.includes('dashboards-releases-on-charts')
+      : this.widgetRequiresLegendUnselection(widget)
         ? {
             [WidgetLegendNameEncoderDecoder.encodeSeriesNameForLegend(
               'Releases',
@@ -148,8 +147,7 @@ class WidgetLegendSelectionState {
   }
 
   formatLegendDefaultQuery(widget: Widget) {
-    return this.organization.features.includes('dashboards-releases-on-charts') &&
-      this.widgetRequiresLegendUnselection(widget)
+    return this.widgetRequiresLegendUnselection(widget)
       ? `${widget.id}${WIDGET_ID_DELIMITER}Releases`
       : undefined;
   }
diff --git a/static/app/views/dashboards/widgets/common/releaseSeries.tsx b/static/app/views/dashboards/widgets/common/releaseSeries.tsx
new file mode 100644
index 00000000000000..b01d2899420737
--- /dev/null
+++ b/static/app/views/dashboards/widgets/common/releaseSeries.tsx
@@ -0,0 +1,67 @@
+import type {Theme} from '@emotion/react';
+
+import MarkLine from 'sentry/components/charts/components/markLine';
+import {t} from 'sentry/locale';
+import type {Series} from 'sentry/types/echarts';
+import {escape} from 'sentry/utils';
+import {getFormattedDate} from 'sentry/utils/dates';
+import {formatVersion} from 'sentry/utils/versions/formatVersion';
+
+import type {Release} from './types';
+
+export function ReleaseSeries(
+  theme: Theme,
+  releases: Release[],
+  onClick: (release: Release) => void,
+  utc: boolean
+): Series {
+  return {
+    seriesName: t('Releases'),
+    color: theme.purple200,
+    data: [],
+    markLine: MarkLine({
+      animation: false,
+      lineStyle: {
+        color: theme.purple300,
+        opacity: 0.3,
+        type: 'solid',
+      },
+      label: {
+        show: false,
+      },
+      data: releases.map(release => ({
+        xAxis: new Date(release.timestamp).getTime(),
+        name: formatVersion(release.version, true),
+        value: formatVersion(release.version, true),
+        onClick: () => {
+          onClick(release);
+        },
+        label: {
+          formatter: () => formatVersion(release.version, true),
+        },
+      })),
+      tooltip: {
+        trigger: 'item',
+        formatter: function (params: any) {
+          const time = getFormattedDate(params.value, 'MMM D, YYYY LT', {
+            local: utc,
+          });
+
+          const version = escape(formatVersion(params.name, true));
+
+          return [
+            '<div class="tooltip-series">',
+            `<div><span class="tooltip-label"><strong>${t(
+              'Release'
+            )}</strong></span> ${version}</div>`,
+            '</div>',
+            '<div class="tooltip-footer">',
+            time,
+            '</div>',
+            '<div class="tooltip-arrow"></div>',
+          ].join('');
+        },
+      },
+    }),
+  };
+}
diff --git a/static/app/views/dashboards/widgets/common/types.tsx b/static/app/views/dashboards/widgets/common/types.tsx
index bb3776e2bbdca4..4b5959990400b4 100644
--- a/static/app/views/dashboards/widgets/common/types.tsx
+++ b/static/app/views/dashboards/widgets/common/types.tsx
@@ -8,7 +8,7 @@ export type Meta = {
 type TableRow = Record<string, number | string | undefined>;
 export type TableData = TableRow[];
 
-type TimeSeriesItem = {
+export type TimeSeriesItem = {
   timestamp: string;
   value: number;
 };
@@ -28,3 +28,8 @@ export interface StateProps {
 }
 
 export type Thresholds = ThresholdsConfig;
+
+export type Release = {
+  timestamp: string;
+  version: string;
+};
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.spec.tsx b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.spec.tsx
index ef3f3894d9d716..64fcbe832b9e32 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.spec.tsx
+++ b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.spec.tsx
@@ -1,6 +1,7 @@
-import {render} from 'sentry-test/reactTestingLibrary';
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import {LineChartWidget} from './lineChartWidget';
+import sampleDurationTimeSeries from './sampleDurationTimeSeries.json';
 
 describe('LineChartWidget', () => {
   describe('Layout', () => {
@@ -9,7 +10,7 @@ describe('LineChartWidget', () => {
         <LineChartWidget
           title="eps()"
           description="Number of events per second"
-          timeseries={[]}
+          timeseries={[sampleDurationTimeSeries]}
           meta={{
             fields: {
               'eps()': 'rate',
@@ -22,4 +23,65 @@ describe('LineChartWidget', () => {
       );
     });
   });
+
+  describe('Visualization', () => {
+    it('Explains missing data', () => {
+      render(<LineChartWidget />);
+
+      expect(screen.getByText('No Data')).toBeInTheDocument();
+    });
+  });
+
+  describe('State', () => {
+    it('Shows a loading placeholder', () => {
+      render(<LineChartWidget isLoading />);
+
+      expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
+    });
+
+    it('Loading state takes precedence over error state', () => {
+      render(
+        <LineChartWidget isLoading error={new Error('Parsing error of old value')} />
+      );
+
+      expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
+    });
+
+    it('Shows an error message', () => {
+      render(<LineChartWidget error={new Error('Uh oh')} />);
+
+      expect(screen.getByText('Error: Uh oh')).toBeInTheDocument();
+    });
+
+    it('Shows a retry button', async () => {
+      const onRetry = jest.fn();
+
+      render(<LineChartWidget error={new Error('Oh no!')} onRetry={onRetry} />);
+
+      await userEvent.click(screen.getByRole('button', {name: 'Retry'}));
+      expect(onRetry).toHaveBeenCalledTimes(1);
+    });
+
+    it('Hides other actions if there is an error and a retry handler', () => {
+      const onRetry = jest.fn();
+
+      render(
+        <LineChartWidget
+          error={new Error('Oh no!')}
+          onRetry={onRetry}
+          actions={[
+            {
+              key: 'Open in Discover',
+              to: '/discover',
+            },
+          ]}
+        />
+      );
+
+      expect(screen.getByRole('button', {name: 'Retry'})).toBeInTheDocument();
+      expect(
+        screen.queryByRole('link', {name: 'Open in Discover'})
+      ).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.stories.tsx b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.stories.tsx
index 9c49d562f16c97..d3cbb4653a4454 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.stories.tsx
+++ b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.stories.tsx
@@ -5,15 +5,17 @@ import moment from 'moment-timezone';
 
 import JSXNode from 'sentry/components/stories/jsxNode';
 import SideBySide from 'sentry/components/stories/sideBySide';
+import SizingWindow from 'sentry/components/stories/sizingWindow';
 import storyBook from 'sentry/stories/storyBook';
 import type {DateString} from 'sentry/types/core';
 import usePageFilters from 'sentry/utils/usePageFilters';
 
-import type {TimeseriesData} from '../common/types';
+import type {Release, TimeseriesData} from '../common/types';
 
 import {LineChartWidget} from './lineChartWidget';
 import sampleDurationTimeSeries from './sampleDurationTimeSeries.json';
 import sampleThroughputTimeSeries from './sampleThroughputTimeSeries.json';
+import {shiftTimeserieToNow} from './shiftTimeserieToNow';
 
 const sampleDurationTimeSeries2 = {
   ...sampleDurationTimeSeries,
@@ -67,35 +69,40 @@ export default storyBook(LineChartWidget, story => {
         <p>
           The visualization of <JSXNode name="LineChartWidget" /> a line chart. It has
           some bells and whistles including automatic axes labels, and a hover tooltip.
+          Like other widgets, it automatically fills the parent element.
         </p>
+        <SmallSizingWindow>
+          <LineChartWidget
+            title="eps()"
+            description="Number of events per second"
+            timeseries={[throughputTimeSeries]}
+            meta={{
+              fields: {
+                'eps()': 'rate',
+              },
+              units: {
+                'eps()': '1/second',
+              },
+            }}
+          />
+        </SmallSizingWindow>
 
         <p>
-          The <code>utc</code> prop controls whether the X Axis timestamps are shown in
-          UTC or not
+          The <code>dataCompletenessDelay</code> prop indicates that this data is live,
+          and the last few buckets might not have complete data. The delay is a number in
+          seconds. Any data bucket that happens in that delay window will be plotted with
+          a dotted line. By default the delay is <code>0</code>.
         </p>
 
         <SideBySide>
-          <MediumWidget>
-            <LineChartWidget
-              title="eps()"
-              description="Number of events per second"
-              timeseries={[throughputTimeSeries]}
-              meta={{
-                fields: {
-                  'eps()': 'rate',
-                },
-                units: {
-                  'eps()': '1/second',
-                },
-              }}
-            />
-          </MediumWidget>
-
           <MediumWidget>
             <LineChartWidget
               title="span.duration"
-              timeseries={[durationTimeSeries1, durationTimeSeries2]}
-              utc
+              dataCompletenessDelay={60 * 60 * 3}
+              timeseries={[
+                shiftTimeserieToNow(durationTimeSeries1),
+                shiftTimeserieToNow(durationTimeSeries2),
+              ]}
               meta={{
                 fields: {
                   'p99(span.duration)': 'duration',
@@ -113,6 +120,40 @@ export default storyBook(LineChartWidget, story => {
     );
   });
 
+  story('State', () => {
+    return (
+      <Fragment>
+        <p>
+          <JSXNode name="LineChartWidget" /> supports the usual loading and error states.
+          The loading state shows a spinner. The error state shows a message, and an
+          optional "Retry" button.
+        </p>
+
+        <SideBySide>
+          <SmallWidget>
+            <LineChartWidget title="Loading Count" isLoading />
+          </SmallWidget>
+          <SmallWidget>
+            <LineChartWidget title="Missing Count" />
+          </SmallWidget>
+          <SmallWidget>
+            <LineChartWidget
+              title="Count Error"
+              error={new Error('Something went wrong!')}
+            />
+          </SmallWidget>
+          <SmallWidget>
+            <LineChartWidget
+              title="Data Error"
+              error={new Error('Something went wrong!')}
+              onRetry={() => {}}
+            />
+          </SmallWidget>
+        </SideBySide>
+      </Fragment>
+    );
+  });
+
   story('Colors', () => {
     const theme = useTheme();
 
@@ -147,10 +188,65 @@ export default storyBook(LineChartWidget, story => {
       </Fragment>
     );
   });
+
+  story('Releases', () => {
+    const releases = [
+      {
+        version: 'ui@0.1.2',
+        timestamp: sampleThroughputTimeSeries.data.at(2)?.timestamp,
+      },
+      {
+        version: 'ui@0.1.3',
+        timestamp: sampleThroughputTimeSeries.data.at(20)?.timestamp,
+      },
+    ].filter(hasTimestamp);
+
+    return (
+      <Fragment>
+        <p>
+          <JSXNode name="LineChartWidget" /> supports the <code>releases</code> prop. If
+          passed in, the widget will plot every release as a vertical line that overlays
+          the chart data. Clicking on a release line will open the release details page.
+        </p>
+
+        <MediumWidget>
+          <LineChartWidget
+            title="error_rate()"
+            timeseries={[
+              {
+                ...sampleThroughputTimeSeries,
+                field: 'error_rate()',
+              } as unknown as TimeseriesData,
+            ]}
+            releases={releases}
+            meta={{
+              fields: {
+                'error_rate()': 'rate',
+              },
+              units: {
+                'error_rate()': '1/second',
+              },
+            }}
+          />
+        </MediumWidget>
+      </Fragment>
+    );
+  });
 });
 
 const MediumWidget = styled('div')`
   width: 420px;
+  height: 250px;
+`;
+
+const SmallWidget = styled('div')`
+  width: 360px;
+  height: 160px;
+`;
+
+const SmallSizingWindow = styled(SizingWindow)`
+  width: 50%;
+  height: 300px;
 `;
 
 function toTimeSeriesSelection(
@@ -173,3 +269,7 @@ function toTimeSeriesSelection(
     }),
   };
 }
+
+function hasTimestamp(release: Partial<Release>): release is Release {
+  return Boolean(release?.timestamp);
+}
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.tsx b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.tsx
index b2d6ace8d11988..283dfa55c35d8a 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.tsx
+++ b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidget.tsx
@@ -1,5 +1,8 @@
 import styled from '@emotion/styled';
 
+import TransparentLoadingMask from 'sentry/components/charts/transparentLoadingMask';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
+import {defined} from 'sentry/utils';
 import {
   WidgetFrame,
   type WidgetFrameProps,
@@ -9,32 +12,54 @@ import {
   type LineChartWidgetVisualizationProps,
 } from 'sentry/views/dashboards/widgets/lineChartWidget/lineChartWidgetVisualization';
 
-import {X_GUTTER, Y_GUTTER} from '../common/settings';
+import {MISSING_DATA_MESSAGE, X_GUTTER, Y_GUTTER} from '../common/settings';
 import type {StateProps} from '../common/types';
 
 interface Props
   extends StateProps,
     Omit<WidgetFrameProps, 'children'>,
-    LineChartWidgetVisualizationProps {}
+    Partial<LineChartWidgetVisualizationProps> {}
 
 export function LineChartWidget(props: Props) {
   const {timeseries} = props;
 
+  if (props.isLoading) {
+    return (
+      <WidgetFrame title={props.title} description={props.description}>
+        <LoadingPlaceholder>
+          <TransparentLoadingMask visible />
+          <LoadingIndicator mini />
+        </LoadingPlaceholder>
+      </WidgetFrame>
+    );
+  }
+
+  let parsingError: string | undefined = undefined;
+
+  if (!defined(timeseries)) {
+    parsingError = MISSING_DATA_MESSAGE;
+  }
+
+  const error = props.error ?? parsingError;
+
   return (
     <WidgetFrame
       title={props.title}
       description={props.description}
       actions={props.actions}
-      error={props.error}
+      error={error}
       onRetry={props.onRetry}
     >
-      <LineChartWrapper>
-        <LineChartWidgetVisualization
-          timeseries={timeseries}
-          utc={props.utc}
-          meta={props.meta}
-        />
-      </LineChartWrapper>
+      {defined(timeseries) && (
+        <LineChartWrapper>
+          <LineChartWidgetVisualization
+            timeseries={timeseries}
+            releases={props.releases}
+            meta={props.meta}
+            dataCompletenessDelay={props.dataCompletenessDelay}
+          />
+        </LineChartWrapper>
+      )}
     </WidgetFrame>
   );
 }
@@ -43,3 +68,12 @@ const LineChartWrapper = styled('div')`
   flex-grow: 1;
   padding: 0 ${X_GUTTER} ${Y_GUTTER} ${X_GUTTER};
 `;
+
+const LoadingPlaceholder = styled('div')`
+  position: absolute;
+  inset: 0;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`;
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidgetVisualization.tsx b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidgetVisualization.tsx
index a9ed7ce9602499..a45e02a0a812f8 100644
--- a/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidgetVisualization.tsx
+++ b/static/app/views/dashboards/widgets/lineChartWidget/lineChartWidgetVisualization.tsx
@@ -1,51 +1,217 @@
+import {useRef} from 'react';
+import {useNavigate} from 'react-router-dom';
+import {useTheme} from '@emotion/react';
+import type {
+  TooltipFormatterCallback,
+  TopLevelFormatterParams,
+} from 'echarts/types/dist/shared';
+import type EChartsReactCore from 'echarts-for-react/lib/core';
+
 import BaseChart from 'sentry/components/charts/baseChart';
+import {getFormatter} from 'sentry/components/charts/components/tooltip';
 import LineSeries from 'sentry/components/charts/series/lineSeries';
 import {useChartZoom} from 'sentry/components/charts/useChartZoom';
+import {isChartHovered} from 'sentry/components/charts/utils';
+import type {Series} from 'sentry/types/echarts';
+import {defined} from 'sentry/utils';
+import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import useOrganization from 'sentry/utils/useOrganization';
+import usePageFilters from 'sentry/utils/usePageFilters';
 
-import type {Meta, TimeseriesData} from '../common/types';
+import {useWidgetSyncContext} from '../../contexts/widgetSyncContext';
+import {ReleaseSeries} from '../common/releaseSeries';
+import type {Meta, Release, TimeseriesData} from '../common/types';
 
 import {formatChartValue} from './formatChartValue';
+import {splitSeriesIntoCompleteAndIncomplete} from './splitSeriesIntoCompleteAndIncomplete';
 
 export interface LineChartWidgetVisualizationProps {
   timeseries: TimeseriesData[];
+  dataCompletenessDelay?: number;
   meta?: Meta;
-  utc?: boolean;
+  releases?: Release[];
 }
 
 export function LineChartWidgetVisualization(props: LineChartWidgetVisualizationProps) {
-  const {timeseries, meta} = props;
+  const chartRef = useRef<EChartsReactCore | null>(null);
+  const {register: registerWithWidgetSyncContext} = useWidgetSyncContext();
+
+  const pageFilters = usePageFilters();
+  const {start, end, period, utc} = pageFilters.selection.datetime;
+  const {meta} = props;
+
+  const dataCompletenessDelay = props.dataCompletenessDelay ?? 0;
+
+  const theme = useTheme();
+  const organization = useOrganization();
+  const navigate = useNavigate();
+
+  let releaseSeries: Series | undefined = undefined;
+  if (props.releases) {
+    const onClick = (release: Release) => {
+      navigate(
+        normalizeUrl({
+          pathname: `/organizations/${
+            organization.slug
+          }/releases/${encodeURIComponent(release.version)}/`,
+        })
+      );
+    };
+
+    releaseSeries = ReleaseSeries(theme, props.releases, onClick, utc ?? false);
+  }
 
   const chartZoomProps = useChartZoom({
     saveOnZoom: true,
   });
 
+  let completeSeries: TimeseriesData[] = props.timeseries;
+  const incompleteSeries: TimeseriesData[] = [];
+
+  if (dataCompletenessDelay > 0) {
+    completeSeries = [];
+
+    props.timeseries.forEach(timeserie => {
+      const [completeSerie, incompleteSerie] = splitSeriesIntoCompleteAndIncomplete(
+        timeserie,
+        dataCompletenessDelay
+      );
+
+      if (completeSerie && completeSerie.data.length > 0) {
+        completeSeries.push(completeSerie);
+      }
+
+      if (incompleteSerie && incompleteSerie.data.length > 0) {
+        incompleteSeries.push(incompleteSerie);
+      }
+    });
+  }
+
+  // TODO: There's a TypeScript indexing error here. This _could_ in theory be
+  // `undefined`. We need to guard against this in the parent component, and
+  // show an error.
+  const firstSeries = props.timeseries[0];
+
   // TODO: Raise error if attempting to plot series of different types or units
-  const firstSeriesField = timeseries[0]?.field;
+  const firstSeriesField = firstSeries?.field;
   const type = meta?.fields?.[firstSeriesField] ?? 'number';
   const unit = meta?.units?.[firstSeriesField] ?? undefined;
 
+  const formatter: TooltipFormatterCallback<TopLevelFormatterParams> = (
+    params,
+    asyncTicket
+  ) => {
+    // Only show the tooltip of the current chart. Otherwise, all tooltips
+    // in the chart group appear.
+    if (!isChartHovered(chartRef?.current)) {
+      return '';
+    }
+
+    let deDupedParams = params;
+
+    if (Array.isArray(params)) {
+      // We split each series into a complete and incomplete series, and they
+      // have the same name. The two series overlap at one point on the chart,
+      // to create a continuous line. This code prevents both series from
+      // showing up on the tooltip
+      const uniqueSeries = new Set<string>();
+
+      deDupedParams = params.filter(param => {
+        // Filter null values from tooltip
+        if (param.value[1] === null) {
+          return false;
+        }
+
+        if (uniqueSeries.has(param.seriesName)) {
+          return false;
+        }
+
+        uniqueSeries.add(param.seriesName);
+        return true;
+      });
+    }
+
+    return getFormatter({
+      isGroupedByDate: true,
+      showTimeInTooltip: true,
+      valueFormatter: value => {
+        return formatChartValue(value, type, unit);
+      },
+      truncate: true,
+      utc: utc ?? false,
+    })(deDupedParams, asyncTicket);
+  };
+
+  let visibleSeriesCount = props.timeseries.length;
+  if (releaseSeries) {
+    visibleSeriesCount += 1;
+  }
+
+  const showLegend = visibleSeriesCount > 1;
+
   return (
     <BaseChart
-      series={timeseries.map(timeserie => {
-        return LineSeries({
-          name: timeserie.field,
-          color: timeserie.color,
-          animation: false,
-          data: timeserie.data.map(datum => {
-            return [datum.timestamp, datum.value];
+      ref={e => {
+        chartRef.current = e;
+
+        if (e?.getEchartsInstance) {
+          registerWithWidgetSyncContext(e.getEchartsInstance());
+        }
+      }}
+      autoHeightResize
+      series={[
+        ...completeSeries.map(timeserie => {
+          return LineSeries({
+            name: timeserie.field,
+            color: timeserie.color,
+            animation: false,
+            data: timeserie.data.map(datum => {
+              return [datum.timestamp, datum.value];
+            }),
+          });
+        }),
+        ...incompleteSeries.map(timeserie => {
+          return LineSeries({
+            name: timeserie.field,
+            color: timeserie.color,
+            animation: false,
+            data: timeserie.data.map(datum => {
+              return [datum.timestamp, datum.value];
+            }),
+            lineStyle: {
+              type: 'dotted',
+            },
+            silent: true,
+          });
+        }),
+        releaseSeries &&
+          LineSeries({
+            ...releaseSeries,
+            name: releaseSeries.seriesName,
+            data: [],
           }),
-        });
-      })}
-      utc={props.utc}
-      legend={{
-        top: 0,
+      ].filter(defined)}
+      grid={{
         left: 0,
+        top: showLegend ? 25 : 10,
+        right: 1,
+        bottom: 0,
+        containLabel: true,
       }}
-      showTimeInTooltip
+      legend={
+        showLegend
+          ? {
+              top: 0,
+              left: 0,
+            }
+          : undefined
+      }
       tooltip={{
-        valueFormatter: value => {
-          return formatChartValue(value, type, unit);
+        trigger: 'axis',
+        axisPointer: {
+          type: 'cross',
         },
+        formatter,
       }}
       yAxis={{
         axisLabel: {
@@ -53,9 +219,24 @@ export function LineChartWidgetVisualization(props: LineChartWidgetVisualization
             return formatChartValue(value, type, unit);
           },
         },
+        axisPointer: {
+          type: 'line',
+          snap: false,
+          lineStyle: {
+            type: 'solid',
+            width: 0.5,
+          },
+          label: {
+            show: false,
+          },
+        },
       }}
       {...chartZoomProps}
       isGroupedByDate
+      start={start ? new Date(start) : undefined}
+      end={end ? new Date(end) : undefined}
+      period={period}
+      utc={utc ?? undefined}
     />
   );
 }
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/shiftTimeserieToNow.tsx b/static/app/views/dashboards/widgets/lineChartWidget/shiftTimeserieToNow.tsx
new file mode 100644
index 00000000000000..2c484d1e2cbce1
--- /dev/null
+++ b/static/app/views/dashboards/widgets/lineChartWidget/shiftTimeserieToNow.tsx
@@ -0,0 +1,21 @@
+import type {TimeseriesData} from '../common/types';
+
+export function shiftTimeserieToNow(timeserie: TimeseriesData): TimeseriesData {
+  const currentTimestamp = new Date().getTime();
+
+  const lastDatum = timeserie.data.at(-1);
+  if (!lastDatum) {
+    return timeserie;
+  }
+
+  const lastTimestampInTimeserie = new Date(lastDatum.timestamp).getTime();
+  const diff = currentTimestamp - lastTimestampInTimeserie;
+
+  return {
+    ...timeserie,
+    data: timeserie.data.map(datum => ({
+      ...datum,
+      timestamp: new Date(new Date(datum.timestamp).getTime() + diff).toISOString(),
+    })),
+  };
+}
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/splitSeriesIntoCompleteAndIncomplete.spec.tsx b/static/app/views/dashboards/widgets/lineChartWidget/splitSeriesIntoCompleteAndIncomplete.spec.tsx
new file mode 100644
index 00000000000000..5e1ce965384a9d
--- /dev/null
+++ b/static/app/views/dashboards/widgets/lineChartWidget/splitSeriesIntoCompleteAndIncomplete.spec.tsx
@@ -0,0 +1,227 @@
+import {resetMockDate, setMockDate} from 'sentry-test/utils';
+
+import type {TimeseriesData} from '../common/types';
+
+import {splitSeriesIntoCompleteAndIncomplete} from './splitSeriesIntoCompleteAndIncomplete';
+
+describe('splitSeriesIntoCompleteAndIncomplete', () => {
+  beforeEach(() => {
+    setMockDate(new Date('2024-10-24T15:59:00.000Z'));
+  });
+
+  afterEach(() => {
+    resetMockDate();
+  });
+
+  it('Does not split a series with all complete data', () => {
+    const serie: TimeseriesData = {
+      field: 'p99(span.duration)',
+      data: [
+        {
+          value: 90,
+          timestamp: '2024-10-24T15:54:00.000Z',
+        },
+        {
+          value: 100,
+          timestamp: '2024-10-24T15:55:00.000Z',
+        },
+        {
+          value: 110,
+          timestamp: '2024-10-24T15:56:00.000Z',
+        },
+      ],
+    };
+
+    const [completeSerie, incompleteSerie] = splitSeriesIntoCompleteAndIncomplete(
+      serie,
+      90
+    );
+
+    expect(completeSerie?.data).toEqual([
+      {
+        value: 90,
+        timestamp: '2024-10-24T15:54:00.000Z',
+      },
+      {
+        value: 100,
+        timestamp: '2024-10-24T15:55:00.000Z',
+      },
+      {
+        value: 110,
+        timestamp: '2024-10-24T15:56:00.000Z',
+      },
+    ]);
+
+    expect(incompleteSerie).toEqual(undefined);
+  });
+
+  it('Does not split a series with all incomplete data', () => {
+    const serie: TimeseriesData = {
+      field: 'p99(span.duration)',
+      data: [
+        {
+          value: 90,
+          timestamp: '2024-10-24T15:58:05.000Z',
+        },
+        {
+          value: 100,
+          timestamp: '2024-10-24T15:58:10.000Z',
+        },
+        {
+          value: 110,
+          timestamp: '2024-10-24T15:58:15.000Z',
+        },
+        {
+          value: 120,
+          timestamp: '2024-10-24T15:58:20.000Z',
+        },
+      ],
+    };
+
+    const [completeSerie, incompleteSerie] = splitSeriesIntoCompleteAndIncomplete(
+      serie,
+      90
+    );
+
+    expect(completeSerie).toEqual(undefined);
+
+    expect(incompleteSerie?.data).toEqual([
+      {
+        value: 90,
+        timestamp: '2024-10-24T15:58:05.000Z',
+      },
+      {
+        value: 100,
+        timestamp: '2024-10-24T15:58:10.000Z',
+      },
+      {
+        value: 110,
+        timestamp: '2024-10-24T15:58:15.000Z',
+      },
+      {
+        value: 120,
+        timestamp: '2024-10-24T15:58:20.000Z',
+      },
+    ]);
+  });
+
+  it('Splits a series with partial incomplete data', () => {
+    const serie: TimeseriesData = {
+      field: 'p99(span.duration)',
+      data: [
+        {
+          value: 100,
+          timestamp: '2024-10-24T15:55:00.000Z',
+        },
+        {
+          value: 110,
+          timestamp: '2024-10-24T15:56:00.000Z',
+        },
+        {
+          value: 120,
+          timestamp: '2024-10-24T15:57:00.000Z',
+        },
+        {
+          value: 130,
+          timestamp: '2024-10-24T15:58:00.000Z',
+        },
+        {
+          value: 140,
+          timestamp: '2024-10-24T15:59:00.000Z',
+        },
+      ],
+    };
+
+    const [completeSerie, incompleteSerie] = splitSeriesIntoCompleteAndIncomplete(
+      serie,
+      90
+    );
+
+    expect(completeSerie?.data).toEqual([
+      {
+        value: 100,
+        timestamp: '2024-10-24T15:55:00.000Z',
+      },
+      {
+        value: 110,
+        timestamp: '2024-10-24T15:56:00.000Z',
+      },
+    ]);
+
+    expect(incompleteSerie?.data).toEqual([
+      {
+        value: 110,
+        timestamp: '2024-10-24T15:56:00.000Z',
+      },
+      {
+        value: 120,
+        timestamp: '2024-10-24T15:57:00.000Z',
+      },
+      {
+        value: 130,
+        timestamp: '2024-10-24T15:58:00.000Z',
+      },
+      {
+        value: 140,
+        timestamp: '2024-10-24T15:59:00.000Z',
+      },
+    ]);
+  });
+
+  it('Splits a series with long buckets', () => {
+    // The time buckets are an hour long. The ingestion delay is 90s. The last buckets should be marked incomplete.
+    //
+    const serie: TimeseriesData = {
+      field: 'p99(span.duration)',
+      data: [
+        {
+          value: 110,
+          timestamp: '2024-10-24T12:00:00.000Z',
+        },
+        {
+          value: 120,
+          timestamp: '2024-10-24T13:00:00.000Z',
+        },
+        {
+          value: 130,
+          timestamp: '2024-10-24T14:00:00.000Z',
+        },
+        {
+          value: 140,
+          timestamp: '2024-10-24T15:00:00.000Z',
+        },
+      ],
+    };
+
+    const [completeSerie, incompleteSerie] = splitSeriesIntoCompleteAndIncomplete(
+      serie,
+      90
+    );
+
+    expect(completeSerie?.data).toEqual([
+      {
+        value: 110,
+        timestamp: '2024-10-24T12:00:00.000Z',
+      },
+      {
+        value: 120,
+        timestamp: '2024-10-24T13:00:00.000Z',
+      },
+      {
+        value: 130,
+        timestamp: '2024-10-24T14:00:00.000Z',
+      },
+    ]);
+
+    expect(incompleteSerie?.data).toEqual([
+      {
+        value: 130,
+        timestamp: '2024-10-24T14:00:00.000Z',
+      },
+      {
+        value: 140,
+        timestamp: '2024-10-24T15:00:00.000Z',
+      },
+    ]);
+  });
+});
diff --git a/static/app/views/dashboards/widgets/lineChartWidget/splitSeriesIntoCompleteAndIncomplete.tsx b/static/app/views/dashboards/widgets/lineChartWidget/splitSeriesIntoCompleteAndIncomplete.tsx
new file mode 100644
index 00000000000000..36ff6a67c3018d
--- /dev/null
+++ b/static/app/views/dashboards/widgets/lineChartWidget/splitSeriesIntoCompleteAndIncomplete.tsx
@@ -0,0 +1,49 @@
+import partition from 'lodash/partition';
+
+import type {TimeseriesData} from '../common/types';
+
+export function splitSeriesIntoCompleteAndIncomplete(
+  serie: TimeseriesData,
+  delay: number
+): (TimeseriesData | undefined)[] {
+  const penultimateDatum = serie.data.at(-2);
+  const finalDatum = serie.data.at(-1);
+
+  let bucketSize: number = 0;
+  if (penultimateDatum && finalDatum) {
+    bucketSize =
+      new Date(finalDatum.timestamp).getTime() -
+      new Date(penultimateDatum.timestamp).getTime();
+  }
+
+  const ingestionDelayTimestamp = Date.now() - delay * 1000;
+
+  const [completeData, incompleteData] = partition(serie.data, datum => {
+    const bucketEndTimestamp = new Date(datum.timestamp).getTime() + bucketSize;
+    return bucketEndTimestamp < ingestionDelayTimestamp;
+  });
+
+  // If there is both complete and incomplete data, prepend the incomplete data
+  // with the final point from the complete data. This way, when the series are
+  // plotted, there's a connecting line between them
+  const finalCompletePoint = completeData.at(-1);
+
+  if (incompleteData.length > 0 && finalCompletePoint) {
+    incompleteData.unshift({...finalCompletePoint});
+  }
+
+  return [
+    completeData.length > 0
+      ? {
+          ...serie,
+          data: completeData,
+        }
+      : undefined,
+    incompleteData.length > 0
+      ? {
+          ...serie,
+          data: incompleteData,
+        }
+      : undefined,
+  ];
+}
diff --git a/static/app/views/discover/eventDetails/content.tsx b/static/app/views/discover/eventDetails/content.tsx
index 6224b1492e602c..ad8a7a655fbaf9 100644
--- a/static/app/views/discover/eventDetails/content.tsx
+++ b/static/app/views/discover/eventDetails/content.tsx
@@ -1,4 +1,4 @@
-import {useState} from 'react';
+import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 
 import Feature from 'sentry/components/acl/feature';
@@ -16,7 +16,6 @@ import FileSize from 'sentry/components/fileSize';
 import * as Layout from 'sentry/components/layouts/thirds';
 import LoadingError from 'sentry/components/loadingError';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
-import {TransactionProfileIdProvider} from 'sentry/components/profiling/transactionProfileIdProvider';
 import {TransactionToProfileButton} from 'sentry/components/profiling/transactionToProfileButton';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {TagsTable} from 'sentry/components/tagsTable';
@@ -133,11 +132,7 @@ function EventDetailsContent(props: Props) {
       metaResults?: TraceMetaQueryChildrenProps
     ) => {
       return (
-        <TransactionProfileIdProvider
-          projectId={event.projectID}
-          transactionId={event.type === 'transaction' ? event.id : undefined}
-          timestamp={event.dateReceived}
-        >
+        <Fragment>
           <Layout.Header>
             <Layout.HeaderContent>
               <DiscoverBreadcrumb
@@ -281,7 +276,7 @@ function EventDetailsContent(props: Props) {
               </Layout.Side>
             )}
           </Layout.Body>
-        </TransactionProfileIdProvider>
+        </Fragment>
       );
     };
 
diff --git a/static/app/views/discover/queryList.tsx b/static/app/views/discover/queryList.tsx
index 591e7f0a0feff9..1e82240a4038d8 100644
--- a/static/app/views/discover/queryList.tsx
+++ b/static/app/views/discover/queryList.tsx
@@ -26,6 +26,7 @@ import withApi from 'sentry/utils/withApi';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
 
 import {
+  getSavedQueryDataset,
   getSavedQueryWithDataset,
   handleCreateQuery,
   handleDeleteQuery,
@@ -33,7 +34,11 @@ import {
 } from './savedQuery/utils';
 import MiniGraph from './miniGraph';
 import QueryCard from './querycard';
-import {getPrebuiltQueries, handleAddQueryToDashboard} from './utils';
+import {
+  getPrebuiltQueries,
+  handleAddQueryToDashboard,
+  SAVED_QUERY_DATASET_TO_WIDGET_TYPE,
+} from './utils';
 
 type Props = {
   api: Client;
@@ -185,6 +190,11 @@ class QueryList extends Component<Props> {
               organization,
               yAxis: view?.yAxis,
               router,
+              widgetType: hasDatasetSelector(organization)
+                ? SAVED_QUERY_DATASET_TO_WIDGET_TYPE[
+                    getSavedQueryDataset(organization, location, newQuery)
+                  ]
+                : undefined,
             }),
         },
         {
@@ -275,6 +285,11 @@ class QueryList extends Component<Props> {
                     organization,
                     yAxis: savedQuery?.yAxis ?? eventView.yAxis,
                     router,
+                    widgetType: hasDatasetSelector(organization)
+                      ? SAVED_QUERY_DATASET_TO_WIDGET_TYPE[
+                          getSavedQueryDataset(organization, location, savedQuery)
+                        ]
+                      : undefined,
                   }),
               },
             ]
diff --git a/static/app/views/discover/results.tsx b/static/app/views/discover/results.tsx
index 08910d2eab0f09..17e8b43874ff0d 100644
--- a/static/app/views/discover/results.tsx
+++ b/static/app/views/discover/results.tsx
@@ -369,6 +369,9 @@ export class Results extends Component<Props, State> {
     if (nextEventView.project.length === 0 && selection.projects) {
       nextEventView.project = selection.projects;
     }
+    if (nextEventView.environment.length === 0 && selection.environments) {
+      nextEventView.environment = selection.environments;
+    }
     if (selection.datetime) {
       const {period, utc, start, end} = selection.datetime;
       nextEventView.statsPeriod = period ?? undefined;
diff --git a/static/app/views/discover/savedQuery/index.tsx b/static/app/views/discover/savedQuery/index.tsx
index 405baa87747c86..015477a301b5a1 100644
--- a/static/app/views/discover/savedQuery/index.tsx
+++ b/static/app/views/discover/savedQuery/index.tsx
@@ -36,12 +36,16 @@ import useOverlay from 'sentry/utils/useOverlay';
 import withApi from 'sentry/utils/withApi';
 import withProjects from 'sentry/utils/withProjects';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
-import {handleAddQueryToDashboard} from 'sentry/views/discover/utils';
+import {
+  handleAddQueryToDashboard,
+  SAVED_QUERY_DATASET_TO_WIDGET_TYPE,
+} from 'sentry/views/discover/utils';
 
 import {DEFAULT_EVENT_VIEW} from '../data';
 
 import {
   getDatasetFromLocationOrSavedQueryDataset,
+  getSavedQueryDataset,
   handleCreateQuery,
   handleDeleteQuery,
   handleResetHomepageQuery,
@@ -449,6 +453,11 @@ class SavedQueryButtonGroup extends PureComponent<Props, State> {
             query: savedQuery,
             yAxis,
             router,
+            widgetType: hasDatasetSelector(organization)
+              ? SAVED_QUERY_DATASET_TO_WIDGET_TYPE[
+                  getSavedQueryDataset(organization, location, savedQuery)
+                ]
+              : undefined,
           })
         }
       >
@@ -568,6 +577,11 @@ class SavedQueryButtonGroup extends PureComponent<Props, State> {
             query: savedQuery,
             yAxis,
             router,
+            widgetType: hasDatasetSelector(organization)
+              ? SAVED_QUERY_DATASET_TO_WIDGET_TYPE[
+                  getSavedQueryDataset(organization, location, savedQuery)
+                ]
+              : undefined,
           });
         },
       });
diff --git a/static/app/views/discover/table/quickContext/releaseContext.tsx b/static/app/views/discover/table/quickContext/releaseContext.tsx
index 7a16eca3eb9755..b6dd23f09daa7c 100644
--- a/static/app/views/discover/table/quickContext/releaseContext.tsx
+++ b/static/app/views/discover/table/quickContext/releaseContext.tsx
@@ -1,4 +1,4 @@
-import {useEffect} from 'react';
+import {useEffect, useMemo} from 'react';
 import styled from '@emotion/styled';
 
 import AvatarList from 'sentry/components/avatar/avatarList';
@@ -9,9 +9,11 @@ import TimeSince from 'sentry/components/timeSince';
 import {IconNot} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import type {Actor} from 'sentry/types/core';
 import type {ReleaseWithHealth} from 'sentry/types/release';
 import type {User} from 'sentry/types/user';
 import {trackAnalytics} from 'sentry/utils/analytics';
+import {uniqueId} from 'sentry/utils/guid';
 import {useApiQuery} from 'sentry/utils/queryClient';
 import {useUser} from 'sentry/utils/useUser';
 
@@ -41,6 +43,19 @@ function ReleaseContext(props: BaseContextProps) {
     }
   );
 
+  const authors = useMemo(
+    () =>
+      data?.authors.map<Actor | User>(author =>
+        // Add a unique id if missing
+        ({
+          ...author,
+          type: 'user',
+          id: 'id' in author ? author.id : uniqueId(),
+        })
+      ),
+    [data?.authors]
+  );
+
   useEffect(() => {
     trackAnalytics('discover_v2.quick_context_hover_contexts', {
       organization,
@@ -55,7 +70,7 @@ function ReleaseContext(props: BaseContextProps) {
     const userInAuthors =
       data &&
       authorsCount >= 1 &&
-      data.authors.find((author: User) => author.id && user.id && author.id === user.id);
+      data.authors.find(author => 'id' in author && user.id && author.id === user.id);
 
     if (userInAuthors) {
       authorsCount = authorsCount - 1;
@@ -105,7 +120,7 @@ function ReleaseContext(props: BaseContextProps) {
             {data.commitCount === 0 ? (
               <IconNot color="gray500" size="md" />
             ) : (
-              <StyledAvatarList users={data.authors} maxVisibleAvatars={10} />
+              <StyledAvatarList users={authors} maxVisibleAvatars={10} />
             )}
           </ContextBody>
         </ReleaseContextContainer>
diff --git a/static/app/views/discover/utils.tsx b/static/app/views/discover/utils.tsx
index 98bad6311316b5..5d47f82828d50e 100644
--- a/static/app/views/discover/utils.tsx
+++ b/static/app/views/discover/utils.tsx
@@ -48,7 +48,6 @@ import {getTitle} from 'sentry/utils/events';
 import {DISCOVER_FIELDS, FieldValueType, getFieldDefinition} from 'sentry/utils/fields';
 import localStorage from 'sentry/utils/localStorage';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
 
 import {
   DashboardWidgetSource,
@@ -58,7 +57,7 @@ import {
 } from '../dashboards/types';
 import {transactionSummaryRouteWithQuery} from '../performance/transactionSummary/utils';
 
-import {displayModeToDisplayType, getSavedQueryDataset} from './savedQuery/utils';
+import {displayModeToDisplayType} from './savedQuery/utils';
 import type {FieldValue, TableColumn} from './table/types';
 import {FieldValueKind} from './table/types';
 import {getAllViews, getTransactionViews, getWebVitalsViews} from './data';
@@ -688,11 +687,13 @@ export function handleAddQueryToDashboard({
   organization,
   router,
   yAxis,
+  widgetType,
 }: {
   eventView: EventView;
   location: Location;
   organization: Organization;
   router: InjectedRouter;
+  widgetType: WidgetType | undefined;
   query?: NewQuery;
   yAxis?: string | string[];
 }) {
@@ -703,14 +704,13 @@ export function handleAddQueryToDashboard({
     yAxis,
   });
 
-  const dataset = getSavedQueryDataset(organization, location, query);
-
   const {query: widgetAsQueryParams} = constructAddQueryToDashboardLink({
     eventView,
     query,
     organization,
     yAxis,
     location,
+    widgetType,
   });
   openAddToDashboardModal({
     organization,
@@ -738,9 +738,7 @@ export function handleAddQueryToDashboard({
         displayType === DisplayType.TOP_N
           ? Number(eventView.topEvents) || TOP_N
           : undefined,
-      widgetType: hasDatasetSelector(organization)
-        ? SAVED_QUERY_DATASET_TO_WIDGET_TYPE[dataset]
-        : undefined,
+      widgetType,
     },
     router,
     widgetAsQueryParams,
@@ -792,11 +790,13 @@ export function constructAddQueryToDashboardLink({
   organization,
   yAxis,
   location,
+  widgetType,
 }: {
   eventView: EventView;
   organization: Organization;
   location?: Location;
   query?: NewQuery;
+  widgetType?: WidgetType;
   yAxis?: string | string[];
 }) {
   const displayType = displayModeToDisplayType(eventView.display as DisplayModes);
@@ -806,7 +806,6 @@ export function constructAddQueryToDashboardLink({
     displayType,
     yAxis,
   });
-  const dataset = getSavedQueryDataset(organization, location, query);
 
   const defaultTitle =
     query?.name ?? (eventView.name !== 'All Events' ? eventView.name : undefined);
@@ -823,9 +822,8 @@ export function constructAddQueryToDashboardLink({
       defaultTableColumns: defaultTableFields,
       defaultTitle,
       displayType: displayType === DisplayType.TOP_N ? DisplayType.AREA : displayType,
-      dataset: hasDatasetSelector(organization)
-        ? SAVED_QUERY_DATASET_TO_WIDGET_TYPE[dataset]
-        : undefined,
+      dataset: widgetType,
+      field: eventView.getFields(),
       limit:
         displayType === DisplayType.TOP_N
           ? Number(eventView.topEvents) || TOP_N
diff --git a/static/app/views/explore/charts/index.tsx b/static/app/views/explore/charts/index.tsx
index c85ab926dcc34c..cd7ff629874112 100644
--- a/static/app/views/explore/charts/index.tsx
+++ b/static/app/views/explore/charts/index.tsx
@@ -1,27 +1,31 @@
-import {Fragment, useCallback, useMemo} from 'react';
+import type {Dispatch, SetStateAction} from 'react';
+import {Fragment, useCallback, useEffect, useMemo} from 'react';
 import styled from '@emotion/styled';
+import isEqual from 'lodash/isEqual';
 
-import Feature from 'sentry/components/acl/feature';
-import {getInterval} from 'sentry/components/charts/utils';
 import {CompactSelect} from 'sentry/components/compactSelect';
-import {DropdownMenu} from 'sentry/components/dropdownMenu';
+import Count from 'sentry/components/count';
 import {Tooltip} from 'sentry/components/tooltip';
 import {CHART_PALETTE} from 'sentry/constants/chartPalette';
-import {IconClock, IconGraph, IconSubscribed} from 'sentry/icons';
-import {t} from 'sentry/locale';
+import {IconClock, IconGraph} from 'sentry/icons';
+import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import type {Confidence, NewQuery} from 'sentry/types/organization';
+import {defined} from 'sentry/utils';
 import {dedupeArray} from 'sentry/utils/dedupeArray';
+import EventView from 'sentry/utils/discover/eventView';
 import {
   aggregateOutputType,
-  formatParsedFunction,
   parseFunction,
+  prettifyParsedFunction,
 } from 'sentry/utils/discover/fields';
+import {DiscoverDatasets} from 'sentry/utils/discover/types';
+import {formatPercentage} from 'sentry/utils/number/formatPercentage';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
-import useProjects from 'sentry/utils/useProjects';
+import usePrevious from 'sentry/utils/usePrevious';
 import {formatVersion} from 'sentry/utils/versions/formatVersion';
-import {Dataset} from 'sentry/views/alerts/rules/metric/types';
+import ChartContextMenu from 'sentry/views/explore/components/chartContextMenu';
 import {useChartInterval} from 'sentry/views/explore/hooks/useChartInterval';
 import {useDataset} from 'sentry/views/explore/hooks/useDataset';
 import {useVisualizes} from 'sentry/views/explore/hooks/useVisualizes';
@@ -31,7 +35,7 @@ import Chart, {
 } from 'sentry/views/insights/common/components/chart';
 import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
 import {useSortedTimeSeries} from 'sentry/views/insights/common/queries/useSortedTimeSeries';
-import {getAlertsUrl} from 'sentry/views/insights/common/utils/getAlertsUrl';
+import {useSpansQuery} from 'sentry/views/insights/common/queries/useSpansQuery';
 import {CHART_HEIGHT} from 'sentry/views/insights/database/settings';
 
 import {useGroupBys} from '../hooks/useGroupBys';
@@ -42,6 +46,8 @@ import {formatSort} from '../tables/aggregatesTable';
 
 interface ExploreChartsProps {
   query: string;
+  setConfidence: Dispatch<SetStateAction<Confidence>>;
+  setError: Dispatch<SetStateAction<string>>;
 }
 
 const exploreChartTypeOptions = [
@@ -61,19 +67,19 @@ const exploreChartTypeOptions = [
 
 export const EXPLORE_CHART_GROUP = 'explore-charts_group';
 
-// TODO: Update to support aggregate mode and multiple queries / visualizations
-export function ExploreCharts({query}: ExploreChartsProps) {
-  const pageFilters = usePageFilters();
-  const organization = useOrganization();
-  const {projects} = useProjects();
-
-  const [dataset] = useDataset();
+export function ExploreCharts({query, setConfidence, setError}: ExploreChartsProps) {
+  const [dataset] = useDataset({allowRPC: true});
   const [visualizes, setVisualizes] = useVisualizes();
   const [interval, setInterval, intervalOptions] = useChartInterval();
   const {groupBys} = useGroupBys();
   const [resultMode] = useResultMode();
   const topEvents = useTopEvents();
 
+  const extrapolationMetaResults = useExtrapolationMeta({
+    dataset,
+    query,
+  });
+
   const fields: string[] = useMemo(() => {
     if (resultMode === 'samples') {
       return [];
@@ -99,34 +105,137 @@ export function ExploreCharts({query}: ExploreChartsProps) {
     return deduped;
   }, [visualizes]);
 
-  const search = new MutableSearch(query);
+  const options = useMemo(() => {
+    const search = new MutableSearch(query);
 
-  // Filtering out all spans with op like 'ui.interaction*' which aren't
-  // embedded under transactions. The trace view does not support rendering
-  // such spans yet.
-  search.addFilterValues('!transaction.span_id', ['00']);
+    // Filtering out all spans with op like 'ui.interaction*' which aren't
+    // embedded under transactions. The trace view does not support rendering
+    // such spans yet.
+    search.addFilterValues('!transaction.span_id', ['00']);
 
-  const timeSeriesResult = useSortedTimeSeries(
-    {
+    return {
       search,
       yAxis: yAxes,
-      interval: interval ?? getInterval(pageFilters.selection.datetime, 'metrics'),
+      interval,
       fields,
       orderby,
       topEvents,
-    },
-    'api.explorer.stats',
-    dataset
-  );
+    };
+  }, [query, yAxes, interval, fields, orderby, topEvents]);
+
+  const previousQuery = usePrevious(query);
+  const previousOptions = usePrevious(options);
+  const canUsePreviousResults = useMemo(() => {
+    if (!isEqual(query, previousQuery)) {
+      return false;
+    }
+
+    if (!isEqual(options.interval, previousOptions.interval)) {
+      return false;
+    }
+
+    if (!isEqual(options.fields, previousOptions.fields)) {
+      return false;
+    }
+
+    if (!isEqual(options.orderby, previousOptions.orderby)) {
+      return false;
+    }
+
+    if (!isEqual(options.topEvents, previousOptions.topEvents)) {
+      return false;
+    }
+
+    return true;
+  }, [query, previousQuery, options, previousOptions]);
+
+  const timeSeriesResult = useSortedTimeSeries(options, 'api.explorer.stats', dataset);
+  const previousTimeSeriesResult = usePrevious(timeSeriesResult);
+
+  const resultConfidence = useMemo(() => {
+    if (dataset !== DiscoverDatasets.SPANS_EAP_RPC) {
+      return null;
+    }
+
+    const {lowConfidence, highConfidence, nullConfidence} = Object.values(
+      timeSeriesResult.data
+    ).reduce(
+      (acc, series) => {
+        for (const s of series) {
+          if (s.confidence === 'low') {
+            acc.lowConfidence += 1;
+          } else if (s.confidence === 'high') {
+            acc.highConfidence += 1;
+          } else {
+            acc.nullConfidence += 1;
+          }
+        }
+        return acc;
+      },
+      {lowConfidence: 0, highConfidence: 0, nullConfidence: 0}
+    );
+
+    if (lowConfidence <= 0 && highConfidence <= 0 && nullConfidence >= 0) {
+      return null;
+    }
+
+    if (lowConfidence / (lowConfidence + highConfidence) > 0.5) {
+      return 'low';
+    }
+
+    return 'high';
+  }, [dataset, timeSeriesResult.data]);
+
+  useEffect(() => {
+    // only update the confidence once the result has loaded
+    if (!timeSeriesResult.isPending) {
+      setConfidence(resultConfidence);
+    }
+  }, [setConfidence, resultConfidence, timeSeriesResult.isPending]);
+
+  useEffect(() => {
+    setError(timeSeriesResult.error?.message ?? '');
+  }, [setError, timeSeriesResult.error?.message]);
 
   const getSeries = useCallback(
-    (dedupedYAxes: string[]) => {
-      return dedupedYAxes.flatMap(yAxis => {
-        const series = timeSeriesResult.data[yAxis];
-        return series !== undefined ? series : [];
+    (dedupedYAxes: string[], formattedYAxes: (string | undefined)[]) => {
+      const shouldUsePreviousResults =
+        timeSeriesResult.isPending &&
+        canUsePreviousResults &&
+        dedupedYAxes.every(yAxis => previousTimeSeriesResult.data.hasOwnProperty(yAxis));
+
+      const data = dedupedYAxes.flatMap((yAxis, i) => {
+        const series = shouldUsePreviousResults
+          ? previousTimeSeriesResult.data[yAxis]
+          : timeSeriesResult.data[yAxis];
+
+        return (series ?? []).map(s => {
+          // We replace the series name with the formatted series name here
+          // when possible as it's cleaner to read.
+          //
+          // We can't do this in top N mode as the series name uses the row
+          // values instead of the aggregate function.
+          if (s.seriesName === yAxis) {
+            return {
+              ...s,
+              seriesName: formattedYAxes[i] ?? yAxis,
+            };
+          }
+          return s;
+        });
       });
+
+      return {
+        data,
+        error: shouldUsePreviousResults
+          ? previousTimeSeriesResult.error
+          : timeSeriesResult.error,
+        loading: shouldUsePreviousResults
+          ? previousTimeSeriesResult.isPending
+          : timeSeriesResult.isPending,
+      };
     },
-    [timeSeriesResult]
+    [canUsePreviousResults, timeSeriesResult, previousTimeSeriesResult]
   );
 
   const handleChartTypeChange = useCallback(
@@ -144,17 +253,17 @@ export function ExploreCharts({query}: ExploreChartsProps) {
     EXPLORE_CHART_GROUP
   );
 
+  const shouldRenderLabel = visualizes.length > 1;
+
   return (
     <Fragment>
       {visualizes.map((visualize, index) => {
         const dedupedYAxes = dedupeArray(visualize.yAxes);
 
-        const formattedYAxes = dedupedYAxes
-          .map(yaxis => {
-            const func = parseFunction(yaxis);
-            return func ? formatParsedFunction(func) : undefined;
-          })
-          .filter(Boolean);
+        const formattedYAxes = dedupedYAxes.map(yaxis => {
+          const func = parseFunction(yaxis);
+          return func ? prettifyParsedFunction(func) : undefined;
+        });
 
         const {chartType, label, yAxes: visualizeYAxes} = visualize;
         const chartIcon =
@@ -164,35 +273,18 @@ export function ExploreCharts({query}: ExploreChartsProps) {
               ? 'area'
               : 'bar';
 
-        const project =
-          projects.length === 1
-            ? projects[0]
-            : projects.find(p => p.id === `${pageFilters.selection.projects[0]}`);
-        const singleProject =
-          (pageFilters.selection.projects.length === 1 || projects.length === 1) &&
-          project;
-        const alertsUrls = singleProject
-          ? visualizeYAxes.map(yAxis => ({
-              key: yAxis,
-              label: yAxis,
-              to: getAlertsUrl({
-                project,
-                query,
-                pageFilters: pageFilters.selection,
-                aggregate: yAxis,
-                orgSlug: organization.slug,
-                dataset: Dataset.EVENTS_ANALYTICS_PLATFORM,
-                interval,
-              }),
-            }))
-          : undefined;
+        const {data, error, loading} = getSeries(dedupedYAxes, formattedYAxes);
+
+        const outputTypes = new Set(
+          formattedYAxes.filter(Boolean).map(aggregateOutputType)
+        );
 
         return (
           <ChartContainer key={index}>
             <ChartPanel>
               <ChartHeader>
-                <ChartLabel>{label}</ChartLabel>
-                <ChartTitle>{formattedYAxes.join(', ')}</ChartTitle>
+                {shouldRenderLabel && <ChartLabel>{label}</ChartLabel>}
+                <ChartTitle>{formattedYAxes.filter(Boolean).join(', ')}</ChartTitle>
                 <Tooltip
                   title={t('Type of chart displayed in this visualization (ex. line)')}
                 >
@@ -225,29 +317,12 @@ export function ExploreCharts({query}: ExploreChartsProps) {
                     options={intervalOptions}
                   />
                 </Tooltip>
-                <Feature features="organizations:alerts-eap">
-                  <Tooltip
-                    title={
-                      singleProject
-                        ? t('Create an alert for this chart')
-                        : t('Cannot create an alert when multiple projects are selected')
-                    }
-                  >
-                    <DropdownMenu
-                      triggerProps={{
-                        'aria-label': t('Create Alert'),
-                        size: 'sm',
-                        borderless: true,
-                        showChevron: false,
-                        icon: <IconSubscribed />,
-                      }}
-                      position="bottom-end"
-                      items={alertsUrls ?? []}
-                      menuTitle={t('Create an alert for')}
-                      isDisabled={!alertsUrls || alertsUrls.length === 0}
-                    />
-                  </Tooltip>
-                </Feature>
+                <ChartContextMenu
+                  visualizeYAxes={visualizeYAxes}
+                  query={query}
+                  interval={interval}
+                  visualizeIndex={index}
+                />
               </ChartHeader>
               <Chart
                 height={CHART_HEIGHT}
@@ -258,16 +333,40 @@ export function ExploreCharts({query}: ExploreChartsProps) {
                   bottom: '0',
                 }}
                 legendFormatter={value => formatVersion(value)}
-                data={getSeries(dedupedYAxes)}
-                error={timeSeriesResult.error}
-                loading={timeSeriesResult.isPending}
+                data={data}
+                error={error}
+                loading={loading}
                 chartGroup={EXPLORE_CHART_GROUP}
                 // TODO Abdullah: Make chart colors dynamic, with changing topN events count and overlay count.
                 chartColors={CHART_PALETTE[TOP_EVENTS_LIMIT - 1]}
                 type={chartType}
-                // for now, use the first y axis unit
-                aggregateOutputFormat={aggregateOutputType(dedupedYAxes[0])}
+                aggregateOutputFormat={
+                  outputTypes.size === 1 ? outputTypes.keys().next().value : undefined
+                }
+                showLegend
               />
+              {dataset === DiscoverDatasets.SPANS_EAP_RPC && (
+                <ChartFooter>
+                  {defined(extrapolationMetaResults.data?.[0]?.['count_sample()']) &&
+                  defined(
+                    extrapolationMetaResults.data?.[0]?.['avg_sample(sampling_rate)']
+                  )
+                    ? tct(
+                        '*[sampleCount] samples extrapolated with an average sampling rate of [sampleRate]',
+                        {
+                          sampleCount: (
+                            <Count
+                              value={extrapolationMetaResults.data[0]['count_sample()']}
+                            />
+                          ),
+                          sampleRate: formatPercentage(
+                            extrapolationMetaResults.data[0]['avg_sample(sampling_rate)']
+                          ),
+                        }
+                      )
+                    : t('foo')}
+                </ChartFooter>
+              )}
             </ChartPanel>
           </ChartContainer>
         );
@@ -276,6 +375,43 @@ export function ExploreCharts({query}: ExploreChartsProps) {
   );
 }
 
+function useExtrapolationMeta({
+  dataset,
+  query,
+}: {
+  dataset: DiscoverDatasets;
+  query: string;
+}) {
+  const {selection} = usePageFilters();
+
+  const extrapolationMetaEventView = useMemo(() => {
+    const search = new MutableSearch(query);
+
+    // Filtering out all spans with op like 'ui.interaction*' which aren't
+    // embedded under transactions. The trace view does not support rendering
+    // such spans yet.
+    search.addFilterValues('!transaction.span_id', ['00']);
+
+    const discoverQuery: NewQuery = {
+      id: undefined,
+      name: 'Explore - Extrapolation Meta',
+      fields: ['count_sample()', 'avg_sample(sampling_rate)', 'min(sampling_rate)'],
+      query: search.formatString(),
+      version: 2,
+      dataset,
+    };
+
+    return EventView.fromNewQueryWithPageFilters(discoverQuery, selection);
+  }, [dataset, query, selection]);
+
+  return useSpansQuery({
+    eventView: extrapolationMetaEventView,
+    initialData: [],
+    referrer: 'api.explore.spans-extrapolation-meta',
+    enabled: dataset === DiscoverDatasets.SPANS_EAP_RPC,
+  });
+}
+
 const ChartContainer = styled('div')`
   display: grid;
   gap: 0;
@@ -286,7 +422,6 @@ const ChartContainer = styled('div')`
 const ChartHeader = styled('div')`
   display: flex;
   justify-content: space-between;
-  gap: ${space(1)};
 `;
 
 const ChartTitle = styled('div')`
@@ -304,4 +439,13 @@ const ChartLabel = styled('div')`
   white-space: nowrap;
   font-weight: ${p => p.theme.fontWeightBold};
   align-content: center;
+  margin-right: ${space(1)};
+`;
+
+const ChartFooter = styled('div')`
+  color: ${p => p.theme.gray300};
+  font-size: ${p => p.theme.fontSizeSmall};
+  display: inline-block;
+  margin-top: ${space(1.5)};
+  margin-bottom: 0;
 `;
diff --git a/static/app/views/explore/components/chartContextMenu.tsx b/static/app/views/explore/components/chartContextMenu.tsx
new file mode 100644
index 00000000000000..d5b05cfcd8c2d7
--- /dev/null
+++ b/static/app/views/explore/components/chartContextMenu.tsx
@@ -0,0 +1,92 @@
+import {DropdownMenu, type MenuItemProps} from 'sentry/components/dropdownMenu';
+import {IconEllipsis} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import useOrganization from 'sentry/utils/useOrganization';
+import usePageFilters from 'sentry/utils/usePageFilters';
+import useProjects from 'sentry/utils/useProjects';
+import {Dataset} from 'sentry/views/alerts/rules/metric/types';
+import {useAddToDashboard} from 'sentry/views/explore/hooks/useAddToDashboard';
+import {getAlertsUrl} from 'sentry/views/insights/common/utils/getAlertsUrl';
+
+function ChartContextMenu({
+  visualizeIndex,
+  visualizeYAxes,
+  query,
+  interval,
+}: {
+  interval: string;
+  query: string;
+  visualizeIndex: number;
+  visualizeYAxes: string[];
+}) {
+  const {addToDashboard} = useAddToDashboard();
+  const organization = useOrganization();
+
+  const {projects} = useProjects();
+  const pageFilters = usePageFilters();
+
+  const project =
+    projects.length === 1
+      ? projects[0]
+      : projects.find(p => p.id === `${pageFilters.selection.projects[0]}`);
+  const singleProject =
+    (pageFilters.selection.projects.length === 1 || projects.length === 1) && project;
+
+  const alertsUrls = singleProject
+    ? visualizeYAxes.map(yAxis => ({
+        key: yAxis,
+        label: yAxis,
+        to: getAlertsUrl({
+          project,
+          query,
+          pageFilters: pageFilters.selection,
+          aggregate: yAxis,
+          orgSlug: organization.slug,
+          dataset: Dataset.EVENTS_ANALYTICS_PLATFORM,
+          interval,
+        }),
+      }))
+    : undefined;
+
+  const items: MenuItemProps[] = [];
+
+  if (organization.features.includes('alerts-eap')) {
+    items.push({
+      key: 'create-alert',
+      label: t('Create an alert for'),
+      children: alertsUrls ?? [],
+      tooltip: !singleProject
+        ? t('Cannot create an alert when multiple projects are selected')
+        : undefined,
+      disabled: !alertsUrls || alertsUrls.length === 0 || !singleProject,
+      isSubmenu: true,
+    });
+  }
+
+  if (organization.features.includes('dashboards-eap')) {
+    items.push({
+      key: 'add-to-dashboard',
+      label: t('Add to Dashboard'),
+      onAction: () => addToDashboard(visualizeIndex),
+    });
+  }
+
+  if (items.length === 0) {
+    return null;
+  }
+
+  return (
+    <DropdownMenu
+      triggerProps={{
+        size: 'sm',
+        borderless: true,
+        showChevron: false,
+        icon: <IconEllipsis />,
+      }}
+      position="bottom-end"
+      items={items}
+    />
+  );
+}
+
+export default ChartContextMenu;
diff --git a/static/app/views/explore/components/table.tsx b/static/app/views/explore/components/table.tsx
index 203c0eaf0cbb5c..8d56f3a32a4f2a 100644
--- a/static/app/views/explore/components/table.tsx
+++ b/static/app/views/explore/components/table.tsx
@@ -50,8 +50,8 @@ export const ALLOWED_CELL_ACTIONS: Actions[] = [
 const MINIMUM_COLUMN_WIDTH = COL_WIDTH_MINIMUM;
 
 type Item = {
-  label: string;
-  value: React.ReactNode;
+  label: React.ReactNode;
+  value: string;
   width?: number | 'min-content';
 };
 
diff --git a/static/app/views/explore/components/typeBadge.tsx b/static/app/views/explore/components/typeBadge.tsx
index ca37c76f104f12..2e247ac99d8527 100644
--- a/static/app/views/explore/components/typeBadge.tsx
+++ b/static/app/views/explore/components/typeBadge.tsx
@@ -1,25 +1,26 @@
 import BadgeTag from 'sentry/components/badge/tag';
 import {t} from 'sentry/locale';
-import type {Tag} from 'sentry/types/group';
 import {defined} from 'sentry/utils';
 import type {ParsedFunction} from 'sentry/utils/discover/fields';
 import {FieldKind} from 'sentry/utils/fields';
 
 interface TypeBadgeProps {
   func?: ParsedFunction;
-  tag?: Tag;
+  kind?: FieldKind;
 }
 
-export function TypeBadge({func, tag}: TypeBadgeProps) {
+export function TypeBadge({func, kind}: TypeBadgeProps) {
   if (defined(func)) {
     return <BadgeTag type="warning">{t('aggregation')}</BadgeTag>;
   }
 
-  if (tag?.kind === FieldKind.MEASUREMENT) {
+  if (kind === FieldKind.MEASUREMENT) {
     return <BadgeTag type="success">{t('number')}</BadgeTag>;
   }
-  if (tag?.kind === FieldKind.TAG) {
+
+  if (kind === FieldKind.TAG) {
     return <BadgeTag type="highlight">{t('string')}</BadgeTag>;
   }
+
   return null;
 }
diff --git a/static/app/views/explore/content.tsx b/static/app/views/explore/content.tsx
index 0c77cafdf59a00..45048858806a4d 100644
--- a/static/app/views/explore/content.tsx
+++ b/static/app/views/explore/content.tsx
@@ -1,7 +1,9 @@
-import {useCallback} from 'react';
+import {useCallback, useState} from 'react';
 import styled from '@emotion/styled';
 import type {Location} from 'history';
 
+import Feature from 'sentry/components/acl/feature';
+import {Alert} from 'sentry/components/alert';
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
 import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
@@ -11,6 +13,7 @@ import {EnvironmentPageFilter} from 'sentry/components/organizations/environment
 import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import PageFiltersContainer from 'sentry/components/organizations/pageFilters/container';
 import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
+import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import {
   EAPSpanSearchQueryBuilder,
   SpanSearchQueryBuilder,
@@ -18,8 +21,12 @@ import {
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import type {Confidence} from 'sentry/types/organization';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
-import {ALLOWED_EXPLORE_VISUALIZE_AGGREGATES} from 'sentry/utils/fields';
+import {
+  type AggregationKey,
+  ALLOWED_EXPLORE_VISUALIZE_AGGREGATES,
+} from 'sentry/utils/fields';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -46,10 +53,7 @@ function ExploreContentImpl({}: ExploreContentProps) {
   const organization = useOrganization();
   const {selection} = usePageFilters();
   const [dataset] = useDataset();
-
-  const [resultMode] = useResultMode();
-  const supportedAggregates =
-    resultMode === 'aggregate' ? ALLOWED_EXPLORE_VISUALIZE_AGGREGATES : [];
+  const [resultsMode] = useResultMode();
 
   const numberTags = useSpanTags('number');
   const stringTags = useSpanTags('string');
@@ -70,29 +74,62 @@ function ExploreContentImpl({}: ExploreContentProps) {
     });
   }, [location, navigate]);
 
+  const [confidence, setConfidence] = useState<Confidence>(null);
+  const [chartError, setChartError] = useState<string>('');
+  const [tableError, setTableError] = useState<string>('');
+
+  const maxPickableDays = 7;
+
   return (
-    <SentryDocumentTitle title={t('Explore')} orgSlug={organization.slug}>
-      <PageFiltersContainer>
+    <SentryDocumentTitle title={t('Traces')} orgSlug={organization.slug}>
+      <PageFiltersContainer maxPickableDays={maxPickableDays}>
         <Layout.Page>
           <Layout.Header>
             <Layout.HeaderContent>
-              <Layout.Title>{t('Explore')}</Layout.Title>
+              <Layout.Title>
+                {t('Traces')}
+                <PageHeadingQuestionTooltip
+                  docsUrl="https://github.com/getsentry/sentry/discussions/81239"
+                  title={t(
+                    'Find problematic spans/traces or compute real-time metrics via aggregation.'
+                  )}
+                  linkLabel={t('Read the Discussion')}
+                />
+              </Layout.Title>
             </Layout.HeaderContent>
             <Layout.HeaderActions>
               <ButtonBar gap={1}>
-                <Button onClick={switchToOldTraceExplorer} size="sm">
-                  {t('Switch to Old Trace Explore')}
-                </Button>
+                <Feature organization={organization} features="visibility-explore-admin">
+                  <Button onClick={switchToOldTraceExplorer} size="sm">
+                    {t('Switch to Old Trace Explore')}
+                  </Button>
+                </Feature>
                 <FeedbackWidgetButton />
               </ButtonBar>
             </Layout.HeaderActions>
           </Layout.Header>
           <Body>
+            {confidence === 'low' && (
+              <ConfidenceAlert type="warning" showIcon>
+                {t(
+                  'Your low sample count may impact the accuracy of this extrapolation. Edit your query or increase your sample rate.'
+                )}
+              </ConfidenceAlert>
+            )}
             <TopSection>
               <StyledPageFilterBar condensed>
                 <ProjectPageFilter />
                 <EnvironmentPageFilter />
-                <DatePageFilter />
+                <DatePageFilter
+                  defaultPeriod="7d"
+                  maxPickableDays={maxPickableDays}
+                  relativeOptions={({arbitraryOptions}) => ({
+                    ...arbitraryOptions,
+                    '1h': t('Last 1 hour'),
+                    '24h': t('Last 24 hours'),
+                    '7d': t('Last 7 days'),
+                  })}
+                />
               </StyledPageFilterBar>
               {dataset === DiscoverDatasets.SPANS_INDEXED ? (
                 <SpanSearchQueryBuilder
@@ -107,7 +144,23 @@ function ExploreContentImpl({}: ExploreContentProps) {
                   initialQuery={userQuery}
                   onSearch={setUserQuery}
                   searchSource="explore"
-                  supportedAggregates={supportedAggregates}
+                  getFilterTokenWarning={
+                    resultsMode === 'samples'
+                      ? key => {
+                          if (
+                            ALLOWED_EXPLORE_VISUALIZE_AGGREGATES.includes(
+                              key as AggregationKey
+                            )
+                          ) {
+                            return t(
+                              "This key won't affect the results because samples mode does not support aggregate functions"
+                            );
+                          }
+                          return undefined;
+                        }
+                      : undefined
+                  }
+                  supportedAggregates={ALLOWED_EXPLORE_VISUALIZE_AGGREGATES}
                   numberTags={numberTags}
                   stringTags={stringTags}
                 />
@@ -115,8 +168,17 @@ function ExploreContentImpl({}: ExploreContentProps) {
             </TopSection>
             <ExploreToolbar extras={toolbarExtras} />
             <MainSection fullWidth>
-              <ExploreCharts query={userQuery} />
-              <ExploreTables />
+              {(tableError || chartError) && (
+                <Alert type="error" showIcon>
+                  {tableError || chartError}
+                </Alert>
+              )}
+              <ExploreCharts
+                query={userQuery}
+                setConfidence={setConfidence}
+                setError={setChartError}
+              />
+              <ExploreTables confidence={confidence} setError={setTableError} />
             </MainSection>
           </Body>
         </Layout.Page>
@@ -129,7 +191,7 @@ export function ExploreContent(props: ExploreContentProps) {
   const [dataset] = useDataset();
 
   return (
-    <SpanTagsProvider dataset={dataset}>
+    <SpanTagsProvider dataset={dataset} enabled>
       <ExploreContentImpl {...props} />
     </SpanTagsProvider>
   );
@@ -139,14 +201,20 @@ const Body = styled(Layout.Body)`
   gap: ${space(2)};
 
   @media (min-width: ${p => p.theme.breakpoints.medium}) {
-    grid-template-columns: 300px minmax(100px, auto);
+    grid-template-columns: 350px minmax(100px, auto);
+    gap: ${space(2)};
   }
 
   @media (min-width: ${p => p.theme.breakpoints.xxlarge}) {
-    grid-template-columns: 350px minmax(100px, auto);
+    grid-template-columns: 400px minmax(100px, auto);
   }
 `;
 
+const ConfidenceAlert = styled(Alert)`
+  grid-column: 1/3;
+  margin: 0;
+`;
+
 const TopSection = styled('div')`
   display: grid;
   gap: ${space(2)};
@@ -154,12 +222,12 @@ const TopSection = styled('div')`
   margin-bottom: ${space(2)};
 
   @media (min-width: ${p => p.theme.breakpoints.large}) {
-    grid-template-columns: minmax(300px, auto) 1fr;
+    grid-template-columns: minmax(350px, auto) 1fr;
     margin-bottom: 0;
   }
 
   @media (min-width: ${p => p.theme.breakpoints.xxlarge}) {
-    grid-template-columns: minmax(350px, auto) 1fr;
+    grid-template-columns: minmax(400px, auto) 1fr;
   }
 `;
 
diff --git a/static/app/views/explore/contexts/spanTagsContext.tsx b/static/app/views/explore/contexts/spanTagsContext.tsx
index 29ae6185475cf1..d8d4ca4e720da6 100644
--- a/static/app/views/explore/contexts/spanTagsContext.tsx
+++ b/static/app/views/explore/contexts/spanTagsContext.tsx
@@ -9,87 +9,123 @@ import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {SpanIndexedField} from 'sentry/views/insights/types';
-import {
-  useSpanFieldStaticTags,
-  useSpanFieldSupportedTags,
-} from 'sentry/views/performance/utils/useSpanFieldSupportedTags';
+import {useSpanFieldCustomTags} from 'sentry/views/performance/utils/useSpanFieldSupportedTags';
 
 type TypedSpanTags = {
   number: TagCollection;
   string: TagCollection;
 };
 
-const SpanTagsContext = createContext<TypedSpanTags | undefined>(undefined);
+export const SpanTagsContext = createContext<TypedSpanTags | undefined>(undefined);
 
 interface SpanTagsProviderProps {
   children: React.ReactNode;
   dataset: DiscoverDatasets;
+  enabled: boolean;
 }
 
-export function SpanTagsProvider({children, dataset}: SpanTagsProviderProps) {
-  const numericSpanFields: Set<string> = useMemo(() => {
-    return new Set([
-      SpanIndexedField.SPAN_DURATION,
-      SpanIndexedField.SPAN_SELF_TIME,
-      SpanIndexedField.INP,
-      SpanIndexedField.INP_SCORE,
-      SpanIndexedField.INP_SCORE_WEIGHT,
-      SpanIndexedField.TOTAL_SCORE,
-      SpanIndexedField.CACHE_ITEM_SIZE,
-      SpanIndexedField.MESSAGING_MESSAGE_BODY_SIZE,
-      SpanIndexedField.MESSAGING_MESSAGE_RECEIVE_LATENCY,
-      SpanIndexedField.MESSAGING_MESSAGE_RETRY_COUNT,
-    ]);
-  }, []);
-
-  const supportedTags = useSpanFieldSupportedTags();
+export function SpanTagsProvider({children, dataset, enabled}: SpanTagsProviderProps) {
+  const {data: indexedTags} = useSpanFieldCustomTags({
+    enabled: dataset === DiscoverDatasets.SPANS_INDEXED && enabled,
+  });
 
   const numberTags: TagCollection = useTypedSpanTags({
-    enabled: dataset === DiscoverDatasets.SPANS_EAP,
+    enabled: dataset === DiscoverDatasets.SPANS_EAP && enabled,
     type: 'number',
   });
 
   const stringTags: TagCollection = useTypedSpanTags({
-    enabled: dataset === DiscoverDatasets.SPANS_EAP,
+    enabled: dataset === DiscoverDatasets.SPANS_EAP && enabled,
     type: 'string',
   });
 
-  const staticTags = useSpanFieldStaticTags();
-
   const allNumberTags = useMemo(() => {
+    const measurements = [
+      SpanIndexedField.SPAN_DURATION,
+      SpanIndexedField.SPAN_SELF_TIME,
+    ].map(measurement => [
+      measurement,
+      {
+        key: measurement,
+        name: measurement,
+        kind: FieldKind.MEASUREMENT,
+      },
+    ]);
+
     if (dataset === DiscoverDatasets.SPANS_INDEXED) {
-      return {};
+      return {
+        ...Object.fromEntries(measurements),
+      };
     }
 
     return {
       ...numberTags,
-      ...Object.fromEntries(
-        Object.entries(staticTags)
-          .filter(([key, _]) => numericSpanFields.has(key))
-          .map(([key, tag]) => [key, {...tag, kind: FieldKind.MEASUREMENT}])
-      ),
+      ...Object.fromEntries(measurements),
     };
-  }, [dataset, numberTags, numericSpanFields, staticTags]);
+  }, [dataset, numberTags]);
 
   const allStringTags = useMemo(() => {
+    const tags = [
+      // NOTE: intentionally choose to not expose transaction id
+      // as we're moving toward span ids
+
+      'id', // SpanIndexedField.SPAN_OP is actually `span_id`
+      'profile.id', // SpanIndexedField.PROFILE_ID is actually `profile_id`
+      SpanIndexedField.BROWSER_NAME,
+      SpanIndexedField.ENVIRONMENT,
+      SpanIndexedField.ORIGIN_TRANSACTION,
+      SpanIndexedField.PROJECT,
+      SpanIndexedField.RAW_DOMAIN,
+      SpanIndexedField.RELEASE,
+      SpanIndexedField.SDK_NAME,
+      SpanIndexedField.SDK_VERSION,
+      SpanIndexedField.SPAN_ACTION,
+      SpanIndexedField.SPAN_CATEGORY,
+      SpanIndexedField.SPAN_DESCRIPTION,
+      SpanIndexedField.SPAN_DOMAIN,
+      SpanIndexedField.SPAN_GROUP,
+      SpanIndexedField.SPAN_MODULE,
+      SpanIndexedField.SPAN_OP,
+      SpanIndexedField.SPAN_STATUS,
+      SpanIndexedField.TIMESTAMP,
+      SpanIndexedField.TRACE,
+      SpanIndexedField.TRANSACTION,
+      SpanIndexedField.TRANSACTION_METHOD,
+      SpanIndexedField.TRANSACTION_OP,
+      SpanIndexedField.USER,
+      SpanIndexedField.USER_EMAIL,
+      SpanIndexedField.USER_GEO_SUBREGION,
+      SpanIndexedField.USER_ID,
+      SpanIndexedField.USER_IP,
+      SpanIndexedField.USER_USERNAME,
+    ].map(tag => [
+      tag,
+      {
+        key: tag,
+        name: tag,
+        kind: FieldKind.TAG,
+      },
+    ]);
+
     if (dataset === DiscoverDatasets.SPANS_INDEXED) {
-      return supportedTags.data;
+      return {
+        ...indexedTags,
+        ...Object.fromEntries(tags),
+      };
     }
 
     return {
       ...stringTags,
-      ...Object.fromEntries(
-        Object.entries(staticTags)
-          .filter(([key, _]) => !numericSpanFields.has(key))
-          .map(([key, tag]) => [key, {...tag, kind: FieldKind.TAG}])
-      ),
+      ...Object.fromEntries(tags),
     };
-  }, [dataset, supportedTags, stringTags, staticTags, numericSpanFields]);
+  }, [dataset, indexedTags, stringTags]);
 
-  const tags = {
-    number: allNumberTags,
-    string: allStringTags,
-  };
+  const tags = useMemo(() => {
+    return {
+      number: allNumberTags,
+      string: allStringTags,
+    };
+  }, [allNumberTags, allStringTags]);
 
   return <SpanTagsContext.Provider value={tags}>{children}</SpanTagsContext.Provider>;
 }
@@ -131,6 +167,7 @@ function useTypedSpanTags({
       environment: selection.environments,
       ...normalizeDateTimeParams(selection.datetime),
       dataset: 'spans',
+      process: 1,
       type,
     },
   };
@@ -149,20 +186,22 @@ function useTypedSpanTags({
       // For now, skip all the sentry. prefixed tags as they
       // should be covered by the static tags that will be
       // merged with these results.
-      if (tag.key.startsWith('sentry.')) {
+      if (tag.key.startsWith('sentry.') || tag.key.startsWith('tags[sentry.')) {
         continue;
       }
 
       // EAP spans contain tags with illegal characters
-      if (!/^[a-zA-Z0-9_.:-]+$/.test(tag.key)) {
+      // SnQL forbids `-` but is allowed in RPC. So add it back later
+      if (
+        !/^[a-zA-Z0-9_.:]+$/.test(tag.key) &&
+        !/^tags\[[a-zA-Z0-9_.:]+,number\]$/.test(tag.key)
+      ) {
         continue;
       }
 
-      const key = type === 'number' ? `tags[${tag.key},number]` : tag.key;
-
-      allTags[key] = {
-        key,
-        name: tag.key,
+      allTags[tag.key] = {
+        key: tag.key,
+        name: tag.name,
         kind: type === 'number' ? FieldKind.MEASUREMENT : FieldKind.TAG,
       };
     }
diff --git a/static/app/views/explore/hooks/useAddToDashboard.spec.tsx b/static/app/views/explore/hooks/useAddToDashboard.spec.tsx
new file mode 100644
index 00000000000000..1780ce8e4cdacd
--- /dev/null
+++ b/static/app/views/explore/hooks/useAddToDashboard.spec.tsx
@@ -0,0 +1,267 @@
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import {openAddToDashboardModal} from 'sentry/actionCreators/modal';
+import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
+import {useAddToDashboard} from 'sentry/views/explore/hooks/useAddToDashboard';
+import {useResultMode} from 'sentry/views/explore/hooks/useResultsMode';
+import {useVisualizes} from 'sentry/views/explore/hooks/useVisualizes';
+import {ChartType} from 'sentry/views/insights/common/components/chart';
+
+jest.mock('sentry/actionCreators/modal');
+jest.mock('sentry/views/explore/hooks/useVisualizes');
+jest.mock('sentry/views/explore/hooks/useResultsMode');
+
+function TestPage({visualizeIndex}: {visualizeIndex: number}) {
+  const {addToDashboard} = useAddToDashboard();
+  return <button onClick={() => addToDashboard(visualizeIndex)}>Add to Dashboard</button>;
+}
+
+describe('AddToDashboardButton', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    jest.mocked(useVisualizes).mockReturnValue([
+      [
+        {
+          yAxes: ['avg(span.duration)'],
+          chartType: ChartType.LINE,
+          label: 'Custom Explore Widget',
+        },
+      ],
+      jest.fn(),
+    ]);
+
+    jest.mocked(useResultMode).mockReturnValue(['samples', jest.fn()]);
+  });
+
+  it('opens the dashboard modal with the correct query for samples mode', async () => {
+    render(<TestPage visualizeIndex={0} />);
+
+    await userEvent.click(screen.getByText('Add to Dashboard'));
+
+    // The table columns are encoded as the fields for the defaultWidgetQuery
+    expect(openAddToDashboardModal).toHaveBeenCalledWith(
+      expect.objectContaining({
+        // For Add + Stay on Page
+        widget: {
+          title: 'Custom Explore Widget',
+          displayType: DisplayType.LINE,
+          interval: undefined,
+          limit: undefined,
+          widgetType: WidgetType.SPANS,
+          queries: [
+            {
+              aggregates: ['avg(span.duration)'],
+              columns: [],
+              fields: ['avg(span.duration)'],
+              conditions: '',
+              orderby: '-timestamp',
+              name: '',
+            },
+          ],
+        },
+
+        // For Open in Widget Builder
+        widgetAsQueryParams: expect.objectContaining({
+          dataset: WidgetType.SPANS,
+          defaultTableColumns: [
+            'id',
+            'project',
+            'span.op',
+            'span.description',
+            'span.duration',
+            'timestamp',
+          ],
+          defaultTitle: 'Custom Explore Widget',
+          defaultWidgetQuery:
+            'name=&aggregates=avg(span.duration)&columns=&fields=avg(span.duration)&conditions=&orderby=-timestamp',
+          displayType: DisplayType.LINE,
+          field: [
+            'id',
+            'project',
+            'span.op',
+            'span.description',
+            'span.duration',
+            'timestamp',
+          ],
+        }),
+      })
+    );
+  });
+
+  it('opens the dashboard modal with the correct query based on the visualize index', async () => {
+    // Mock a second visualize object
+    jest.mocked(useVisualizes).mockReturnValue([
+      [
+        {
+          yAxes: ['avg(span.duration)'],
+          chartType: ChartType.LINE,
+          label: 'Custom Explore Widget',
+        },
+        {
+          yAxes: ['max(span.duration)'],
+          chartType: ChartType.LINE,
+          label: 'Custom Explore Widget',
+        },
+      ],
+      jest.fn(),
+    ]);
+
+    render(<TestPage visualizeIndex={1} />);
+    await userEvent.click(screen.getByText('Add to Dashboard'));
+
+    // The group by and the yAxes are encoded as the fields for the defaultTableQuery
+    expect(openAddToDashboardModal).toHaveBeenCalledWith(
+      expect.objectContaining({
+        // For Add + Stay on Page
+        widget: {
+          title: 'Custom Explore Widget',
+          displayType: DisplayType.LINE,
+          interval: undefined,
+          limit: undefined,
+          widgetType: WidgetType.SPANS,
+          queries: [
+            {
+              aggregates: ['max(span.duration)'],
+              columns: [],
+              fields: ['max(span.duration)'],
+              conditions: '',
+              orderby: '-timestamp',
+              name: '',
+            },
+          ],
+        },
+
+        // For Open in Widget Builder
+        widgetAsQueryParams: expect.objectContaining({
+          dataset: WidgetType.SPANS,
+          defaultTableColumns: [
+            'id',
+            'project',
+            'span.op',
+            'span.description',
+            'span.duration',
+            'timestamp',
+          ],
+          defaultTitle: 'Custom Explore Widget',
+          defaultWidgetQuery:
+            'name=&aggregates=max(span.duration)&columns=&fields=max(span.duration)&conditions=&orderby=-timestamp',
+          displayType: DisplayType.LINE,
+          field: [
+            'id',
+            'project',
+            'span.op',
+            'span.description',
+            'span.duration',
+            'timestamp',
+          ],
+        }),
+      })
+    );
+  });
+
+  it('uses the yAxes for the aggregate mode', async () => {
+    jest.mocked(useResultMode).mockReturnValue(['aggregate', jest.fn()]);
+
+    render(<TestPage visualizeIndex={0} />);
+    await userEvent.click(screen.getByText('Add to Dashboard'));
+
+    expect(openAddToDashboardModal).toHaveBeenCalledWith(
+      expect.objectContaining({
+        // For Add + Stay on Page
+        widget: {
+          title: 'Custom Explore Widget',
+          displayType: DisplayType.LINE,
+          interval: undefined,
+          limit: undefined,
+          widgetType: WidgetType.SPANS,
+          queries: [
+            {
+              aggregates: ['avg(span.duration)'],
+              columns: [],
+              fields: ['avg(span.duration)'],
+              conditions: '',
+              orderby: '-avg(span.duration)',
+              name: '',
+            },
+          ],
+        },
+
+        // For Open in Widget Builder
+        widgetAsQueryParams: expect.objectContaining({
+          dataset: WidgetType.SPANS,
+          defaultTableColumns: ['avg(span.duration)'],
+          defaultTitle: 'Custom Explore Widget',
+          defaultWidgetQuery:
+            'name=&aggregates=avg(span.duration)&columns=&fields=avg(span.duration)&conditions=&orderby=-avg(span.duration)',
+          displayType: DisplayType.LINE,
+          field: ['avg(span.duration)'],
+        }),
+      })
+    );
+  });
+
+  it('takes the first 3 yAxes', async () => {
+    jest.mocked(useResultMode).mockReturnValue(['aggregate', jest.fn()]);
+    jest.mocked(useVisualizes).mockReturnValue([
+      [
+        {
+          yAxes: [
+            'avg(span.duration)',
+            'max(span.duration)',
+            'min(span.duration)',
+            'p90(span.duration)',
+          ],
+          chartType: ChartType.LINE,
+          label: 'Custom Explore Widget',
+        },
+      ],
+      jest.fn(),
+    ]);
+
+    render(<TestPage visualizeIndex={0} />);
+    await userEvent.click(screen.getByText('Add to Dashboard'));
+
+    expect(openAddToDashboardModal).toHaveBeenCalledWith(
+      expect.objectContaining({
+        // For Add + Stay on Page
+        widget: {
+          title: 'Custom Explore Widget',
+          displayType: DisplayType.LINE,
+          interval: undefined,
+          limit: undefined,
+          widgetType: WidgetType.SPANS,
+          queries: [
+            {
+              aggregates: [
+                'avg(span.duration)',
+                'max(span.duration)',
+                'min(span.duration)',
+              ],
+              columns: [],
+              fields: ['avg(span.duration)', 'max(span.duration)', 'min(span.duration)'],
+              conditions: '',
+              orderby: '-avg(span.duration)',
+              name: '',
+            },
+          ],
+        },
+
+        // For Open in Widget Builder
+        widgetAsQueryParams: expect.objectContaining({
+          dataset: WidgetType.SPANS,
+          defaultTableColumns: [
+            'avg(span.duration)',
+            'max(span.duration)',
+            'min(span.duration)',
+          ],
+          defaultTitle: 'Custom Explore Widget',
+          defaultWidgetQuery:
+            'name=&aggregates=avg(span.duration)%2Cmax(span.duration)%2Cmin(span.duration)&columns=&fields=avg(span.duration)%2Cmax(span.duration)%2Cmin(span.duration)&conditions=&orderby=-avg(span.duration)',
+          displayType: DisplayType.LINE,
+          field: ['avg(span.duration)', 'max(span.duration)', 'min(span.duration)'],
+        }),
+      })
+    );
+  });
+});
diff --git a/static/app/views/explore/hooks/useAddToDashboard.tsx b/static/app/views/explore/hooks/useAddToDashboard.tsx
new file mode 100644
index 00000000000000..cb8b3ce6a59b55
--- /dev/null
+++ b/static/app/views/explore/hooks/useAddToDashboard.tsx
@@ -0,0 +1,89 @@
+import {useCallback} from 'react';
+
+import {t} from 'sentry/locale';
+import type {NewQuery} from 'sentry/types/organization';
+import EventView from 'sentry/utils/discover/eventView';
+import {MutableSearch} from 'sentry/utils/tokenizeSearch';
+import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
+import usePageFilters from 'sentry/utils/usePageFilters';
+import useRouter from 'sentry/utils/useRouter';
+import {WidgetType} from 'sentry/views/dashboards/types';
+import {MAX_NUM_Y_AXES} from 'sentry/views/dashboards/widgetBuilder/buildSteps/yAxisStep/yAxisSelector';
+import {handleAddQueryToDashboard} from 'sentry/views/discover/utils';
+import {useDataset} from 'sentry/views/explore/hooks/useDataset';
+import {useGroupBys} from 'sentry/views/explore/hooks/useGroupBys';
+import {useResultMode} from 'sentry/views/explore/hooks/useResultsMode';
+import {useSampleFields} from 'sentry/views/explore/hooks/useSampleFields';
+import {getSorts} from 'sentry/views/explore/hooks/useSorts';
+import {useUserQuery} from 'sentry/views/explore/hooks/useUserQuery';
+import {useVisualizes} from 'sentry/views/explore/hooks/useVisualizes';
+import {formatSort} from 'sentry/views/explore/tables/aggregatesTable';
+
+export function useAddToDashboard() {
+  const location = useLocation();
+  const router = useRouter();
+  const {selection} = usePageFilters();
+  const organization = useOrganization();
+
+  const [resultMode] = useResultMode();
+  const [dataset] = useDataset();
+  const {groupBys} = useGroupBys();
+  const [visualizes] = useVisualizes();
+  const [sampleFields] = useSampleFields();
+  const [query] = useUserQuery();
+
+  const getEventView = useCallback(
+    (visualizeIndex: number) => {
+      const yAxes = visualizes[visualizeIndex].yAxes.slice(0, MAX_NUM_Y_AXES);
+
+      let fields;
+      if (resultMode === 'samples') {
+        fields = sampleFields.filter(Boolean);
+      } else {
+        fields = [...groupBys, ...yAxes].filter(Boolean);
+      }
+
+      const search = new MutableSearch(query);
+      const sorts = getSorts(fields, location);
+
+      const discoverQuery: NewQuery = {
+        name: t('Custom Explore Widget'),
+        fields,
+        orderby: sorts.map(formatSort),
+        query: search.formatString(),
+        version: 2,
+        dataset,
+        yAxis: yAxes,
+      };
+
+      const newEventView = EventView.fromNewQueryWithPageFilters(
+        discoverQuery,
+        selection
+      );
+      newEventView.dataset = dataset;
+      return newEventView;
+    },
+    [visualizes, resultMode, sampleFields, groupBys, query, location, dataset, selection]
+  );
+
+  const addToDashboard = useCallback(
+    (visualizeIndex: number) => {
+      const eventView = getEventView(visualizeIndex);
+
+      handleAddQueryToDashboard({
+        organization,
+        location,
+        eventView,
+        router,
+        yAxis: eventView.yAxis,
+        widgetType: WidgetType.SPANS,
+      });
+    },
+    [organization, location, getEventView, router]
+  );
+
+  return {
+    addToDashboard,
+  };
+}
diff --git a/static/app/views/explore/hooks/useAnalytics.tsx b/static/app/views/explore/hooks/useAnalytics.tsx
index e387d1034121ea..80f64fcde1bf3a 100644
--- a/static/app/views/explore/hooks/useAnalytics.tsx
+++ b/static/app/views/explore/hooks/useAnalytics.tsx
@@ -1,54 +1,65 @@
 import {useEffect} from 'react';
 
-import type {Organization} from 'sentry/types/organization';
+import type {Confidence, Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
+import type {UseApiQueryResult} from 'sentry/utils/queryClient';
+import type RequestError from 'sentry/utils/requestError/requestError';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-import type {useSpansQuery} from 'sentry/views/insights/common/queries/useSpansQuery';
 
 import type {Visualize} from './useVisualizes';
 
 export function useAnalytics({
-  result,
-  resultsMode,
+  resultLength,
+  resultMissingRoot,
+  resultMode,
+  resultStatus,
   visualizes,
   organization,
   columns,
   userQuery,
+  confidence,
 }: {
   columns: string[];
+  confidence: Confidence;
   organization: Organization;
-  result: ReturnType<typeof useSpansQuery>;
-  resultsMode: 'sample' | 'aggregate';
+  resultLength: number | undefined;
+  resultMode: 'span samples' | 'trace samples' | 'aggregates';
+  resultStatus: UseApiQueryResult<any, RequestError>['status'];
   userQuery: string;
   visualizes: Visualize[];
+  resultMissingRoot?: number;
 }) {
   useEffect(() => {
-    if (result.status === 'pending') {
+    if (resultStatus === 'pending') {
       return;
     }
 
     const search = new MutableSearch(userQuery);
     const params = {
-      query_status: result.status,
-      results_mode: resultsMode,
-      has_results: Array.isArray(result?.data) && result.data.length > 0,
+      organization,
+      columns,
+      columns_count: columns.filter(Boolean).length,
+      confidence,
+      query_status: resultStatus,
+      result_length: resultLength || 0,
+      result_missing_root: resultMissingRoot || 0,
+      result_mode: resultMode,
       user_queries: search.formatString(),
       user_queries_count: search.tokens.length,
       visualizes,
       visualizes_count: visualizes.length,
-      organization,
-      columns,
-      columns_count: columns.filter(Boolean).length,
     };
 
     trackAnalytics('trace.explorer.metadata', params);
   }, [
-    result.status,
-    result.data,
     organization,
-    resultsMode,
+    resultLength,
+    resultMissingRoot,
+    resultMode,
+    resultStatus,
     visualizes,
     columns,
     userQuery,
+    confidence,
   ]);
 }
diff --git a/static/app/views/explore/hooks/useDataset.tsx b/static/app/views/explore/hooks/useDataset.tsx
index 58d85d43e75163..6e276672c60a8a 100644
--- a/static/app/views/explore/hooks/useDataset.tsx
+++ b/static/app/views/explore/hooks/useDataset.tsx
@@ -9,27 +9,39 @@ import {useNavigate} from 'sentry/utils/useNavigate';
 interface Options {
   location: Location;
   navigate: ReturnType<typeof useNavigate>;
+  allowRPC?: boolean;
 }
 
-export function useDataset(): [DiscoverDatasets, (dataset: DiscoverDatasets) => void] {
+interface UseDatasetOptions {
+  allowRPC?: boolean;
+}
+
+export function useDataset(
+  options?: UseDatasetOptions
+): [DiscoverDatasets, (dataset: DiscoverDatasets) => void] {
   const location = useLocation();
   const navigate = useNavigate();
-  const options = {location, navigate};
 
-  return useDatasetImpl(options);
+  return useDatasetImpl({location, navigate, allowRPC: options?.allowRPC});
 }
 
 function useDatasetImpl({
   location,
   navigate,
+  allowRPC,
 }: Options): [DiscoverDatasets, (dataset: DiscoverDatasets) => void] {
   const dataset: DiscoverDatasets = useMemo(() => {
     const rawDataset = decodeScalar(location.query.dataset);
     if (rawDataset === 'spansIndexed') {
       return DiscoverDatasets.SPANS_INDEXED;
     }
+
+    if (allowRPC && rawDataset === 'spansRpc') {
+      return DiscoverDatasets.SPANS_EAP_RPC;
+    }
+
     return DiscoverDatasets.SPANS_EAP;
-  }, [location.query.dataset]);
+  }, [location.query.dataset, allowRPC]);
 
   const setDataset = useCallback(
     (newDataset: DiscoverDatasets) => {
diff --git a/static/app/views/explore/hooks/useGroupBys.spec.tsx b/static/app/views/explore/hooks/useGroupBys.spec.tsx
index 93f21496f99efd..2bdbafaad4ea95 100644
--- a/static/app/views/explore/hooks/useGroupBys.spec.tsx
+++ b/static/app/views/explore/hooks/useGroupBys.spec.tsx
@@ -34,7 +34,7 @@ describe('useGroupBys', function () {
     }
 
     render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP}>
+      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
         <TestPage />
       </SpanTagsProvider>,
       {disableRouterMocks: true}
diff --git a/static/app/views/explore/hooks/useResultsMode.spec.tsx b/static/app/views/explore/hooks/useResultsMode.spec.tsx
index ca060618933591..7b62332b3bd6b0 100644
--- a/static/app/views/explore/hooks/useResultsMode.spec.tsx
+++ b/static/app/views/explore/hooks/useResultsMode.spec.tsx
@@ -31,7 +31,7 @@ describe('useResultMode', function () {
     }
 
     render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP}>
+      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
         <TestPage />
       </SpanTagsProvider>,
       {disableRouterMocks: true}
@@ -39,7 +39,7 @@ describe('useResultMode', function () {
 
     expect(resultMode).toEqual('samples'); // default
     expect(sampleFields).toEqual([
-      'span_id',
+      'id',
       'project',
       'span.op',
       'span.description',
@@ -56,7 +56,7 @@ describe('useResultMode', function () {
     expect(resultMode).toEqual('samples');
 
     expect(sampleFields).toEqual([
-      'span_id',
+      'id',
       'project',
       'span.op',
       'span.description',
diff --git a/static/app/views/explore/hooks/useSampleFields.spec.tsx b/static/app/views/explore/hooks/useSampleFields.spec.tsx
index 2e5f464458e05c..59ccc2aff095b4 100644
--- a/static/app/views/explore/hooks/useSampleFields.spec.tsx
+++ b/static/app/views/explore/hooks/useSampleFields.spec.tsx
@@ -14,7 +14,7 @@ describe('useSampleFields', function () {
     render(<TestPage />, {disableRouterMocks: true});
 
     expect(sampleFields).toEqual([
-      'span_id',
+      'id',
       'project',
       'span.op',
       'span.description',
@@ -27,7 +27,7 @@ describe('useSampleFields', function () {
 
     act(() => setSampleFields([]));
     expect(sampleFields).toEqual([
-      'span_id',
+      'id',
       'project',
       'span.op',
       'span.description',
diff --git a/static/app/views/explore/hooks/useSampleFields.tsx b/static/app/views/explore/hooks/useSampleFields.tsx
index 762425d8773c44..701e6b80db9458 100644
--- a/static/app/views/explore/hooks/useSampleFields.tsx
+++ b/static/app/views/explore/hooks/useSampleFields.tsx
@@ -31,14 +31,7 @@ function useSampleFieldsImpl({
       return fields;
     }
 
-    return [
-      'span_id',
-      'project',
-      'span.op',
-      'span.description',
-      'span.duration',
-      'timestamp',
-    ];
+    return ['id', 'project', 'span.op', 'span.description', 'span.duration', 'timestamp'];
   }, [location.query.field]);
 
   const setSampleFields = useCallback(
diff --git a/static/app/views/explore/hooks/useSorts.tsx b/static/app/views/explore/hooks/useSorts.tsx
index 67f83410b3bf4c..6a700f2d4d777e 100644
--- a/static/app/views/explore/hooks/useSorts.tsx
+++ b/static/app/views/explore/hooks/useSorts.tsx
@@ -30,34 +30,7 @@ function useSortsImpl({
   location,
   navigate,
 }: ImplOptions): [Sort[], (newSorts: Sort[]) => void] {
-  const sorts = useMemo(() => {
-    const rawSorts = decodeSorts(location.query.sort);
-
-    // Try to assign a default sort if possible
-    if (!rawSorts.length || !rawSorts.some(rawSort => fields.includes(rawSort.field))) {
-      if (fields.includes('timestamp')) {
-        return [
-          {
-            field: 'timestamp',
-            kind: 'desc' as const,
-          },
-        ];
-      }
-
-      if (fields.length) {
-        return [
-          {
-            field: fields[0],
-            kind: 'desc' as const,
-          },
-        ];
-      }
-
-      return [];
-    }
-
-    return rawSorts;
-  }, [fields, location.query.sort]);
+  const sorts = useMemo(() => getSorts(fields, location), [fields, location]);
 
   const setSort = useCallback(
     (newSorts: Sort[]) => {
@@ -77,3 +50,32 @@ function useSortsImpl({
 
   return [sorts, setSort];
 }
+
+export function getSorts(fields: Field[], location: Location) {
+  const rawSorts = decodeSorts(location.query.sort);
+
+  // Try to assign a default sort if possible
+  if (!rawSorts.length || !rawSorts.some(rawSort => fields.includes(rawSort.field))) {
+    if (fields.includes('timestamp')) {
+      return [
+        {
+          field: 'timestamp',
+          kind: 'desc' as const,
+        },
+      ];
+    }
+
+    if (fields.length) {
+      return [
+        {
+          field: fields[0],
+          kind: 'desc' as const,
+        },
+      ];
+    }
+
+    return [];
+  }
+
+  return rawSorts;
+}
diff --git a/static/app/views/explore/hooks/useTab.tsx b/static/app/views/explore/hooks/useTab.tsx
new file mode 100644
index 00000000000000..a29772eeca83fa
--- /dev/null
+++ b/static/app/views/explore/hooks/useTab.tsx
@@ -0,0 +1,39 @@
+import {useCallback, useMemo} from 'react';
+
+import {decodeScalar} from 'sentry/utils/queryString';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
+
+export enum Tab {
+  SPAN = 'span',
+  TRACE = 'trace',
+}
+
+export function useTab(): [Tab, (tab: Tab) => void] {
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  const tab = useMemo(() => {
+    const rawTab = decodeScalar(location.query.table);
+    if (rawTab === 'trace') {
+      return Tab.TRACE;
+    }
+    return Tab.SPAN;
+  }, [location.query.table]);
+
+  const setTab = useCallback(
+    (newTab: Tab) => {
+      navigate({
+        ...location,
+        query: {
+          ...location.query,
+          table: newTab,
+          cursor: undefined,
+        },
+      });
+    },
+    [location, navigate]
+  );
+
+  return [tab, setTab];
+}
diff --git a/static/app/views/explore/hooks/useTraces.tsx b/static/app/views/explore/hooks/useTraces.tsx
index de341f5811a9c0..8f78eb9b02863c 100644
--- a/static/app/views/explore/hooks/useTraces.tsx
+++ b/static/app/views/explore/hooks/useTraces.tsx
@@ -1,13 +1,13 @@
-import {useEffect} from 'react';
-
 import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
 import type {PageFilters} from 'sentry/types/core';
-import {trackAnalytics} from 'sentry/utils/analytics';
+import type {QueryError} from 'sentry/utils/discover/genericDiscoverQuery';
+import {parseError} from 'sentry/utils/discover/genericDiscoverQuery';
 import type {DiscoverDatasets} from 'sentry/utils/discover/types';
+import type {UseApiQueryResult} from 'sentry/utils/queryClient';
 import {useApiQuery} from 'sentry/utils/queryClient';
+import type RequestError from 'sentry/utils/requestError/requestError';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
-import useProjects from 'sentry/utils/useProjects';
 
 export const BREAKDOWN_SLICES = 40;
 
@@ -65,6 +65,10 @@ interface UseTracesOptions {
   sort?: 'timestamp' | '-timestamp';
 }
 
+type UseTracesResult = Omit<UseApiQueryResult<TraceResults, RequestError>, 'error'> & {
+  error: QueryError | null;
+};
+
 export function useTraces({
   cursor,
   dataset,
@@ -73,9 +77,8 @@ export function useTraces({
   limit,
   query,
   sort,
-}: UseTracesOptions) {
+}: UseTracesOptions): UseTracesResult {
   const organization = useOrganization();
-  const {projects} = useProjects();
   const {selection} = usePageFilters();
 
   const path = `/organizations/${organization.slug}/traces/`;
@@ -94,25 +97,7 @@ export function useTraces({
     },
   };
 
-  const serializedEndpointOptions = JSON.stringify(endpointOptions);
-
-  let queries: string[] = [];
-  if (Array.isArray(query)) {
-    queries = query;
-  } else if (query !== undefined) {
-    queries = [query];
-  }
-
-  useEffect(() => {
-    trackAnalytics('trace_explorer.search_request', {
-      organization,
-      queries,
-    });
-    // `queries` is already included as a dep in serializedEndpointOptions
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [serializedEndpointOptions, organization]);
-
-  const result = useApiQuery<TraceResults>([path, endpointOptions], {
+  const {error, ...rest} = useApiQuery<TraceResults>([path, endpointOptions], {
     staleTime: 0,
     refetchOnWindowFocus: false,
     refetchOnMount: false,
@@ -120,38 +105,8 @@ export function useTraces({
     enabled,
   });
 
-  useEffect(() => {
-    if (result.status === 'success') {
-      const project_slugs = [...new Set(result.data.data.map(trace => trace.project))];
-      const project_platforms = projects
-        .filter(p => project_slugs.includes(p.slug))
-        .map(p => p.platform ?? '');
-
-      trackAnalytics('trace_explorer.search_success', {
-        organization,
-        queries,
-        has_data: result.data.data.length > 0,
-        num_traces: result.data.data.length,
-        num_missing_trace_root: result.data.data.filter(trace => trace.name === null)
-          .length,
-        project_platforms,
-      });
-    } else if (result.status === 'error') {
-      const response = result.error.responseJSON;
-      const error =
-        typeof response?.detail === 'string'
-          ? response?.detail
-          : response?.detail?.message;
-      trackAnalytics('trace_explorer.search_failure', {
-        organization,
-        queries,
-        error: error ?? '',
-      });
-    }
-    // result.status is tied to result.data. No need to explicitly
-    // include result.data as an additional dep.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [serializedEndpointOptions, result.status, organization]);
-
-  return result;
+  return {
+    ...rest,
+    error: parseError(error),
+  };
 }
diff --git a/static/app/views/explore/hooks/useVisualizes.spec.tsx b/static/app/views/explore/hooks/useVisualizes.spec.tsx
index b6ff6a24d6df12..ee5773ef46ce0e 100644
--- a/static/app/views/explore/hooks/useVisualizes.spec.tsx
+++ b/static/app/views/explore/hooks/useVisualizes.spec.tsx
@@ -18,7 +18,7 @@ describe('useVisualizes', function () {
       {
         chartType: ChartType.LINE,
         label: 'A',
-        yAxes: ['count(span.duration)'],
+        yAxes: ['avg(span.duration)'],
       },
     ]); // default
 
@@ -36,7 +36,7 @@ describe('useVisualizes', function () {
       {
         chartType: ChartType.LINE,
         label: 'A',
-        yAxes: ['count(span.duration)'],
+        yAxes: ['avg(span.duration)'],
       },
     ]); // default
 
diff --git a/static/app/views/explore/hooks/useVisualizes.tsx b/static/app/views/explore/hooks/useVisualizes.tsx
index b9dcc7e0c82110..5f7ec106f6e54c 100644
--- a/static/app/views/explore/hooks/useVisualizes.tsx
+++ b/static/app/views/explore/hooks/useVisualizes.tsx
@@ -12,6 +12,8 @@ import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import {ChartType} from 'sentry/views/insights/common/components/chart';
 
+export const MAX_VISUALIZES = 4;
+
 type BaseVisualize = {
   chartType: ChartType;
   yAxes: string[];
diff --git a/static/app/views/explore/tables/aggregatesTable.tsx b/static/app/views/explore/tables/aggregatesTable.tsx
index af881485008d8e..e61c1cb3f6bebc 100644
--- a/static/app/views/explore/tables/aggregatesTable.tsx
+++ b/static/app/views/explore/tables/aggregatesTable.tsx
@@ -1,4 +1,5 @@
-import {Fragment, useMemo} from 'react';
+import type {Dispatch, SetStateAction} from 'react';
+import {Fragment, useEffect, useMemo} from 'react';
 import styled from '@emotion/styled';
 
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
@@ -8,15 +9,15 @@ import {CHART_PALETTE} from 'sentry/constants/chartPalette';
 import {IconArrow} from 'sentry/icons/iconArrow';
 import {IconWarning} from 'sentry/icons/iconWarning';
 import {t} from 'sentry/locale';
-import type {NewQuery} from 'sentry/types/organization';
+import type {Confidence, NewQuery} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
 import EventView from 'sentry/utils/discover/eventView';
 import type {Sort} from 'sentry/utils/discover/fields';
 import {
   fieldAlignment,
-  formatParsedFunction,
   getAggregateAlias,
   parseFunction,
+  prettifyParsedFunction,
 } from 'sentry/utils/discover/fields';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -32,16 +33,15 @@ import {
   useTableStyles,
 } from 'sentry/views/explore/components/table';
 import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
+import {useAnalytics} from 'sentry/views/explore/hooks/useAnalytics';
 import {useDataset} from 'sentry/views/explore/hooks/useDataset';
 import {useGroupBys} from 'sentry/views/explore/hooks/useGroupBys';
 import {useSorts} from 'sentry/views/explore/hooks/useSorts';
+import {TOP_EVENTS_LIMIT, useTopEvents} from 'sentry/views/explore/hooks/useTopEvents';
 import {useUserQuery} from 'sentry/views/explore/hooks/useUserQuery';
 import {useVisualizes} from 'sentry/views/explore/hooks/useVisualizes';
 import {useSpansQuery} from 'sentry/views/insights/common/queries/useSpansQuery';
 
-import {useAnalytics} from '../hooks/useAnalytics';
-import {TOP_EVENTS_LIMIT, useTopEvents} from '../hooks/useTopEvents';
-
 import {FieldRenderer} from './fieldRenderer';
 
 export function formatSort(sort: Sort): string {
@@ -49,19 +49,38 @@ export function formatSort(sort: Sort): string {
   return `${direction}${getAggregateAlias(sort.field)}`;
 }
 
-interface AggregatesTableProps {}
+interface AggregatesTableProps {
+  confidence: Confidence;
+  setError: Dispatch<SetStateAction<string>>;
+}
 
-export function AggregatesTable({}: AggregatesTableProps) {
+export function AggregatesTable({confidence, setError}: AggregatesTableProps) {
   const {selection} = usePageFilters();
   const topEvents = useTopEvents();
   const organization = useOrganization();
-  const [dataset] = useDataset();
+  const [dataset] = useDataset({allowRPC: true});
   const {groupBys} = useGroupBys();
   const [visualizes] = useVisualizes();
   const fields = useMemo(() => {
-    return [...groupBys, ...visualizes.flatMap(visualize => visualize.yAxes)].filter(
-      Boolean
-    );
+    const allFields: string[] = [];
+
+    for (const visualize of visualizes) {
+      for (const yAxis of visualize.yAxes) {
+        if (allFields.includes(yAxis)) {
+          continue;
+        }
+        allFields.push(yAxis);
+      }
+    }
+
+    for (const groupBy of groupBys) {
+      if (allFields.includes(groupBy)) {
+        continue;
+      }
+      allFields.push(groupBy);
+    }
+
+    return allFields.filter(Boolean);
   }, [groupBys, visualizes]);
   const [sorts, setSorts] = useSorts({fields});
   const [query] = useUserQuery();
@@ -95,13 +114,19 @@ export function AggregatesTable({}: AggregatesTableProps) {
     referrer: 'api.explore.spans-aggregates-table',
   });
 
+  useEffect(() => {
+    setError(result.error?.message ?? '');
+  }, [setError, result.error?.message]);
+
   useAnalytics({
-    result,
+    resultLength: result.data?.length,
+    resultMode: 'aggregates',
+    resultStatus: result.status,
     visualizes,
     organization,
     columns: groupBys,
     userQuery: query,
-    resultsMode: 'aggregate',
+    confidence,
   });
 
   const {tableStyles} = useTableStyles({
@@ -140,7 +165,7 @@ export function AggregatesTable({}: AggregatesTableProps) {
 
               const func = parseFunction(field);
               if (func) {
-                label = formatParsedFunction(func);
+                label = prettifyParsedFunction(func);
               }
 
               const direction = sorts.find(s => s.field === field)?.kind;
diff --git a/static/app/views/explore/tables/columnEditorModal.spec.tsx b/static/app/views/explore/tables/columnEditorModal.spec.tsx
index 214efd0a7b2ec4..42fdead7c28858 100644
--- a/static/app/views/explore/tables/columnEditorModal.spec.tsx
+++ b/static/app/views/explore/tables/columnEditorModal.spec.tsx
@@ -128,11 +128,17 @@ describe('ColumnEditorModal', function () {
       expect(column).toHaveTextContent(columns2[i]);
     });
 
-    const options = ['id', 'project', 'span.duration', 'span.op'];
+    const options: [string, 'string' | 'number'][] = [
+      ['id', 'string'],
+      ['project', 'string'],
+      ['span.duration', 'number'],
+      ['span.op', 'string'],
+    ];
     await userEvent.click(screen.getByRole('button', {name: 'Column None'}));
     const columnOptions = await screen.findAllByRole('option');
     columnOptions.forEach((option, i) => {
-      expect(option).toHaveTextContent(options[i]);
+      expect(option).toHaveTextContent(options[i][0]);
+      expect(option).toHaveTextContent(options[i][1]);
     });
 
     await userEvent.click(columnOptions[3]);
@@ -170,11 +176,17 @@ describe('ColumnEditorModal', function () {
       expect(column).toHaveTextContent(columns1[i]);
     });
 
-    const options = ['id', 'project', 'span.duration', 'span.op'];
-    await userEvent.click(screen.getByRole('button', {name: 'Column project'}));
+    const options: [string, 'string' | 'number'][] = [
+      ['id', 'string'],
+      ['project', 'string'],
+      ['span.duration', 'number'],
+      ['span.op', 'string'],
+    ];
+    await userEvent.click(screen.getByRole('button', {name: 'Column project string'}));
     const columnOptions = await screen.findAllByRole('option');
     columnOptions.forEach((option, i) => {
-      expect(option).toHaveTextContent(options[i]);
+      expect(option).toHaveTextContent(options[i][0]);
+      expect(option).toHaveTextContent(options[i][1]);
     });
 
     await userEvent.click(columnOptions[3]);
diff --git a/static/app/views/explore/tables/columnEditorModal.tsx b/static/app/views/explore/tables/columnEditorModal.tsx
index f9913eaa1693b1..6715602d2b8085 100644
--- a/static/app/views/explore/tables/columnEditorModal.tsx
+++ b/static/app/views/explore/tables/columnEditorModal.tsx
@@ -16,6 +16,8 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {TagCollection} from 'sentry/types/group';
 import {defined} from 'sentry/utils';
+import {classifyTagKey, prettifyTagKey} from 'sentry/utils/discover/fields';
+import {FieldKind} from 'sentry/utils/fields';
 import {TypeBadge} from 'sentry/views/explore/components/typeBadge';
 
 import {DragNDropContext} from '../contexts/dragNDropContext';
@@ -40,12 +42,25 @@ export function ColumnEditorModal({
 }: ColumnEditorModalProps) {
   const tags: SelectOption<string>[] = useMemo(() => {
     const allTags = [
+      ...columns
+        .filter(
+          column =>
+            !stringTags.hasOwnProperty(column) && !numberTags.hasOwnProperty(column)
+        )
+        .map(column => {
+          return {
+            label: prettifyTagKey(column),
+            value: column,
+            textValue: column,
+            trailingItems: <TypeBadge kind={classifyTagKey(column)} />,
+          };
+        }),
       ...Object.values(stringTags).map(tag => {
         return {
           label: tag.name,
           value: tag.key,
           textValue: tag.name,
-          trailingItems: <TypeBadge tag={tag} />,
+          trailingItems: <TypeBadge kind={FieldKind.TAG} />,
         };
       }),
       ...Object.values(numberTags).map(tag => {
@@ -53,7 +68,7 @@ export function ColumnEditorModal({
           label: tag.name,
           value: tag.key,
           textValue: tag.name,
-          trailingItems: <TypeBadge tag={tag} />,
+          trailingItems: <TypeBadge kind={FieldKind.MEASUREMENT} />,
         };
       }),
     ];
@@ -69,14 +84,14 @@ export function ColumnEditorModal({
       return 0;
     });
     return allTags;
-  }, [stringTags, numberTags]);
+  }, [columns, stringTags, numberTags]);
 
   // We keep a temporary state for the columns so that we can apply the changes
   // only when the user clicks on the apply button.
   const [tempColumns, setTempColumns] = useState<string[]>(columns);
 
   function handleApply() {
-    onColumnsChange(tempColumns);
+    onColumnsChange(tempColumns.filter(Boolean));
     closeModal();
   }
 
@@ -162,7 +177,7 @@ function ColumnEditorRow({
       if (defined(tag)) {
         return (
           <TriggerLabel>
-            {tag.label}
+            <TriggerLabelText>{tag.label}</TriggerLabelText>
             {tag.trailingItems &&
               (typeof tag.trailingItems === 'function'
                 ? tag.trailingItems({
@@ -232,13 +247,19 @@ const RowContainer = styled('div')`
 `;
 
 const StyledCompactSelect = styled(CompactSelect)`
-  flex-grow: 1;
+  flex: 1 1;
+  min-width: 0;
 `;
 
 const TriggerLabel = styled('span')`
-  ${p => p.theme.overflowEllipsis}
   text-align: left;
-  line-height: normal;
+  line-height: 20px;
   display: flex;
   justify-content: space-between;
+  flex: 1 1;
+  min-width: 0;
+`;
+
+const TriggerLabelText = styled('span')`
+  ${p => p.theme.overflowEllipsis}
 `;
diff --git a/static/app/views/explore/tables/fieldRenderer.tsx b/static/app/views/explore/tables/fieldRenderer.tsx
index 49419bad455e3c..d55bf4844d4eec 100644
--- a/static/app/views/explore/tables/fieldRenderer.tsx
+++ b/static/app/views/explore/tables/fieldRenderer.tsx
@@ -6,7 +6,10 @@ import type {TableDataRow} from 'sentry/utils/discover/discoverQuery';
 import type {EventData, MetaType} from 'sentry/utils/discover/eventView';
 import EventView from 'sentry/utils/discover/eventView';
 import {getFieldRenderer} from 'sentry/utils/discover/fieldRenderers';
+import {Container} from 'sentry/utils/discover/styles';
 import {generateLinkToEventInTraceView} from 'sentry/utils/discover/urls';
+import {getShortEventId} from 'sentry/utils/events';
+import {generateProfileFlamechartRouteWithQuery} from 'sentry/utils/profiling/routes';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -33,7 +36,7 @@ export function FieldRenderer({data, meta, unit, column}: FieldProps) {
   const query = new MutableSearch(userQuery);
   const field = column.name;
 
-  const renderer = getFieldRenderer(field, meta, false);
+  const renderer = getExploreFieldRenderer(field, meta);
 
   let rendered = renderer(data, {
     location,
@@ -76,6 +79,15 @@ export function FieldRenderer({data, meta, unit, column}: FieldProps) {
     rendered = <Link to={target}>{rendered}</Link>;
   }
 
+  if (field === 'profile.id') {
+    const target = generateProfileFlamechartRouteWithQuery({
+      orgSlug: organization.slug,
+      projectSlug: data.project,
+      profileId: data['profile.id'],
+    });
+    rendered = <Link to={target}>{rendered}</Link>;
+  }
+
   return (
     <CellAction
       column={column}
@@ -91,6 +103,28 @@ export function FieldRenderer({data, meta, unit, column}: FieldProps) {
   );
 }
 
+function getExploreFieldRenderer(
+  field: string,
+  meta: MetaType
+): ReturnType<typeof getFieldRenderer> {
+  if (field === 'id' || field === 'span_id') {
+    return eventIdRenderFunc(field);
+  }
+  return getFieldRenderer(field, meta, false);
+}
+
+function eventIdRenderFunc(field: string) {
+  function renderer(data: EventData) {
+    const spanId: string | unknown = data?.[field];
+    if (typeof spanId !== 'string') {
+      return null;
+    }
+
+    return <Container>{getShortEventId(spanId)}</Container>;
+  }
+  return renderer;
+}
+
 const StyledTimeSince = styled(TimeSince)`
   width: fit-content;
 `;
diff --git a/static/app/views/explore/tables/index.tsx b/static/app/views/explore/tables/index.tsx
index eedb0bae837b39..14dd2eeea628b9 100644
--- a/static/app/views/explore/tables/index.tsx
+++ b/static/app/views/explore/tables/index.tsx
@@ -1,4 +1,5 @@
-import {Fragment, useCallback, useMemo} from 'react';
+import type {Dispatch, SetStateAction} from 'react';
+import {Fragment, useCallback} from 'react';
 import styled from '@emotion/styled';
 
 import {openModal} from 'sentry/actionCreators/modal';
@@ -7,71 +8,37 @@ import {TabList, Tabs} from 'sentry/components/tabs';
 import {IconTable} from 'sentry/icons/iconTable';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {decodeScalar} from 'sentry/utils/queryString';
-import {useLocation} from 'sentry/utils/useLocation';
-import {useNavigate} from 'sentry/utils/useNavigate';
+import type {Confidence} from 'sentry/types/organization';
+import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
 import {useResultMode} from 'sentry/views/explore/hooks/useResultsMode';
 import {useSampleFields} from 'sentry/views/explore/hooks/useSampleFields';
-
-import {useSpanTags} from '../contexts/spanTagsContext';
-
-import {TracesTable} from './tracesTable/index';
-import {AggregatesTable} from './aggregatesTable';
-import {ColumnEditorModal} from './columnEditorModal';
-import {SpansTable} from './spansTable';
-
-enum Tab {
-  SPAN = 'span',
-  TRACE = 'trace',
-}
-
-function useTab(): [Tab, (tab: Tab) => void] {
-  const location = useLocation();
-  const navigate = useNavigate();
-
-  const tab = useMemo(() => {
-    const rawTab = decodeScalar(location.query.table);
-    if (rawTab === 'trace') {
-      return Tab.TRACE;
-    }
-    return Tab.SPAN;
-  }, [location.query.table]);
-
-  const setTab = useCallback(
-    (newTab: Tab) => {
-      navigate({
-        ...location,
-        query: {
-          ...location.query,
-          table: newTab,
-          cursor: undefined,
-        },
-      });
-    },
-    [location, navigate]
-  );
-
-  return [tab, setTab];
+import {Tab, useTab} from 'sentry/views/explore/hooks/useTab';
+import {AggregatesTable} from 'sentry/views/explore/tables/aggregatesTable';
+import {ColumnEditorModal} from 'sentry/views/explore/tables/columnEditorModal';
+import {SpansTable} from 'sentry/views/explore/tables/spansTable';
+import {TracesTable} from 'sentry/views/explore/tables/tracesTable/index';
+
+interface ExploreTablesProps {
+  confidence: Confidence;
+  setError: Dispatch<SetStateAction<string>>;
 }
 
-interface ExploreTablesProps {}
-
-export function ExploreTables({}: ExploreTablesProps) {
+export function ExploreTables(props: ExploreTablesProps) {
   const [resultMode] = useResultMode();
 
   return (
     <Fragment>
-      {resultMode === 'aggregate' && <ExploreAggregatesTable />}
-      {resultMode === 'samples' && <ExploreSamplesTable />}
+      {resultMode === 'aggregate' && <ExploreAggregatesTable {...props} />}
+      {resultMode === 'samples' && <ExploreSamplesTable {...props} />}
     </Fragment>
   );
 }
 
-function ExploreAggregatesTable() {
-  return <AggregatesTable />;
+function ExploreAggregatesTable(props: ExploreTablesProps) {
+  return <AggregatesTable {...props} />;
 }
 
-function ExploreSamplesTable() {
+function ExploreSamplesTable(props: ExploreTablesProps) {
   const [tab, setTab] = useTab();
 
   const [fields, setFields] = useSampleFields();
@@ -110,8 +77,8 @@ function ExploreSamplesTable() {
           {t('Edit Table')}
         </Button>
       </SamplesTableHeader>
-      {tab === Tab.SPAN && <SpansTable />}
-      {tab === Tab.TRACE && <TracesTable />}
+      {tab === Tab.SPAN && <SpansTable {...props} />}
+      {tab === Tab.TRACE && <TracesTable {...props} />}
     </Fragment>
   );
 }
diff --git a/static/app/views/explore/tables/spansTable.tsx b/static/app/views/explore/tables/spansTable.tsx
index c7c6358e4574ce..d19ed8a809865b 100644
--- a/static/app/views/explore/tables/spansTable.tsx
+++ b/static/app/views/explore/tables/spansTable.tsx
@@ -1,4 +1,5 @@
-import {Fragment, useMemo} from 'react';
+import type {Dispatch, SetStateAction} from 'react';
+import {Fragment, useEffect, useMemo} from 'react';
 import styled from '@emotion/styled';
 
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
@@ -7,10 +8,10 @@ import Pagination from 'sentry/components/pagination';
 import {IconArrow} from 'sentry/icons/iconArrow';
 import {IconWarning} from 'sentry/icons/iconWarning';
 import {t} from 'sentry/locale';
-import type {NewQuery} from 'sentry/types/organization';
+import type {Confidence, NewQuery} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
 import EventView from 'sentry/utils/discover/eventView';
-import {fieldAlignment} from 'sentry/utils/discover/fields';
+import {fieldAlignment, prettifyTagKey} from 'sentry/utils/discover/fields';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
@@ -25,36 +26,43 @@ import {
   useTableStyles,
 } from 'sentry/views/explore/components/table';
 import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
+import {useAnalytics} from 'sentry/views/explore/hooks/useAnalytics';
 import {useDataset} from 'sentry/views/explore/hooks/useDataset';
 import {useSampleFields} from 'sentry/views/explore/hooks/useSampleFields';
 import {useSorts} from 'sentry/views/explore/hooks/useSorts';
 import {useUserQuery} from 'sentry/views/explore/hooks/useUserQuery';
+import {useVisualizes} from 'sentry/views/explore/hooks/useVisualizes';
 import {useSpansQuery} from 'sentry/views/insights/common/queries/useSpansQuery';
 
-import {useAnalytics} from '../hooks/useAnalytics';
-import {useVisualizes} from '../hooks/useVisualizes';
-
 import {FieldRenderer} from './fieldRenderer';
 
-interface SpansTableProps {}
+interface SpansTableProps {
+  confidence: Confidence;
+  setError: Dispatch<SetStateAction<string>>;
+}
 
-export function SpansTable({}: SpansTableProps) {
+export function SpansTable({confidence, setError}: SpansTableProps) {
   const {selection} = usePageFilters();
 
-  const [dataset] = useDataset();
+  const [dataset] = useDataset({allowRPC: true});
   const [fields] = useSampleFields();
   const [sorts, setSorts] = useSorts({fields});
   const [query] = useUserQuery();
   const [visualizes] = useVisualizes();
   const organization = useOrganization();
 
+  const visibleFields = useMemo(
+    () => (fields.includes('id') ? fields : ['id', ...fields]),
+    [fields]
+  );
+
   const eventView = useMemo(() => {
     const queryFields = [
-      ...fields,
+      ...visibleFields,
       'project',
       'trace',
       'transaction.span_id',
-      'span_id',
+      'id',
       'timestamp',
     ];
 
@@ -76,7 +84,7 @@ export function SpansTable({}: SpansTableProps) {
     };
 
     return EventView.fromNewQueryWithPageFilters(discoverQuery, selection);
-  }, [dataset, fields, sorts, query, selection]);
+  }, [dataset, sorts, query, selection, visibleFields]);
 
   const columns = useMemo(() => eventView.getColumns(), [eventView]);
 
@@ -87,17 +95,23 @@ export function SpansTable({}: SpansTableProps) {
     allowAggregateConditions: false,
   });
 
+  useEffect(() => {
+    setError(result.error?.message ?? '');
+  }, [setError, result.error?.message]);
+
   useAnalytics({
-    result,
+    resultLength: result.data?.length,
+    resultMode: 'span samples',
+    resultStatus: result.status,
     visualizes,
     organization,
     columns: fields,
     userQuery: query,
-    resultsMode: 'sample',
+    confidence,
   });
 
   const {tableStyles} = useTableStyles({
-    items: fields.map(field => {
+    items: visibleFields.map(field => {
       return {
         label: field,
         value: field,
@@ -115,7 +129,7 @@ export function SpansTable({}: SpansTableProps) {
       <Table style={tableStyles}>
         <TableHead>
           <TableRow>
-            {fields.map((field, i) => {
+            {visibleFields.map((field, i) => {
               // Hide column names before alignment is determined
               if (result.isPending) {
                 return <TableHeadCell key={i} isFirst={i === 0} />;
@@ -139,7 +153,7 @@ export function SpansTable({}: SpansTableProps) {
                   isFirst={i === 0}
                   onClick={updateSort}
                 >
-                  <span>{tag?.name ?? field}</span>
+                  <span>{tag?.name ?? prettifyTagKey(field)}</span>
                   {defined(direction) && (
                     <IconArrow
                       size="xs"
@@ -169,7 +183,7 @@ export function SpansTable({}: SpansTableProps) {
           ) : result.isFetched && result.data?.length ? (
             result.data?.map((row, i) => (
               <TableRow key={i}>
-                {fields.map((field, j) => {
+                {visibleFields.map((field, j) => {
                   return (
                     <TableBodyCell key={j}>
                       <FieldRenderer
diff --git a/static/app/views/explore/tables/tracesTable/fieldRenderers.tsx b/static/app/views/explore/tables/tracesTable/fieldRenderers.tsx
index 8a1f9710533936..830bfb6289ef17 100644
--- a/static/app/views/explore/tables/tracesTable/fieldRenderers.tsx
+++ b/static/app/views/explore/tables/tracesTable/fieldRenderers.tsx
@@ -433,7 +433,7 @@ interface TraceIdRendererProps {
   location: Location;
   timestamp: number; // in milliseconds
   traceId: string;
-  onClick?: () => void;
+  onClick?: React.ComponentProps<typeof Link>['onClick'];
   transactionId?: string;
 }
 
diff --git a/static/app/views/explore/tables/tracesTable/index.tsx b/static/app/views/explore/tables/tracesTable/index.tsx
index 74565fd8297ea7..44594fc76ed15d 100644
--- a/static/app/views/explore/tables/tracesTable/index.tsx
+++ b/static/app/views/explore/tables/tracesTable/index.tsx
@@ -1,4 +1,5 @@
-import {Fragment, useCallback, useMemo, useState} from 'react';
+import type {Dispatch, SetStateAction} from 'react';
+import {Fragment, useCallback, useEffect, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
 import debounce from 'lodash/debounce';
 
@@ -9,11 +10,13 @@ import ExternalLink from 'sentry/components/links/externalLink';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import Pagination from 'sentry/components/pagination';
 import PerformanceDuration from 'sentry/components/performanceDuration';
+import {Tooltip} from 'sentry/components/tooltip';
 import {DEFAULT_PER_PAGE, SPAN_PROPS_DOCS_URL} from 'sentry/constants';
 import {IconChevron} from 'sentry/icons/iconChevron';
 import {IconWarning} from 'sentry/icons/iconWarning';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import type {Confidence} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {decodeScalar} from 'sentry/utils/queryString';
@@ -21,9 +24,11 @@ import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import useProjects from 'sentry/utils/useProjects';
+import {useAnalytics} from 'sentry/views/explore/hooks/useAnalytics';
 import {useDataset} from 'sentry/views/explore/hooks/useDataset';
 import {type TraceResult, useTraces} from 'sentry/views/explore/hooks/useTraces';
 import {useUserQuery} from 'sentry/views/explore/hooks/useUserQuery';
+import {useVisualizes} from 'sentry/views/explore/hooks/useVisualizes';
 import {
   Description,
   ProjectBadgeWrapper,
@@ -44,14 +49,21 @@ import {
   WrappingText,
 } from 'sentry/views/explore/tables/tracesTable/styles';
 
-export function TracesTable() {
+interface TracesTableProps {
+  confidence: Confidence;
+  setError: Dispatch<SetStateAction<string>>;
+}
+
+export function TracesTable({confidence, setError}: TracesTableProps) {
   const [dataset] = useDataset();
   const [query] = useUserQuery();
+  const [visualizes] = useVisualizes();
+  const organization = useOrganization();
 
   const location = useLocation();
   const cursor = decodeScalar(location.query.cursor);
 
-  const {data, isPending, isError, getResponseHeader} = useTraces({
+  const result = useTraces({
     dataset,
     query,
     limit: DEFAULT_PER_PAGE,
@@ -59,13 +71,33 @@ export function TracesTable() {
     cursor,
   });
 
-  const showErrorState = useMemo(() => {
-    return !isPending && isError;
-  }, [isPending, isError]);
+  useEffect(() => {
+    setError(result.error?.message ?? '');
+  }, [setError, result.error?.message]);
+
+  useAnalytics({
+    resultLength: result.data?.data?.length,
+    resultMode: 'trace samples',
+    resultStatus: result.status,
+    resultMissingRoot: result.data?.data?.filter(trace => !defined(trace.name))?.length,
+    visualizes,
+    organization,
+    columns: [
+      'trace id',
+      'trace root',
+      'total spans',
+      'timeline',
+      'root duration',
+      'timestamp',
+    ],
+    userQuery: query,
+    confidence,
+  });
+
+  const {data, isPending, isError, getResponseHeader} = result;
 
-  const showEmptyState = useMemo(() => {
-    return !isPending && !showErrorState && (data?.data?.length ?? 0) === 0;
-  }, [data, isPending, showErrorState]);
+  const showErrorState = !isPending && isError;
+  const showEmptyState = !isPending && !showErrorState && (data?.data?.length ?? 0) === 0;
 
   return (
     <Fragment>
@@ -94,15 +126,15 @@ export function TracesTable() {
               <LoadingIndicator />
             </StyledPanelItem>
           )}
-          {showErrorState && ( // TODO: need an error state
-            <StyledPanelItem span={7} overflow>
-              <EmptyStreamWrapper>
-                <IconWarning color="gray300" size="lg" />
-              </EmptyStreamWrapper>
+          {showErrorState && (
+            <StyledPanelItem span={6} overflow>
+              <WarningStreamWrapper>
+                <IconWarning data-test-id="error-indicator" color="gray300" size="lg" />
+              </WarningStreamWrapper>
             </StyledPanelItem>
           )}
           {showEmptyState && (
-            <StyledPanelItem span={7} overflow>
+            <StyledPanelItem span={6} overflow>
               <EmptyStateWarning withIcon>
                 <EmptyStateText size="fontSizeExtraLarge">
                   {t('No trace results found')}
@@ -208,39 +240,44 @@ function TraceRow({
             trackAnalytics('trace_explorer.toggle_trace_details', {
               organization,
               expanded,
+              source: 'new explore',
             })
           }
         />
         <TraceIdRenderer
           traceId={trace.trace}
           timestamp={trace.end}
-          onClick={() =>
+          onClick={event => {
+            event.stopPropagation();
             trackAnalytics('trace_explorer.open_trace', {
               organization,
-            })
-          }
+              source: 'new explore',
+            });
+          }}
           location={location}
         />
       </StyledPanelItem>
       <StyledPanelItem align="left" overflow>
-        <Description>
-          <ProjectBadgeWrapper>
-            <ProjectsRenderer
-              projectSlugs={
-                traceProjects.length > 0
-                  ? traceProjects
-                  : trace.project
-                    ? [trace.project]
-                    : []
-              }
-            />
-          </ProjectBadgeWrapper>
-          {trace.name ? (
-            <WrappingText>{trace.name}</WrappingText>
-          ) : (
-            <EmptyValueContainer>{t('Missing Trace Root')}</EmptyValueContainer>
-          )}
-        </Description>
+        <Tooltip title={trace.name} containerDisplayMode="block" showOnlyOnOverflow>
+          <Description>
+            <ProjectBadgeWrapper>
+              <ProjectsRenderer
+                projectSlugs={
+                  traceProjects.length > 0
+                    ? traceProjects
+                    : trace.project
+                      ? [trace.project]
+                      : []
+                }
+              />
+            </ProjectBadgeWrapper>
+            {trace.name ? (
+              <WrappingText>{trace.name}</WrappingText>
+            ) : (
+              <EmptyValueContainer>{t('Missing Trace Root')}</EmptyValueContainer>
+            )}
+          </Description>
+        </Tooltip>
       </StyledPanelItem>
       <StyledPanelItem align="right">
         {query ? (
@@ -283,3 +320,9 @@ function TraceRow({
 const StyledButton = styled(Button)`
   margin-right: ${space(0.5)};
 `;
+
+const WarningStreamWrapper = styled(EmptyStreamWrapper)`
+  > svg {
+    fill: ${p => p.theme.gray300};
+  }
+`;
diff --git a/static/app/views/explore/tables/tracesTable/spansTable.tsx b/static/app/views/explore/tables/tracesTable/spansTable.tsx
index 7794ce0d4c2e7f..4fc24e9ed760e4 100644
--- a/static/app/views/explore/tables/tracesTable/spansTable.tsx
+++ b/static/app/views/explore/tables/tracesTable/spansTable.tsx
@@ -161,6 +161,7 @@ function SpanRow({
           onClick={() =>
             trackAnalytics('trace_explorer.open_trace_span', {
               organization,
+              source: 'new explore',
             })
           }
         />
diff --git a/static/app/views/explore/toolbar/index.spec.tsx b/static/app/views/explore/toolbar/index.spec.tsx
index eb75c1f8dd460f..0b0f9c0b1809e8 100644
--- a/static/app/views/explore/toolbar/index.spec.tsx
+++ b/static/app/views/explore/toolbar/index.spec.tsx
@@ -38,7 +38,7 @@ describe('ExploreToolbar', function () {
     }
 
     render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP}>
+      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
         <Component />
       </SpanTagsProvider>,
       {disableRouterMocks: true}
@@ -53,7 +53,7 @@ describe('ExploreToolbar', function () {
     expect(resultMode).toEqual('samples');
 
     expect(sampleFields).toEqual([
-      'span_id',
+      'id',
       'project',
       'span.op',
       'span.description',
@@ -80,7 +80,7 @@ describe('ExploreToolbar', function () {
     expect(resultMode).toEqual('samples');
 
     expect(sampleFields).toEqual([
-      'span_id',
+      'id',
       'project',
       'span.op',
       'span.description',
@@ -98,7 +98,7 @@ describe('ExploreToolbar', function () {
       return <ExploreToolbar />;
     }
     render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP}>
+      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
         <Component />
       </SpanTagsProvider>,
       {disableRouterMocks: true}
@@ -111,7 +111,7 @@ describe('ExploreToolbar', function () {
       {
         chartType: ChartType.LINE,
         label: 'A',
-        yAxes: ['count(span.duration)'],
+        yAxes: ['avg(span.duration)'],
       },
     ]);
 
@@ -122,30 +122,30 @@ describe('ExploreToolbar', function () {
       {
         chartType: ChartType.LINE,
         label: 'A',
-        yAxes: ['count(span.self_time)'],
+        yAxes: ['avg(span.self_time)'],
       },
     ]);
 
     // try changing the aggregate
-    await userEvent.click(within(section).getByRole('button', {name: 'count'}));
-    await userEvent.click(within(section).getByRole('option', {name: 'avg'}));
+    await userEvent.click(within(section).getByRole('button', {name: 'avg'}));
+    await userEvent.click(within(section).getByRole('option', {name: 'count'}));
     expect(visualizes).toEqual([
       {
         chartType: ChartType.LINE,
         label: 'A',
-        yAxes: ['avg(span.self_time)'],
+        yAxes: ['count(span.self_time)'],
       },
     ]);
 
     // try adding an overlay
-    await userEvent.click(within(section).getByRole('button', {name: 'Add Data'}));
+    await userEvent.click(within(section).getByRole('button', {name: 'Add Series'}));
     await userEvent.click(within(section).getByRole('button', {name: 'span.duration'}));
     await userEvent.click(within(section).getByRole('option', {name: 'span.self_time'}));
     expect(visualizes).toEqual([
       {
         chartType: ChartType.LINE,
         label: 'A',
-        yAxes: ['avg(span.self_time)', 'count(span.self_time)'],
+        yAxes: ['count(span.self_time)', 'avg(span.self_time)'],
       },
     ]);
 
@@ -155,12 +155,12 @@ describe('ExploreToolbar', function () {
       {
         chartType: ChartType.LINE,
         label: 'A',
-        yAxes: ['avg(span.self_time)', 'count(span.self_time)'],
+        yAxes: ['count(span.self_time)', 'avg(span.self_time)'],
       },
       {
         chartType: ChartType.LINE,
         label: 'B',
-        yAxes: ['count(span.duration)'],
+        yAxes: ['avg(span.duration)'],
       },
     ]);
 
@@ -170,12 +170,12 @@ describe('ExploreToolbar', function () {
       {
         chartType: ChartType.LINE,
         label: 'A',
-        yAxes: ['count(span.self_time)'],
+        yAxes: ['avg(span.self_time)'],
       },
       {
         chartType: ChartType.LINE,
         label: 'B',
-        yAxes: ['count(span.duration)'],
+        yAxes: ['avg(span.duration)'],
       },
     ]);
 
@@ -185,7 +185,7 @@ describe('ExploreToolbar', function () {
       {
         chartType: ChartType.LINE,
         label: 'A',
-        yAxes: ['count(span.self_time)'],
+        yAxes: ['avg(span.self_time)'],
       },
     ]);
 
@@ -202,7 +202,7 @@ describe('ExploreToolbar', function () {
       return <ExploreToolbar />;
     }
     render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP}>
+      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
         <Component />
       </SpanTagsProvider>,
       {disableRouterMocks: true}
@@ -217,11 +217,11 @@ describe('ExploreToolbar', function () {
 
     // check the default field options
     const fields = [
-      'span_id',
+      'id',
       'project',
-      'span.op',
       'span.description',
       'span.duration',
+      'span.op',
       'timestamp',
     ];
     await userEvent.click(within(section).getByRole('button', {name: 'timestamp'}));
@@ -259,7 +259,7 @@ describe('ExploreToolbar', function () {
       return <ExploreToolbar />;
     }
     render(
-      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP}>
+      <SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
         <Component />
       </SpanTagsProvider>,
       {disableRouterMocks: true}
diff --git a/static/app/views/explore/toolbar/index.tsx b/static/app/views/explore/toolbar/index.tsx
index 068433e96ead11..99f9ffaa2e6817 100644
--- a/static/app/views/explore/toolbar/index.tsx
+++ b/static/app/views/explore/toolbar/index.tsx
@@ -19,7 +19,7 @@ interface ExploreToolbarProps {
 }
 
 export function ExploreToolbar({extras}: ExploreToolbarProps) {
-  const [dataset, setDataset] = useDataset();
+  const [dataset, setDataset] = useDataset({allowRPC: true});
   const [resultMode, setResultMode] = useResultMode();
 
   const [sampleFields] = useSampleFields();
@@ -31,9 +31,26 @@ export function ExploreToolbar({extras}: ExploreToolbarProps) {
     if (resultMode === 'samples') {
       return sampleFields;
     }
-    return [...groupBys, ...visualizes.flatMap(visualize => visualize.yAxes)].filter(
-      Boolean
-    );
+
+    const allFields: string[] = [];
+
+    for (const visualize of visualizes) {
+      for (const yAxis of visualize.yAxes) {
+        if (allFields.includes(yAxis)) {
+          continue;
+        }
+        allFields.push(yAxis);
+      }
+    }
+
+    for (const groupBy of groupBys) {
+      if (allFields.includes(groupBy)) {
+        continue;
+      }
+      allFields.push(groupBy);
+    }
+
+    return allFields.filter(Boolean);
   }, [resultMode, sampleFields, groupBys, visualizes]);
 
   const [sorts, setSorts] = useSorts({fields});
diff --git a/static/app/views/explore/toolbar/styles.tsx b/static/app/views/explore/toolbar/styles.tsx
index 82c3fdfee9d3d7..7ec2e5a9009ba3 100644
--- a/static/app/views/explore/toolbar/styles.tsx
+++ b/static/app/views/explore/toolbar/styles.tsx
@@ -33,28 +33,15 @@ export const ToolbarFooterButton = styled(Button)<{disabled?: boolean}>`
   color: ${p => (p.disabled ? p.theme.gray300 : p.theme.linkColor)};
 `;
 
-export const ToolbarFooter = styled('div')<{disabled?: boolean}>`
-  margin: ${space(0.5)} 0;
-`;
+export const ToolbarFooter = styled('div')<{disabled?: boolean}>``;
 
 export const ToolbarRow = styled('div')`
   display: flex;
   flex-direction: row;
+  justify-content: space-between;
   gap: ${space(0.5)};
-  margin-bottom: ${space(0.5)};
-
-  div,
-  label,
-  span {
-    flex-grow: 1;
-
-    &:first-child {
-      min-width: 0;
-    }
 
-    > button {
-      width: 100%;
-      font-weight: normal;
-    }
+  :not(:last-child) {
+    margin-bottom: ${space(0.5)};
   }
 `;
diff --git a/static/app/views/explore/toolbar/toolbarDataset.tsx b/static/app/views/explore/toolbar/toolbarDataset.tsx
index 14711c6b59e776..3eadecb62654ad 100644
--- a/static/app/views/explore/toolbar/toolbarDataset.tsx
+++ b/static/app/views/explore/toolbar/toolbarDataset.tsx
@@ -19,6 +19,9 @@ export function ToolbarDataset({dataset, setDataset}: ToolbarDatasetProps) {
         <SegmentedControl.Item key={DiscoverDatasets.SPANS_EAP}>
           {t('EAP Spans')}
         </SegmentedControl.Item>
+        <SegmentedControl.Item key={DiscoverDatasets.SPANS_EAP_RPC}>
+          {t('EAP RPC Spans')}
+        </SegmentedControl.Item>
         <SegmentedControl.Item key={DiscoverDatasets.SPANS_INDEXED}>
           {t('Indexed Spans')}
         </SegmentedControl.Item>
diff --git a/static/app/views/explore/toolbar/toolbarGroupBy.tsx b/static/app/views/explore/toolbar/toolbarGroupBy.tsx
index 63e59f5ecf7dcb..89b466ef9e49b6 100644
--- a/static/app/views/explore/toolbar/toolbarGroupBy.tsx
+++ b/static/app/views/explore/toolbar/toolbarGroupBy.tsx
@@ -1,4 +1,4 @@
-import {useMemo} from 'react';
+import {Fragment, useMemo} from 'react';
 import {useSortable} from '@dnd-kit/sortable';
 import {CSS} from '@dnd-kit/utilities';
 import styled from '@emotion/styled';
@@ -11,7 +11,6 @@ import {IconAdd} from 'sentry/icons/iconAdd';
 import {IconDelete} from 'sentry/icons/iconDelete';
 import {IconGrabbable} from 'sentry/icons/iconGrabbable';
 import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
 import {defined} from 'sentry/utils';
 import {useGroupBys} from 'sentry/views/explore/hooks/useGroupBys';
 
@@ -20,7 +19,13 @@ import {useSpanTags} from '../contexts/spanTagsContext';
 import type {Column} from '../hooks/useDragNDropColumns';
 import {useResultMode} from '../hooks/useResultsMode';
 
-import {ToolbarHeader, ToolbarHeaderButton, ToolbarLabel, ToolbarSection} from './styles';
+import {
+  ToolbarHeader,
+  ToolbarHeaderButton,
+  ToolbarLabel,
+  ToolbarRow,
+  ToolbarSection,
+} from './styles';
 
 interface ToolbarGroupByProps {
   disabled?: boolean;
@@ -33,80 +38,93 @@ export function ToolbarGroupBy({disabled}: ToolbarGroupByProps) {
   const {groupBys, setGroupBys} = useGroupBys();
 
   const options: SelectOption<string>[] = useMemo(() => {
-    // These options aren't known to exist on this project but it was inserted into
-    // the group bys somehow so it should be a valid options in the group bys.
-    //
-    // One place this may come from is when switching projects/environment/date range,
-    // a tag may disappear based on the selection.
-    const unknownOptions = groupBys
-      .filter(groupBy => groupBy && !tags.hasOwnProperty(groupBy))
-      .map(groupBy => {
-        return {
-          label: groupBy,
-          value: groupBy,
-          textValue: groupBy,
-        };
-      });
-
-    const knownOptions = Object.keys(tags).map(tagKey => {
-      return {
-        label: tagKey,
-        value: tagKey,
-        textValue: tagKey,
-      };
-    });
+    const potentialOptions = [
+      ...Object.keys(tags),
+
+      // These options aren't known to exist on this project but it was inserted into
+      // the group bys somehow so it should be a valid options in the group bys.
+      //
+      // One place this may come from is when switching projects/environment/date range,
+      // a tag may disappear based on the selection.
+      ...groupBys.filter(groupBy => groupBy && !tags.hasOwnProperty(groupBy)),
+    ];
+    potentialOptions.sort();
 
     return [
       // hard code in an empty option
       {label: t('None'), value: '', textValue: t('none')},
-      ...unknownOptions,
-      ...knownOptions,
+      ...potentialOptions.map(key => ({
+        label: key,
+        value: key,
+        textValue: key,
+      })),
     ];
   }, [groupBys, tags]);
 
   return (
     <DragNDropContext columns={groupBys} setColumns={setGroupBys}>
-      {({editableColumns, insertColumn, updateColumnAtIndex, deleteColumnAtIndex}) => (
-        <ToolbarSection data-test-id="section-group-by">
-          <StyledToolbarHeader>
-            <Tooltip
-              position="right"
-              title={t(
-                'Aggregated data by a key attribute to calculate averages, percentiles, count and more'
-              )}
+      {({editableColumns, insertColumn, updateColumnAtIndex, deleteColumnAtIndex}) => {
+        let columnEditorRows = (
+          <Fragment>
+            {editableColumns.map((column, i) => (
+              <ColumnEditorRow
+                disabled={resultMode === 'samples'}
+                key={column.id}
+                canDelete={
+                  editableColumns.length > 1 || !['', undefined].includes(column.column)
+                }
+                column={column}
+                options={options}
+                onColumnChange={c => updateColumnAtIndex(i, c)}
+                onColumnDelete={() => deleteColumnAtIndex(i)}
+              />
+            ))}
+          </Fragment>
+        );
+
+        if (disabled) {
+          columnEditorRows = (
+            <FullWidthTooltip
+              position="top"
+              title={t('Group by is only applicable to aggregate results.')}
             >
-              <ToolbarLabel disabled={disabled}>{t('Group By')}</ToolbarLabel>
-            </Tooltip>
-            <ToolbarHeaderButton
-              disabled={disabled}
-              size="zero"
-              onClick={insertColumn}
-              borderless
-              aria-label={t('Add Group')}
-              icon={<IconAdd />}
-            />
-          </StyledToolbarHeader>
-          {editableColumns.map((column, i) => (
-            <ColumnEditorRow
-              disabled={resultMode === 'samples'}
-              key={column.id}
-              canDelete={
-                editableColumns.length > 1 || !['', undefined].includes(column.column)
-              }
-              column={column}
-              options={options}
-              onColumnChange={c => updateColumnAtIndex(i, c)}
-              onColumnDelete={() => deleteColumnAtIndex(i)}
-            />
-          ))}
-        </ToolbarSection>
-      )}
+              {columnEditorRows}
+            </FullWidthTooltip>
+          );
+        }
+
+        return (
+          <ToolbarSection data-test-id="section-group-by">
+            <ToolbarHeader>
+              <Tooltip
+                position="right"
+                title={t(
+                  'Aggregated data by a key attribute to calculate averages, percentiles, count and more'
+                )}
+              >
+                <ToolbarLabel disabled={disabled}>{t('Group By')}</ToolbarLabel>
+              </Tooltip>
+              <Tooltip title={t('Add a new group')}>
+                <ToolbarHeaderButton
+                  disabled={disabled}
+                  size="zero"
+                  onClick={insertColumn}
+                  borderless
+                  aria-label={t('Add Group')}
+                  icon={<IconAdd />}
+                />
+              </Tooltip>
+            </ToolbarHeader>
+            {columnEditorRows}
+          </ToolbarSection>
+        );
+      }}
     </DragNDropContext>
   );
 }
 
-const StyledToolbarHeader = styled(ToolbarHeader)`
-  margin-bottom: ${space(1)};
+const FullWidthTooltip = styled(Tooltip)`
+  width: 100%;
 `;
 
 interface ColumnEditorRowProps {
@@ -142,7 +160,7 @@ function ColumnEditorRow({
   }, [column.column, options]);
 
   return (
-    <RowContainer
+    <ToolbarRow
       key={column.id}
       ref={setNodeRef}
       style={{
@@ -181,20 +199,10 @@ function ColumnEditorRow({
         icon={<IconDelete size="sm" />}
         onClick={() => onColumnDelete()}
       />
-    </RowContainer>
+    </ToolbarRow>
   );
 }
 
-const RowContainer = styled('div')`
-  display: flex;
-  flex-direction: row;
-  gap: ${space(0.5)};
-
-  :not(:first-child) {
-    margin-top: ${space(1)};
-  }
-`;
-
 const StyledCompactSelect = styled(CompactSelect)`
   flex-grow: 1;
   min-width: 0;
diff --git a/static/app/views/explore/toolbar/toolbarResults.tsx b/static/app/views/explore/toolbar/toolbarResults.tsx
index 592eadd7a9bc12..d0e538a52fa9a7 100644
--- a/static/app/views/explore/toolbar/toolbarResults.tsx
+++ b/static/app/views/explore/toolbar/toolbarResults.tsx
@@ -1,3 +1,5 @@
+import styled from '@emotion/styled';
+
 import {SegmentedControl} from 'sentry/components/segmentedControl';
 import {t} from 'sentry/locale';
 import type {ResultMode} from 'sentry/views/explore/hooks/useResultsMode';
@@ -12,16 +14,30 @@ interface ToolbarResultsProps {
 export function ToolbarResults({resultMode, setResultMode}: ToolbarResultsProps) {
   return (
     <ToolbarSection data-test-id="section-result-mode">
-      <ToolbarRow>
+      <StyledToolbarRow>
         <SegmentedControl
           aria-label={t('Result Mode')}
           value={resultMode}
           onChange={setResultMode}
         >
-          <SegmentedControl.Item key="samples">{t('Samples')}</SegmentedControl.Item>
-          <SegmentedControl.Item key="aggregate">{t('Aggregates')}</SegmentedControl.Item>
+          <SegmentedControl.Item key={'samples' as const}>
+            {t('Samples')}
+          </SegmentedControl.Item>
+          <SegmentedControl.Item key={'aggregate' as const}>
+            {t('Aggregates')}
+          </SegmentedControl.Item>
         </SegmentedControl>
-      </ToolbarRow>
+      </StyledToolbarRow>
     </ToolbarSection>
   );
 }
+
+const StyledToolbarRow = styled(ToolbarRow)`
+  > div {
+    flex-grow: 1;
+
+    > label > :last-child {
+      flex-grow: 1;
+    }
+  }
+`;
diff --git a/static/app/views/explore/toolbar/toolbarSortBy.tsx b/static/app/views/explore/toolbar/toolbarSortBy.tsx
index e0ab1387d6b8c9..44bbd099e94720 100644
--- a/static/app/views/explore/toolbar/toolbarSortBy.tsx
+++ b/static/app/views/explore/toolbar/toolbarSortBy.tsx
@@ -1,14 +1,22 @@
 import {useCallback, useMemo} from 'react';
+import styled from '@emotion/styled';
 
-import type {SelectOption} from 'sentry/components/compactSelect';
+import type {SelectKey, SelectOption} from 'sentry/components/compactSelect';
 import {CompactSelect} from 'sentry/components/compactSelect';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t} from 'sentry/locale';
 import type {Sort} from 'sentry/utils/discover/fields';
-import {formatParsedFunction, parseFunction} from 'sentry/utils/discover/fields';
+import {
+  classifyTagKey,
+  parseFunction,
+  prettifyParsedFunction,
+  prettifyTagKey,
+} from 'sentry/utils/discover/fields';
 import {TypeBadge} from 'sentry/views/explore/components/typeBadge';
 import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
+import {useResultMode} from 'sentry/views/explore/hooks/useResultsMode';
 import type {Field} from 'sentry/views/explore/hooks/useSampleFields';
+import {Tab, useTab} from 'sentry/views/explore/hooks/useTab';
 
 import {ToolbarHeader, ToolbarLabel, ToolbarRow, ToolbarSection} from './styles';
 
@@ -19,24 +27,37 @@ interface ToolbarSortByProps {
 }
 
 export function ToolbarSortBy({fields, setSorts, sorts}: ToolbarSortByProps) {
+  const [resultMode] = useResultMode();
+  const [tab] = useTab();
+
+  // traces table is only sorted by timestamp so disable the sort by
+  const disabled = resultMode === 'samples' && tab === Tab.TRACE;
+
   const numberTags = useSpanTags('number');
   const stringTags = useSpanTags('string');
 
   const fieldOptions: SelectOption<Field>[] = useMemo(() => {
-    return fields.map(field => {
+    const uniqFields: Field[] = [];
+    for (const field of fields) {
+      if (!uniqFields.includes(field)) {
+        uniqFields.push(field);
+      }
+    }
+
+    const options = uniqFields.map(field => {
       const tag = stringTags[field] ?? numberTags[field] ?? null;
       if (tag) {
         return {
           label: tag.name,
           value: field,
           textValue: tag.name,
-          trailingItems: <TypeBadge tag={tag} />,
+          trailingItems: <TypeBadge kind={tag?.kind} />,
         };
       }
 
       const func = parseFunction(field);
       if (func) {
-        const formatted = formatParsedFunction(func);
+        const formatted = prettifyParsedFunction(func);
         return {
           label: formatted,
           value: field,
@@ -44,20 +65,32 @@ export function ToolbarSortBy({fields, setSorts, sorts}: ToolbarSortByProps) {
           trailingItems: <TypeBadge func={func} />,
         };
       }
-
-      // not a tag, maybe it's an aggregate
       return {
-        label: field,
+        label: prettifyTagKey(field),
         value: field,
         textValue: field,
-        trailingItems: <TypeBadge tag={tag} />,
+        trailingItems: <TypeBadge kind={classifyTagKey(field)} />,
       };
     });
+
+    options.sort((a, b) => {
+      if (a.label < b.label) {
+        return -1;
+      }
+
+      if (a.label > b.label) {
+        return 1;
+      }
+
+      return 0;
+    });
+
+    return options;
   }, [fields, numberTags, stringTags]);
 
   const setSortField = useCallback(
-    (i: number, {value}: SelectOption<Field>) => {
-      if (sorts[i]) {
+    (i: number, {value}: SelectOption<SelectKey>) => {
+      if (sorts[i] && typeof value === 'string') {
         setSorts([
           {
             field: value,
@@ -85,12 +118,12 @@ export function ToolbarSortBy({fields, setSorts, sorts}: ToolbarSortByProps) {
   }, []);
 
   const setSortKind = useCallback(
-    (i: number, {value}: SelectOption<Sort['kind']>) => {
+    (i: number, {value}: SelectOption<SelectKey>) => {
       if (sorts[i]) {
         setSorts([
           {
             field: sorts[i].field,
-            kind: value,
+            kind: value as Sort['kind'],
           },
         ]);
       }
@@ -98,6 +131,34 @@ export function ToolbarSortBy({fields, setSorts, sorts}: ToolbarSortByProps) {
     [setSorts, sorts]
   );
 
+  let toolbarRow = (
+    <ToolbarRow>
+      <ColumnCompactSelect
+        options={fieldOptions}
+        value={sorts[0]?.field}
+        onChange={newSortField => setSortField(0, newSortField)}
+        disabled={disabled}
+      />
+      <DirectionCompactSelect
+        options={kindOptions}
+        value={sorts[0]?.kind}
+        onChange={newSortKind => setSortKind(0, newSortKind)}
+        disabled={disabled}
+      />
+    </ToolbarRow>
+  );
+
+  if (disabled) {
+    toolbarRow = (
+      <FullWidthTooltip
+        position="top"
+        title={t('Sort by is not applicable to trace results.')}
+      >
+        {toolbarRow}
+      </FullWidthTooltip>
+    );
+  }
+
   return (
     <ToolbarSection data-test-id="section-sort-by">
       <ToolbarHeader>
@@ -105,23 +166,31 @@ export function ToolbarSortBy({fields, setSorts, sorts}: ToolbarSortByProps) {
           position="right"
           title={t('Results you see first and last in your samples or aggregates.')}
         >
-          <ToolbarLabel>{t('Sort By')}</ToolbarLabel>
+          <ToolbarLabel disabled={disabled}>{t('Sort By')}</ToolbarLabel>
         </Tooltip>
       </ToolbarHeader>
-      <div>
-        <ToolbarRow>
-          <CompactSelect
-            options={fieldOptions}
-            value={sorts[0]?.field}
-            onChange={newSortField => setSortField(0, newSortField)}
-          />
-          <CompactSelect
-            options={kindOptions}
-            value={sorts[0]?.kind}
-            onChange={newSortKind => setSortKind(0, newSortKind)}
-          />
-        </ToolbarRow>
-      </div>
+      <div>{toolbarRow}</div>
     </ToolbarSection>
   );
 }
+
+const FullWidthTooltip = styled(Tooltip)`
+  width: 100%;
+`;
+
+const ColumnCompactSelect = styled(CompactSelect)`
+  flex: 1 1;
+  min-width: 0;
+
+  > button {
+    width: 100%;
+  }
+`;
+
+const DirectionCompactSelect = styled(CompactSelect)`
+  width: 90px;
+
+  > button {
+    width: 100%;
+  }
+`;
diff --git a/static/app/views/explore/toolbar/toolbarVisualize.tsx b/static/app/views/explore/toolbar/toolbarVisualize.tsx
index 11c71207191bd7..95090a13620437 100644
--- a/static/app/views/explore/toolbar/toolbarVisualize.tsx
+++ b/static/app/views/explore/toolbar/toolbarVisualize.tsx
@@ -2,19 +2,21 @@ import {Fragment, useCallback, useMemo} from 'react';
 import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/button';
-import {CompactSelect, type SelectOption} from 'sentry/components/compactSelect';
+import type {SelectKey, SelectOption} from 'sentry/components/compactSelect';
+import {CompactSelect} from 'sentry/components/compactSelect';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconAdd} from 'sentry/icons';
 import {IconDelete} from 'sentry/icons/iconDelete';
 import {t} from 'sentry/locale';
 import {defined} from 'sentry/utils';
 import type {ParsedFunction} from 'sentry/utils/discover/fields';
-import {parseFunction} from 'sentry/utils/discover/fields';
+import {parseFunction, prettifyTagKey} from 'sentry/utils/discover/fields';
 import {ALLOWED_EXPLORE_VISUALIZE_AGGREGATES} from 'sentry/utils/fields';
 import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
 import type {Visualize} from 'sentry/views/explore/hooks/useVisualizes';
 import {
   DEFAULT_VISUALIZATION,
+  MAX_VISUALIZES,
   useVisualizes,
 } from 'sentry/views/explore/hooks/useVisualizes';
 import {ChartType} from 'sentry/views/insights/common/components/chart';
@@ -56,13 +58,30 @@ export function ToolbarVisualize({}: ToolbarVisualizeProps) {
   }, [visualizes]);
 
   const fieldOptions: SelectOption<string>[] = useMemo(() => {
-    const options = Object.values(numberTags).map(tag => {
-      return {
-        label: tag.name,
-        value: tag.key,
-        textValue: tag.name,
-      };
-    });
+    const unknownOptions = parsedVisualizeGroups
+      .flatMap(group =>
+        group.flatMap(entry => {
+          return entry.func.arguments;
+        })
+      )
+      .filter(option => {
+        return !numberTags.hasOwnProperty(option);
+      });
+
+    const options = [
+      ...unknownOptions.map(option => ({
+        label: prettifyTagKey(option),
+        value: option,
+        textValue: option,
+      })),
+      ...Object.values(numberTags).map(tag => {
+        return {
+          label: tag.name,
+          value: tag.key,
+          textValue: tag.name,
+        };
+      }),
+    ];
 
     options.sort((a, b) => {
       if (a.label < b.label) {
@@ -77,7 +96,7 @@ export function ToolbarVisualize({}: ToolbarVisualizeProps) {
     });
 
     return options;
-  }, [numberTags]);
+  }, [numberTags, parsedVisualizeGroups]);
 
   const aggregateOptions: SelectOption<string>[] = useMemo(() => {
     return ALLOWED_EXPLORE_VISUALIZE_AGGREGATES.map(aggregate => {
@@ -106,7 +125,7 @@ export function ToolbarVisualize({}: ToolbarVisualizeProps) {
   );
 
   const setChartField = useCallback(
-    (group: number, index: number, {value}: SelectOption<string>) => {
+    (group: number, index: number, {value}: SelectOption<SelectKey>) => {
       const newVisualizes = visualizes.slice();
       newVisualizes[group].yAxes[index] =
         `${parsedVisualizeGroups[group][index].func.name}(${value})`;
@@ -116,7 +135,7 @@ export function ToolbarVisualize({}: ToolbarVisualizeProps) {
   );
 
   const setChartAggregate = useCallback(
-    (group: number, index: number, {value}: SelectOption<string>) => {
+    (group: number, index: number, {value}: SelectOption<SelectKey>) => {
       const newVisualizes = visualizes.slice();
       newVisualizes[group].yAxes[index] =
         `${value}(${parsedVisualizeGroups[group][index].func.arguments[0]})`;
@@ -149,24 +168,29 @@ export function ToolbarVisualize({}: ToolbarVisualizeProps) {
       .map(parsedVisualizeGroup => parsedVisualizeGroup.length)
       .reduce((a, b) => a + b, 0) <= 1;
 
+  const shouldRenderLabel = visualizes.length > 1;
+
   return (
     <ToolbarSection data-test-id="section-visualizes">
       <ToolbarHeader>
         <Tooltip
           position="right"
           title={t(
-            'Primary metric that appears in your chart, overlays and/or equations.'
+            'Primary metric that appears in your chart. You can also overlay a series onto an existing chart or add an equation.'
           )}
         >
           <ToolbarLabel>{t('Visualize')}</ToolbarLabel>
         </Tooltip>
-        <ToolbarHeaderButton
-          size="zero"
-          icon={<IconAdd />}
-          onClick={addChart}
-          aria-label={t('Add Chart')}
-          borderless
-        />
+        <Tooltip title={t('Add a new chart')}>
+          <ToolbarHeaderButton
+            size="zero"
+            icon={<IconAdd />}
+            onClick={addChart}
+            aria-label={t('Add Chart')}
+            borderless
+            disabled={visualizes.length >= MAX_VISUALIZES}
+          />
+        </Tooltip>
       </ToolbarHeader>
       <div>
         {parsedVisualizeGroups.map((parsedVisualizeGroup, group) => {
@@ -174,14 +198,14 @@ export function ToolbarVisualize({}: ToolbarVisualizeProps) {
             <Fragment key={group}>
               {parsedVisualizeGroup.map((parsedVisualize, index) => (
                 <ToolbarRow key={index}>
-                  <ChartLabel>{parsedVisualize.label}</ChartLabel>
-                  <CompactSelect
+                  {shouldRenderLabel && <ChartLabel>{parsedVisualize.label}</ChartLabel>}
+                  <ColumnCompactSelect
                     searchable
                     options={fieldOptions}
                     value={parsedVisualize.func.arguments[0]}
                     onChange={newField => setChartField(group, index, newField)}
                   />
-                  <CompactSelect
+                  <AggregateCompactSelect
                     options={aggregateOptions}
                     value={parsedVisualize.func.name}
                     onChange={newAggregate =>
@@ -205,9 +229,9 @@ export function ToolbarVisualize({}: ToolbarVisualizeProps) {
                   icon={<IconAdd />}
                   onClick={() => addOverlay(group)}
                   priority="link"
-                  aria-label={t('Add Data')}
+                  aria-label={t('Add Series')}
                 >
-                  {t('Add Data')}
+                  {t('Add Series')}
                 </ToolbarFooterButton>
               </ToolbarFooter>
             </Fragment>
@@ -222,9 +246,26 @@ const ChartLabel = styled('div')`
   background-color: ${p => p.theme.purple100};
   border-radius: ${p => p.theme.borderRadius};
   text-align: center;
-  min-width: 32px;
+  width: 38px;
   color: ${p => p.theme.purple400};
   white-space: nowrap;
   font-weight: ${p => p.theme.fontWeightBold};
   align-content: center;
 `;
+
+const ColumnCompactSelect = styled(CompactSelect)`
+  flex: 1 1;
+  min-width: 0;
+
+  > button {
+    width: 100%;
+  }
+`;
+
+const AggregateCompactSelect = styled(CompactSelect)`
+  width: 100px;
+
+  > button {
+    width: 100%;
+  }
+`;
diff --git a/static/app/views/insights/browser/resources/alerts.ts b/static/app/views/insights/browser/resources/alerts.ts
deleted file mode 100644
index 5dcbce24e7ff2d..00000000000000
--- a/static/app/views/insights/browser/resources/alerts.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {t} from 'sentry/locale';
-import type {AlertConfig} from 'sentry/views/insights/common/components/chartPanel';
-import {SpanMetricsField} from 'sentry/views/insights/types';
-
-export const ALERTS: Record<string, AlertConfig> = {
-  spm: {
-    aggregate: 'spm()',
-  },
-  duration: {
-    aggregate: 'avg(d:spans/duration@millisecond)',
-  },
-  decodedSize: {
-    aggregate: `avg(d:spans/${SpanMetricsField.HTTP_DECODED_RESPONSE_CONTENT_LENGTH}@byte)`,
-    name: t('Create Decoded Size Alert'),
-  },
-  transferSize: {
-    aggregate: `avg(d:spans/${SpanMetricsField.HTTP_RESPONSE_TRANSFER_SIZE}@byte)`,
-    name: t('Create Transfer Size Alert'),
-  },
-  encodedSize: {
-    aggregate: `avg(d:spans/${SpanMetricsField.HTTP_RESPONSE_CONTENT_LENGTH}@byte)`,
-    name: t('Create Encoded Size Alert'),
-  },
-};
diff --git a/static/app/views/insights/browser/resources/components/charts/resourceSummaryCharts.tsx b/static/app/views/insights/browser/resources/components/charts/resourceSummaryCharts.tsx
index 0b0443034d04fd..a12e2f86dccb91 100644
--- a/static/app/views/insights/browser/resources/components/charts/resourceSummaryCharts.tsx
+++ b/static/app/views/insights/browser/resources/components/charts/resourceSummaryCharts.tsx
@@ -5,7 +5,6 @@ import {formatBytesBase2} from 'sentry/utils/bytes/formatBytesBase2';
 import {formatRate} from 'sentry/utils/formatters';
 import getDynamicText from 'sentry/utils/getDynamicText';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-import {ALERTS} from 'sentry/views/insights/browser/resources/alerts';
 import {Referrer} from 'sentry/views/insights/browser/resources/referrer';
 import {
   DATA_TYPE,
@@ -77,10 +76,7 @@ function ResourceSummaryCharts(props: {groupId: string}) {
   return (
     <Fragment>
       <ModuleLayout.Third>
-        <ChartPanel
-          title={getThroughputChartTitle('http', RESOURCE_THROUGHPUT_UNIT)}
-          alertConfigs={[{...ALERTS.spm, query: mutableSearch.formatString()}]}
-        >
+        <ChartPanel title={getThroughputChartTitle('http', RESOURCE_THROUGHPUT_UNIT)}>
           <Chart
             height={160}
             data={[spanMetricsSeriesData?.[`spm()`]]}
@@ -100,10 +96,7 @@ function ResourceSummaryCharts(props: {groupId: string}) {
       </ModuleLayout.Third>
 
       <ModuleLayout.Third>
-        <ChartPanel
-          title={getDurationChartTitle('http')}
-          alertConfigs={[{...ALERTS.duration, query: mutableSearch.formatString()}]}
-        >
+        <ChartPanel title={getDurationChartTitle('http')}>
           <Chart
             height={160}
             data={[spanMetricsSeriesData?.[`avg(${SPAN_SELF_TIME})`]]}
@@ -116,14 +109,7 @@ function ResourceSummaryCharts(props: {groupId: string}) {
       </ModuleLayout.Third>
 
       <ModuleLayout.Third>
-        <ChartPanel
-          title={tct('Average [dataType] Size', {dataType: DATA_TYPE})}
-          alertConfigs={[
-            {...ALERTS.decodedSize, query: mutableSearch.formatString()},
-            {...ALERTS.transferSize, query: mutableSearch.formatString()},
-            {...ALERTS.encodedSize, query: mutableSearch.formatString()},
-          ]}
-        >
+        <ChartPanel title={tct('Average [dataType] Size', {dataType: DATA_TYPE})}>
           <Chart
             height={160}
             aggregateOutputFormat="size"
diff --git a/static/app/views/insights/browser/resources/settings.ts b/static/app/views/insights/browser/resources/settings.ts
index a848a342ad9fe9..c632c9e268a436 100644
--- a/static/app/views/insights/browser/resources/settings.ts
+++ b/static/app/views/insights/browser/resources/settings.ts
@@ -19,6 +19,6 @@ export const DEFAULT_RESOURCE_TYPES = [
   ResourceSpanOps.IMAGE,
 ];
 
-export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/assets/';
+export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/frontend/assets/';
 
 export const MODULE_FEATURES = ['insights-initial-modules'];
diff --git a/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx b/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx
index c0cb0e27318d4c..56a14b0b86afbb 100644
--- a/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx
+++ b/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx
@@ -1,13 +1,6 @@
 import React from 'react';
 
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
-import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
-import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
-import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
-import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
 import {t, tct} from 'sentry/locale';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
@@ -24,16 +17,15 @@ import {ResourceSpanOps} from 'sentry/views/insights/browser/resources/types';
 import {useResourceModuleFilters} from 'sentry/views/insights/browser/resources/utils/useResourceFilters';
 import {HeaderContainer} from 'sentry/views/insights/common/components/headerContainer';
 import * as ModuleLayout from 'sentry/views/insights/common/components/moduleLayout';
+import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
 import {ToolRibbon} from 'sentry/views/insights/common/components/ribbon';
 import {useSpanMetrics} from 'sentry/views/insights/common/queries/useDiscover';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {useModuleURL} from 'sentry/views/insights/common/utils/useModuleURL';
 import SubregionSelector from 'sentry/views/insights/common/views/spans/selectors/subregionSelector';
 import {SampleList} from 'sentry/views/insights/common/views/spanSummaryPage/sampleList';
 import {FrontendHeader} from 'sentry/views/insights/pages/frontend/frontendPageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName, SpanMetricsField} from 'sentry/views/insights/types';
 import {TraceViewSources} from 'sentry/views/performance/newTraceDetails/traceHeader/breadcrumbs';
 
@@ -50,7 +42,6 @@ const {
 function ResourceSummary() {
   const webVitalsModuleURL = useModuleURL('vital');
   const {groupId} = useParams();
-  const {isInDomainView} = useDomainViewFilters();
   const filters = useResourceModuleFilters();
   const selectedSpanOp = filters[SPAN_OP];
   const {
@@ -94,43 +85,17 @@ function ResourceSummary() {
     ) ||
     (uniqueSpanOps.size === 1 && spanMetrics[SPAN_OP] === ResourceSpanOps.IMAGE);
 
-  const crumbs = useModuleBreadcrumbs('resource');
-
   return (
     <React.Fragment>
-      {!isInDomainView && (
-        <Layout.Header>
-          <Layout.HeaderContent>
-            <Breadcrumbs
-              crumbs={[
-                ...crumbs,
-                {
-                  label: tct('[dataType] Summary', {dataType: DATA_TYPE}),
-                },
-              ]}
-            />
-
-            <Layout.Title>{spanMetrics[SpanMetricsField.SPAN_DESCRIPTION]}</Layout.Title>
-          </Layout.HeaderContent>
-          <Layout.HeaderActions>
-            <ButtonBar gap={1}>
-              <FeedbackWidgetButton />
-            </ButtonBar>
-          </Layout.HeaderActions>
-        </Layout.Header>
-      )}
-
-      {isInDomainView && (
-        <FrontendHeader
-          headerTitle={spanMetrics[SpanMetricsField.SPAN_DESCRIPTION]}
-          breadcrumbs={[
-            {
-              label: tct('[dataType] Summary', {dataType: DATA_TYPE}),
-            },
-          ]}
-          module={ModuleName.RESOURCE}
-        />
-      )}
+      <FrontendHeader
+        headerTitle={spanMetrics[SpanMetricsField.SPAN_DESCRIPTION]}
+        breadcrumbs={[
+          {
+            label: tct('[dataType] Summary', {dataType: DATA_TYPE}),
+          },
+        ]}
+        module={ModuleName.RESOURCE}
+      />
 
       <ModuleBodyUpsellHook moduleName={ModuleName.RESOURCE}>
         <Layout.Body>
@@ -139,12 +104,7 @@ function ResourceSummary() {
               <ModuleLayout.Full>
                 <HeaderContainer>
                   <ToolRibbon>
-                    <PageFilterBar condensed>
-                      <ProjectPageFilter />
-                      <EnvironmentPageFilter />
-                      <DatePageFilter />
-                    </PageFilterBar>
-
+                    <ModulePageFilterBar moduleName={ModuleName.RESOURCE} />
                     <RenderBlockingSelector
                       value={filters[RESOURCE_RENDER_BLOCKING_STATUS] || ''}
                     />
@@ -197,11 +157,7 @@ function ResourceSummary() {
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="resource"
-      pageTitle={`${DATA_TYPE} ${t('Summary')}`}
-      features="insights-initial-modules"
-    >
+    <ModulePageProviders moduleName="resource" pageTitle={`${DATA_TYPE} ${t('Summary')}`}>
       <ResourceSummary />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/browser/resources/views/resourcesLandingPage.tsx b/static/app/views/insights/browser/resources/views/resourcesLandingPage.tsx
index 8f21421b1e3d5e..e0fc22c0f3be03 100644
--- a/static/app/views/insights/browser/resources/views/resourcesLandingPage.tsx
+++ b/static/app/views/insights/browser/resources/views/resourcesLandingPage.tsx
@@ -1,9 +1,6 @@
 import React, {Fragment} from 'react';
 import styled from '@emotion/styled';
 
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import {space} from 'sentry/styles/space';
@@ -26,58 +23,31 @@ import {ModulePageProviders} from 'sentry/views/insights/common/components/modul
 import {ModulesOnboarding} from 'sentry/views/insights/common/components/modulesOnboarding';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
 import {ToolRibbon} from 'sentry/views/insights/common/components/ribbon';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {DomainSelector} from 'sentry/views/insights/common/views/spans/selectors/domainSelector';
 import SubregionSelector from 'sentry/views/insights/common/views/spans/selectors/subregionSelector';
 import {FrontendHeader} from 'sentry/views/insights/pages/frontend/frontendPageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName} from 'sentry/views/insights/types';
 
 const {SPAN_OP, SPAN_DOMAIN} = BrowserStarfishFields;
 
 function ResourcesLandingPage() {
   const filters = useResourceModuleFilters();
-  const {isInDomainView} = useDomainViewFilters();
-  const crumbs = useModuleBreadcrumbs('resource');
 
   return (
     <React.Fragment>
       <PageAlertProvider>
-        {!isInDomainView && (
-          <Layout.Header>
-            <Layout.HeaderContent>
-              <Breadcrumbs crumbs={crumbs} />
-
-              <Layout.Title>
-                {MODULE_TITLE}
-                <PageHeadingQuestionTooltip
-                  docsUrl={MODULE_DOC_LINK}
-                  title={MODULE_DESCRIPTION}
-                />
-              </Layout.Title>
-            </Layout.HeaderContent>
-            <Layout.HeaderActions>
-              <ButtonBar gap={1}>
-                <FeedbackWidgetButton />
-              </ButtonBar>
-            </Layout.HeaderActions>
-          </Layout.Header>
-        )}
-
-        {isInDomainView && (
-          <FrontendHeader
-            headerTitle={
-              <Fragment>
-                {MODULE_TITLE}
-                <PageHeadingQuestionTooltip
-                  docsUrl={MODULE_DOC_LINK}
-                  title={MODULE_DESCRIPTION}
-                />
-              </Fragment>
-            }
-            module={ModuleName.RESOURCE}
-          />
-        )}
+        <FrontendHeader
+          headerTitle={
+            <Fragment>
+              {MODULE_TITLE}
+              <PageHeadingQuestionTooltip
+                docsUrl={MODULE_DOC_LINK}
+                title={MODULE_DESCRIPTION}
+              />
+            </Fragment>
+          }
+          module={ModuleName.RESOURCE}
+        />
         <ModuleBodyUpsellHook moduleName={ModuleName.RESOURCE}>
           <Layout.Body>
             <Layout.Main fullWidth>
@@ -118,7 +88,6 @@ function PageWithProviders() {
   return (
     <ModulePageProviders
       moduleName="resource"
-      features="insights-initial-modules"
       analyticEventName="insight.page_loads.assets"
     >
       <ResourcesLandingPage />
diff --git a/static/app/views/insights/browser/webVitals/alerts.ts b/static/app/views/insights/browser/webVitals/alerts.ts
deleted file mode 100644
index 3e6ad888b72cda..00000000000000
--- a/static/app/views/insights/browser/webVitals/alerts.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type {AlertConfig} from 'sentry/views/insights/common/components/chartPanel';
-
-export const ALERTS: Record<string, AlertConfig> = {
-  lcp: {
-    aggregate: 'performance_score(d:transactions/measurements.score.lcp@ratio)',
-    query: 'has:measurements.score.total',
-    name: 'Create LCP Score Alert',
-  },
-  fcp: {
-    aggregate: 'performance_score(measurements.score.fcp)',
-    query: 'has:measurements.score.total',
-    name: 'Create FCP Score Alert',
-  },
-  cls: {
-    aggregate: 'performance_score(measurements.score.cls)',
-    query: 'has:measurements.score.total',
-    name: 'Create CLS Score Alert',
-  },
-  ttfb: {
-    aggregate: 'performance_score(measurements.score.ttfb)',
-    query: 'has:measurements.score.total',
-    name: 'Create TTFB Score Alert',
-  },
-  inp: {
-    aggregate: 'performance_score(measurements.score.inp)',
-    query: 'has:measurements.score.total',
-    name: 'Create INP Score Alert',
-  },
-  total: {
-    aggregate: 'performance_score(measurements.score.total)',
-    query: 'has:measurements.score.total',
-    name: 'Create Total Score Alert',
-  },
-};
diff --git a/static/app/views/insights/browser/webVitals/components/charts/performanceScoreBreakdownChart.tsx b/static/app/views/insights/browser/webVitals/components/charts/performanceScoreBreakdownChart.tsx
index f7eb0f64dc7fd5..6ae6914104ce00 100644
--- a/static/app/views/insights/browser/webVitals/components/charts/performanceScoreBreakdownChart.tsx
+++ b/static/app/views/insights/browser/webVitals/components/charts/performanceScoreBreakdownChart.tsx
@@ -5,21 +5,18 @@ import {DEFAULT_RELATIVE_PERIODS} from 'sentry/constants';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Series} from 'sentry/types/echarts';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import usePageFilters from 'sentry/utils/usePageFilters';
-import {ALERTS} from 'sentry/views/insights/browser/webVitals/alerts';
 import {ORDER} from 'sentry/views/insights/browser/webVitals/components/charts/performanceScoreChart';
 import {
   useProjectWebVitalsScoresTimeseriesQuery,
   type WebVitalsScoreBreakdown,
 } from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresTimeseriesQuery';
-import {DEFAULT_QUERY_FILTER} from 'sentry/views/insights/browser/webVitals/settings';
 import {applyStaticWeightsToTimeseries} from 'sentry/views/insights/browser/webVitals/utils/applyStaticWeightsToTimeseries';
 import type {BrowserType} from 'sentry/views/insights/browser/webVitals/utils/queryParameterDecoders/browserType';
 import {PERFORMANCE_SCORE_WEIGHTS} from 'sentry/views/insights/browser/webVitals/utils/scoreThresholds';
 import Chart, {ChartType} from 'sentry/views/insights/common/components/chart';
 import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
-import {SpanMetricsField, type SubregionCode} from 'sentry/views/insights/types';
+import type {SubregionCode} from 'sentry/views/insights/types';
 
 type Props = {
   browserTypes?: BrowserType[];
@@ -94,24 +91,8 @@ export function PerformanceScoreBreakdownChart({
     return {name, value};
   });
 
-  // We need to reproduce the same query filters that were used to fetch the timeseries data so that they can be propagated to the alerts
-  const search = new MutableSearch(ALERTS.total.query ?? '');
-  if (transaction) {
-    search.addFilterValue('transaction', transaction);
-  }
-  if (subregions) {
-    search.addDisjunctionFilterValues(SpanMetricsField.USER_GEO_SUBREGION, subregions);
-  }
-  if (browserTypes) {
-    search.addDisjunctionFilterValues(SpanMetricsField.BROWSER_NAME, browserTypes);
-  }
-  const query = [DEFAULT_QUERY_FILTER, search.formatString()].join(' ').trim();
-
   return (
-    <StyledChartPanel
-      title={t('Score Breakdown')}
-      alertConfigs={Object.values(ALERTS).map(alertConfig => ({...alertConfig, query}))}
-    >
+    <StyledChartPanel title={t('Score Breakdown')}>
       <PerformanceScoreSubtext>{performanceScoreSubtext}</PerformanceScoreSubtext>
       <Chart
         stacked
diff --git a/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.spec.tsx b/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.spec.tsx
index e2f5c7955f20d9..422453cdf43d14 100644
--- a/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.spec.tsx
@@ -147,7 +147,7 @@ describe('PagePerformanceTable', function () {
     expect(screen.getByRole('cell', {name: '/insights/browser/'})).toBeInTheDocument();
     expect(screen.getByRole('link', {name: '/insights/browser/'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/insights/pageloads/overview/?project=11276&transaction=%2Finsights%2Fbrowser%2F'
+      '/organizations/org-slug/insights/frontend/pageloads/overview/?project=11276&transaction=%2Finsights%2Fbrowser%2F'
     );
 
     expect(screen.getByRole('cell', {name: 'View Project Details'})).toBeInTheDocument();
diff --git a/static/app/views/insights/browser/webVitals/components/webVitalMeters.spec.tsx b/static/app/views/insights/browser/webVitals/components/webVitalMeters.spec.tsx
index 4a055be7e14e2e..c8398c218cdfbe 100644
--- a/static/app/views/insights/browser/webVitals/components/webVitalMeters.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/components/webVitalMeters.spec.tsx
@@ -19,6 +19,11 @@ describe('WebVitalMeters', function () {
     clsWeight: 15,
     ttfbWeight: 10,
     inpWeight: 10,
+    lcpScore: 100,
+    fcpScore: 100,
+    clsScore: 100,
+    ttfbScore: 100,
+    inpScore: 100,
   };
   const projectData: TableData = {
     data: [],
@@ -56,6 +61,7 @@ describe('WebVitalMeters', function () {
     render(<WebVitalMeters projectData={projectData} projectScore={projectScore} />, {
       organization,
     });
+
     await screen.findByText('Largest Contentful Paint');
     screen.getByText('First Contentful Paint');
     screen.getByText('Cumulative Layout Shift');
diff --git a/static/app/views/insights/browser/webVitals/components/webVitalMeters.tsx b/static/app/views/insights/browser/webVitals/components/webVitalMeters.tsx
index fa1db8b522bc64..1209ef1d2a248b 100644
--- a/static/app/views/insights/browser/webVitals/components/webVitalMeters.tsx
+++ b/static/app/views/insights/browser/webVitals/components/webVitalMeters.tsx
@@ -69,77 +69,149 @@ export default function WebVitalMeters({
   const webVitals = Object.keys(webVitalsConfig) as WebVitals[];
   const colors = theme.charts.getColorPalette(3);
 
+  const renderVitals = () => {
+    return webVitals.map((webVital, index) => {
+      const webVitalKey = `p75(measurements.${webVital})`;
+      const score = projectScore[`${webVital}Score`];
+      const meterValue = projectData?.data?.[0]?.[webVitalKey] as number;
+
+      if (!score) {
+        return null;
+      }
+
+      return (
+        <VitalMeter
+          key={webVital}
+          webVital={webVital}
+          showTooltip={showTooltip}
+          score={score}
+          meterValue={meterValue}
+          color={colors[index]}
+          onClick={onClick}
+        />
+      );
+    });
+  };
+
   return (
     <Container>
-      <Flex>
-        {webVitals.map((webVital, index) => {
-          const webVitalExists = projectScore[`${webVital}Score`] !== undefined;
-          const formattedMeterValueText = webVitalExists ? (
-            webVitalsConfig[webVital].formatter(
-              projectData?.data?.[0]?.[`p75(measurements.${webVital})`] as number
-            )
-          ) : (
-            <NoValue />
-          );
-          const headerText = webVitalsConfig[webVital].name;
-          const meterBody = (
-            <Fragment>
-              <MeterBarBody>
-                {showTooltip && (
-                  <StyledQuestionTooltip
-                    isHoverable
-                    size="xs"
-                    title={
-                      <span>
-                        {tct(
-                          `The p75 [webVital] value and aggregate [webVital] score of your selected project(s).
-                          Scores and values may share some (but not perfect) correlation.`,
-                          {
-                            webVital: webVital.toUpperCase(),
-                          }
-                        )}
-                        <br />
-                        <ExternalLink href={`${MODULE_DOC_LINK}#performance-score`}>
-                          {t('Find out how performance scores are calculated here.')}
-                        </ExternalLink>
-                      </span>
-                    }
-                  />
-                )}
-                <MeterHeader>{headerText}</MeterHeader>
-                <MeterValueText>
-                  <Dot color={colors[index]} />
-                  {formattedMeterValueText}
-                </MeterValueText>
-              </MeterBarBody>
-              <MeterBarFooter score={projectScore[`${webVital}Score`]} />
-            </Fragment>
-          );
-          return (
-            <MeterBarContainer
-              key={webVital}
-              onClick={() => webVitalExists && onClick?.(webVital)}
-              clickable={webVitalExists}
-            >
-              {webVitalExists && <InteractionStateLayer />}
-              {webVitalExists && meterBody}
-              {!webVitalExists && (
-                <StyledTooltip
-                  title={tct('No [webVital] data found in this project.', {
-                    webVital: webVital.toUpperCase(),
-                  })}
-                >
-                  {meterBody}
-                </StyledTooltip>
-              )}
-            </MeterBarContainer>
-          );
-        })}
-      </Flex>
+      <Flex>{renderVitals()}</Flex>
     </Container>
   );
 }
 
+type VitalMeterProps = {
+  color: string;
+  meterValue: number | undefined;
+  score: number | undefined;
+  showTooltip: boolean;
+  webVital: WebVitals;
+  isAggregateMode?: boolean;
+  onClick?: (webVital: WebVitals) => void;
+};
+
+export function VitalMeter({
+  webVital,
+  showTooltip,
+  score,
+  meterValue,
+  color,
+  onClick,
+  isAggregateMode = true,
+}: VitalMeterProps) {
+  const webVitalsConfig = WEB_VITALS_METERS_CONFIG;
+  const webVitalExists = score !== undefined;
+
+  const formattedMeterValueText =
+    webVitalExists && meterValue ? (
+      webVitalsConfig[webVital].formatter(meterValue)
+    ) : (
+      <NoValue />
+    );
+
+  const headerText = webVitalsConfig[webVital].name;
+  const meterBody = (
+    <Fragment>
+      <MeterBarBody>
+        {showTooltip && (
+          <StyledQuestionTooltip
+            isHoverable
+            size="xs"
+            title={
+              <span>
+                {tct(
+                  `The p75 [webVital] value and aggregate [webVital] score of your selected project(s).
+                      Scores and values may share some (but not perfect) correlation.`,
+                  {
+                    webVital: webVital.toUpperCase(),
+                  }
+                )}
+                <br />
+                <ExternalLink href={`${MODULE_DOC_LINK}#performance-score`}>
+                  {t('Find out how performance scores are calculated here.')}
+                </ExternalLink>
+              </span>
+            }
+          />
+        )}
+        <MeterHeader>{headerText}</MeterHeader>
+        <MeterValueText>
+          <Dot color={color} />
+          {formattedMeterValueText}
+        </MeterValueText>
+      </MeterBarBody>
+      <MeterBarFooter score={score} />
+    </Fragment>
+  );
+  return (
+    <VitalContainer
+      key={webVital}
+      webVital={webVital}
+      webVitalExists={webVitalExists}
+      meterBody={meterBody}
+      onClick={onClick}
+      isAggregateMode={isAggregateMode}
+    />
+  );
+}
+
+type VitalContainerProps = {
+  meterBody: React.ReactNode;
+  webVital: WebVitals;
+  webVitalExists: boolean;
+  isAggregateMode?: boolean;
+  onClick?: (webVital: WebVitals) => void;
+};
+
+function VitalContainer({
+  webVital,
+  webVitalExists,
+  meterBody,
+  onClick,
+  isAggregateMode = true,
+}: VitalContainerProps) {
+  return (
+    <MeterBarContainer
+      key={webVital}
+      onClick={() => webVitalExists && onClick?.(webVital)}
+      clickable={webVitalExists}
+    >
+      {webVitalExists && <InteractionStateLayer />}
+      {webVitalExists && meterBody}
+      {!webVitalExists && (
+        <StyledTooltip
+          title={tct('No [webVital] data found in this [selection].', {
+            webVital: webVital.toUpperCase(),
+            selection: isAggregateMode ? 'project' : 'trace',
+          })}
+        >
+          {meterBody}
+        </StyledTooltip>
+      )}
+    </MeterBarContainer>
+  );
+}
+
 export const getFormattedDuration = (value: number) => {
   return getDuration(value, value < 1 ? 0 : 2, true);
 };
@@ -175,6 +247,7 @@ const MeterBarBody = styled('div')`
 
 const MeterHeader = styled('div')`
   font-size: ${p => p.theme.fontSizeSmall};
+  font-weight: ${p => p.theme.fontWeightBold};
   color: ${p => p.theme.textColor};
   display: inline-block;
   text-align: center;
@@ -209,7 +282,7 @@ const MeterBarFooterContainer = styled('div')<{status: string}>`
   color: ${p => p.theme[PERFORMANCE_SCORE_COLORS[p.status].normal]};
   border-radius: 0 0 ${p => p.theme.borderRadius} ${p => p.theme.borderRadius};
   background-color: ${p => p.theme[PERFORMANCE_SCORE_COLORS[p.status].light]};
-  border: solid 1px ${p => p.theme[PERFORMANCE_SCORE_COLORS[p.status].light]};
+  border: solid 1px ${p => p.theme[PERFORMANCE_SCORE_COLORS[p.status].border]};
   font-size: ${p => p.theme.fontSizeExtraSmall};
   padding: ${space(0.5)};
   text-align: center;
diff --git a/static/app/views/insights/browser/webVitals/settings.ts b/static/app/views/insights/browser/webVitals/settings.ts
index 20ef3c17f1a6f3..5673dfe593092f 100644
--- a/static/app/views/insights/browser/webVitals/settings.ts
+++ b/static/app/views/insights/browser/webVitals/settings.ts
@@ -8,7 +8,8 @@ export const DATA_TYPE_PLURAL = t('Web Vitals');
 export const MODULE_DESCRIPTION = t(
   'Measure the quality of real user experience in your web applications using industry standard quality signals.'
 );
-export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/web-vitals/';
+export const MODULE_DOC_LINK =
+  'https://docs.sentry.io/product/insights/frontend/web-vitals/';
 
 export const DEFAULT_QUERY_FILTER =
   'transaction.op:[pageload,""] span.op:[ui.interaction.click,ui.interaction.hover,ui.interaction.drag,ui.interaction.press,ui.webvital.cls,""] !transaction:"<< unparameterized >>"';
diff --git a/static/app/views/insights/browser/webVitals/utils/performanceScoreColors.tsx b/static/app/views/insights/browser/webVitals/utils/performanceScoreColors.tsx
index 9226c60c568d06..ad16991cd0a804 100644
--- a/static/app/views/insights/browser/webVitals/utils/performanceScoreColors.tsx
+++ b/static/app/views/insights/browser/webVitals/utils/performanceScoreColors.tsx
@@ -2,17 +2,21 @@ export const PERFORMANCE_SCORE_COLORS = {
   good: {
     light: 'green100',
     normal: 'green300',
+    border: 'green200',
   },
   needsImprovement: {
     light: 'yellow100',
     normal: 'yellow400',
+    border: 'yellow200',
   },
   bad: {
     light: 'red100',
     normal: 'red300',
+    border: 'red200',
   },
   none: {
     light: 'gray100',
     normal: 'gray300',
+    border: 'gray200',
   },
 };
diff --git a/static/app/views/insights/browser/webVitals/views/pageOverview.tsx b/static/app/views/insights/browser/webVitals/views/pageOverview.tsx
index c72a4ddbffbe90..612eff239f9e53 100644
--- a/static/app/views/insights/browser/webVitals/views/pageOverview.tsx
+++ b/static/app/views/insights/browser/webVitals/views/pageOverview.tsx
@@ -3,16 +3,9 @@ import styled from '@emotion/styled';
 import omit from 'lodash/omit';
 
 import ProjectAvatar from 'sentry/components/avatar/projectAvatar';
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
 import {LinkButton} from 'sentry/components/button';
-import ButtonBar from 'sentry/components/buttonBar';
 import {AggregateSpans} from 'sentry/components/events/interfaces/spans/aggregateSpans';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
-import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
-import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
-import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
-import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
 import {TabList, Tabs} from 'sentry/components/tabs';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
@@ -35,9 +28,9 @@ import {calculatePerformanceScoreFromStoredTableDataRow} from 'sentry/views/insi
 import {useProjectWebVitalsScoresQuery} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresQuery';
 import type {WebVitals} from 'sentry/views/insights/browser/webVitals/types';
 import decodeBrowserTypes from 'sentry/views/insights/browser/webVitals/utils/queryParameterDecoders/browserType';
+import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {useModuleURL} from 'sentry/views/insights/common/utils/useModuleURL';
 import {FrontendHeader} from 'sentry/views/insights/pages/frontend/frontendPageHeader';
 import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
@@ -78,7 +71,7 @@ export function PageOverview() {
   const location = useLocation();
   const {projects} = useProjects();
   const router = useRouter();
-  const {isInDomainView, view} = useDomainViewFilters();
+  const {view} = useDomainViewFilters();
   const transaction = location.query.transaction
     ? Array.isArray(location.query.transaction)
       ? location.query.transaction[0]
@@ -98,8 +91,6 @@ export function PageOverview() {
     webVital: (location.query.webVital as WebVitals) ?? null,
   });
 
-  const crumbs = useModuleBreadcrumbs('vital');
-
   const query = decodeScalar(location.query.query);
   const browserTypes = decodeBrowserTypes(location.query[SpanIndexedField.BROWSER_NAME]);
   const subregions = decodeList(
@@ -154,81 +145,43 @@ export function PageOverview() {
   return (
     <React.Fragment>
       <Tabs value={tab} onChange={handleTabChange}>
-        {!isInDomainView && (
-          <Layout.Header>
-            <Layout.HeaderContent>
-              <Breadcrumbs
-                crumbs={[...crumbs, ...(transaction ? [{label: 'Page Summary'}] : [])]}
-              />
-              <Layout.Title>
-                {transaction && project && <ProjectAvatar project={project} size={24} />}
-                {transaction ?? t('Page Loads')}
-              </Layout.Title>
-            </Layout.HeaderContent>
-            <Layout.HeaderActions>
-              <ButtonBar gap={1}>
-                <FeedbackWidgetButton />
-                {transactionSummaryTarget && (
-                  <LinkButton
-                    to={transactionSummaryTarget}
-                    onClick={() => {
-                      trackAnalytics('insight.vital.overview.open_transaction_summary', {
-                        organization,
-                      });
-                    }}
-                    size="sm"
-                  >
-                    {t('View Transaction Summary')}
-                  </LinkButton>
-                )}
-              </ButtonBar>
-            </Layout.HeaderActions>
-            <TabList hideBorder>
-              {LANDING_DISPLAYS.map(({label, field}) => (
-                <TabList.Item key={field}>{label}</TabList.Item>
-              ))}
-            </TabList>
-          </Layout.Header>
-        )}
-        {isInDomainView && (
-          <FrontendHeader
-            headerTitle={
-              <Fragment>
-                {transaction && project && <ProjectAvatar project={project} size={24} />}
-                {transaction ?? t('Page Loads')}
-              </Fragment>
-            }
-            headerActions={
-              transactionSummaryTarget && (
-                <LinkButton
-                  to={transactionSummaryTarget}
-                  onClick={() => {
-                    trackAnalytics('insight.vital.overview.open_transaction_summary', {
-                      organization,
-                    });
-                  }}
-                  size="sm"
-                >
-                  {t('View Transaction Summary')}
-                </LinkButton>
-              )
-            }
-            hideDefaultTabs
-            tabs={{
-              value: tab,
-              onTabChange: handleTabChange,
-              tabList: (
-                <TabList hideBorder>
-                  {LANDING_DISPLAYS.map(({label, field}) => (
-                    <TabList.Item key={field}>{label}</TabList.Item>
-                  ))}
-                </TabList>
-              ),
-            }}
-            breadcrumbs={transaction ? [{label: 'Page Summary'}] : []}
-            module={ModuleName.VITAL}
-          />
-        )}
+        <FrontendHeader
+          headerTitle={
+            <Fragment>
+              {transaction && project && <ProjectAvatar project={project} size={24} />}
+              {transaction ?? t('Page Loads')}
+            </Fragment>
+          }
+          headerActions={
+            transactionSummaryTarget && (
+              <LinkButton
+                to={transactionSummaryTarget}
+                onClick={() => {
+                  trackAnalytics('insight.vital.overview.open_transaction_summary', {
+                    organization,
+                  });
+                }}
+                size="sm"
+              >
+                {t('View Transaction Summary')}
+              </LinkButton>
+            )
+          }
+          hideDefaultTabs
+          tabs={{
+            value: tab,
+            onTabChange: handleTabChange,
+            tabList: (
+              <TabList hideBorder>
+                {LANDING_DISPLAYS.map(({label, field}) => (
+                  <TabList.Item key={field}>{label}</TabList.Item>
+                ))}
+              </TabList>
+            ),
+          }}
+          breadcrumbs={transaction ? [{label: 'Page Summary'}] : []}
+          module={ModuleName.VITAL}
+        />
         <ModuleBodyUpsellHook moduleName={ModuleName.VITAL}>
           {tab === LandingDisplayField.SPANS ? (
             <Layout.Body>
@@ -240,11 +193,7 @@ export function PageOverview() {
             <Layout.Body>
               <Layout.Main>
                 <TopMenuContainer>
-                  <PageFilterBar condensed>
-                    <ProjectPageFilter />
-                    <EnvironmentPageFilter />
-                    <DatePageFilter />
-                  </PageFilterBar>
+                  <ModulePageFilterBar moduleName={ModuleName.VITAL} />
                   <BrowserTypeSelector />
                 </TopMenuContainer>
                 <Flex>
@@ -306,7 +255,7 @@ export function PageOverview() {
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders moduleName="vital" features="insights-initial-modules">
+    <ModulePageProviders moduleName="vital">
       <PageOverview />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx b/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx
index d79e845504a35e..89a23b43b3677a 100644
--- a/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx
+++ b/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.tsx
@@ -3,10 +3,7 @@ import styled from '@emotion/styled';
 import omit from 'lodash/omit';
 
 import Alert from 'sentry/components/alert';
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
 import {Button} from 'sentry/components/button';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import ExternalLink from 'sentry/components/links/externalLink';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
@@ -35,18 +32,17 @@ import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modul
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {ModulesOnboarding} from 'sentry/views/insights/common/components/modulesOnboarding';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {FrontendHeader} from 'sentry/views/insights/pages/frontend/frontendPageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {
   ModuleName,
   SpanMetricsField,
   type SubregionCode,
 } from 'sentry/views/insights/types';
 
+const WEB_VITALS_COUNT = 5;
+
 export function WebVitalsLandingPage() {
   const location = useLocation();
-  const {isInDomainView} = useDomainViewFilters();
 
   const router = useRouter();
 
@@ -71,45 +67,21 @@ export function WebVitalsLandingPage() {
       ? undefined
       : calculatePerformanceScoreFromStoredTableDataRow(projectScores?.data?.[0]);
 
-  const crumbs = useModuleBreadcrumbs('vital');
-
   return (
     <React.Fragment>
-      {!isInDomainView && (
-        <Layout.Header>
-          <Layout.HeaderContent>
-            <Breadcrumbs crumbs={crumbs} />
-
-            <Layout.Title>
-              {MODULE_TITLE}
-              <PageHeadingQuestionTooltip
-                docsUrl={MODULE_DOC_LINK}
-                title={MODULE_DESCRIPTION}
-              />
-            </Layout.Title>
-          </Layout.HeaderContent>
-          <Layout.HeaderActions>
-            <ButtonBar gap={1}>
-              <FeedbackWidgetButton />
-            </ButtonBar>
-          </Layout.HeaderActions>
-        </Layout.Header>
-      )}
-
-      {isInDomainView && (
-        <FrontendHeader
-          headerTitle={
-            <Fragment>
-              {MODULE_TITLE}
-              <PageHeadingQuestionTooltip
-                docsUrl={MODULE_DOC_LINK}
-                title={MODULE_DESCRIPTION}
-              />
-            </Fragment>
-          }
-          module={ModuleName.VITAL}
-        />
-      )}
+      <FrontendHeader
+        headerTitle={
+          <Fragment>
+            {MODULE_TITLE}
+            <PageHeadingQuestionTooltip
+              docsUrl={MODULE_DOC_LINK}
+              title={MODULE_DESCRIPTION}
+            />
+          </Fragment>
+        }
+        module={ModuleName.VITAL}
+      />
+
       <ModuleBodyUpsellHook moduleName={ModuleName.VITAL}>
         <Layout.Body>
           <Layout.Main fullWidth>
@@ -135,6 +107,7 @@ export function WebVitalsLandingPage() {
                   />
                 </PerformanceScoreChartContainer>
                 <WebVitalMetersContainer>
+                  {(isPending || isProjectScoresLoading) && <WebVitalMetersPlaceholder />}
                   <WebVitalMeters
                     projectData={projectData}
                     projectScore={projectScore}
@@ -188,13 +161,19 @@ export function WebVitalsLandingPage() {
   );
 }
 
+function WebVitalMetersPlaceholder() {
+  return (
+    <LoadingBoxContainer>
+      {[...Array(WEB_VITALS_COUNT)].map((_, index) => (
+        <LoadingBox key={index} />
+      ))}
+    </LoadingBoxContainer>
+  );
+}
+
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="vital"
-      features="insights-initial-modules"
-      analyticEventName="insight.page_loads.vital"
-    >
+    <ModulePageProviders moduleName="vital" analyticEventName="insight.page_loads.vital">
       <WebVitalsLandingPage />
     </ModulePageProviders>
   );
@@ -219,6 +198,26 @@ const WebVitalMetersContainer = styled('div')`
   margin-bottom: ${space(2)};
 `;
 
+const LoadingBoxContainer = styled('div')`
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  width: 100%;
+  gap: ${space(1)};
+  align-items: center;
+  flex-wrap: wrap;
+
+  margin-bottom: ${space(1)};
+`;
+
+const LoadingBox = styled('div')`
+  flex: 1;
+  min-width: 140px;
+  height: 90px;
+  background-color: ${p => p.theme.gray100};
+  border-radius: ${p => p.theme.borderRadius};
+`;
+
 export const AlertContent = styled('div')`
   display: grid;
   grid-template-columns: 1fr max-content;
diff --git a/static/app/views/insights/cache/alerts.ts b/static/app/views/insights/cache/alerts.ts
deleted file mode 100644
index 564e3dccf86bb5..00000000000000
--- a/static/app/views/insights/cache/alerts.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {t} from 'sentry/locale';
-import type {AlertConfig} from 'sentry/views/insights/common/components/chartPanel';
-
-export const ALERTS: Record<string, AlertConfig> = {
-  missRate: {
-    aggregate: 'cache_miss_rate()',
-    query: 'span.op:[cache.get_item,cache.get]',
-  },
-  spm: {
-    aggregate: 'spm()',
-    query: 'span.op:[cache.get_item,cache.get]',
-  },
-  duration: {
-    aggregate: 'avg(transaction.duration)',
-    name: t('Create Average Duration Alert'),
-  },
-};
diff --git a/static/app/views/insights/cache/components/charts/hitMissChart.tsx b/static/app/views/insights/cache/components/charts/hitMissChart.tsx
index dcb9eb711bb123..93616785f8edbb 100644
--- a/static/app/views/insights/cache/components/charts/hitMissChart.tsx
+++ b/static/app/views/insights/cache/components/charts/hitMissChart.tsx
@@ -1,6 +1,5 @@
 import type {Series} from 'sentry/types/echarts';
 import {formatPercentage} from 'sentry/utils/number/formatPercentage';
-import {ALERTS} from 'sentry/views/insights/cache/alerts';
 import {CHART_HEIGHT} from 'sentry/views/insights/cache/settings';
 import {AVG_COLOR} from 'sentry/views/insights/colors';
 import Chart, {ChartType} from 'sentry/views/insights/common/components/chart';
@@ -15,7 +14,7 @@ type Props = {
 
 export function CacheHitMissChart({series, isLoading, error}: Props) {
   return (
-    <ChartPanel title={DataTitles[`cache_miss_rate()`]} alertConfigs={[ALERTS.missRate]}>
+    <ChartPanel title={DataTitles[`cache_miss_rate()`]}>
       <Chart
         height={CHART_HEIGHT}
         grid={{
diff --git a/static/app/views/insights/cache/components/charts/throughputChart.tsx b/static/app/views/insights/cache/components/charts/throughputChart.tsx
index c90953adc2faad..93be5948ca6102 100644
--- a/static/app/views/insights/cache/components/charts/throughputChart.tsx
+++ b/static/app/views/insights/cache/components/charts/throughputChart.tsx
@@ -1,7 +1,6 @@
 import type {Series} from 'sentry/types/echarts';
 import {RateUnit} from 'sentry/utils/discover/fields';
 import {formatRate} from 'sentry/utils/formatters';
-import {ALERTS} from 'sentry/views/insights/cache/alerts';
 import {CHART_HEIGHT} from 'sentry/views/insights/cache/settings';
 import {THROUGHPUT_COLOR} from 'sentry/views/insights/colors';
 import Chart, {ChartType} from 'sentry/views/insights/common/components/chart';
@@ -16,10 +15,7 @@ interface Props {
 
 export function ThroughputChart({series, isLoading, error}: Props) {
   return (
-    <ChartPanel
-      title={getThroughputChartTitle('cache.get_item')}
-      alertConfigs={[ALERTS.spm]}
-    >
+    <ChartPanel title={getThroughputChartTitle('cache.get_item')}>
       <Chart
         height={CHART_HEIGHT}
         grid={{
diff --git a/static/app/views/insights/cache/components/charts/transactionDurationChart.tsx b/static/app/views/insights/cache/components/charts/transactionDurationChart.tsx
index 64439d9049d3f6..c8cdcdf871ab41 100644
--- a/static/app/views/insights/cache/components/charts/transactionDurationChart.tsx
+++ b/static/app/views/insights/cache/components/charts/transactionDurationChart.tsx
@@ -3,7 +3,6 @@ import type {EChartHighlightHandler, Series} from 'sentry/types/echarts';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import useLocationQuery from 'sentry/utils/url/useLocationQuery';
-import {ALERTS} from 'sentry/views/insights/cache/alerts';
 import type {DataRow} from 'sentry/views/insights/cache/components/tables/spanSamplesTable';
 import {Referrer} from 'sentry/views/insights/cache/referrers';
 import {CHART_HEIGHT} from 'sentry/views/insights/cache/settings';
@@ -84,12 +83,7 @@ export function TransactionDurationChart({
   };
 
   return (
-    <ChartPanel
-      title={DataTitles['transaction.duration']}
-      alertConfigs={[
-        {...ALERTS.duration, query: MutableSearch.fromQueryObject(search).formatString()},
-      ]}
-    >
+    <ChartPanel title={DataTitles['transaction.duration']}>
       <Chart
         height={CHART_HEIGHT}
         grid={{
diff --git a/static/app/views/insights/cache/settings.ts b/static/app/views/insights/cache/settings.ts
index 8a9502bb4a10e4..9d2dbaa212a14f 100644
--- a/static/app/views/insights/cache/settings.ts
+++ b/static/app/views/insights/cache/settings.ts
@@ -17,6 +17,6 @@ export const BASE_FILTERS: SpanMetricsQueryFilters = {
 export const MODULE_DESCRIPTION = t(
   'Discover whether your application is utilizing caching effectively and understand the latency associated with cache misses.'
 );
-export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/caches/';
+export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/backend/caches/';
 
 export const MODULE_FEATURES = ['insights-addon-modules'];
diff --git a/static/app/views/insights/cache/views/cacheLandingPage.spec.tsx b/static/app/views/insights/cache/views/cacheLandingPage.spec.tsx
index 404a86c18bd569..cdffcca3ba993e 100644
--- a/static/app/views/insights/cache/views/cacheLandingPage.spec.tsx
+++ b/static/app/views/insights/cache/views/cacheLandingPage.spec.tsx
@@ -253,7 +253,7 @@ describe('CacheLandingPage', function () {
     expect(screen.getByRole('cell', {name: 'my-transaction'})).toBeInTheDocument();
     expect(screen.getByRole('link', {name: 'my-transaction'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/insights/caches/?project=123&statsPeriod=10d&transaction=my-transaction'
+      '/organizations/org-slug/insights/backend/caches/?project=123&statsPeriod=10d&transaction=my-transaction'
     );
 
     expect(screen.getByRole('columnheader', {name: 'Project'})).toBeInTheDocument();
diff --git a/static/app/views/insights/cache/views/cacheLandingPage.tsx b/static/app/views/insights/cache/views/cacheLandingPage.tsx
index 189f3f5e09b924..1ac8e199d2a1fe 100644
--- a/static/app/views/insights/cache/views/cacheLandingPage.tsx
+++ b/static/app/views/insights/cache/views/cacheLandingPage.tsx
@@ -1,9 +1,6 @@
 import React, {Fragment, useEffect} from 'react';
 import keyBy from 'lodash/keyBy';
 
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import ExternalLink from 'sentry/components/links/externalLink';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
@@ -44,11 +41,9 @@ import {
 import {useSpanMetricsSeries} from 'sentry/views/insights/common/queries/useDiscoverSeries';
 import {useHasFirstSpan} from 'sentry/views/insights/common/queries/useHasFirstSpan';
 import {useOnboardingProject} from 'sentry/views/insights/common/queries/useOnboardingProject';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
 import {DataTitles} from 'sentry/views/insights/common/views/spans/types';
 import {BackendHeader} from 'sentry/views/insights/pages/backend/backendPageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName, SpanFunction, SpanMetricsField} from 'sentry/views/insights/types';
 
 const {CACHE_MISS_RATE} = SpanFunction;
@@ -68,7 +63,6 @@ const SDK_UPDATE_ALERT = (
 const CACHE_ERROR_MESSAGE = 'Column cache.hit was not found in metrics indexer';
 
 export function CacheLandingPage() {
-  const {isInDomainView} = useDomainViewFilters();
   const location = useLocation();
   const {setPageInfo, pageAlert} = usePageAlert();
 
@@ -181,45 +175,20 @@ export function CacheLandingPage() {
 
   addCustomMeta(meta);
 
-  const crumbs = useModuleBreadcrumbs('cache');
-
   return (
     <React.Fragment>
-      {!isInDomainView && (
-        <Layout.Header>
-          <Layout.HeaderContent>
-            <Breadcrumbs crumbs={crumbs} />
-
-            <Layout.Title>
-              {MODULE_TITLE}
-              <PageHeadingQuestionTooltip
-                docsUrl={MODULE_DOC_LINK}
-                title={MODULE_DESCRIPTION}
-              />
-            </Layout.Title>
-          </Layout.HeaderContent>
-          <Layout.HeaderActions>
-            <ButtonBar gap={1}>
-              <FeedbackWidgetButton />
-            </ButtonBar>
-          </Layout.HeaderActions>
-        </Layout.Header>
-      )}
-
-      {isInDomainView && (
-        <BackendHeader
-          headerTitle={
-            <Fragment>
-              {MODULE_TITLE}
-              <PageHeadingQuestionTooltip
-                docsUrl={MODULE_DOC_LINK}
-                title={MODULE_DESCRIPTION}
-              />
-            </Fragment>
-          }
-          module={ModuleName.CACHE}
-        />
-      )}
+      <BackendHeader
+        headerTitle={
+          <Fragment>
+            {MODULE_TITLE}
+            <PageHeadingQuestionTooltip
+              docsUrl={MODULE_DOC_LINK}
+              title={MODULE_DESCRIPTION}
+            />
+          </Fragment>
+        }
+        module={ModuleName.CACHE}
+      />
 
       <ModuleBodyUpsellHook moduleName={ModuleName.CACHE}>
         <Layout.Body>
@@ -271,11 +240,7 @@ export function CacheLandingPage() {
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="cache"
-      features="insights-addon-modules"
-      analyticEventName="insight.page_loads.cache"
-    >
+    <ModulePageProviders moduleName="cache" analyticEventName="insight.page_loads.cache">
       <PageAlertProvider>
         <CacheLandingPage />
       </PageAlertProvider>
diff --git a/static/app/views/insights/common/components/chart.tsx b/static/app/views/insights/common/components/chart.tsx
index 4a9d1fe36ff5a1..8e3093c7a80dae 100644
--- a/static/app/views/insights/common/components/chart.tsx
+++ b/static/app/views/insights/common/components/chart.tsx
@@ -239,17 +239,29 @@ function Chart({
     return getIngestionDelayBucketCount(bucketSize, lastBucketTimestamp);
   }, [bucketSize, lastBucketTimestamp]);
 
-  // TODO: Support area and bar charts
+  // TODO: Support bar charts
   if (type === ChartType.LINE || type === ChartType.AREA) {
     const metricChartType =
       type === ChartType.AREA ? MetricDisplayType.AREA : MetricDisplayType.LINE;
-    const seriesToShow = series.map(serie =>
-      createIngestionSeries(serie as MetricSeries, ingestionBuckets, metricChartType)
-    );
+    const seriesToShow = series.map(serie => {
+      const ingestionSeries = createIngestionSeries(
+        serie as MetricSeries,
+        ingestionBuckets,
+        metricChartType
+      );
+      // this helper causes all the incomplete series to stack, here we remove the stacking
+      if (!stacked) {
+        for (const s of ingestionSeries) {
+          delete s.stack;
+        }
+      }
+      return ingestionSeries;
+    });
     [series, incompleteSeries] = seriesToShow.reduce(
       (acc, serie, index) => {
         const [trimmed, incomplete] = acc;
         const {markLine: _, ...incompleteSerie} = serie[1] ?? {};
+
         return [
           [...trimmed, {...serie[0], color: colors[index]}],
           [
@@ -274,7 +286,7 @@ function Chart({
           return axisLabelFormatter(
             value,
             aggregateOutputFormat ?? aggregateOutputType(data[0].seriesName),
-            undefined,
+            true,
             durationUnit ?? getDurationUnit(data),
             rateUnit
           );
@@ -322,6 +334,7 @@ function Chart({
     return getFormatter({
       isGroupedByDate: true,
       showTimeInTooltip: true,
+      truncate: true,
       utc: utc ?? false,
       valueFormatter: (value, seriesName) => {
         return tooltipFormatter(
@@ -442,16 +455,10 @@ function Chart({
     if (type === ChartType.BAR) {
       return (
         <BarChart
+          {...zoomRenderProps}
           height={height}
           series={series}
-          xAxis={{
-            type: 'category',
-            axisTick: {show: true},
-            truncate: Infinity, // Show axis labels
-            axisLabel: {
-              interval: 0, // Show _all_ axis labels
-            },
-          }}
+          xAxis={xAxis}
           yAxis={{
             minInterval: durationUnit ?? getDurationUnit(data),
             splitNumber: definedAxisTicks,
@@ -462,7 +469,7 @@ function Chart({
                 return axisLabelFormatter(
                   value,
                   aggregateOutputFormat ?? aggregateOutputType(data[0].seriesName),
-                  undefined,
+                  true,
                   durationUnit ?? getDurationUnit(data),
                   rateUnit
                 );
diff --git a/static/app/views/insights/common/components/chartPanel.spec.tsx b/static/app/views/insights/common/components/chartPanel.spec.tsx
index 362f0a895d70b7..d0403a5ce321cd 100644
--- a/static/app/views/insights/common/components/chartPanel.spec.tsx
+++ b/static/app/views/insights/common/components/chartPanel.spec.tsx
@@ -1,5 +1,5 @@
 import {initializeOrg} from 'sentry-test/initializeOrg';
-import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
 
@@ -7,28 +7,13 @@ describe('chartPanel', function () {
   const {organization} = initializeOrg({
     organization: {features: ['insights-alerts', 'insights-initial-modules']},
   });
-
-  it('should render create alert options', async function () {
-    const alertConfigs = [
-      {
-        aggregate: 'avg(d:spans/duration@millisecond)',
-        query: 'span.module:db has:span.description',
-        name: 'Average DB Duration',
-      },
-      {
-        aggregate: 'spm()',
-        query: 'span.module:db has:span.description',
-        name: 'DB Spans per minute',
-      },
-    ];
+  it('should render', function () {
     render(
-      <ChartPanel title="Avg Latency" alertConfigs={alertConfigs}>
+      <ChartPanel title="Avg Latency">
         <div />
       </ChartPanel>,
       {organization}
     );
-    await userEvent.click(screen.getByLabelText('Chart Actions'));
-    screen.getByText('Average DB Duration');
-    screen.getByText('DB Spans per minute');
+    expect(screen.getByText('Avg Latency')).toBeInTheDocument();
   });
 });
diff --git a/static/app/views/insights/common/components/chartPanel.tsx b/static/app/views/insights/common/components/chartPanel.tsx
index 1a084909330ba7..efe250f8d7d55a 100644
--- a/static/app/views/insights/common/components/chartPanel.tsx
+++ b/static/app/views/insights/common/components/chartPanel.tsx
@@ -1,31 +1,15 @@
-import {useMemo} from 'react';
 import styled from '@emotion/styled';
 
 import {openInsightChartModal} from 'sentry/actionCreators/modal';
 import {Button} from 'sentry/components/button';
-import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import Panel from 'sentry/components/panels/panel';
-import {IconEllipsis, IconExpand} from 'sentry/icons';
+import {IconExpand} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import useOrganization from 'sentry/utils/useOrganization';
-import usePageFilters from 'sentry/utils/usePageFilters';
-import useProjects from 'sentry/utils/useProjects';
-import {getAlertsUrl} from 'sentry/views/insights/common/utils/getAlertsUrl';
-import {hasInsightsAlerts} from 'sentry/views/insights/common/utils/hasInsightsAlerts';
-import {useModuleNameFromUrl} from 'sentry/views/insights/common/utils/useModuleNameFromUrl';
 import {Subtitle} from 'sentry/views/performance/landing/widgets/widgets/singleFieldAreaWidget';
 
-export type AlertConfig = {
-  aggregate: string;
-  name?: string;
-  query?: string;
-};
-
 type Props = {
   children: React.ReactNode;
-  alertConfigs?: AlertConfig[];
   button?: JSX.Element;
   className?: string;
   subtitle?: React.ReactNode;
@@ -37,65 +21,8 @@ export default function ChartPanel({
   children,
   button,
   subtitle,
-  alertConfigs,
   className,
 }: Props) {
-  const organization = useOrganization();
-  const {selection} = usePageFilters();
-  const {projects} = useProjects();
-  const project = useMemo(
-    () =>
-      selection.projects.length === 1
-        ? projects.find(p => p.id === `${selection.projects[0]}`)
-        : undefined,
-    [projects, selection.projects]
-  );
-  const moduleName = useModuleNameFromUrl();
-  const alertsUrls =
-    alertConfigs?.map(alertConfig => {
-      // Alerts only support single project selection and one or all environment
-      const singleProject = selection.projects.length === 1 && project;
-      const singleEnvironment = selection.environments.length <= 1;
-      const alertsUrl =
-        alertConfig && singleProject && singleEnvironment
-          ? getAlertsUrl({
-              project,
-              orgSlug: organization.slug,
-              pageFilters: selection,
-              name: typeof title === 'string' ? title : undefined,
-              ...alertConfig,
-            })
-          : undefined;
-      const name = alertConfig.name ?? 'Create Alert';
-      const disabled = !singleProject || !singleEnvironment;
-      const tooltip = !singleProject
-        ? t(
-            'Alerts are only available for single project selection. Update your project filter to create an alert.'
-          )
-        : !singleEnvironment
-          ? t(
-              'Alerts are only available with at most one environment selection. Update your environment filter to create an alert.'
-            )
-          : undefined;
-      return {
-        key: name,
-        label: name,
-        to: alertsUrl,
-        disabled,
-        tooltip,
-        onClick: () => {
-          trackAnalytics('insight.general.create_alert', {
-            organization,
-            chart_name: typeof title === 'string' ? title : undefined,
-            alert_name: name,
-            source: moduleName ?? undefined,
-          });
-        },
-      };
-    }) ?? [];
-
-  const dropdownMenuItems = hasInsightsAlerts(organization) ? alertsUrls : [];
-
   return (
     <PanelWithNoPadding className={className}>
       <PanelBody>
@@ -112,19 +39,6 @@ export default function ChartPanel({
             )}
             <MenuContainer>
               {button}
-              {dropdownMenuItems.length > 0 && (
-                <DropdownMenu
-                  triggerProps={{
-                    'aria-label': t('Chart Actions'),
-                    size: 'xs',
-                    borderless: true,
-                    showChevron: false,
-                    icon: <IconEllipsis direction="down" size="sm" />,
-                  }}
-                  position="bottom-end"
-                  items={dropdownMenuItems}
-                />
-              )}
               <Button
                 aria-label={t('Expand Insight Chart')}
                 borderless
diff --git a/static/app/views/insights/common/components/modulePageFilterBar.tsx b/static/app/views/insights/common/components/modulePageFilterBar.tsx
index 3dd83dcf46fce6..5b0b76d7d14c6e 100644
--- a/static/app/views/insights/common/components/modulePageFilterBar.tsx
+++ b/static/app/views/insights/common/components/modulePageFilterBar.tsx
@@ -21,6 +21,7 @@ import type {ModuleName} from 'sentry/views/insights/types';
 
 type Props = {
   moduleName: ModuleName;
+  disableProjectFilter?: boolean; // This is used primarily for module summary pages when a project can't be selected
   extraFilters?: React.ReactNode;
   onProjectChange?: ComponentProps<typeof ProjectPageFilter>['onChange'];
 };
@@ -28,7 +29,12 @@ type Props = {
 const CHANGE_PROJECT_TEXT = t('Make sure you have the correct project selected.');
 const DISABLED_OPTIONS = ['14d', '30d', '90d'];
 
-export function ModulePageFilterBar({moduleName, onProjectChange, extraFilters}: Props) {
+export function ModulePageFilterBar({
+  moduleName,
+  onProjectChange,
+  extraFilters,
+  disableProjectFilter,
+}: Props) {
   const {projects: allProjects} = useProjects();
   const organization = useOrganization();
 
@@ -101,7 +107,7 @@ export function ModulePageFilterBar({moduleName, onProjectChange, extraFilters}:
           otherwise two clicks are required because of some rerendering/event propogation issues into the children */}
           <div style={{width: '100px', position: 'absolute', height: '100%'}} />
         </Tooltip>
-        <ProjectPageFilter onChange={onProjectChange} />
+        {!disableProjectFilter && <ProjectPageFilter onChange={onProjectChange} />}
         <EnvironmentPageFilter />
         <DatePageFilter {...dateFilterProps} />
       </PageFilterBar>
diff --git a/static/app/views/insights/common/components/modulePageProviders.tsx b/static/app/views/insights/common/components/modulePageProviders.tsx
index 17285e632a9efd..962a9a50ed2233 100644
--- a/static/app/views/insights/common/components/modulePageProviders.tsx
+++ b/static/app/views/insights/common/components/modulePageProviders.tsx
@@ -1,7 +1,4 @@
-import type {ComponentProps} from 'react';
-
 import Feature from 'sentry/components/acl/feature';
-import HookOrDefault from 'sentry/components/hookOrDefault';
 import * as Layout from 'sentry/components/layouts/thirds';
 import NoProjectMessage from 'sentry/components/noProjectMessage';
 import PageFiltersContainer from 'sentry/components/organizations/pageFilters/container';
@@ -11,8 +8,11 @@ import useOrganization from 'sentry/utils/useOrganization';
 import {NoAccess} from 'sentry/views/insights/common/components/noAccess';
 import {useHasDataTrackAnalytics} from 'sentry/views/insights/common/utils/useHasDataTrackAnalytics';
 import {useModuleTitles} from 'sentry/views/insights/common/utils/useModuleTitle';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
-import {INSIGHTS_TITLE, QUERY_DATE_RANGE_LIMIT} from 'sentry/views/insights/settings';
+import {
+  INSIGHTS_TITLE,
+  MODULE_FEATURE_MAP,
+  QUERY_DATE_RANGE_LIMIT,
+} from 'sentry/views/insights/settings';
 import type {ModuleName} from 'sentry/views/insights/types';
 
 type ModuleNameStrings = `${ModuleName}`;
@@ -20,7 +20,6 @@ export type TitleableModuleNames = Exclude<ModuleNameStrings, '' | 'other'>;
 
 interface Props {
   children: React.ReactNode;
-  features: ComponentProps<typeof Feature>['features'];
   moduleName: TitleableModuleNames;
   analyticEventName?: InsightEventKey;
   pageTitle?: string;
@@ -30,21 +29,20 @@ export function ModulePageProviders({
   moduleName,
   pageTitle,
   children,
-  features,
   analyticEventName,
 }: Props) {
   const organization = useOrganization();
   const moduleTitles = useModuleTitles();
-  const {isInDomainView} = useDomainViewFilters();
 
   const hasDateRangeQueryLimit = organization.features.includes(
     'insights-query-date-range-limit'
   );
 
+  const features = MODULE_FEATURE_MAP[moduleName];
+
   useHasDataTrackAnalytics(moduleName as ModuleName, analyticEventName);
 
   const moduleTitle = moduleTitles[moduleName];
-  const shouldUseUpsellHook = !isInDomainView;
 
   const fullPageTitle = [pageTitle, moduleTitle, INSIGHTS_TITLE]
     .filter(Boolean)
@@ -55,39 +53,16 @@ export function ModulePageProviders({
       maxPickableDays={hasDateRangeQueryLimit ? QUERY_DATE_RANGE_LIMIT : undefined}
     >
       <SentryDocumentTitle title={fullPageTitle} orgSlug={organization.slug}>
-        {shouldUseUpsellHook && (
-          <UpsellPageHook moduleName={moduleName}>
-            <Layout.Page>
-              <Feature
-                features={features}
-                organization={organization}
-                renderDisabled={NoAccess}
-              >
-                <NoProjectMessage organization={organization}>
-                  {children}
-                </NoProjectMessage>
-              </Feature>
-            </Layout.Page>
-          </UpsellPageHook>
-        )}
-
-        {!shouldUseUpsellHook && (
-          <Layout.Page>
-            <Feature
-              features={['insights-entry-points']}
-              organization={organization}
-              renderDisabled={NoAccess}
-            >
-              <NoProjectMessage organization={organization}>{children}</NoProjectMessage>
-            </Feature>
-          </Layout.Page>
-        )}
+        <Layout.Page>
+          <Feature
+            features={features}
+            organization={organization}
+            renderDisabled={NoAccess}
+          >
+            <NoProjectMessage organization={organization}>{children}</NoProjectMessage>
+          </Feature>
+        </Layout.Page>
       </SentryDocumentTitle>
     </PageFiltersContainer>
   );
 }
-
-export const UpsellPageHook = HookOrDefault({
-  hookName: 'component:insights-upsell-page',
-  defaultComponent: ({children}) => children,
-});
diff --git a/static/app/views/insights/common/components/moduleUpsellHookWrapper.tsx b/static/app/views/insights/common/components/moduleUpsellHookWrapper.tsx
index 1c62f7a5ad30bc..a45010e17eb48a 100644
--- a/static/app/views/insights/common/components/moduleUpsellHookWrapper.tsx
+++ b/static/app/views/insights/common/components/moduleUpsellHookWrapper.tsx
@@ -1,12 +1,5 @@
-import Feature from 'sentry/components/acl/feature';
-import {NoAccess} from 'sentry/components/noAccess';
-import useOrganization from 'sentry/utils/useOrganization';
-import {
-  type TitleableModuleNames,
-  UpsellPageHook,
-} from 'sentry/views/insights/common/components/modulePageProviders';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
-import {MODULE_FEATURE_MAP} from 'sentry/views/insights/settings';
+import HookOrDefault from 'sentry/components/hookOrDefault';
+import type {TitleableModuleNames} from 'sentry/views/insights/common/components/modulePageProviders';
 
 // TODO - remove, This is only necessary for domain views, where we don't want to show the full upsell page.
 export function ModuleBodyUpsellHook({
@@ -16,21 +9,14 @@ export function ModuleBodyUpsellHook({
   children: React.ReactNode;
   moduleName: TitleableModuleNames;
 }) {
-  const {isInDomainView: shouldDisplayUpsell} = useDomainViewFilters();
-  const organization = useOrganization();
-
-  if (shouldDisplayUpsell) {
-    return (
-      <UpsellPageHook moduleName={moduleName} fullPage={false}>
-        <Feature
-          features={MODULE_FEATURE_MAP[moduleName]}
-          organization={organization}
-          renderDisabled={NoAccess}
-        >
-          {children}
-        </Feature>
-      </UpsellPageHook>
-    );
-  }
-  return children;
+  return (
+    <UpsellPageHook moduleName={moduleName} fullPage={false}>
+      {children}
+    </UpsellPageHook>
+  );
 }
+
+const UpsellPageHook = HookOrDefault({
+  hookName: 'component:insights-upsell-page',
+  defaultComponent: ({children}) => children,
+});
diff --git a/static/app/views/insights/common/components/modulesOnboarding.tsx b/static/app/views/insights/common/components/modulesOnboarding.tsx
index 20c61271d64fd7..7a4aa7b488ec8d 100644
--- a/static/app/views/insights/common/components/modulesOnboarding.tsx
+++ b/static/app/views/insights/common/components/modulesOnboarding.tsx
@@ -370,7 +370,7 @@ const EMPTY_STATE_CONTENT: Record<TitleableModuleNames, EmptyStateContent> = {
     imageSrc: requestPreviewImg,
   },
   resource: {
-    heading: t('Is your favourite animated gif worth the time it takes to load?'),
+    heading: t('Is your favorite animated gif worth the time it takes to load?'),
     description: tct(
       'Find large and slow-to-load [dataTypePlurl] used by your application and understand their impact on page performance.',
       {dataTypePlurl: MODULE_DATA_TYPES_PLURAL[ModuleName.RESOURCE].toLocaleLowerCase()}
diff --git a/static/app/views/insights/common/queries/useSortedTimeSeries.tsx b/static/app/views/insights/common/queries/useSortedTimeSeries.tsx
index 3a533c91fa9c8f..0c81710e851e26 100644
--- a/static/app/views/insights/common/queries/useSortedTimeSeries.tsx
+++ b/static/app/views/insights/common/queries/useSortedTimeSeries.tsx
@@ -1,9 +1,11 @@
 import type {Series} from 'sentry/types/echarts';
 import type {
+  Confidence,
   EventsStats,
   GroupedMultiSeriesEventsStats,
   MultiSeriesEventsStats,
 } from 'sentry/types/organization';
+import {defined} from 'sentry/utils';
 import {encodeSort} from 'sentry/utils/discover/eventView';
 import {DURATION_UNITS, SIZE_UNITS} from 'sentry/utils/discover/fieldRenderers';
 import {getAggregateAlias} from 'sentry/utils/discover/fields';
@@ -16,6 +18,7 @@ import type {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
+import {determineSeriesConfidence} from 'sentry/views/alerts/rules/metric/utils/determineSeriesConfidence';
 import {getSeriesEventView} from 'sentry/views/insights/common/queries/getSeriesEventView';
 import type {SpanFunctions, SpanIndexedField} from 'sentry/views/insights/types';
 
@@ -116,7 +119,7 @@ export const useSortedTimeSeries = <
   };
 };
 
-function isEventsStats(
+export function isEventsStats(
   obj: EventsStats | MultiSeriesEventsStats | GroupedMultiSeriesEventsStats
 ): obj is EventsStats {
   return typeof obj === 'object' && obj !== null && typeof obj.data === 'object';
@@ -211,7 +214,7 @@ function processSingleEventStats(
     scale = (unit && (DURATION_UNITS[unit] ?? SIZE_UNITS[unit])) ?? 1;
   }
 
-  const processsedData: Series = {
+  const processedData: Series = {
     seriesName: seriesName || '(empty string)',
     data: seriesData.data.map(([timestamp, countsForTimestamp]) => ({
       name: timestamp * 1000,
@@ -219,5 +222,10 @@ function processSingleEventStats(
     })),
   };
 
-  return [seriesData.order || 0, processsedData];
+  const confidence: Confidence = determineSeriesConfidence(seriesData);
+  if (defined(confidence)) {
+    processedData.confidence = confidence;
+  }
+
+  return [seriesData.order || 0, processedData];
 }
diff --git a/static/app/views/insights/common/utils/getAlertsUrl.tsx b/static/app/views/insights/common/utils/getAlertsUrl.tsx
index e3b7b356b69496..f32b6f484e46a1 100644
--- a/static/app/views/insights/common/utils/getAlertsUrl.tsx
+++ b/static/app/views/insights/common/utils/getAlertsUrl.tsx
@@ -51,6 +51,8 @@ function getStatsPeriod(pageFilters: PageFilters) {
     case '7d':
     case '14d':
       return period;
+    case '1h':
+      return '24h'; // Explore allows 1h, but alerts only allows 24h minimum
     default:
       return '7d';
   }
diff --git a/static/app/views/insights/common/utils/hasInsightsAlerts.tsx b/static/app/views/insights/common/utils/hasInsightsAlerts.tsx
deleted file mode 100644
index 44ef8e4892bed3..00000000000000
--- a/static/app/views/insights/common/utils/hasInsightsAlerts.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {Organization} from 'sentry/types/organization';
-
-export function hasInsightsAlerts(organization: Organization): boolean {
-  return (
-    organization.features.includes('insights-initial-modules') &&
-    organization.features.includes('insights-alerts')
-  );
-}
diff --git a/static/app/views/insights/common/utils/moduleTitles.tsx b/static/app/views/insights/common/utils/moduleTitles.tsx
index 15aff27de7fd69..534050f288d9c5 100644
--- a/static/app/views/insights/common/utils/moduleTitles.tsx
+++ b/static/app/views/insights/common/utils/moduleTitles.tsx
@@ -4,6 +4,7 @@ import {MODULE_TITLE as CACHE_MODULE_TITLE} from 'sentry/views/insights/cache/se
 import {MODULE_TITLE as DB_MODULE_TITLE} from 'sentry/views/insights/database/settings';
 import {
   FRONTEND_MODULE_TITLE as HTTP_FRONTEND_MODULE_TITLE,
+  MOBILE_MODULE_TITLE as HTTP_MOBILE_MODULE_TITLE,
   MODULE_TITLE as HTTP_MODULE_TITLE,
 } from 'sentry/views/insights/http/settings';
 import {MODULE_TITLE as AI_MODULE_TITLE} from 'sentry/views/insights/llmMonitoring/settings';
@@ -42,7 +43,9 @@ export const DOMAIN_VIEW_MODULE_TITLES: Record<
 > = {
   ai: {},
   backend: {},
-  mobile: {},
+  mobile: {
+    [ModuleName.HTTP]: HTTP_MOBILE_MODULE_TITLE,
+  },
   frontend: {
     [ModuleName.HTTP]: HTTP_FRONTEND_MODULE_TITLE,
   },
diff --git a/static/app/views/insights/common/utils/useHasDataTrackAnalytics.tsx b/static/app/views/insights/common/utils/useHasDataTrackAnalytics.tsx
index 05e328f74a8210..2fffd1963eb83c 100644
--- a/static/app/views/insights/common/utils/useHasDataTrackAnalytics.tsx
+++ b/static/app/views/insights/common/utils/useHasDataTrackAnalytics.tsx
@@ -5,11 +5,13 @@ import {trackAnalytics} from 'sentry/utils/analytics';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {useHasFirstSpan} from 'sentry/views/insights/common/queries/useHasFirstSpan';
+import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import type {ModuleName} from 'sentry/views/insights/types';
 
 export function useHasDataTrackAnalytics(module: ModuleName, analyticEvent?: string) {
   const organization = useOrganization();
   const pageFilters = usePageFilters();
+  const view = useDomainViewFilters();
 
   const hasEverSentData = useHasFirstSpan(module);
 
@@ -22,7 +24,8 @@ export function useHasDataTrackAnalytics(module: ModuleName, analyticEvent?: str
       trackAnalytics(analyticEvent, {
         organization,
         has_ever_sent_data: hasEverSentData,
+        ...(view ? {view} : {}),
       });
     }
-  }, [organization, hasEverSentData, analyticEvent, projects, pageFilters.isReady]);
+  }, [organization, hasEverSentData, analyticEvent, projects, pageFilters.isReady, view]);
 }
diff --git a/static/app/views/insights/common/utils/useModuleBreadcrumbs.tsx b/static/app/views/insights/common/utils/useModuleBreadcrumbs.tsx
deleted file mode 100644
index ea44cd3e274b39..00000000000000
--- a/static/app/views/insights/common/utils/useModuleBreadcrumbs.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import type {Crumb} from 'sentry/components/breadcrumbs';
-import {useModuleURL} from 'sentry/views/insights/common/utils/useModuleURL';
-import {INSIGHTS_TITLE, MODULE_TITLES} from 'sentry/views/insights/settings';
-import type {ModuleName} from 'sentry/views/insights/types';
-
-type ModuleNameStrings = `${ModuleName}`;
-type RoutableModuleNames = Exclude<ModuleNameStrings, '' | 'other'>;
-
-export function useModuleBreadcrumbs(moduleName: RoutableModuleNames): Crumb[] {
-  const moduleTitle = MODULE_TITLES[moduleName];
-  const moduleTo = useModuleURL(moduleName);
-
-  return [
-    {
-      label: INSIGHTS_TITLE,
-      to: undefined, // There is no page at `/insights/` so there is nothing to link to
-      preservePageFilters: true,
-    },
-    {
-      label: moduleTitle,
-      to: moduleTo,
-      preservePageFilters: true,
-    },
-  ];
-}
diff --git a/static/app/views/insights/common/utils/useModuleURL.tsx b/static/app/views/insights/common/utils/useModuleURL.tsx
index b97ef2813e72cc..cbd303192697f2 100644
--- a/static/app/views/insights/common/utils/useModuleURL.tsx
+++ b/static/app/views/insights/common/utils/useModuleURL.tsx
@@ -18,7 +18,6 @@ import {
 } from 'sentry/views/insights/pages/useFilters';
 import {getModuleView} from 'sentry/views/insights/pages/utils';
 import {BASE_URL as QUEUE_BASE_URL} from 'sentry/views/insights/queues/settings';
-import {INSIGHTS_BASE_URL} from 'sentry/views/insights/settings';
 import {ModuleName} from 'sentry/views/insights/types';
 
 export const MODULE_BASE_URLS: Record<ModuleName, string> = {
@@ -66,7 +65,6 @@ export function useModuleURLBuilder(
   detectDomainView: boolean = true
 ): URLBuilder {
   const organization = useOrganization({allowNull: true}); // Some parts of the app, like the main sidebar, render even if the organization isn't available (during loading, or at all).
-  const hasDomainViewFeature = organization?.features.includes('insights-domain-view');
   const {view: currentView} = useDomainViewFilters();
 
   if (!organization) {
@@ -76,28 +74,17 @@ export function useModuleURLBuilder(
 
   const {slug} = organization;
 
-  if (hasDomainViewFeature) {
-    return function (moduleName: RoutableModuleNames, domainView?: DomainView) {
-      let view = detectDomainView ? currentView : currentView ?? domainView;
+  return function (moduleName: RoutableModuleNames, domainView?: DomainView) {
+    let view = detectDomainView ? currentView : currentView ?? domainView;
 
-      if (!view) {
-        view = getModuleView(moduleName as ModuleName);
-      }
+    if (!view) {
+      view = getModuleView(moduleName as ModuleName);
+    }
 
-      return bare
-        ? `${DOMAIN_VIEW_BASE_URL}/${view}/${MODULE_BASE_URLS[moduleName]}`
-        : normalizeUrl(
-            `/organizations/${slug}/${DOMAIN_VIEW_BASE_URL}/${view}/${MODULE_BASE_URLS[moduleName]}`
-          );
-    };
-  }
-
-  // TODO - delete this block once the domain view feature is fully rolled out
-  return function (moduleName: RoutableModuleNames) {
     return bare
-      ? `${INSIGHTS_BASE_URL}/${MODULE_BASE_URLS[moduleName]}`
+      ? `${DOMAIN_VIEW_BASE_URL}/${view}/${MODULE_BASE_URLS[moduleName]}`
       : normalizeUrl(
-          `/organizations/${slug}/${INSIGHTS_BASE_URL}/${MODULE_BASE_URLS[moduleName]}`
+          `/organizations/${slug}/${DOMAIN_VIEW_BASE_URL}/${view}/${MODULE_BASE_URLS[moduleName]}`
         );
   };
 }
diff --git a/static/app/views/insights/common/views/spans/selectors/subregionSelector.tsx b/static/app/views/insights/common/views/spans/selectors/subregionSelector.tsx
index 962d99c7d6ae75..bdb73be362b391 100644
--- a/static/app/views/insights/common/views/spans/selectors/subregionSelector.tsx
+++ b/static/app/views/insights/common/views/spans/selectors/subregionSelector.tsx
@@ -66,7 +66,7 @@ export default function SubregionSelector({size}: Props) {
       triggerProps={{
         prefix: (
           <Fragment>
-            <StyledFeatureBadge type="beta" />
+            <StyledFeatureBadge type="new" />
             {t('Geo region')}
           </Fragment>
         ),
diff --git a/static/app/views/insights/common/views/spans/spanTimeCharts.tsx b/static/app/views/insights/common/views/spans/spanTimeCharts.tsx
index a470b6dbeffe6b..22843c3e5cacb8 100644
--- a/static/app/views/insights/common/views/spans/spanTimeCharts.tsx
+++ b/static/app/views/insights/common/views/spans/spanTimeCharts.tsx
@@ -17,9 +17,7 @@ import Chart, {
   ChartType,
   useSynchronizeCharts,
 } from 'sentry/views/insights/common/components/chart';
-import ChartPanel, {
-  type AlertConfig,
-} from 'sentry/views/insights/common/components/chartPanel';
+import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
 import {useSpansQuery} from 'sentry/views/insights/common/queries/useSpansQuery';
 import {STARFISH_CHART_INTERVAL_FIDELITY} from 'sentry/views/insights/common/utils/constants';
 import {useErrorRateQuery as useErrorCountQuery} from 'sentry/views/insights/common/views/spans/queries';
@@ -37,9 +35,6 @@ const {SPAN_SELF_TIME, SPAN_MODULE, SPAN_DESCRIPTION, SPAN_DOMAIN} = SpanMetrics
 
 const CHART_HEIGHT = 140;
 
-const THROUGHPUT_ALERT_AGGREGATE = 'spm()';
-const DURATION_ALERT_AGGREGATE = `avg(d:spans/exclusive_time@millisecond)`; // TODO: we should move this to span.duration once we stop using exclusive time entirely in the insights charts
-
 type Props = {
   appliedFilters: ModuleFilters;
   moduleName: ModuleName;
@@ -88,7 +83,6 @@ export function SpanTimeCharts({
     {
       Comp: (props: ChartProps) => JSX.Element;
       title: string;
-      alertConfigs?: AlertConfig[];
     }[]
   > = {
     [ModuleName.DB]: [],
@@ -110,35 +104,23 @@ export function SpanTimeCharts({
     [ModuleName.OTHER]: [],
   };
 
-  const throughputAlertConfig = {
-    aggregate: THROUGHPUT_ALERT_AGGREGATE,
-    query: eventView.query,
-  };
-
-  const durationAlertConfig = {
-    aggregate: DURATION_ALERT_AGGREGATE,
-    query: eventView.query,
-  };
-
   const charts = [
     {
       title: getThroughputChartTitle(moduleName, throughputUnit),
       Comp: ThroughputChart,
-      alertConfigs: [throughputAlertConfig],
     },
     {
       title: getDurationChartTitle(moduleName),
       Comp: DurationChart,
-      alertConfigs: [durationAlertConfig],
     },
     ...moduleCharts[moduleName],
   ];
 
   return (
     <ChartsContainer>
-      {charts.map(({title, Comp, alertConfigs}) => (
+      {charts.map(({title, Comp}) => (
         <ChartsContainerItem key={title}>
-          <ChartPanel title={title} alertConfigs={alertConfigs}>
+          <ChartPanel title={title}>
             <Comp
               moduleName={moduleName}
               filters={appliedFilters}
diff --git a/static/app/views/insights/constants.tsx b/static/app/views/insights/constants.tsx
index 3d4c5cf5b44f36..47c46bcf6cca9e 100644
--- a/static/app/views/insights/constants.tsx
+++ b/static/app/views/insights/constants.tsx
@@ -87,6 +87,7 @@ const USER_CONTEXT_FILTERS: FilterKeySection = {
   children: [
     SpanIndexedField.USER,
     SpanIndexedField.USER_ID,
+    SpanIndexedField.USER_IP,
     SpanIndexedField.USER_EMAIL,
     SpanIndexedField.USER_USERNAME,
     SpanIndexedField.USER_GEO_SUBREGION,
diff --git a/static/app/views/insights/database/alerts.ts b/static/app/views/insights/database/alerts.ts
deleted file mode 100644
index a9958611a25794..00000000000000
--- a/static/app/views/insights/database/alerts.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {AlertConfig} from 'sentry/views/insights/common/components/chartPanel';
-
-export const ALERTS: Record<string, AlertConfig> = {
-  duration: {
-    aggregate: 'avg(d:spans/exclusive_time@millisecond)',
-    query: 'span.module:db has:span.description',
-  },
-  spm: {
-    aggregate: 'spm()',
-    query: 'span.module:db has:span.description',
-  },
-};
diff --git a/static/app/views/insights/database/components/charts/durationChart.tsx b/static/app/views/insights/database/components/charts/durationChart.tsx
index 651e581ed4206c..25b8b0417dc87c 100644
--- a/static/app/views/insights/database/components/charts/durationChart.tsx
+++ b/static/app/views/insights/database/components/charts/durationChart.tsx
@@ -1,25 +1,19 @@
 import type {Series} from 'sentry/types/echarts';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {AVG_COLOR} from 'sentry/views/insights/colors';
 import Chart, {ChartType} from 'sentry/views/insights/common/components/chart';
 import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
 import {getDurationChartTitle} from 'sentry/views/insights/common/views/spans/types';
-import {ALERTS} from 'sentry/views/insights/database/alerts';
 import {CHART_HEIGHT} from 'sentry/views/insights/database/settings';
-import type {SpanMetricsQueryFilters} from 'sentry/views/insights/types';
 
 interface Props {
   isLoading: boolean;
   series: Series[];
   error?: Error | null;
-  filters?: SpanMetricsQueryFilters;
 }
 
-export function DurationChart({series, isLoading, error, filters}: Props) {
-  const filterString = filters && MutableSearch.fromQueryObject(filters).formatString();
-  const alertConfig = {...ALERTS.duration, query: filterString ?? ALERTS.duration.query};
+export function DurationChart({series, isLoading, error}: Props) {
   return (
-    <ChartPanel title={getDurationChartTitle('db')} alertConfigs={[alertConfig]}>
+    <ChartPanel title={getDurationChartTitle('db')}>
       <Chart
         height={CHART_HEIGHT}
         grid={{
diff --git a/static/app/views/insights/database/components/charts/throughputChart.tsx b/static/app/views/insights/database/components/charts/throughputChart.tsx
index b411d1fccae407..61f265061667f2 100644
--- a/static/app/views/insights/database/components/charts/throughputChart.tsx
+++ b/static/app/views/insights/database/components/charts/throughputChart.tsx
@@ -1,27 +1,21 @@
 import type {Series} from 'sentry/types/echarts';
 import {RateUnit} from 'sentry/utils/discover/fields';
 import {formatRate} from 'sentry/utils/formatters';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {THROUGHPUT_COLOR} from 'sentry/views/insights/colors';
 import Chart, {ChartType} from 'sentry/views/insights/common/components/chart';
 import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
 import {getThroughputChartTitle} from 'sentry/views/insights/common/views/spans/types';
-import {ALERTS} from 'sentry/views/insights/database/alerts';
 import {CHART_HEIGHT} from 'sentry/views/insights/database/settings';
-import type {SpanMetricsQueryFilters} from 'sentry/views/insights/types';
 
 interface Props {
   isLoading: boolean;
   series: Series;
   error?: Error | null;
-  filters?: SpanMetricsQueryFilters;
 }
 
-export function ThroughputChart({series, isLoading, filters}: Props) {
-  const filterString = filters && MutableSearch.fromQueryObject(filters).formatString();
-  const alertConfig = {...ALERTS.spm, query: filterString ?? ALERTS.spm.query};
+export function ThroughputChart({series, isLoading}: Props) {
   return (
-    <ChartPanel title={getThroughputChartTitle('db')} alertConfigs={[alertConfig]}>
+    <ChartPanel title={getThroughputChartTitle('db')}>
       <Chart
         height={CHART_HEIGHT}
         grid={{
diff --git a/static/app/views/insights/database/components/databasePageFilters.tsx b/static/app/views/insights/database/components/databasePageFilters.tsx
index 98b796b8f01009..ed529c48765ce6 100644
--- a/static/app/views/insights/database/components/databasePageFilters.tsx
+++ b/static/app/views/insights/database/components/databasePageFilters.tsx
@@ -12,8 +12,8 @@ import {SupportedDatabaseSystem} from 'sentry/views/insights/database/utils/cons
 import {ModuleName} from 'sentry/views/insights/types';
 
 type Props = {
-  system: string;
   databaseCommand?: string;
+  system?: string;
   table?: string;
 };
 
@@ -30,7 +30,7 @@ export function DatabasePageFilters(props: Props) {
         <ActionSelector
           moduleName={ModuleName.DB}
           value={databaseCommand ?? ''}
-          filters={{'span.system': system}}
+          filters={system ? {'span.system': system} : undefined}
         />
         <DomainSelector
           moduleName={ModuleName.DB}
diff --git a/static/app/views/insights/database/components/databaseSystemSelector.tsx b/static/app/views/insights/database/components/databaseSystemSelector.tsx
index 01affaadaa4caa..1a2faf01992f7c 100644
--- a/static/app/views/insights/database/components/databaseSystemSelector.tsx
+++ b/static/app/views/insights/database/components/databaseSystemSelector.tsx
@@ -17,6 +17,8 @@ export function DatabaseSystemSelector() {
   const {selectedSystem, setSelectedSystem, options, isLoading, isError} =
     useSystemSelectorOptions();
 
+  const system = systemQueryParam ?? selectedSystem;
+
   return (
     <CompactSelect
       onChange={option => {
@@ -36,7 +38,7 @@ export function DatabaseSystemSelector() {
       triggerProps={{prefix: t('System')}}
       loading={isLoading}
       disabled={isError || isLoading || options.length <= 1}
-      value={systemQueryParam ?? selectedSystem}
+      value={system}
     />
   );
 }
diff --git a/static/app/views/insights/database/components/tables/queriesTable.tsx b/static/app/views/insights/database/components/tables/queriesTable.tsx
index 28c5b5c15604e6..300de458b10954 100644
--- a/static/app/views/insights/database/components/tables/queriesTable.tsx
+++ b/static/app/views/insights/database/components/tables/queriesTable.tsx
@@ -80,7 +80,7 @@ interface Props {
     pageLinks?: string;
   };
   sort: ValidSort;
-  system: string;
+  system?: string;
 }
 
 export function QueriesTable({response, sort, system}: Props) {
@@ -145,7 +145,7 @@ function renderBodyCell(
   meta: EventsMetaType | undefined,
   location: Location,
   organization: Organization,
-  system: string
+  system?: string
 ) {
   if (column.key === 'span.description') {
     return (
diff --git a/static/app/views/insights/database/components/useSystemSelectorOptions.tsx b/static/app/views/insights/database/components/useSystemSelectorOptions.tsx
index 602b3785e19b3d..e8f2054452f7d1 100644
--- a/static/app/views/insights/database/components/useSystemSelectorOptions.tsx
+++ b/static/app/views/insights/database/components/useSystemSelectorOptions.tsx
@@ -9,9 +9,9 @@ import {
 import {SpanMetricsField} from 'sentry/views/insights/types';
 
 export function useSystemSelectorOptions() {
-  const [selectedSystem, setSelectedSystem] = useLocalStorageState<string>(
+  const [selectedSystem, setSelectedSystem] = useLocalStorageState<string | undefined>(
     'insights-db-system-selector',
-    ''
+    undefined
   );
 
   const {data, isPending, isError} = useSpanMetrics(
diff --git a/static/app/views/insights/database/settings.ts b/static/app/views/insights/database/settings.ts
index 433fa4bc176add..539fba110a4947 100644
--- a/static/app/views/insights/database/settings.ts
+++ b/static/app/views/insights/database/settings.ts
@@ -59,6 +59,6 @@ export const DISTRIBUTION_GRANULARITIES = new GranularityLadder([
 export const MODULE_DESCRIPTION = t(
   'Investigate the performance of database queries and get the information necessary to improve them.'
 );
-export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/queries/';
+export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/backend/queries/';
 
 export const MODULE_FEATURES = ['insights-initial-modules'];
diff --git a/static/app/views/insights/database/views/databaseLandingPage.tsx b/static/app/views/insights/database/views/databaseLandingPage.tsx
index 1b424621fedb8b..1e46f69c766e41 100644
--- a/static/app/views/insights/database/views/databaseLandingPage.tsx
+++ b/static/app/views/insights/database/views/databaseLandingPage.tsx
@@ -1,9 +1,6 @@
 import React from 'react';
 
 import Alert from 'sentry/components/alert';
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import SearchBar from 'sentry/components/searchBar';
@@ -23,7 +20,6 @@ import {useSpanMetrics} from 'sentry/views/insights/common/queries/useDiscover';
 import {useSpanMetricsSeries} from 'sentry/views/insights/common/queries/useDiscoverSeries';
 import {useHasFirstSpan} from 'sentry/views/insights/common/queries/useHasFirstSpan';
 import {useOnboardingProject} from 'sentry/views/insights/common/queries/useOnboardingProject';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
 import {DurationChart} from 'sentry/views/insights/database/components/charts/durationChart';
 import {ThroughputChart} from 'sentry/views/insights/database/components/charts/throughputChart';
@@ -42,11 +38,9 @@ import {
   MODULE_TITLE,
 } from 'sentry/views/insights/database/settings';
 import {BackendHeader} from 'sentry/views/insights/pages/backend/backendPageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName, SpanMetricsField} from 'sentry/views/insights/types';
 
 export function DatabaseLandingPage() {
-  const {isInDomainView} = useDomainViewFilters();
   const organization = useOrganization();
   const moduleName = ModuleName.DB;
   const location = useLocation();
@@ -162,45 +156,20 @@ export function DatabaseLandingPage() {
 
   useSynchronizeCharts(2, !isThroughputDataLoading && !isDurationDataLoading);
 
-  const crumbs = useModuleBreadcrumbs('db');
-
   return (
     <React.Fragment>
-      {!isInDomainView && (
-        <Layout.Header>
-          <Layout.HeaderContent>
-            <Breadcrumbs crumbs={crumbs} />
-
-            <Layout.Title>
-              {MODULE_TITLE}
-              <PageHeadingQuestionTooltip
-                docsUrl={MODULE_DOC_LINK}
-                title={MODULE_DESCRIPTION}
-              />
-            </Layout.Title>
-          </Layout.HeaderContent>
-          <Layout.HeaderActions>
-            <ButtonBar gap={1}>
-              <FeedbackWidgetButton />
-            </ButtonBar>
-          </Layout.HeaderActions>
-        </Layout.Header>
-      )}
-
-      {isInDomainView && (
-        <BackendHeader
-          headerTitle={
-            <React.Fragment>
-              {MODULE_TITLE}
-              <PageHeadingQuestionTooltip
-                docsUrl={MODULE_DOC_LINK}
-                title={MODULE_DESCRIPTION}
-              />
-            </React.Fragment>
-          }
-          module={ModuleName.DB}
-        />
-      )}
+      <BackendHeader
+        headerTitle={
+          <React.Fragment>
+            {MODULE_TITLE}
+            <PageHeadingQuestionTooltip
+              docsUrl={MODULE_DOC_LINK}
+              title={MODULE_DESCRIPTION}
+            />
+          </React.Fragment>
+        }
+        module={ModuleName.DB}
+      />
       <ModuleBodyUpsellHook moduleName={ModuleName.DB}>
         <Layout.Body>
           <Layout.Main fullWidth>
@@ -225,7 +194,6 @@ export function DatabaseLandingPage() {
                     series={throughputData['spm()']}
                     isLoading={isThroughputDataLoading}
                     error={throughputError}
-                    filters={chartFilters}
                   />
                 </ModuleLayout.Half>
 
@@ -234,7 +202,6 @@ export function DatabaseLandingPage() {
                     series={[durationData[`${selectedAggregate}(span.self_time)`]]}
                     isLoading={isDurationDataLoading}
                     error={durationError}
-                    filters={chartFilters}
                   />
                 </ModuleLayout.Half>
 
@@ -279,11 +246,7 @@ const LIMIT: number = 25;
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="db"
-      features="insights-initial-modules"
-      analyticEventName="insight.page_loads.db"
-    >
+    <ModulePageProviders moduleName="db" analyticEventName="insight.page_loads.db">
       <DatabaseLandingPage />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/database/views/databaseSpanSummaryPage.spec.tsx b/static/app/views/insights/database/views/databaseSpanSummaryPage.spec.tsx
index 9d51fef2d1678d..91af5dbf084ec6 100644
--- a/static/app/views/insights/database/views/databaseSpanSummaryPage.spec.tsx
+++ b/static/app/views/insights/database/views/databaseSpanSummaryPage.spec.tsx
@@ -348,7 +348,7 @@ describe('DatabaseSpanSummaryPage', function () {
     expect(screen.getByRole('cell', {name: 'GET /api/users'})).toBeInTheDocument();
     expect(screen.getByRole('link', {name: 'GET /api/users'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/insights/database/spans/span/1756baf8fd19c116?statsPeriod=10d&transaction=%2Fapi%2Fusers&transactionMethod=GET&transactionsCursor=0%3A25%3A0'
+      '/organizations/org-slug/insights/backend/database/spans/span/1756baf8fd19c116?statsPeriod=10d&transaction=%2Fapi%2Fusers&transactionMethod=GET&transactionsCursor=0%3A25%3A0'
     );
     expect(screen.getByRole('cell', {name: '17.9/s'})).toBeInTheDocument();
     expect(screen.getByRole('cell', {name: '204.50ms'})).toBeInTheDocument();
diff --git a/static/app/views/insights/database/views/databaseSpanSummaryPage.tsx b/static/app/views/insights/database/views/databaseSpanSummaryPage.tsx
index f6a7119ab670b7..a9d811259a7261 100644
--- a/static/app/views/insights/database/views/databaseSpanSummaryPage.tsx
+++ b/static/app/views/insights/database/views/databaseSpanSummaryPage.tsx
@@ -2,13 +2,7 @@ import {Fragment} from 'react';
 import styled from '@emotion/styled';
 
 import Feature from 'sentry/components/acl/feature';
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
-import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
-import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
-import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
@@ -21,6 +15,7 @@ import {HeaderContainer} from 'sentry/views/insights/common/components/headerCon
 import InsightIssuesList from 'sentry/views/insights/common/components/issues';
 import {MetricReadout} from 'sentry/views/insights/common/components/metricReadout';
 import * as ModuleLayout from 'sentry/views/insights/common/components/moduleLayout';
+import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
 import {ReadoutRibbon, ToolRibbon} from 'sentry/views/insights/common/components/ribbon';
@@ -31,7 +26,6 @@ import {
   useSpansIndexed,
 } from 'sentry/views/insights/common/queries/useDiscover';
 import {useSpanMetricsSeries} from 'sentry/views/insights/common/queries/useDiscoverSeries';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
 import {
   DataTitles,
@@ -44,7 +38,6 @@ import {isAValidSort} from 'sentry/views/insights/database/components/tables/que
 import {QueryTransactionsTable} from 'sentry/views/insights/database/components/tables/queryTransactionsTable';
 import {DEFAULT_DURATION_AGGREGATE} from 'sentry/views/insights/database/settings';
 import {BackendHeader} from 'sentry/views/insights/pages/backend/backendPageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import type {SpanMetricsQueryFilters} from 'sentry/views/insights/types';
 import {
   ModuleName,
@@ -64,7 +57,6 @@ type Query = {
 type Props = RouteComponentProps<Query, {groupId: string}>;
 
 export function DatabaseSpanSummaryPage({params}: Props) {
-  const {isInDomainView} = useDomainViewFilters();
   const location = useLocation<Query>();
 
   const selectedAggregate = DEFAULT_DURATION_AGGREGATE;
@@ -183,42 +175,17 @@ export function DatabaseSpanSummaryPage({params}: Props) {
 
   useSynchronizeCharts(2, !isThroughputDataLoading && !isDurationDataLoading);
 
-  const crumbs = useModuleBreadcrumbs('db');
-
   return (
     <Fragment>
-      {!isInDomainView && (
-        <Layout.Header>
-          <Layout.HeaderContent>
-            <Breadcrumbs
-              crumbs={[
-                ...crumbs,
-                {
-                  label: t('Query Summary'),
-                },
-              ]}
-            />
-            <Layout.Title>{t('Query Summary')}</Layout.Title>
-          </Layout.HeaderContent>
-          <Layout.HeaderActions>
-            <ButtonBar gap={1}>
-              <FeedbackWidgetButton />
-            </ButtonBar>
-          </Layout.HeaderActions>
-        </Layout.Header>
-      )}
-
-      {isInDomainView && (
-        <BackendHeader
-          headerTitle={t('Query Summary')}
-          breadcrumbs={[
-            {
-              label: t('Query Summary'),
-            },
-          ]}
-          module={ModuleName.DB}
-        />
-      )}
+      <BackendHeader
+        headerTitle={t('Query Summary')}
+        breadcrumbs={[
+          {
+            label: t('Query Summary'),
+          },
+        ]}
+        module={ModuleName.DB}
+      />
 
       <ModuleBodyUpsellHook moduleName={ModuleName.DB}>
         <Layout.Body>
@@ -227,10 +194,10 @@ export function DatabaseSpanSummaryPage({params}: Props) {
               <ModuleLayout.Full>
                 <HeaderContainer>
                   <ToolRibbon>
-                    <PageFilterBar condensed>
-                      <EnvironmentPageFilter />
-                      <DatePageFilter />
-                    </PageFilterBar>
+                    <ModulePageFilterBar
+                      moduleName={ModuleName.DB}
+                      disableProjectFilter
+                    />
                   </ToolRibbon>
 
                   <ReadoutRibbon>
@@ -291,7 +258,6 @@ export function DatabaseSpanSummaryPage({params}: Props) {
                     series={throughputData['spm()']}
                     isLoading={isThroughputDataLoading}
                     error={throughputError}
-                    filters={filters}
                   />
 
                   <DurationChart
@@ -302,7 +268,6 @@ export function DatabaseSpanSummaryPage({params}: Props) {
                     ]}
                     isLoading={isDurationDataLoading}
                     error={durationError}
-                    filters={filters}
                   />
                 </ChartContainer>
               </ModuleLayout.Full>
@@ -360,11 +325,7 @@ const DescriptionContainer = styled(ModuleLayout.Full)`
 
 function PageWithProviders(props) {
   return (
-    <ModulePageProviders
-      moduleName="db"
-      pageTitle={t('Query Summary')}
-      features="insights-initial-modules"
-    >
+    <ModulePageProviders moduleName="db" pageTitle={t('Query Summary')}>
       <DatabaseSpanSummaryPage {...props} />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/http/alerts.ts b/static/app/views/insights/http/alerts.ts
deleted file mode 100644
index 8c2d3c2d48ddf3..00000000000000
--- a/static/app/views/insights/http/alerts.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import type {AlertConfig} from 'sentry/views/insights/common/components/chartPanel';
-
-const QUERY = 'span.module:http span.op:http.client';
-
-export const ALERTS: Record<string, AlertConfig> = {
-  spm: {
-    aggregate: 'spm()',
-    query: QUERY,
-  },
-  duration: {
-    aggregate: 'avg(d:spans/duration@millisecond)',
-    query: QUERY,
-  },
-  threeHundreds: {
-    aggregate: 'http_response_rate(3)',
-    query: QUERY,
-    name: 'Create 3XX Response Rate Alert',
-  },
-  fourHundreds: {
-    aggregate: 'http_response_rate(4)',
-    query: QUERY,
-    name: 'Create 4XX Response Rate Alert',
-  },
-  fiveHundreds: {
-    aggregate: 'http_response_rate(5)',
-    query: QUERY,
-    name: 'Create 5XX Response Rate Alert',
-  },
-};
diff --git a/static/app/views/insights/http/components/charts/durationChart.tsx b/static/app/views/insights/http/components/charts/durationChart.tsx
index dd96c94e1e520d..39a856dace93c9 100644
--- a/static/app/views/insights/http/components/charts/durationChart.tsx
+++ b/static/app/views/insights/http/components/charts/durationChart.tsx
@@ -1,20 +1,16 @@
 import type {ComponentProps} from 'react';
 
 import type {EChartHighlightHandler, Series} from 'sentry/types/echarts';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {AVG_COLOR} from 'sentry/views/insights/colors';
 import Chart, {ChartType} from 'sentry/views/insights/common/components/chart';
 import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
 import {getDurationChartTitle} from 'sentry/views/insights/common/views/spans/types';
-import {ALERTS} from 'sentry/views/insights/http/alerts';
 import {CHART_HEIGHT} from 'sentry/views/insights/http/settings';
-import type {SpanMetricsQueryFilters} from 'sentry/views/insights/types';
 
 interface Props {
   isLoading: boolean;
   series: Series[];
   error?: Error | null;
-  filters?: SpanMetricsQueryFilters;
   onHighlight?: (highlights: Highlight[], event: Event) => void; // TODO: Correctly type this
   scatterPlot?: ComponentProps<typeof Chart>['scatterPlot'];
 }
@@ -30,7 +26,6 @@ export function DurationChart({
   isLoading,
   error,
   onHighlight,
-  filters,
 }: Props) {
   // TODO: This is duplicated from `DurationChart` in `SampleList`. Resolve the duplication
   const handleChartHighlight: EChartHighlightHandler = function (event) {
@@ -57,14 +52,8 @@ export function DurationChart({
     onHighlight?.(highlightedDataPoints, event);
   };
 
-  const filterString = filters && MutableSearch.fromQueryObject(filters).formatString();
-  const alertConfig = {
-    ...ALERTS.duration,
-    query: filterString ?? ALERTS.duration.query,
-  };
-
   return (
-    <ChartPanel title={getDurationChartTitle('http')} alertConfigs={[alertConfig]}>
+    <ChartPanel title={getDurationChartTitle('http')}>
       <Chart
         height={CHART_HEIGHT}
         grid={{
diff --git a/static/app/views/insights/http/components/charts/responseRateChart.tsx b/static/app/views/insights/http/components/charts/responseRateChart.tsx
index e59dd17aa51d39..a5fd79dc09d754 100644
--- a/static/app/views/insights/http/components/charts/responseRateChart.tsx
+++ b/static/app/views/insights/http/components/charts/responseRateChart.tsx
@@ -1,6 +1,5 @@
 import type {Series} from 'sentry/types/echarts';
 import {formatPercentage} from 'sentry/utils/number/formatPercentage';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {
   HTTP_RESPONSE_3XX_COLOR,
   HTTP_RESPONSE_4XX_COLOR,
@@ -9,26 +8,17 @@ import {
 import Chart, {ChartType} from 'sentry/views/insights/common/components/chart';
 import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
 import {DataTitles} from 'sentry/views/insights/common/views/spans/types';
-import {ALERTS} from 'sentry/views/insights/http/alerts';
 import {CHART_HEIGHT} from 'sentry/views/insights/http/settings';
-import type {SpanMetricsQueryFilters} from 'sentry/views/insights/types';
 
 interface Props {
   isLoading: boolean;
   series: [Series, Series, Series];
   error?: Error | null;
-  filters?: SpanMetricsQueryFilters;
 }
 
-export function ResponseRateChart({series, isLoading, error, filters}: Props) {
-  const filterString = filters && MutableSearch.fromQueryObject(filters).formatString();
-  const alertConfig = [
-    {...ALERTS.threeHundreds, query: filterString ?? ALERTS.threeHundreds.query},
-    {...ALERTS.fourHundreds, query: filterString ?? ALERTS.fourHundreds.query},
-    {...ALERTS.fiveHundreds, query: filterString ?? ALERTS.fiveHundreds.query},
-  ];
+export function ResponseRateChart({series, isLoading, error}: Props) {
   return (
-    <ChartPanel title={DataTitles.unsuccessfulHTTPCodes} alertConfigs={alertConfig}>
+    <ChartPanel title={DataTitles.unsuccessfulHTTPCodes}>
       <Chart
         showLegend
         height={CHART_HEIGHT}
diff --git a/static/app/views/insights/http/components/charts/throughputChart.tsx b/static/app/views/insights/http/components/charts/throughputChart.tsx
index d8837350451947..ef223e8c308d1b 100644
--- a/static/app/views/insights/http/components/charts/throughputChart.tsx
+++ b/static/app/views/insights/http/components/charts/throughputChart.tsx
@@ -1,27 +1,21 @@
 import type {Series} from 'sentry/types/echarts';
 import {RateUnit} from 'sentry/utils/discover/fields';
 import {formatRate} from 'sentry/utils/formatters';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {THROUGHPUT_COLOR} from 'sentry/views/insights/colors';
 import Chart, {ChartType} from 'sentry/views/insights/common/components/chart';
 import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
 import {getThroughputChartTitle} from 'sentry/views/insights/common/views/spans/types';
-import {ALERTS} from 'sentry/views/insights/http/alerts';
 import {CHART_HEIGHT} from 'sentry/views/insights/http/settings';
-import type {SpanMetricsQueryFilters} from 'sentry/views/insights/types';
 
 interface Props {
   isLoading: boolean;
   series: Series;
   error?: Error | null;
-  filters?: SpanMetricsQueryFilters;
 }
 
-export function ThroughputChart({series, isLoading, error, filters}: Props) {
-  const filterString = filters && MutableSearch.fromQueryObject(filters).formatString();
-  const alertConfig = {...ALERTS.spm, query: filterString ?? ALERTS.spm.query};
+export function ThroughputChart({series, isLoading, error}: Props) {
   return (
-    <ChartPanel title={getThroughputChartTitle('http')} alertConfigs={[alertConfig]}>
+    <ChartPanel title={getThroughputChartTitle('http')}>
       <Chart
         height={CHART_HEIGHT}
         grid={{
diff --git a/static/app/views/insights/http/components/httpSamplesPanel.tsx b/static/app/views/insights/http/components/httpSamplesPanel.tsx
index 3b1a45185491d4..79c979ca79bbe1 100644
--- a/static/app/views/insights/http/components/httpSamplesPanel.tsx
+++ b/static/app/views/insights/http/components/httpSamplesPanel.tsx
@@ -458,7 +458,6 @@ export function HTTPSamplesPanel() {
                   }}
                   isLoading={isDurationDataFetching}
                   error={durationError}
-                  filters={filters}
                 />
               </ModuleLayout.Full>
             </Fragment>
diff --git a/static/app/views/insights/http/settings.ts b/static/app/views/insights/http/settings.ts
index b0192074af8df3..da2559967a6b47 100644
--- a/static/app/views/insights/http/settings.ts
+++ b/static/app/views/insights/http/settings.ts
@@ -3,6 +3,7 @@ import {ModuleName} from 'sentry/views/insights/types';
 
 export const MODULE_TITLE = t('Outbound API Requests');
 export const FRONTEND_MODULE_TITLE = t('Network Requests');
+export const MOBILE_MODULE_TITLE = t('Network Requests');
 export const MODULE_SIDEBAR_TITLE = t('Requests');
 export const DATA_TYPE = t('Request');
 export const DATA_TYPE_PLURAL = t('Requests');
@@ -21,6 +22,7 @@ export const BASE_FILTERS = {
 export const MODULE_DESCRIPTION = t(
   'Monitor outgoing HTTP requests and investigate errors and performance bottlenecks tied to domains.'
 );
-export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/requests/';
+export const MODULE_DOC_LINK =
+  'https://docs.sentry.io/product/insights/backend/requests/';
 
 export const MODULE_FEATURES = ['insights-initial-modules'];
diff --git a/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx b/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx
index 494e7f2b0a7c0c..6c59c736ddf63e 100644
--- a/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx
+++ b/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx
@@ -275,7 +275,7 @@ describe('HTTPSummaryPage', function () {
     expect(screen.getByRole('cell', {name: 'GET /api/users'})).toBeInTheDocument();
     expect(screen.getByRole('link', {name: 'GET /api/users'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/insights/http/domains/?domain=%2A.sentry.dev&project=8&statsPeriod=10d&transaction=%2Fapi%2Fusers&transactionMethod=GET&transactionsCursor=0%3A20%3A0'
+      '/organizations/org-slug/insights/backend/http/domains/?domain=%2A.sentry.dev&project=8&statsPeriod=10d&transaction=%2Fapi%2Fusers&transactionMethod=GET&transactionsCursor=0%3A20%3A0'
     );
     expect(screen.getByRole('cell', {name: '17.9/s'})).toBeInTheDocument();
     expect(screen.getByRole('cell', {name: '97%'})).toBeInTheDocument();
diff --git a/static/app/views/insights/http/views/httpDomainSummaryPage.tsx b/static/app/views/insights/http/views/httpDomainSummaryPage.tsx
index b9643cd155387b..3acd1dbcc0054f 100644
--- a/static/app/views/insights/http/views/httpDomainSummaryPage.tsx
+++ b/static/app/views/insights/http/views/httpDomainSummaryPage.tsx
@@ -2,14 +2,8 @@ import React, {Fragment} from 'react';
 
 import Alert from 'sentry/components/alert';
 import ProjectAvatar from 'sentry/components/avatar/projectAvatar';
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import ExternalLink from 'sentry/components/links/externalLink';
-import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
-import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
-import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {t, tct} from 'sentry/locale';
 import {DurationUnit, RateUnit} from 'sentry/utils/discover/fields';
 import {decodeList, decodeScalar, decodeSorts} from 'sentry/utils/queryString';
@@ -25,13 +19,13 @@ import {useSynchronizeCharts} from 'sentry/views/insights/common/components/char
 import {HeaderContainer} from 'sentry/views/insights/common/components/headerContainer';
 import {MetricReadout} from 'sentry/views/insights/common/components/metricReadout';
 import * as ModuleLayout from 'sentry/views/insights/common/components/moduleLayout';
+import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
 import {ReadoutRibbon, ToolRibbon} from 'sentry/views/insights/common/components/ribbon';
 import {getTimeSpentExplanation} from 'sentry/views/insights/common/components/tableCells/timeSpentCell';
 import {useSpanMetrics} from 'sentry/views/insights/common/queries/useDiscover';
 import {useSpanMetricsSeries} from 'sentry/views/insights/common/queries/useDiscoverSeries';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
 import SubregionSelector from 'sentry/views/insights/common/views/spans/selectors/subregionSelector';
 import {
@@ -57,6 +51,8 @@ import {BackendHeader} from 'sentry/views/insights/pages/backend/backendPageHead
 import {BACKEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/backend/settings';
 import {FrontendHeader} from 'sentry/views/insights/pages/frontend/frontendPageHeader';
 import {FRONTEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/frontend/settings';
+import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
+import {MOBILE_LANDING_SUB_PATH} from 'sentry/views/insights/pages/mobile/settings';
 import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import type {SpanMetricsQueryFilters} from 'sentry/views/insights/types';
 import {ModuleName, SpanFunction, SpanMetricsField} from 'sentry/views/insights/types';
@@ -69,7 +65,7 @@ type Query = {
 export function HTTPDomainSummaryPage() {
   const location = useLocation<Query>();
   const {projects} = useProjects();
-  const {isInDomainView, view} = useDomainViewFilters();
+  const {view} = useDomainViewFilters();
 
   // TODO: Fetch sort information using `useLocationQuery`
   const sortField = decodeScalar(location.query?.[QueryParameterNames.TRANSACTIONS_SORT]);
@@ -186,72 +182,27 @@ export function HTTPDomainSummaryPage() {
     !isThroughputDataLoading && !isDurationDataLoading && !isResponseCodeDataLoading
   );
 
-  const crumbs = useModuleBreadcrumbs('http');
-
-  const headerTitle = (
-    <Fragment>
-      {project && <ProjectAvatar project={project} size={36} />}
-      {domain || NULL_DOMAIN_DESCRIPTION}
-      <DomainStatusLink domain={domain} />
-    </Fragment>
-  );
+  const headerProps = {
+    headerTitle: (
+      <Fragment>
+        {project && <ProjectAvatar project={project} size={36} />}
+        {domain || NULL_DOMAIN_DESCRIPTION}
+        <DomainStatusLink domain={domain} />
+      </Fragment>
+    ),
+    breadcrumbs: [
+      {
+        label: t('Domain Summary'),
+      },
+    ],
+    module: ModuleName.HTTP,
+  };
 
   return (
     <React.Fragment>
-      {!isInDomainView && (
-        <Layout.Header>
-          <Layout.HeaderContent>
-            <Breadcrumbs
-              crumbs={[
-                ...crumbs,
-                {
-                  label: t('Domain Summary'),
-                },
-              ]}
-            />
-            <Layout.Title>
-              {project && <ProjectAvatar project={project} size={36} />}
-              {domain || NULL_DOMAIN_DESCRIPTION}
-              <DomainStatusLink domain={domain} />
-            </Layout.Title>
-          </Layout.HeaderContent>
-          <Layout.HeaderActions>
-            <ButtonBar gap={1}>
-              <FeedbackWidgetButton />
-            </ButtonBar>
-          </Layout.HeaderActions>
-        </Layout.Header>
-      )}
-
-      {isInDomainView && view === FRONTEND_LANDING_SUB_PATH && (
-        <FrontendHeader
-          headerTitle={
-            <Fragment>
-              {project && <ProjectAvatar project={project} size={36} />}
-              {domain || NULL_DOMAIN_DESCRIPTION}
-              <DomainStatusLink domain={domain} />
-            </Fragment>
-          }
-          breadcrumbs={[
-            {
-              label: 'Domain Summary',
-            },
-          ]}
-          module={ModuleName.HTTP}
-        />
-      )}
-
-      {isInDomainView && view === BACKEND_LANDING_SUB_PATH && (
-        <BackendHeader
-          headerTitle={headerTitle}
-          module={ModuleName.HTTP}
-          breadcrumbs={[
-            {
-              label: t('Domain Summary'),
-            },
-          ]}
-        />
-      )}
+      {view === FRONTEND_LANDING_SUB_PATH && <FrontendHeader {...headerProps} />}
+      {view === BACKEND_LANDING_SUB_PATH && <BackendHeader {...headerProps} />}
+      {view === MOBILE_LANDING_SUB_PATH && <MobileHeader {...headerProps} />}
 
       <ModuleBodyUpsellHook moduleName={ModuleName.HTTP}>
         <Layout.Body>
@@ -273,10 +224,10 @@ export function HTTPDomainSummaryPage() {
               <ModuleLayout.Full>
                 <HeaderContainer>
                   <ToolRibbon>
-                    <PageFilterBar condensed>
-                      <EnvironmentPageFilter />
-                      <DatePageFilter />
-                    </PageFilterBar>
+                    <ModulePageFilterBar
+                      moduleName={ModuleName.HTTP}
+                      disableProjectFilter
+                    />
                     <SubregionSelector />
                   </ToolRibbon>
 
@@ -337,7 +288,6 @@ export function HTTPDomainSummaryPage() {
                   series={throughputData['spm()']}
                   isLoading={isThroughputDataLoading}
                   error={throughputError}
-                  filters={filters}
                 />
               </ModuleLayout.Third>
 
@@ -346,7 +296,6 @@ export function HTTPDomainSummaryPage() {
                   series={[durationData[`avg(${SpanMetricsField.SPAN_SELF_TIME})`]]}
                   isLoading={isDurationDataLoading}
                   error={durationError}
-                  filters={filters}
                 />
               </ModuleLayout.Third>
 
@@ -368,7 +317,6 @@ export function HTTPDomainSummaryPage() {
                   ]}
                   isLoading={isResponseCodeDataLoading}
                   error={responseCodeError}
-                  filters={filters}
                 />
               </ModuleLayout.Third>
 
@@ -402,11 +350,7 @@ const TRANSACTIONS_TABLE_ROW_COUNT = 20;
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="http"
-      pageTitle={t('Domain Summary')}
-      features="insights-initial-modules"
-    >
+    <ModulePageProviders moduleName="http" pageTitle={t('Domain Summary')}>
       <HTTPDomainSummaryPage />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/http/views/httpLandingPage.spec.tsx b/static/app/views/insights/http/views/httpLandingPage.spec.tsx
index 6be5397d5e26f2..4fa1cc74b73178 100644
--- a/static/app/views/insights/http/views/httpLandingPage.spec.tsx
+++ b/static/app/views/insights/http/views/httpLandingPage.spec.tsx
@@ -15,7 +15,7 @@ jest.mock('sentry/utils/useProjects');
 jest.mock('sentry/views/insights/common/queries/useOnboardingProject');
 
 describe('HTTPLandingPage', function () {
-  const organization = OrganizationFixture();
+  const organization = OrganizationFixture({features: ['insights-initial-modules']});
 
   let spanListRequestMock, spanChartsRequestMock;
 
@@ -39,7 +39,7 @@ describe('HTTPLandingPage', function () {
   });
 
   jest.mocked(useLocation).mockReturnValue({
-    pathname: '',
+    pathname: '/insights/backend/http/',
     search: '',
     query: {statsPeriod: '10d', 'span.domain': 'git', project: '1'},
     hash: '',
@@ -300,7 +300,7 @@ describe('HTTPLandingPage', function () {
     expect(screen.getByRole('cell', {name: '*.sentry.io'})).toBeInTheDocument();
     expect(screen.getByRole('link', {name: '*.sentry.io'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/insights/http/domains/?domain=%2A.sentry.io&project=1&statsPeriod=10d'
+      '/organizations/org-slug/insights/backend/http/domains/?domain=%2A.sentry.io&project=1&statsPeriod=10d'
     );
     expect(
       screen.getAllByRole('cell', {name: 'View Project Details'})[0]
diff --git a/static/app/views/insights/http/views/httpLandingPage.tsx b/static/app/views/insights/http/views/httpLandingPage.tsx
index 6c72d6e822d751..fcd000b2411c29 100644
--- a/static/app/views/insights/http/views/httpLandingPage.tsx
+++ b/static/app/views/insights/http/views/httpLandingPage.tsx
@@ -1,8 +1,5 @@
 import React, {Fragment} from 'react';
 
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import SearchBar from 'sentry/components/searchBar';
@@ -23,7 +20,6 @@ import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/modu
 import {ToolRibbon} from 'sentry/views/insights/common/components/ribbon';
 import {useSpanMetrics} from 'sentry/views/insights/common/queries/useDiscover';
 import {useSpanMetricsSeries} from 'sentry/views/insights/common/queries/useDiscoverSeries';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {useModuleTitle} from 'sentry/views/insights/common/utils/useModuleTitle';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
 import SubregionSelector from 'sentry/views/insights/common/views/spans/selectors/subregionSelector';
@@ -44,13 +40,15 @@ import {BackendHeader} from 'sentry/views/insights/pages/backend/backendPageHead
 import {BACKEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/backend/settings';
 import {FrontendHeader} from 'sentry/views/insights/pages/frontend/frontendPageHeader';
 import {FRONTEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/frontend/settings';
+import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
+import {MOBILE_LANDING_SUB_PATH} from 'sentry/views/insights/pages/mobile/settings';
 import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName, SpanMetricsField} from 'sentry/views/insights/types';
 
 export function HTTPLandingPage() {
   const organization = useOrganization();
   const location = useLocation();
-  const {isInDomainView, view} = useDomainViewFilters();
+  const {view} = useDomainViewFilters();
   const moduleTitle = useModuleTitle(ModuleName.HTTP);
 
   const sortField = decodeScalar(location.query?.[QueryParameterNames.DOMAINS_SORT]);
@@ -164,8 +162,6 @@ export function HTTPLandingPage() {
     !isThroughputDataLoading && !isDurationDataLoading && !isResponseCodeDataLoading
   );
 
-  const crumbs = useModuleBreadcrumbs('http');
-
   const headerTitle = (
     <Fragment>
       {moduleTitle}
@@ -173,41 +169,16 @@ export function HTTPLandingPage() {
     </Fragment>
   );
 
+  const headerProps = {
+    headerTitle,
+    module: ModuleName.HTTP,
+  };
+
   return (
     <React.Fragment>
-      {!isInDomainView && (
-        <Layout.Header>
-          <Layout.HeaderContent>
-            <Breadcrumbs crumbs={crumbs} />
-
-            <Layout.Title>{headerTitle}</Layout.Title>
-          </Layout.HeaderContent>
-          <Layout.HeaderActions>
-            <ButtonBar gap={1}>
-              <FeedbackWidgetButton />
-            </ButtonBar>
-          </Layout.HeaderActions>
-        </Layout.Header>
-      )}
-
-      {isInDomainView && view === FRONTEND_LANDING_SUB_PATH && (
-        <FrontendHeader
-          headerTitle={
-            <Fragment>
-              {moduleTitle}
-              <PageHeadingQuestionTooltip
-                docsUrl={MODULE_DOC_LINK}
-                title={MODULE_DESCRIPTION}
-              />
-            </Fragment>
-          }
-          module={ModuleName.HTTP}
-        />
-      )}
-
-      {isInDomainView && view === BACKEND_LANDING_SUB_PATH && (
-        <BackendHeader headerTitle={headerTitle} module={ModuleName.HTTP} />
-      )}
+      {view === FRONTEND_LANDING_SUB_PATH && <FrontendHeader {...headerProps} />}
+      {view === BACKEND_LANDING_SUB_PATH && <BackendHeader {...headerProps} />}
+      {view === MOBILE_LANDING_SUB_PATH && <MobileHeader {...headerProps} />}
 
       <ModuleBodyUpsellHook moduleName={ModuleName.HTTP}>
         <Layout.Body>
@@ -228,7 +199,6 @@ export function HTTPLandingPage() {
                     series={throughputData['spm()']}
                     isLoading={isThroughputDataLoading}
                     error={throughputError}
-                    filters={chartFilters}
                   />
                 </ModuleLayout.Third>
 
@@ -237,7 +207,6 @@ export function HTTPLandingPage() {
                     series={[durationData[`avg(span.self_time)`]]}
                     isLoading={isDurationDataLoading}
                     error={durationError}
-                    filters={chartFilters}
                   />
                 </ModuleLayout.Third>
 
@@ -259,7 +228,6 @@ export function HTTPLandingPage() {
                     ]}
                     isLoading={isResponseCodeDataLoading}
                     error={responseCodeError}
-                    filters={chartFilters}
                   />
                 </ModuleLayout.Third>
 
@@ -292,11 +260,7 @@ const DOMAIN_TABLE_ROW_COUNT = 10;
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="http"
-      features="insights-initial-modules"
-      analyticEventName="insight.page_loads.http"
-    >
+    <ModulePageProviders moduleName="http" analyticEventName="insight.page_loads.http">
       <HTTPLandingPage />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/llmMonitoring/alerts.ts b/static/app/views/insights/llmMonitoring/alerts.ts
deleted file mode 100644
index 1221723eb17e91..00000000000000
--- a/static/app/views/insights/llmMonitoring/alerts.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type {AlertConfig} from 'sentry/views/insights/common/components/chartPanel';
-import {SpanMetricsField} from 'sentry/views/insights/types';
-
-export const ALERTS: Record<string, AlertConfig> = {
-  spm: {
-    aggregate: 'spm()',
-  },
-  duration: {
-    aggregate: 'avg(d:spans/duration@millisecond)',
-  },
-  tokensUsed: {
-    aggregate: `sum(c:spans/${SpanMetricsField.AI_TOTAL_TOKENS_USED}@none)`,
-  },
-};
diff --git a/static/app/views/insights/llmMonitoring/components/charts/llmMonitoringCharts.tsx b/static/app/views/insights/llmMonitoring/components/charts/llmMonitoringCharts.tsx
index 16f3c29d03b627..4534b3e777337f 100644
--- a/static/app/views/insights/llmMonitoring/components/charts/llmMonitoringCharts.tsx
+++ b/static/app/views/insights/llmMonitoring/components/charts/llmMonitoringCharts.tsx
@@ -8,7 +8,6 @@ import {
   useSpanIndexedSeries,
   useSpanMetricsSeries,
 } from 'sentry/views/insights/common/queries/useDiscoverSeries';
-import {ALERTS} from 'sentry/views/insights/llmMonitoring/alerts';
 
 interface TotalTokensUsedChartProps {
   groupId?: string;
@@ -31,10 +30,7 @@ export function EAPTotalTokensUsedChart({groupId}: TotalTokensUsedChartProps) {
   );
 
   return (
-    <ChartPanel
-      title={t('Total tokens used')}
-      alertConfigs={[{...ALERTS.tokensUsed, query}]}
-    >
+    <ChartPanel title={t('Total tokens used')}>
       <Chart
         height={200}
         grid={{
@@ -69,10 +65,7 @@ export function TotalTokensUsedChart({groupId}: TotalTokensUsedChartProps) {
   );
 
   return (
-    <ChartPanel
-      title={t('Total tokens used')}
-      alertConfigs={[{...ALERTS.tokensUsed, query}]}
-    >
+    <ChartPanel title={t('Total tokens used')}>
       <Chart
         height={200}
         grid={{
@@ -185,10 +178,7 @@ export function EAPPipelineDurationChart({groupId}: PipelineDurationChartProps)
   );
 
   return (
-    <ChartPanel
-      title={t('Pipeline Duration')}
-      alertConfigs={[{...ALERTS.duration, query}]}
-    >
+    <ChartPanel title={t('Pipeline Duration')}>
       <Chart
         height={200}
         grid={{
@@ -222,10 +212,7 @@ export function PipelineDurationChart({groupId}: PipelineDurationChartProps) {
   );
 
   return (
-    <ChartPanel
-      title={t('Pipeline Duration')}
-      alertConfigs={[{...ALERTS.duration, query}]}
-    >
+    <ChartPanel title={t('Pipeline Duration')}>
       <Chart
         height={200}
         grid={{
diff --git a/static/app/views/insights/llmMonitoring/settings.ts b/static/app/views/insights/llmMonitoring/settings.ts
index 21e0b67261e693..cd8f7bc06b5db6 100644
--- a/static/app/views/insights/llmMonitoring/settings.ts
+++ b/static/app/views/insights/llmMonitoring/settings.ts
@@ -9,6 +9,7 @@ export const DATA_TYPE_PLURAL = t('LLMs');
 
 export const RELEASE_LEVEL: BadgeType = 'beta';
 
-export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/llm-monitoring/';
+export const MODULE_DOC_LINK =
+  'https://docs.sentry.io/product/insights/ai/llm-monitoring/';
 
 export const MODULE_FEATURES = ['insights-addon-modules'];
diff --git a/static/app/views/insights/llmMonitoring/views/llmMonitoringDetailsPage.tsx b/static/app/views/insights/llmMonitoring/views/llmMonitoringDetailsPage.tsx
index e9685ca4b2ed08..3a1a7c4048c84d 100644
--- a/static/app/views/insights/llmMonitoring/views/llmMonitoringDetailsPage.tsx
+++ b/static/app/views/insights/llmMonitoring/views/llmMonitoringDetailsPage.tsx
@@ -1,13 +1,8 @@
 import {Fragment} from 'react';
 
 import FeatureBadge from 'sentry/components/badge/featureBadge';
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
 import * as Layout from 'sentry/components/layouts/thirds';
 import NoProjectMessage from 'sentry/components/noProjectMessage';
-import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
-import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
-import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
-import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
 import {t} from 'sentry/locale';
 import {CurrencyUnit, DurationUnit, RateUnit} from 'sentry/utils/discover/fields';
 import {decodeScalar} from 'sentry/utils/queryString';
@@ -17,6 +12,7 @@ import useOrganization from 'sentry/utils/useOrganization';
 import {HeaderContainer} from 'sentry/views/insights/common/components/headerContainer';
 import {MetricReadout} from 'sentry/views/insights/common/components/metricReadout';
 import * as ModuleLayout from 'sentry/views/insights/common/components/moduleLayout';
+import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
 import {ReadoutRibbon, ToolRibbon} from 'sentry/views/insights/common/components/ribbon';
@@ -24,7 +20,6 @@ import {
   useEAPSpans,
   useSpanMetrics,
 } from 'sentry/views/insights/common/queries/useDiscover';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {
   EAPNumberOfPipelinesChart,
   EAPPipelineDurationChart,
@@ -36,7 +31,6 @@ import {
 import {PipelineSpansTable} from 'sentry/views/insights/llmMonitoring/components/tables/pipelineSpansTable';
 import {RELEASE_LEVEL} from 'sentry/views/insights/llmMonitoring/settings';
 import {AiHeader} from 'sentry/views/insights/pages/ai/aiPageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {
   ModuleName,
   SpanFunction,
@@ -55,7 +49,6 @@ type Query = {
 };
 
 export function LLMMonitoringPage({params}: Props) {
-  const {isInDomainView} = useDomainViewFilters();
   const location = useLocation<Query>();
 
   const organization = useOrganization();
@@ -123,46 +116,23 @@ export function LLMMonitoringPage({params}: Props) {
   );
   const tokenUsedMetric = (useEAP ? eapTokenData[0] : totalTokenData[0]) ?? {};
 
-  const crumbs = useModuleBreadcrumbs('ai');
-
   return (
     <Layout.Page>
       <NoProjectMessage organization={organization}>
-        {!isInDomainView && (
-          <Layout.Header>
-            <Layout.HeaderContent>
-              <Breadcrumbs
-                crumbs={[
-                  ...crumbs,
-                  {
-                    label: t('Pipeline Summary'),
-                  },
-                ]}
-              />
-              <Layout.Title>
-                {spanDescription}
-                <FeatureBadge type={RELEASE_LEVEL} />
-              </Layout.Title>
-            </Layout.HeaderContent>
-          </Layout.Header>
-        )}
-
-        {isInDomainView && (
-          <AiHeader
-            headerTitle={
-              <Fragment>
-                {spanDescription}
-                <FeatureBadge type={RELEASE_LEVEL} />
-              </Fragment>
-            }
-            breadcrumbs={[
-              {
-                label: t('Pipeline Summary'),
-              },
-            ]}
-            module={ModuleName.AI}
-          />
-        )}
+        <AiHeader
+          headerTitle={
+            <Fragment>
+              {spanDescription}
+              <FeatureBadge type={RELEASE_LEVEL} />
+            </Fragment>
+          }
+          breadcrumbs={[
+            {
+              label: t('Pipeline Summary'),
+            },
+          ]}
+          module={ModuleName.AI}
+        />
         <ModuleBodyUpsellHook moduleName={ModuleName.AI}>
           <Layout.Body>
             <Layout.Main fullWidth>
@@ -170,11 +140,7 @@ export function LLMMonitoringPage({params}: Props) {
                 <ModuleLayout.Full>
                   <HeaderContainer>
                     <ToolRibbon>
-                      <PageFilterBar condensed>
-                        <ProjectPageFilter />
-                        <EnvironmentPageFilter />
-                        <DatePageFilter />
-                      </PageFilterBar>
+                      <ModulePageFilterBar moduleName={ModuleName.AI} />
                     </ToolRibbon>
 
                     <ReadoutRibbon>
@@ -247,11 +213,7 @@ export function LLMMonitoringPage({params}: Props) {
 
 function PageWithProviders({params}: Props) {
   return (
-    <ModulePageProviders
-      moduleName="ai"
-      pageTitle={t('Pipeline Summary')}
-      features="insights-addon-modules"
-    >
+    <ModulePageProviders moduleName="ai" pageTitle={t('Pipeline Summary')}>
       <LLMMonitoringPage params={params} />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/llmMonitoring/views/llmMonitoringLandingPage.tsx b/static/app/views/insights/llmMonitoring/views/llmMonitoringLandingPage.tsx
index 0131be673e1b5a..1a09b2bc3561f0 100644
--- a/static/app/views/insights/llmMonitoring/views/llmMonitoringLandingPage.tsx
+++ b/static/app/views/insights/llmMonitoring/views/llmMonitoringLandingPage.tsx
@@ -1,9 +1,6 @@
 import {Fragment} from 'react';
 
 import FeatureBadge from 'sentry/components/badge/featureBadge';
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import {t} from 'sentry/locale';
@@ -13,7 +10,6 @@ import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modul
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {ModulesOnboarding} from 'sentry/views/insights/common/components/modulesOnboarding';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {
   EAPNumberOfPipelinesChart,
   EAPPipelineDurationChart,
@@ -32,53 +28,28 @@ import {
   RELEASE_LEVEL,
 } from 'sentry/views/insights/llmMonitoring/settings';
 import {AiHeader} from 'sentry/views/insights/pages/ai/aiPageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName} from 'sentry/views/insights/types';
 
 export function LLMMonitoringPage() {
-  const {isInDomainView} = useDomainViewFilters();
   const organization = useOrganization();
 
-  const crumbs = useModuleBreadcrumbs('ai');
   const useEAP = organization.features.includes('insights-use-eap');
 
   return (
     <Layout.Page>
-      {!isInDomainView && (
-        <Layout.Header>
-          <Layout.HeaderContent>
-            <Breadcrumbs crumbs={crumbs} />
-            <Layout.Title>
-              {MODULE_TITLE}
-              <PageHeadingQuestionTooltip
-                title={t('View analytics and information about your AI pipelines')}
-                docsUrl={MODULE_DOC_LINK}
-              />
-              <FeatureBadge type={RELEASE_LEVEL} />
-            </Layout.Title>
-          </Layout.HeaderContent>
-          <Layout.HeaderActions>
-            <ButtonBar gap={1}>
-              <FeedbackWidgetButton />
-            </ButtonBar>
-          </Layout.HeaderActions>
-        </Layout.Header>
-      )}
-      {isInDomainView && (
-        <AiHeader
-          headerTitle={
-            <Fragment>
-              {MODULE_TITLE}
-              <PageHeadingQuestionTooltip
-                title={t('View analytics and information about your AI pipelines')}
-                docsUrl={MODULE_DOC_LINK}
-              />
-              <FeatureBadge type={RELEASE_LEVEL} />
-            </Fragment>
-          }
-          module={ModuleName.AI}
-        />
-      )}
+      <AiHeader
+        headerTitle={
+          <Fragment>
+            {MODULE_TITLE}
+            <PageHeadingQuestionTooltip
+              title={t('View analytics and information about your AI pipelines')}
+              docsUrl={MODULE_DOC_LINK}
+            />
+            <FeatureBadge type={RELEASE_LEVEL} />
+          </Fragment>
+        }
+        module={ModuleName.AI}
+      />
       <ModuleBodyUpsellHook moduleName={ModuleName.AI}>
         <Layout.Body>
           <Layout.Main fullWidth>
@@ -110,11 +81,7 @@ export function LLMMonitoringPage() {
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="ai"
-      features="insights-addon-modules"
-      analyticEventName="insight.page_loads.ai"
-    >
+    <ModulePageProviders moduleName="ai" analyticEventName="insight.page_loads.ai">
       <LLMMonitoringPage />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/mobile/appStarts/components/tables/spanOperationTable.spec.tsx b/static/app/views/insights/mobile/appStarts/components/tables/spanOperationTable.spec.tsx
index eb1912cfce9171..5f174ba07a3f7f 100644
--- a/static/app/views/insights/mobile/appStarts/components/tables/spanOperationTable.spec.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/tables/spanOperationTable.spec.tsx
@@ -94,7 +94,7 @@ describe('SpanOpSelector', function () {
 
     expect(screen.getByRole('link', {name: 'Application Init'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/insights/app-startup/spans/?spanDescription=Application%20Init&spanGroup=7f4be68f08c0455f&spanOp=app.start.warm&transaction=foo-bar'
+      '/organizations/org-slug/insights/mobile/app-startup/spans/?spanDescription=Application%20Init&spanGroup=7f4be68f08c0455f&spanOp=app.start.warm&transaction=foo-bar'
     );
   });
 
diff --git a/static/app/views/insights/mobile/appStarts/settings.ts b/static/app/views/insights/mobile/appStarts/settings.ts
index ecfe66191e9790..e283a8711844e1 100644
--- a/static/app/views/insights/mobile/appStarts/settings.ts
+++ b/static/app/views/insights/mobile/appStarts/settings.ts
@@ -9,6 +9,6 @@ export const MODULE_DESCRIPTION = t(
   'Improve the latency associated with your application starting up. '
 );
 export const MODULE_DOC_LINK =
-  'https://docs.sentry.io/product/insights/mobile-vitals/app-starts/';
+  'https://docs.sentry.io/product/insights/mobile/app-starts/';
 
 export const MODULE_FEATURES = ['insights-initial-modules'];
diff --git a/static/app/views/insights/mobile/appStarts/views/appStartsLandingPage.tsx b/static/app/views/insights/mobile/appStarts/views/appStartsLandingPage.tsx
index 15aec60d6119e9..0961145608dd47 100644
--- a/static/app/views/insights/mobile/appStarts/views/appStartsLandingPage.tsx
+++ b/static/app/views/insights/mobile/appStarts/views/appStartsLandingPage.tsx
@@ -26,7 +26,6 @@ function PageWithProviders() {
   return (
     <ModulePageProviders
       moduleName="app_start"
-      features="insights-initial-modules"
       analyticEventName="insight.page_loads.app_start"
     >
       <InitializationModule />
diff --git a/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx b/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx
index 3032e433bac2b3..e92291033984b8 100644
--- a/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx
+++ b/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx
@@ -2,12 +2,8 @@ import {Fragment, useEffect} from 'react';
 import styled from '@emotion/styled';
 import omit from 'lodash/omit';
 
-import Breadcrumbs from 'sentry/components/breadcrumbs';
 import ErrorBoundary from 'sentry/components/errorBoundary';
 import * as Layout from 'sentry/components/layouts/thirds';
-import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
-import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
-import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {browserHistory} from 'sentry/utils/browserHistory';
@@ -18,6 +14,7 @@ import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import useRouter from 'sentry/utils/useRouter';
 import {HeaderContainer} from 'sentry/views/insights/common/components/headerContainer';
+import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {
   PRIMARY_RELEASE_ALIAS,
@@ -25,7 +22,6 @@ import {
   SECONDARY_RELEASE_ALIAS,
 } from 'sentry/views/insights/common/components/releaseSelector';
 import {ToolRibbon} from 'sentry/views/insights/common/components/ribbon';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {SamplesTables} from 'sentry/views/insights/mobile/appStarts/components/samples';
 import {
   COLD_START_TYPE,
@@ -34,7 +30,6 @@ import {
 import {SpanSamplesPanel} from 'sentry/views/insights/mobile/common/components/spanSamplesPanel';
 import {MobileMetricsRibbon} from 'sentry/views/insights/mobile/screenload/components/metricsRibbon';
 import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {isModuleEnabled} from 'sentry/views/insights/pages/utils';
 import {ModuleName, SpanMetricsField} from 'sentry/views/insights/types';
 
@@ -56,43 +51,24 @@ export function ScreenSummary() {
   const location = useLocation<Query>();
   const {transaction: transactionName} = location.query;
   const organization = useOrganization();
-  const crumbs = useModuleBreadcrumbs('app_start');
-  const {isInDomainView} = useDomainViewFilters();
 
   const isMobileScreensEnabled = isModuleEnabled(ModuleName.MOBILE_SCREENS, organization);
 
   return (
     <Layout.Page>
       <PageAlertProvider>
-        {!isInDomainView && (
-          <Layout.Header>
-            <Layout.HeaderContent>
-              <Breadcrumbs
-                crumbs={[
-                  ...crumbs,
-                  {
-                    label: t('Screen Summary'),
-                  },
-                ]}
-              />
-              <Layout.Title>{transactionName}</Layout.Title>
-            </Layout.HeaderContent>
-          </Layout.Header>
-        )}
-        {isInDomainView && (
-          <MobileHeader
-            hideDefaultTabs={isMobileScreensEnabled}
-            module={
-              isMobileScreensEnabled ? ModuleName.MOBILE_SCREENS : ModuleName.APP_START
-            }
-            headerTitle={transactionName}
-            breadcrumbs={[
-              {
-                label: t('Screen Summary'),
-              },
-            ]}
-          />
-        )}
+        <MobileHeader
+          hideDefaultTabs={isMobileScreensEnabled}
+          module={
+            isMobileScreensEnabled ? ModuleName.MOBILE_SCREENS : ModuleName.APP_START
+          }
+          headerTitle={transactionName}
+          breadcrumbs={[
+            {
+              label: t('Screen Summary'),
+            },
+          ]}
+        />
         <Layout.Body>
           <Layout.Main fullWidth>
             <PageAlert />
@@ -136,10 +112,7 @@ export function ScreenSummaryContentPage() {
     <Fragment>
       <HeaderContainer>
         <ToolRibbon>
-          <PageFilterBar condensed>
-            <EnvironmentPageFilter />
-            <DatePageFilter />
-          </PageFilterBar>
+          <ModulePageFilterBar moduleName={ModuleName.APP_START} disableProjectFilter />
           <ReleaseComparisonSelector />
           <StartTypeSelector />
         </ToolRibbon>
@@ -237,11 +210,7 @@ export function ScreenSummaryContentPage() {
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="app_start"
-      pageTitle={t('Screen Summary')}
-      features="insights-initial-modules"
-    >
+    <ModulePageProviders moduleName="app_start" pageTitle={t('Screen Summary')}>
       <ScreenSummary />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/mobile/common/components/screensTemplate.tsx b/static/app/views/insights/mobile/common/components/screensTemplate.tsx
index ea73223ae537dd..f7b1fc48ca765d 100644
--- a/static/app/views/insights/mobile/common/components/screensTemplate.tsx
+++ b/static/app/views/insights/mobile/common/components/screensTemplate.tsx
@@ -2,10 +2,7 @@ import {Fragment, type ReactNode, useCallback} from 'react';
 import styled from '@emotion/styled';
 import omit from 'lodash/omit';
 
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
 import ErrorBoundary from 'sentry/components/errorBoundary';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import {space} from 'sentry/styles/space';
@@ -16,11 +13,9 @@ import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modul
 import {ModulesOnboarding} from 'sentry/views/insights/common/components/modulesOnboarding';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
 import {ReleaseComparisonSelector} from 'sentry/views/insights/common/components/releaseSelector';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import useCrossPlatformProject from 'sentry/views/insights/mobile/common/queries/useCrossPlatformProject';
 import {PlatformSelector} from 'sentry/views/insights/mobile/screenload/components/platformSelector';
 import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName} from 'sentry/views/insights/types';
 
 type ScreensTemplateProps = {
@@ -42,7 +37,6 @@ export default function ScreensTemplate({
 }: ScreensTemplateProps) {
   const location = useLocation();
   const {isProjectCrossPlatform} = useCrossPlatformProject();
-  const {isInDomainView} = useDomainViewFilters();
 
   const handleProjectChange = useCallback(() => {
     browserHistory.replace({
@@ -53,47 +47,22 @@ export default function ScreensTemplate({
     });
   }, [location]);
 
-  const crumbs = useModuleBreadcrumbs(moduleName);
-
   return (
     <Layout.Page>
       <PageAlertProvider>
-        {!isInDomainView && (
-          <Layout.Header>
-            <Layout.HeaderContent>
-              <Breadcrumbs crumbs={crumbs} />
-              <Layout.Title>
-                {title}
-                <PageHeadingQuestionTooltip
-                  docsUrl={moduleDocLink}
-                  title={moduleDescription}
-                />
-              </Layout.Title>
-            </Layout.HeaderContent>
-            <Layout.HeaderActions>
-              <ButtonBar gap={1}>
-                {isProjectCrossPlatform && <PlatformSelector />}
-                <FeedbackWidgetButton />
-              </ButtonBar>
-            </Layout.HeaderActions>
-          </Layout.Header>
-        )}
-
-        {isInDomainView && (
-          <MobileHeader
-            headerTitle={
-              <Fragment>
-                {title}
-                <PageHeadingQuestionTooltip
-                  docsUrl={moduleDocLink}
-                  title={moduleDescription}
-                />
-              </Fragment>
-            }
-            module={ModuleName.APP_START}
-            headerActions={isProjectCrossPlatform && <PlatformSelector />}
-          />
-        )}
+        <MobileHeader
+          headerTitle={
+            <Fragment>
+              {title}
+              <PageHeadingQuestionTooltip
+                docsUrl={moduleDocLink}
+                title={moduleDescription}
+              />
+            </Fragment>
+          }
+          module={ModuleName.APP_START}
+          headerActions={isProjectCrossPlatform && <PlatformSelector />}
+        />
 
         <ModuleBodyUpsellHook moduleName={moduleName}>
           <Layout.Body>
diff --git a/static/app/views/insights/mobile/screenRendering/screenRenderingLandingPage.tsx b/static/app/views/insights/mobile/screenRendering/screenRenderingLandingPage.tsx
index f4b0aad4e2829f..7a26dd51bfbe26 100644
--- a/static/app/views/insights/mobile/screenRendering/screenRenderingLandingPage.tsx
+++ b/static/app/views/insights/mobile/screenRendering/screenRenderingLandingPage.tsx
@@ -14,7 +14,6 @@ import {PlatformSelector} from 'sentry/views/insights/mobile/screenload/componen
 import {ScreenRenderingContent} from 'sentry/views/insights/mobile/screenRendering/screenRenderingContent';
 import {MODULE_TITLE} from 'sentry/views/insights/mobile/screenRendering/settings';
 import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
-import {MODULE_FEATURE_MAP} from 'sentry/views/insights/settings';
 import {ModuleName} from 'sentry/views/insights/types';
 
 export function ScreenRenderingModule() {
@@ -56,7 +55,6 @@ function PageWithProviders() {
   return (
     <ModulePageProviders
       moduleName="screen_load"
-      features={MODULE_FEATURE_MAP[ModuleName.SCREEN_RENDERING]}
       analyticEventName="insight.page_loads.screen_rendering"
     >
       <ScreenRenderingModule />
diff --git a/static/app/views/insights/mobile/screenRendering/screenRenderingSummaryPage.tsx b/static/app/views/insights/mobile/screenRendering/screenRenderingSummaryPage.tsx
index aa2ef78983a2bb..616153fc7c42ed 100644
--- a/static/app/views/insights/mobile/screenRendering/screenRenderingSummaryPage.tsx
+++ b/static/app/views/insights/mobile/screenRendering/screenRenderingSummaryPage.tsx
@@ -12,7 +12,6 @@ import {
 } from 'sentry/views/insights/mobile/screenRendering/settings';
 import {ScreenSummaryContent} from 'sentry/views/insights/mobile/ui/views/screenSummaryPage';
 import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
-import {MODULE_FEATURE_MAP} from 'sentry/views/insights/settings';
 import {ModuleName} from 'sentry/views/insights/types';
 
 function ScreenRenderingSummary() {
@@ -46,7 +45,6 @@ function PageWithProviders() {
     <ModulePageProviders
       moduleName={ModuleName.SCREEN_RENDERING}
       pageTitle={`${DATA_TYPE} ${t('Summary')}`}
-      features={MODULE_FEATURE_MAP[ModuleName.SCREEN_RENDERING]}
     >
       <ScreenRenderingSummary />
     </ModulePageProviders>
diff --git a/static/app/views/insights/mobile/screenRendering/settings.ts b/static/app/views/insights/mobile/screenRendering/settings.ts
index aba6a2259ef66e..265b5b6a8264ec 100644
--- a/static/app/views/insights/mobile/screenRendering/settings.ts
+++ b/static/app/views/insights/mobile/screenRendering/settings.ts
@@ -6,12 +6,14 @@ export const DATA_TYPE_PLURAL = t('Screen Renders');
 
 export const CHART_HEIGHT = 160;
 
-export const MODULE_DESCRIPTION = t('TODO');
-export const MODULE_DOC_LINK = 'TODO';
+export const MODULE_DESCRIPTION = t(
+  'Screen Rendering identifies slow and frozen interactions, helping you find and fix problems that might cause users to complain, or uninstall.'
+);
+export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/mobile/';
 
 export const BASE_URL = 'screen-rendering';
 export const SUMMARY_PAGE_BASE_URL = 'details';
 
 export const SUMMARY_PAGE_TITLE = t('Render Summary');
 
-export const MODULE_FEATURES = ['insights-addon-modules', 'insights-domain-view'];
+export const MODULE_FEATURES = ['insights-addon-modules'];
diff --git a/static/app/views/insights/mobile/screenload/settings.ts b/static/app/views/insights/mobile/screenload/settings.ts
index 6d9ae934d7852a..40ee6d8c0a0152 100644
--- a/static/app/views/insights/mobile/screenload/settings.ts
+++ b/static/app/views/insights/mobile/screenload/settings.ts
@@ -9,6 +9,6 @@ export const MODULE_DESCRIPTION = t(
   'View the most active screens in your mobile application and monitor your releases for TTID and TTFD regressions.'
 );
 export const MODULE_DOC_LINK =
-  'https://docs.sentry.io/product/insights/mobile-vitals/screen-loads/';
+  'https://docs.sentry.io/product/insights/mobile/screen-loads/';
 
 export const MODULE_FEATURES = ['insights-initial-modules'];
diff --git a/static/app/views/insights/mobile/screenload/views/screenLoadSpansPage.tsx b/static/app/views/insights/mobile/screenload/views/screenLoadSpansPage.tsx
index b9c9db5611cf58..36b4db1bc1a8ef 100644
--- a/static/app/views/insights/mobile/screenload/views/screenLoadSpansPage.tsx
+++ b/static/app/views/insights/mobile/screenload/views/screenLoadSpansPage.tsx
@@ -2,23 +2,17 @@ import {Fragment} from 'react';
 import styled from '@emotion/styled';
 import omit from 'lodash/omit';
 
-import Breadcrumbs from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
 import ErrorBoundary from 'sentry/components/errorBoundary';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
-import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
-import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
-import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {DurationUnit} from 'sentry/utils/discover/fields';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import {PageAlert, PageAlertProvider} from 'sentry/utils/performance/contexts/pageAlert';
 import {useLocation} from 'sentry/utils/useLocation';
-import useOrganization from 'sentry/utils/useOrganization';
 import useRouter from 'sentry/utils/useRouter';
 import {HeaderContainer} from 'sentry/views/insights/common/components/headerContainer';
+import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {
   PRIMARY_RELEASE_ALIAS,
@@ -26,7 +20,6 @@ import {
   SECONDARY_RELEASE_ALIAS,
 } from 'sentry/views/insights/common/components/releaseSelector';
 import {ToolRibbon} from 'sentry/views/insights/common/components/ribbon';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
 import {SpanSamplesPanel} from 'sentry/views/insights/mobile/common/components/spanSamplesPanel';
 import useCrossPlatformProject from 'sentry/views/insights/mobile/common/queries/useCrossPlatformProject';
@@ -43,7 +36,6 @@ import {
   MobileSortKeys,
 } from 'sentry/views/insights/mobile/screenload/constants';
 import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName} from 'sentry/views/insights/types';
 
 type Query = {
@@ -58,55 +50,22 @@ type Query = {
 
 function ScreenLoadSpans() {
   const location = useLocation<Query>();
-  const organization = useOrganization();
   const {isProjectCrossPlatform} = useCrossPlatformProject();
-
-  const crumbs = useModuleBreadcrumbs('screen_load');
-
   const {transaction: transactionName} = location.query;
 
-  const {isInDomainView} = useDomainViewFilters();
-
   return (
     <Layout.Page>
       <PageAlertProvider>
-        {!isInDomainView && (
-          <Layout.Header>
-            <Layout.HeaderContent>
-              <Breadcrumbs
-                crumbs={[
-                  ...crumbs,
-                  {
-                    label: t('Screen Summary'),
-                  },
-                ]}
-              />
-              <HeaderWrapper>
-                <Layout.Title>{transactionName}</Layout.Title>
-                {organization.features.includes('insights-initial-modules') &&
-                  isProjectCrossPlatform && <PlatformSelector />}
-              </HeaderWrapper>
-            </Layout.HeaderContent>
-            <Layout.HeaderActions>
-              <ButtonBar gap={1}>
-                <FeedbackWidgetButton />
-              </ButtonBar>
-            </Layout.HeaderActions>
-          </Layout.Header>
-        )}
-
-        {isInDomainView && (
-          <MobileHeader
-            module={ModuleName.SCREEN_LOAD}
-            headerTitle={transactionName}
-            headerActions={isProjectCrossPlatform && <PlatformSelector />}
-            breadcrumbs={[
-              {
-                label: t('Screen Summary'),
-              },
-            ]}
-          />
-        )}
+        <MobileHeader
+          module={ModuleName.SCREEN_LOAD}
+          headerTitle={transactionName}
+          headerActions={isProjectCrossPlatform && <PlatformSelector />}
+          breadcrumbs={[
+            {
+              label: t('Screen Summary'),
+            },
+          ]}
+        />
         <Layout.Body>
           <Layout.Main fullWidth>
             <PageAlert />
@@ -135,10 +94,7 @@ export function ScreenLoadSpansContent() {
       <HeaderContainer>
         <ToolRibbon>
           <FilterContainer>
-            <PageFilterBar condensed>
-              <EnvironmentPageFilter />
-              <DatePageFilter />
-            </PageFilterBar>
+            <ModulePageFilterBar moduleName={ModuleName.APP_START} disableProjectFilter />
             <ReleaseComparisonSelector />
           </FilterContainer>
         </ToolRibbon>
@@ -245,11 +201,7 @@ export function ScreenLoadSpansContent() {
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="screen_load"
-      pageTitle={t('Screen Summary')}
-      features="insights-initial-modules"
-    >
+    <ModulePageProviders moduleName="screen_load" pageTitle={t('Screen Summary')}>
       <ScreenLoadSpans />
     </ModulePageProviders>
   );
@@ -274,6 +226,3 @@ const SampleContainer = styled('div')`
 const SampleContainerItem = styled('div')`
   flex: 1;
 `;
-const HeaderWrapper = styled('div')`
-  display: flex;
-`;
diff --git a/static/app/views/insights/mobile/screenload/views/screenloadLandingPage.tsx b/static/app/views/insights/mobile/screenload/views/screenloadLandingPage.tsx
index c9c02c17e344d3..59efb25cc03051 100644
--- a/static/app/views/insights/mobile/screenload/views/screenloadLandingPage.tsx
+++ b/static/app/views/insights/mobile/screenload/views/screenloadLandingPage.tsx
@@ -1,10 +1,7 @@
 import {Fragment} from 'react';
 import styled from '@emotion/styled';
 
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
 import ErrorBoundary from 'sentry/components/errorBoundary';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import {space} from 'sentry/styles/space';
@@ -16,7 +13,6 @@ import {ModulesOnboarding} from 'sentry/views/insights/common/components/modules
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
 import {ReleaseComparisonSelector} from 'sentry/views/insights/common/components/releaseSelector';
 import {useOnboardingProject} from 'sentry/views/insights/common/queries/useOnboardingProject';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import useCrossPlatformProject from 'sentry/views/insights/mobile/common/queries/useCrossPlatformProject';
 import {PlatformSelector} from 'sentry/views/insights/mobile/screenload/components/platformSelector';
 import {ScreensView} from 'sentry/views/insights/mobile/screenload/components/screensView';
@@ -27,7 +23,6 @@ import {
   MODULE_TITLE,
 } from 'sentry/views/insights/mobile/screenload/settings';
 import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName} from 'sentry/views/insights/types';
 import Onboarding from 'sentry/views/performance/onboarding';
 
@@ -35,51 +30,23 @@ export function PageloadModule() {
   const organization = useOrganization();
   const onboardingProject = useOnboardingProject();
   const {isProjectCrossPlatform} = useCrossPlatformProject();
-  const {isInDomainView} = useDomainViewFilters();
-
-  const crumbs = useModuleBreadcrumbs('screen_load');
 
   return (
     <Layout.Page>
       <PageAlertProvider>
-        {!isInDomainView && (
-          <Layout.Header>
-            <Layout.HeaderContent>
-              <Breadcrumbs crumbs={crumbs} />
-              <HeaderWrapper>
-                <Layout.Title>
-                  {MODULE_TITLE}
-                  <PageHeadingQuestionTooltip
-                    docsUrl={MODULE_DOC_LINK}
-                    title={MODULE_DESCRIPTION}
-                  />
-                </Layout.Title>
-              </HeaderWrapper>
-            </Layout.HeaderContent>
-            <Layout.HeaderActions>
-              <ButtonBar gap={1}>
-                {isProjectCrossPlatform && <PlatformSelector />}
-                <FeedbackWidgetButton />
-              </ButtonBar>
-            </Layout.HeaderActions>
-          </Layout.Header>
-        )}
-
-        {isInDomainView && (
-          <MobileHeader
-            module={ModuleName.SCREEN_LOAD}
-            headerTitle={
-              <Fragment>
-                {MODULE_TITLE}
-                <PageHeadingQuestionTooltip
-                  docsUrl={MODULE_DOC_LINK}
-                  title={MODULE_DESCRIPTION}
-                />
-              </Fragment>
-            }
-            headerActions={isProjectCrossPlatform && <PlatformSelector />}
-          />
-        )}
+        <MobileHeader
+          module={ModuleName.SCREEN_LOAD}
+          headerTitle={
+            <Fragment>
+              {MODULE_TITLE}
+              <PageHeadingQuestionTooltip
+                docsUrl={MODULE_DOC_LINK}
+                title={MODULE_DESCRIPTION}
+              />
+            </Fragment>
+          }
+          headerActions={isProjectCrossPlatform && <PlatformSelector />}
+        />
 
         <ModuleBodyUpsellHook moduleName={ModuleName.SCREEN_LOAD}>
           <Layout.Body>
@@ -118,7 +85,6 @@ function PageWithProviders() {
   return (
     <ModulePageProviders
       moduleName="screen_load"
-      features="insights-initial-modules"
       analyticEventName="insight.page_loads.screen_load"
     >
       <PageloadModule />
@@ -143,7 +109,3 @@ const Container = styled('div')`
 const OnboardingContainer = styled('div')`
   margin-top: ${space(2)};
 `;
-
-const HeaderWrapper = styled('div')`
-  display: flex;
-`;
diff --git a/static/app/views/insights/mobile/screens/settings.ts b/static/app/views/insights/mobile/screens/settings.ts
index 8e70f2b18c01ea..2d71e6451b5646 100644
--- a/static/app/views/insights/mobile/screens/settings.ts
+++ b/static/app/views/insights/mobile/screens/settings.ts
@@ -11,5 +11,4 @@ export const MODULE_FEATURE = t('insights-mobile-screens-module');
 export const DATA_TYPE = t('Mobile Screens');
 export const DATA_TYPE_PLURAL = t('Mobile Screens');
 
-// TODO: Update this link once we have the proper docs.
-export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/mobile-vitals/';
+export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/mobile/';
diff --git a/static/app/views/insights/mobile/screens/views/screenDetailsPage.tsx b/static/app/views/insights/mobile/screens/views/screenDetailsPage.tsx
index e5f526fd4dccbf..f48d9058feb1d2 100644
--- a/static/app/views/insights/mobile/screens/views/screenDetailsPage.tsx
+++ b/static/app/views/insights/mobile/screens/views/screenDetailsPage.tsx
@@ -3,8 +3,6 @@ import {useState} from 'react';
 import type {Location} from 'history';
 
 import FeatureBadge from 'sentry/components/badge/featureBadge';
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
 import * as Layout from 'sentry/components/layouts/thirds';
 import PageFiltersContainer from 'sentry/components/organizations/pageFilters/container';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
@@ -15,14 +13,12 @@ import {PageAlert, PageAlertProvider} from 'sentry/utils/performance/contexts/pa
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {ScreenSummaryContentPage as AppStartPage} from 'sentry/views/insights/mobile/appStarts/views/screenSummaryPage';
 import useCrossPlatformProject from 'sentry/views/insights/mobile/common/queries/useCrossPlatformProject';
 import {PlatformSelector} from 'sentry/views/insights/mobile/screenload/components/platformSelector';
 import {ScreenLoadSpansContent as ScreenLoadPage} from 'sentry/views/insights/mobile/screenload/views/screenLoadSpansPage';
 import {ScreenSummaryContent as UiPage} from 'sentry/views/insights/mobile/ui/views/screenSummaryPage';
 import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName} from 'sentry/views/insights/types';
 
 type Query = {
@@ -40,19 +36,12 @@ type Tab = {
 };
 
 export function ScreenDetailsPage() {
-  const {isInDomainView} = useDomainViewFilters();
   const location: Location = useLocation<Query>();
   const organization = useOrganization();
   const {isProjectCrossPlatform} = useCrossPlatformProject();
 
   const {transaction: transactionName} = location.query;
   const moduleName = ModuleName.MOBILE_SCREENS;
-  const crumbs = [
-    ...useModuleBreadcrumbs(moduleName),
-    {
-      label: transactionName,
-    },
-  ];
 
   const tabs: Tab[] = [
     {
@@ -120,35 +109,18 @@ export function ScreenDetailsPage() {
       <Layout.Page>
         <PageAlertProvider>
           <Tabs value={selectedTabKey} onChange={tabKey => handleTabChange(tabKey)}>
-            {!isInDomainView && (
-              <Layout.Header>
-                <Layout.HeaderContent style={{margin: 0}}>
-                  <Breadcrumbs crumbs={crumbs} />
-                  <Layout.Title>{transactionName}</Layout.Title>
-                </Layout.HeaderContent>
-                <Layout.HeaderActions>
-                  <ButtonBar gap={1}>
-                    {isProjectCrossPlatform && <PlatformSelector />}
-                  </ButtonBar>
-                </Layout.HeaderActions>
-                {tabList}
-              </Layout.Header>
-            )}
-
-            {isInDomainView && (
-              <MobileHeader
-                module={ModuleName.MOBILE_SCREENS}
-                hideDefaultTabs
-                tabs={{tabList, value: selectedTabKey, onTabChange: handleTabChange}}
-                headerActions={isProjectCrossPlatform && <PlatformSelector />}
-                headerTitle={transactionName}
-                breadcrumbs={[
-                  {
-                    label: t('Screen Summary'),
-                  },
-                ]}
-              />
-            )}
+            <MobileHeader
+              module={moduleName}
+              hideDefaultTabs
+              tabs={{tabList, value: selectedTabKey, onTabChange: handleTabChange}}
+              headerActions={isProjectCrossPlatform && <PlatformSelector />}
+              headerTitle={transactionName}
+              breadcrumbs={[
+                {
+                  label: t('Screen Summary'),
+                },
+              ]}
+            />
             <Layout.Body>
               <Layout.Main fullWidth>
                 <PageAlert />
diff --git a/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx b/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx
index c4353014a7b836..c26926d8850988 100644
--- a/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx
+++ b/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx
@@ -2,10 +2,7 @@ import {Fragment, useCallback, useState} from 'react';
 import styled from '@emotion/styled';
 import omit from 'lodash/omit';
 
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
 import ErrorBoundary from 'sentry/components/errorBoundary';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {TabbedCodeSnippet} from 'sentry/components/onboarding/gettingStartedDoc/step';
 import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
@@ -26,7 +23,6 @@ import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import useCrossPlatformProject from 'sentry/views/insights/mobile/common/queries/useCrossPlatformProject';
 import {PlatformSelector} from 'sentry/views/insights/mobile/screenload/components/platformSelector';
 import {SETUP_CONTENT as TTFD_SETUP} from 'sentry/views/insights/mobile/screenload/data/setupContent';
@@ -37,7 +33,6 @@ import {Referrer} from 'sentry/views/insights/mobile/screens/referrers';
 import {
   MODULE_DESCRIPTION,
   MODULE_DOC_LINK,
-  MODULE_FEATURE,
   MODULE_TITLE,
 } from 'sentry/views/insights/mobile/screens/settings';
 import {
@@ -50,13 +45,10 @@ import {
   type VitalStatus,
 } from 'sentry/views/insights/mobile/screens/utils';
 import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {ModuleName} from 'sentry/views/insights/types';
 
 export function ScreensLandingPage() {
-  const {isInDomainView} = useDomainViewFilters();
   const moduleName = ModuleName.MOBILE_SCREENS;
-  const crumbs = useModuleBreadcrumbs(moduleName);
   const location = useLocation();
   const organization = useOrganization();
   const {isProjectCrossPlatform, selectedPlatform} = useCrossPlatformProject();
@@ -291,45 +283,22 @@ export function ScreensLandingPage() {
   };
 
   return (
-    <ModulePageProviders moduleName="mobile-screens" features={[MODULE_FEATURE]}>
+    <ModulePageProviders moduleName="mobile-screens">
       <Layout.Page>
         <PageAlertProvider>
-          {!isInDomainView && (
-            <Layout.Header>
-              <Layout.HeaderContent>
-                <Breadcrumbs crumbs={crumbs} />
-                <Layout.Title>
-                  {MODULE_TITLE}
-                  <PageHeadingQuestionTooltip
-                    docsUrl={MODULE_DOC_LINK}
-                    title={MODULE_DESCRIPTION}
-                  />
-                </Layout.Title>
-              </Layout.HeaderContent>
-              <Layout.HeaderActions>
-                <ButtonBar gap={1}>
-                  {isProjectCrossPlatform && <PlatformSelector />}
-                  <FeedbackWidgetButton />
-                </ButtonBar>
-              </Layout.HeaderActions>
-            </Layout.Header>
-          )}
-          {isInDomainView && (
-            <MobileHeader
-              headerTitle={
-                <Fragment>
-                  {MODULE_TITLE}
-                  <PageHeadingQuestionTooltip
-                    docsUrl={MODULE_DOC_LINK}
-                    title={MODULE_DESCRIPTION}
-                  />
-                </Fragment>
-              }
-              headerActions={isProjectCrossPlatform && <PlatformSelector />}
-              module={ModuleName.MOBILE_SCREENS}
-            />
-          )}
-
+          <MobileHeader
+            headerTitle={
+              <Fragment>
+                {MODULE_TITLE}
+                <PageHeadingQuestionTooltip
+                  docsUrl={MODULE_DOC_LINK}
+                  title={MODULE_DESCRIPTION}
+                />
+              </Fragment>
+            }
+            headerActions={isProjectCrossPlatform && <PlatformSelector />}
+            module={moduleName}
+          />
           <Layout.Body>
             <Layout.Main fullWidth>
               <Container>
diff --git a/static/app/views/insights/mobile/ui/components/tables/spanOperationTable.tsx b/static/app/views/insights/mobile/ui/components/tables/spanOperationTable.tsx
index 49770d19ecd341..3fa83edf81804e 100644
--- a/static/app/views/insights/mobile/ui/components/tables/spanOperationTable.tsx
+++ b/static/app/views/insights/mobile/ui/components/tables/spanOperationTable.tsx
@@ -175,9 +175,11 @@ export function SpanOperationTable({
       };
 
       return (
-        <Link to={`${pathname}?${qs.stringify(query)}`}>
-          <OverflowEllipsisTextContainer>{label}</OverflowEllipsisTextContainer>
-        </Link>
+        <OverflowEllipsisTextContainer>
+          <Link to={`${pathname}?${qs.stringify(query)}`}>
+            <OverflowEllipsisTextContainer>{label}</OverflowEllipsisTextContainer>
+          </Link>
+        </OverflowEllipsisTextContainer>
       );
     }
 
diff --git a/static/app/views/insights/mobile/ui/components/tables/uiScreensTable.tsx b/static/app/views/insights/mobile/ui/components/tables/uiScreensTable.tsx
index 610f8dd4e71ea6..3fd70d64ff1be0 100644
--- a/static/app/views/insights/mobile/ui/components/tables/uiScreensTable.tsx
+++ b/static/app/views/insights/mobile/ui/components/tables/uiScreensTable.tsx
@@ -13,6 +13,7 @@ import {
   PRIMARY_RELEASE_ALIAS,
   SECONDARY_RELEASE_ALIAS,
 } from 'sentry/views/insights/common/components/releaseSelector';
+import {OverflowEllipsisTextContainer} from 'sentry/views/insights/common/components/textAlign';
 import {useReleaseSelection} from 'sentry/views/insights/common/queries/useReleases';
 import {useModuleURL} from 'sentry/views/insights/common/utils/useModuleURL';
 import {ScreensTable} from 'sentry/views/insights/mobile/common/components/tables/screensTable';
@@ -102,19 +103,21 @@ export function UIScreensTable({data, eventView, isLoading, pageLinks}: Props) {
     if (field === 'transaction') {
       return (
         <Fragment>
-          <TopResultsIndicator count={TOP_SCREENS} index={index} />
-          <Link
-            to={`${moduleURL}/spans/?${qs.stringify({
-              ...location.query,
-              project: row['project.id'],
-              transaction: row.transaction,
-              primaryRelease,
-              secondaryRelease,
-            })}`}
-            style={{display: `block`, width: `100%`}}
-          >
-            {row.transaction}
-          </Link>
+          <OverflowEllipsisTextContainer>
+            <TopResultsIndicator count={TOP_SCREENS} index={index} />
+            <Link
+              to={`${moduleURL}/spans/?${qs.stringify({
+                ...location.query,
+                project: row['project.id'],
+                transaction: row.transaction,
+                primaryRelease,
+                secondaryRelease,
+              })}`}
+              style={{display: `block`, width: `100%`}}
+            >
+              {row.transaction}
+            </Link>
+          </OverflowEllipsisTextContainer>
         </Fragment>
       );
     }
diff --git a/static/app/views/insights/mobile/ui/settings.ts b/static/app/views/insights/mobile/ui/settings.ts
index bae69d75c8f993..3d469006195a79 100644
--- a/static/app/views/insights/mobile/ui/settings.ts
+++ b/static/app/views/insights/mobile/ui/settings.ts
@@ -5,7 +5,6 @@ export const BASE_URL = 'ui';
 
 export const MODULE_DESCRIPTION = t("Improve your application's responsiveness.");
 
-// TODO: Update this link once we have the proper docs.
-export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/mobile-vitals/';
+export const MODULE_DOC_LINK = 'https://docs.sentry.io/product/insights/mobile/';
 
 export const MODULE_FEATURES = ['insights-addon-modules', 'starfish-mobile-ui-module'];
diff --git a/static/app/views/insights/mobile/ui/views/screenSummaryPage.tsx b/static/app/views/insights/mobile/ui/views/screenSummaryPage.tsx
index 45b3cf51287710..bbfdce2991a620 100644
--- a/static/app/views/insights/mobile/ui/views/screenSummaryPage.tsx
+++ b/static/app/views/insights/mobile/ui/views/screenSummaryPage.tsx
@@ -2,11 +2,7 @@ import {Fragment} from 'react';
 import styled from '@emotion/styled';
 import omit from 'lodash/omit';
 
-import Breadcrumbs from 'sentry/components/breadcrumbs';
 import * as Layout from 'sentry/components/layouts/thirds';
-import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
-import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
-import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {PageAlert, PageAlertProvider} from 'sentry/utils/performance/contexts/pageAlert';
@@ -14,15 +10,14 @@ import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import useRouter from 'sentry/utils/useRouter';
 import {HeaderContainer} from 'sentry/views/insights/common/components/headerContainer';
+import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {ReleaseComparisonSelector} from 'sentry/views/insights/common/components/releaseSelector';
 import {ToolRibbon} from 'sentry/views/insights/common/components/ribbon';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {SpanSamplesPanel} from 'sentry/views/insights/mobile/common/components/spanSamplesPanel';
 import {SamplesTables} from 'sentry/views/insights/mobile/common/components/tables/samplesTables';
 import {SpanOperationTable} from 'sentry/views/insights/mobile/ui/components/tables/spanOperationTable';
 import {MobileHeader} from 'sentry/views/insights/pages/mobile/mobilePageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {isModuleEnabled} from 'sentry/views/insights/pages/utils';
 import {ModuleName, SpanMetricsField} from 'sentry/views/insights/types';
 
@@ -39,44 +34,24 @@ type Query = {
 
 function ScreenSummary() {
   const location = useLocation<Query>();
-  const {isInDomainView} = useDomainViewFilters();
   const organization = useOrganization();
   const {transaction: transactionName} = location.query;
 
-  const crumbs = useModuleBreadcrumbs('mobile-ui');
   const isMobileScreensEnabled = isModuleEnabled(ModuleName.MOBILE_SCREENS, organization);
 
   return (
     <Layout.Page>
       <PageAlertProvider>
-        {!isInDomainView && (
-          <Layout.Header>
-            <Layout.HeaderContent>
-              <Breadcrumbs
-                crumbs={[
-                  ...crumbs,
-                  {
-                    label: t('Screen Summary'),
-                  },
-                ]}
-              />
-              <Layout.Title>{transactionName}</Layout.Title>
-            </Layout.HeaderContent>
-          </Layout.Header>
-        )}
-
-        {isInDomainView && (
-          <MobileHeader
-            hideDefaultTabs={isMobileScreensEnabled}
-            module={ModuleName.MOBILE_SCREENS}
-            headerTitle={transactionName}
-            breadcrumbs={[
-              {
-                label: t('Screen Summary'),
-              },
-            ]}
-          />
-        )}
+        <MobileHeader
+          hideDefaultTabs={isMobileScreensEnabled}
+          module={ModuleName.MOBILE_SCREENS}
+          headerTitle={transactionName}
+          breadcrumbs={[
+            {
+              label: t('Screen Summary'),
+            },
+          ]}
+        />
         <Layout.Body>
           <Layout.Main fullWidth>
             <PageAlert />
@@ -104,10 +79,10 @@ export function ScreenSummaryContent() {
     <Fragment>
       <HeaderContainer>
         <ToolRibbon>
-          <PageFilterBar condensed>
-            <EnvironmentPageFilter />
-            <DatePageFilter />
-          </PageFilterBar>
+          <ModulePageFilterBar
+            moduleName={ModuleName.SCREEN_RENDERING}
+            disableProjectFilter
+          />
           <ReleaseComparisonSelector />
         </ToolRibbon>
       </HeaderContainer>
@@ -151,11 +126,7 @@ export function ScreenSummaryContent() {
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="mobile-ui"
-      pageTitle={t('Screen Summary')}
-      features={['insights-addon-modules', 'starfish-mobile-ui-module']}
-    >
+    <ModulePageProviders moduleName="mobile-ui" pageTitle={t('Screen Summary')}>
       <ScreenSummary />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/mobile/ui/views/uiLandingPage.tsx b/static/app/views/insights/mobile/ui/views/uiLandingPage.tsx
index ae6634c377a8a1..3ef6250edfddaf 100644
--- a/static/app/views/insights/mobile/ui/views/uiLandingPage.tsx
+++ b/static/app/views/insights/mobile/ui/views/uiLandingPage.tsx
@@ -22,10 +22,7 @@ export function ResponsivenessModule() {
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="mobile-ui"
-      features={['insights-addon-modules', 'starfish-mobile-ui-module']}
-    >
+    <ModulePageProviders moduleName="mobile-ui">
       <ResponsivenessModule />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/pages/ai/aiOverviewPage.tsx b/static/app/views/insights/pages/ai/aiOverviewPage.tsx
index f354cc1f578f0a..01ddbff22c0e0d 100644
--- a/static/app/views/insights/pages/ai/aiOverviewPage.tsx
+++ b/static/app/views/insights/pages/ai/aiOverviewPage.tsx
@@ -52,7 +52,6 @@ export const AI_COLUMN_TITLES = [
   'project',
   'tpm',
   'p50()',
-  'p75()',
   'p95()',
   'users',
 ];
@@ -81,9 +80,8 @@ function AiOverviewPage() {
     {field: 'transaction.op'},
     {field: 'project'},
     {field: 'tpm()'},
-    {field: 'p50(transaction.duration)'},
-    {field: 'p75(transaction.duration)'},
-    {field: 'p95(transaction.duration)'},
+    {field: 'p50()'},
+    {field: 'p95()'},
   ].map(field => ({...field, width: COL_WIDTH_UNDEFINED}));
 
   const showOnboarding = onboardingProject !== undefined;
@@ -136,7 +134,7 @@ function AiOverviewPage() {
 
   return (
     <Feature
-      features="insights-domain-view"
+      features="performance-view"
       organization={organization}
       renderDisabled={NoAccess}
     >
diff --git a/static/app/views/insights/pages/backend/backendOverviewPage.tsx b/static/app/views/insights/pages/backend/backendOverviewPage.tsx
index a2c631688b9d29..3e68d8c204f7a4 100644
--- a/static/app/views/insights/pages/backend/backendOverviewPage.tsx
+++ b/static/app/views/insights/pages/backend/backendOverviewPage.tsx
@@ -52,8 +52,8 @@ export const BACKEND_COLUMN_TITLES = [
   'operation',
   'project',
   'tpm',
-  'p50',
-  'p95',
+  'p50()',
+  'p95()',
   'failure rate',
   'apdex',
   'users',
@@ -85,8 +85,8 @@ function BackendOverviewPage() {
     {field: 'transaction.op'},
     {field: 'project'},
     {field: 'tpm()'},
-    {field: 'p50(transaction.duration)'},
-    {field: 'p95(transaction.duration)'},
+    {field: 'p50()'},
+    {field: 'p95()'},
     {field: 'failure_rate()'},
     {field: 'apdex()'},
     {field: 'count_unique(user)'},
@@ -166,7 +166,7 @@ function BackendOverviewPage() {
 
   return (
     <Feature
-      features="insights-domain-view"
+      features="performance-view"
       organization={organization}
       renderDisabled={NoAccess}
     >
diff --git a/static/app/views/insights/pages/domainViewHeader.tsx b/static/app/views/insights/pages/domainViewHeader.tsx
index 65101e2f3598a7..edf03e68c90aa8 100644
--- a/static/app/views/insights/pages/domainViewHeader.tsx
+++ b/static/app/views/insights/pages/domainViewHeader.tsx
@@ -1,5 +1,6 @@
 import {Fragment} from 'react';
 import styled from '@emotion/styled';
+import type {LocationDescriptor} from 'history';
 
 import {Breadcrumbs, type Crumb} from 'sentry/components/breadcrumbs';
 import ButtonBar from 'sentry/components/buttonBar';
@@ -8,7 +9,6 @@ import * as Layout from 'sentry/components/layouts/thirds';
 import {TabList, Tabs} from 'sentry/components/tabs';
 import {IconBusiness} from 'sentry/icons';
 import {space} from 'sentry/styles/space';
-import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useModuleTitles} from 'sentry/views/insights/common/utils/useModuleTitle';
 import {
@@ -37,6 +37,7 @@ export type Props = {
 type Tab = {
   key: string;
   label: React.ReactNode;
+  to: LocationDescriptor;
 };
 
 export function DomainViewHeader({
@@ -50,7 +51,6 @@ export function DomainViewHeader({
   domainBaseUrl,
   tabs,
 }: Props) {
-  const navigate = useNavigate();
   const organization = useOrganization();
   const moduleURLBuilder = useModuleURLBuilder();
   const moduleTitles = useModuleTitles();
@@ -78,30 +78,14 @@ export function DomainViewHeader({
 
   const showModuleTabs = organization.features.includes('insights-entry-points');
 
-  const defaultHandleTabChange = (key: ModuleName | typeof OVERVIEW_PAGE_TITLE) => {
-    if (key === selectedModule || (key === OVERVIEW_PAGE_TITLE && !module)) {
-      return;
-    }
-    if (!key) {
-      return;
-    }
-    if (key === OVERVIEW_PAGE_TITLE) {
-      navigate(domainBaseUrl);
-      return;
-    }
-    navigate(`${moduleURLBuilder(key as RoutableModuleNames)}/`);
-  };
-
   const tabValue =
     hideDefaultTabs && tabs?.value ? tabs.value : selectedModule ?? OVERVIEW_PAGE_TITLE;
 
-  const handleTabChange =
-    hideDefaultTabs && tabs ? tabs.onTabChange : defaultHandleTabChange;
-
   const tabList: Tab[] = [
     {
       key: OVERVIEW_PAGE_TITLE,
       label: OVERVIEW_PAGE_TITLE,
+      to: domainBaseUrl,
     },
   ];
 
@@ -110,6 +94,7 @@ export function DomainViewHeader({
       ...modules.map(moduleName => ({
         key: moduleName,
         label: <TabLabel moduleName={moduleName} />,
+        to: `${moduleURLBuilder(moduleName as RoutableModuleNames)}/`,
       }))
     );
   }
@@ -128,11 +113,13 @@ export function DomainViewHeader({
             <FeedbackWidgetButton />
           </ButtonBar>
         </Layout.HeaderActions>
-        <Tabs value={tabValue} onChange={handleTabChange}>
+        <Tabs value={tabValue} onChange={tabs?.onTabChange}>
           {!hideDefaultTabs && (
             <TabList hideBorder>
               {tabList.map(tab => (
-                <TabList.Item key={tab.key}>{tab.label}</TabList.Item>
+                <TabList.Item key={tab.key} to={tab.to}>
+                  {tab.label}
+                </TabList.Item>
               ))}
             </TabList>
           )}
diff --git a/static/app/views/insights/pages/frontend/frontendOverviewPage.tsx b/static/app/views/insights/pages/frontend/frontendOverviewPage.tsx
index 758e4644d44cc7..3acbb180657884 100644
--- a/static/app/views/insights/pages/frontend/frontendOverviewPage.tsx
+++ b/static/app/views/insights/pages/frontend/frontendOverviewPage.tsx
@@ -157,7 +157,7 @@ function FrontendOverviewPage() {
 
   return (
     <Feature
-      features="insights-domain-view"
+      features="performance-view"
       organization={organization}
       renderDisabled={NoAccess}
     >
diff --git a/static/app/views/insights/pages/mobile/mobileOverviewPage.tsx b/static/app/views/insights/pages/mobile/mobileOverviewPage.tsx
index 625cc9a2b84bb5..e4e1f9a39fa16b 100644
--- a/static/app/views/insights/pages/mobile/mobileOverviewPage.tsx
+++ b/static/app/views/insights/pages/mobile/mobileOverviewPage.tsx
@@ -180,7 +180,7 @@ function MobileOverviewPage() {
 
   return (
     <Feature
-      features="insights-domain-view"
+      features="performance-view"
       organization={organization}
       renderDisabled={NoAccess}
     >
diff --git a/static/app/views/insights/pages/mobile/mobilePageHeader.tsx b/static/app/views/insights/pages/mobile/mobilePageHeader.tsx
index a6d17ea20fe881..d134978bd5c1e7 100644
--- a/static/app/views/insights/pages/mobile/mobilePageHeader.tsx
+++ b/static/app/views/insights/pages/mobile/mobilePageHeader.tsx
@@ -40,7 +40,12 @@ export function MobileHeader({
 
   const modules = hasMobileScreens
     ? [ModuleName.MOBILE_SCREENS]
-    : [ModuleName.APP_START, ModuleName.SCREEN_LOAD, ModuleName.SCREEN_RENDERING];
+    : [
+        ModuleName.APP_START,
+        ModuleName.SCREEN_LOAD,
+        ModuleName.SCREEN_RENDERING,
+        ModuleName.HTTP,
+      ];
 
   if (!hasMobileScreens && hasMobileUi) {
     modules.push(ModuleName.MOBILE_UI);
diff --git a/static/app/views/insights/pages/mobile/settings.ts b/static/app/views/insights/pages/mobile/settings.ts
index e84075733d536c..80a6d966389f25 100644
--- a/static/app/views/insights/pages/mobile/settings.ts
+++ b/static/app/views/insights/pages/mobile/settings.ts
@@ -9,6 +9,7 @@ export const OVERVIEW_PAGE_ALLOWED_OPS = [
   'ui.action.swipe',
   'ui.action.scroll',
   'ui.action.click',
+  'ui.action',
   'ui.load',
   'app.lifecycle',
   // navigation and pageload are seen in react-native
diff --git a/static/app/views/insights/pages/useFilters.spec.tsx b/static/app/views/insights/pages/useFilters.spec.tsx
index df135528142669..b963f9dd079614 100644
--- a/static/app/views/insights/pages/useFilters.spec.tsx
+++ b/static/app/views/insights/pages/useFilters.spec.tsx
@@ -23,16 +23,7 @@ describe('useDomainViewFilters', () => {
     mockUseLocation.mockReturnValue(
       LocationFixture({pathname: `/${DOMAIN_VIEW_BASE_URL}/${FRONTEND_LANDING_SUB_PATH}`})
     );
-    mockUseOrganization.mockReturnValue(
-      OrganizationFixture({features: ['insights-domain-view']})
-    );
-  });
-
-  it('should return isInDomainView as false without feature', function () {
     mockUseOrganization.mockReturnValue(OrganizationFixture());
-    const {isInDomainView, view} = useDomainViewFilters();
-    expect(isInDomainView).toBe(false);
-    expect(view).toBeUndefined();
   });
 
   it('should return correct domain view based on the url', function () {
diff --git a/static/app/views/insights/pages/useFilters.tsx b/static/app/views/insights/pages/useFilters.tsx
index fac196b49f9620..d0815204df527d 100644
--- a/static/app/views/insights/pages/useFilters.tsx
+++ b/static/app/views/insights/pages/useFilters.tsx
@@ -1,7 +1,6 @@
 import type {ModuleName} from 'webpack-cli';
 
 import {useLocation} from 'sentry/utils/useLocation';
-import useOrganization from 'sentry/utils/useOrganization';
 import {AI_LANDING_SUB_PATH} from 'sentry/views/insights/pages/ai/settings';
 import {BACKEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/backend/settings';
 import {FRONTEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/frontend/settings';
@@ -32,15 +31,12 @@ export type Filters = {
 
 export const useDomainViewFilters = () => {
   const location = useLocation();
-  const organization = useOrganization({allowNull: true});
-
-  const hasDomainViewFeature = organization?.features.includes('insights-domain-view');
   const pathSegments = location.pathname.split('/').filter(Boolean);
   const indexOfPerformance = pathSegments.indexOf(DOMAIN_VIEW_BASE_URL);
   const isInDomainView = indexOfPerformance !== -1;
   const view = pathSegments[indexOfPerformance + 1] as DomainViewFilters['view'];
 
-  if (!domainViews.includes(view || '') || !hasDomainViewFeature) {
+  if (!domainViews.includes(view || '')) {
     return {isInDomainView: false};
   }
 
diff --git a/static/app/views/insights/queues/alerts.ts b/static/app/views/insights/queues/alerts.ts
deleted file mode 100644
index aa018183858a2c..00000000000000
--- a/static/app/views/insights/queues/alerts.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import {t} from 'sentry/locale';
-import type {AlertConfig} from 'sentry/views/insights/common/components/chartPanel';
-import {SpanMetricsField} from 'sentry/views/insights/types';
-
-export const ALERTS: Record<string, AlertConfig> = {
-  latency: {
-    aggregate: `avg(g:spans/${SpanMetricsField.MESSAGING_MESSAGE_RECEIVE_LATENCY}@millisecond)`,
-    query: 'span.op:queue.process',
-    name: t('Create Time in Queue Alert'),
-  },
-  duration: {
-    aggregate: 'avg(d:spans/duration@millisecond)',
-    query: 'span.op:queue.process',
-    name: t('Create Processing Time Alert'),
-  },
-  processed: {
-    aggregate: 'spm()',
-    query: 'span.op:queue.process',
-    name: t('Create Processed Alert'),
-  },
-  published: {
-    aggregate: 'spm()',
-    query: 'span.op:queue.publish',
-    name: t('Create Published Alert'),
-  },
-};
diff --git a/static/app/views/insights/queues/charts/latencyChart.tsx b/static/app/views/insights/queues/charts/latencyChart.tsx
index 97328face2577b..84fe0b4ec767c9 100644
--- a/static/app/views/insights/queues/charts/latencyChart.tsx
+++ b/static/app/views/insights/queues/charts/latencyChart.tsx
@@ -2,7 +2,6 @@ import {CHART_PALETTE} from 'sentry/constants/chartPalette';
 import {t} from 'sentry/locale';
 import Chart, {ChartType} from 'sentry/views/insights/common/components/chart';
 import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
-import {ALERTS} from 'sentry/views/insights/queues/alerts';
 import {useProcessQueuesTimeSeriesQuery} from 'sentry/views/insights/queues/queries/useProcessQueuesTimeSeriesQuery';
 import type {Referrer} from 'sentry/views/insights/queues/referrers';
 import {CHART_HEIGHT} from 'sentry/views/insights/queues/settings';
@@ -19,20 +18,8 @@ export function LatencyChart({error, destination, referrer}: Props) {
     referrer,
   });
 
-  let {latency, duration} = ALERTS;
-  if (destination) {
-    latency = {
-      ...latency,
-      query: `${latency.query} messaging.destination.name:${destination}`,
-    };
-    duration = {
-      ...duration,
-      query: `${duration.query} messaging.destination.name:${destination}`,
-    };
-  }
-
   return (
-    <ChartPanel title={t('Avg Latency')} alertConfigs={[latency, duration]}>
+    <ChartPanel title={t('Avg Latency')}>
       <Chart
         height={CHART_HEIGHT}
         grid={{
diff --git a/static/app/views/insights/queues/charts/throughputChart.tsx b/static/app/views/insights/queues/charts/throughputChart.tsx
index b189b2f60b690e..857489ccd946ca 100644
--- a/static/app/views/insights/queues/charts/throughputChart.tsx
+++ b/static/app/views/insights/queues/charts/throughputChart.tsx
@@ -4,7 +4,6 @@ import {RateUnit} from 'sentry/utils/discover/fields';
 import {formatRate} from 'sentry/utils/formatters';
 import Chart, {ChartType} from 'sentry/views/insights/common/components/chart';
 import ChartPanel from 'sentry/views/insights/common/components/chartPanel';
-import {ALERTS} from 'sentry/views/insights/queues/alerts';
 import {useProcessQueuesTimeSeriesQuery} from 'sentry/views/insights/queues/queries/useProcessQueuesTimeSeriesQuery';
 import {usePublishQueuesTimeSeriesQuery} from 'sentry/views/insights/queues/queries/usePublishQueuesTimeSeriesQuery';
 import type {Referrer} from 'sentry/views/insights/queues/referrers';
@@ -27,19 +26,8 @@ export function ThroughputChart({error, destination, referrer}: Props) {
       destination,
       referrer,
     });
-  let {processed, published} = ALERTS;
-  if (destination) {
-    processed = {
-      ...processed,
-      query: `${processed.query} messaging.destination.name:${destination}`,
-    };
-    published = {
-      ...published,
-      query: `${published.query} messaging.destination.name:${destination}`,
-    };
-  }
   return (
-    <ChartPanel title={t('Published vs Processed')} alertConfigs={[processed, published]}>
+    <ChartPanel title={t('Published vs Processed')}>
       <Chart
         height={CHART_HEIGHT}
         grid={{
diff --git a/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx b/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx
index 4186a754e99653..03713e0ba4ce8f 100644
--- a/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx
+++ b/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx
@@ -349,10 +349,6 @@ export function MessageSpanSamplesPanel() {
               }}
               isLoading={isDurationDataFetching}
               error={durationError}
-              filters={timeseriesFilters.getFilterKeys().reduce((acc, key) => {
-                acc[key] = timeseriesFilters.getFilterValues(key)[0];
-                return acc;
-              }, {})}
             />
           </ModuleLayout.Full>
 
diff --git a/static/app/views/insights/queues/settings.ts b/static/app/views/insights/queues/settings.ts
index 31ea5fc3c61983..9bca7d122e001a 100644
--- a/static/app/views/insights/queues/settings.ts
+++ b/static/app/views/insights/queues/settings.ts
@@ -44,7 +44,7 @@ export const MODULE_DESCRIPTION = t(
   'Understand the health and performance impact that queues have on your application and diagnose errors tied to jobs.'
 );
 export const MODULE_DOC_LINK =
-  'https://docs.sentry.io/product/insights/queue-monitoring/';
+  'https://docs.sentry.io/product/insights/backend/queue-monitoring/';
 
 export const TABLE_ROWS_LIMIT = 25;
 
diff --git a/static/app/views/insights/queues/views/destinationSummaryPage.tsx b/static/app/views/insights/queues/views/destinationSummaryPage.tsx
index 941c98e3b7173e..925f8a1671a605 100644
--- a/static/app/views/insights/queues/views/destinationSummaryPage.tsx
+++ b/static/app/views/insights/queues/views/destinationSummaryPage.tsx
@@ -1,14 +1,7 @@
 import {Fragment} from 'react';
 import styled from '@emotion/styled';
 
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
-import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
-import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
-import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
-import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {DurationUnit} from 'sentry/utils/discover/fields';
@@ -18,14 +11,13 @@ import useOrganization from 'sentry/utils/useOrganization';
 import {HeaderContainer} from 'sentry/views/insights/common/components/headerContainer';
 import {MetricReadout} from 'sentry/views/insights/common/components/metricReadout';
 import * as ModuleLayout from 'sentry/views/insights/common/components/moduleLayout';
+import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modulePageFilterBar';
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
 import {ReadoutRibbon, ToolRibbon} from 'sentry/views/insights/common/components/ribbon';
 import {getTimeSpentExplanation} from 'sentry/views/insights/common/components/tableCells/timeSpentCell';
 import {useOnboardingProject} from 'sentry/views/insights/common/queries/useOnboardingProject';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {BackendHeader} from 'sentry/views/insights/pages/backend/backendPageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {LatencyChart} from 'sentry/views/insights/queues/charts/latencyChart';
 import {ThroughputChart} from 'sentry/views/insights/queues/charts/throughputChart';
 import {MessageSpanSamplesPanel} from 'sentry/views/insights/queues/components/messageSpanSamplesPanel';
@@ -37,7 +29,6 @@ import {ModuleName} from 'sentry/views/insights/types';
 import Onboarding from 'sentry/views/performance/onboarding';
 
 function DestinationSummaryPage() {
-  const {isInDomainView} = useDomainViewFilters();
   const organization = useOrganization();
   const onboardingProject = useOnboardingProject();
 
@@ -50,44 +41,17 @@ function DestinationSummaryPage() {
   });
   const errorRate = 1 - (data[0]?.['trace_status_rate(ok)'] ?? 0);
 
-  const crumbs = useModuleBreadcrumbs('queue');
-
   return (
     <Fragment>
-      {!isInDomainView && (
-        <Layout.Header>
-          <Layout.HeaderContent>
-            <Breadcrumbs
-              crumbs={[
-                ...crumbs,
-                {
-                  label: DESTINATION_TITLE,
-                },
-              ]}
-            />
-
-            <Layout.Title>{destination}</Layout.Title>
-          </Layout.HeaderContent>
-          <Layout.HeaderActions>
-            <ButtonBar gap={1}>
-              <FeedbackWidgetButton />
-            </ButtonBar>
-          </Layout.HeaderActions>
-        </Layout.Header>
-      )}
-
-      {isInDomainView && (
-        <BackendHeader
-          headerTitle={destination}
-          breadcrumbs={[
-            {
-              label: DESTINATION_TITLE,
-            },
-          ]}
-          module={ModuleName.QUEUE}
-        />
-      )}
-
+      <BackendHeader
+        headerTitle={destination}
+        breadcrumbs={[
+          {
+            label: DESTINATION_TITLE,
+          },
+        ]}
+        module={ModuleName.QUEUE}
+      />
       <ModuleBodyUpsellHook moduleName={ModuleName.QUEUE}>
         <Layout.Body>
           <Layout.Main fullWidth>
@@ -95,11 +59,7 @@ function DestinationSummaryPage() {
               <ModuleLayout.Full>
                 <HeaderContainer>
                   <ToolRibbon>
-                    <PageFilterBar condensed>
-                      <ProjectPageFilter />
-                      <EnvironmentPageFilter />
-                      <DatePageFilter />
-                    </PageFilterBar>
+                    <ModulePageFilterBar moduleName={ModuleName.QUEUE} />
                   </ToolRibbon>
 
                   {!onboardingProject && (
@@ -186,11 +146,7 @@ function DestinationSummaryPage() {
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="queue"
-      pageTitle={t('Destination Summary')}
-      features="insights-addon-modules"
-    >
+    <ModulePageProviders moduleName="queue" pageTitle={t('Destination Summary')}>
       <DestinationSummaryPage />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/queues/views/queuesLandingPage.tsx b/static/app/views/insights/queues/views/queuesLandingPage.tsx
index a22194167f62fe..0b661cbfcc966b 100644
--- a/static/app/views/insights/queues/views/queuesLandingPage.tsx
+++ b/static/app/views/insights/queues/views/queuesLandingPage.tsx
@@ -1,9 +1,6 @@
 import {Fragment} from 'react';
 import styled from '@emotion/styled';
 
-import {Breadcrumbs} from 'sentry/components/breadcrumbs';
-import ButtonBar from 'sentry/components/buttonBar';
-import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import SearchBar from 'sentry/components/searchBar';
@@ -21,10 +18,8 @@ import {ModulePageFilterBar} from 'sentry/views/insights/common/components/modul
 import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {ModulesOnboarding} from 'sentry/views/insights/common/components/modulesOnboarding';
 import {ModuleBodyUpsellHook} from 'sentry/views/insights/common/components/moduleUpsellHookWrapper';
-import {useModuleBreadcrumbs} from 'sentry/views/insights/common/utils/useModuleBreadcrumbs';
 import {QueryParameterNames} from 'sentry/views/insights/common/views/queryParameters';
 import {BackendHeader} from 'sentry/views/insights/pages/backend/backendPageHeader';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import {LatencyChart} from 'sentry/views/insights/queues/charts/latencyChart';
 import {ThroughputChart} from 'sentry/views/insights/queues/charts/throughputChart';
 import {
@@ -45,7 +40,6 @@ const DEFAULT_SORT = {
 };
 
 function QueuesLandingPage() {
-  const {isInDomainView} = useDomainViewFilters();
   const location = useLocation();
   const organization = useOrganization();
 
@@ -83,45 +77,20 @@ function QueuesLandingPage() {
     ? `*${escapeFilterValue(query.destination)}*`
     : undefined;
 
-  const crumbs = useModuleBreadcrumbs('queue');
-
   return (
     <Fragment>
-      {!isInDomainView && (
-        <Layout.Header>
-          <Layout.HeaderContent>
-            <Breadcrumbs crumbs={crumbs} />
-
-            <Layout.Title>
-              {MODULE_TITLE}
-              <PageHeadingQuestionTooltip
-                docsUrl={MODULE_DOC_LINK}
-                title={MODULE_DESCRIPTION}
-              />
-            </Layout.Title>
-          </Layout.HeaderContent>
-          <Layout.HeaderActions>
-            <ButtonBar gap={1}>
-              <FeedbackWidgetButton />
-            </ButtonBar>
-          </Layout.HeaderActions>
-        </Layout.Header>
-      )}
-
-      {isInDomainView && (
-        <BackendHeader
-          headerTitle={
-            <Fragment>
-              {MODULE_TITLE}
-              <PageHeadingQuestionTooltip
-                docsUrl={MODULE_DOC_LINK}
-                title={MODULE_DESCRIPTION}
-              />
-            </Fragment>
-          }
-          module={ModuleName.QUEUE}
-        />
-      )}
+      <BackendHeader
+        headerTitle={
+          <Fragment>
+            {MODULE_TITLE}
+            <PageHeadingQuestionTooltip
+              docsUrl={MODULE_DOC_LINK}
+              title={MODULE_DESCRIPTION}
+            />
+          </Fragment>
+        }
+        module={ModuleName.QUEUE}
+      />
 
       <ModuleBodyUpsellHook moduleName={ModuleName.QUEUE}>
         <Layout.Body>
@@ -158,11 +127,7 @@ function QueuesLandingPage() {
 
 function PageWithProviders() {
   return (
-    <ModulePageProviders
-      moduleName="queue"
-      features="insights-addon-modules"
-      analyticEventName="insight.page_loads.queue"
-    >
+    <ModulePageProviders moduleName="queue" analyticEventName="insight.page_loads.queue">
       <QueuesLandingPage />
     </ModulePageProviders>
   );
diff --git a/static/app/views/insights/types.tsx b/static/app/views/insights/types.tsx
index 81f36d2321e158..af4efcb98be3eb 100644
--- a/static/app/views/insights/types.tsx
+++ b/static/app/views/insights/types.tsx
@@ -229,6 +229,7 @@ export enum SpanIndexedField {
   SPAN_AI_PIPELINE_GROUP = 'span.ai.pipeline.group',
   SPAN_AI_PIPELINE_GROUP_TAG = 'ai_pipeline_group',
   SDK_NAME = 'sdk.name',
+  SDK_VERSION = 'sdk.version',
   TRACE = 'trace',
   TRANSACTION_ID = 'transaction.id',
   TRANSACTION_METHOD = 'transaction.method',
@@ -246,6 +247,7 @@ export enum SpanIndexedField {
   BROWSER_NAME = 'browser.name',
   USER = 'user',
   USER_ID = 'user.id',
+  USER_IP = 'user.ip',
   USER_EMAIL = 'user.email',
   USER_USERNAME = 'user.username',
   INP = 'measurements.inp',
@@ -268,6 +270,7 @@ export type SpanIndexedResponse = {
   [SpanIndexedField.ENVIRONMENT]: string;
   [SpanIndexedField.RELEASE]: string;
   [SpanIndexedField.SDK_NAME]: string;
+  [SpanIndexedField.SDK_VERSION]: string;
   [SpanIndexedField.SPAN_CATEGORY]: string;
   [SpanIndexedField.SPAN_DURATION]: number;
   [SpanIndexedField.SPAN_SELF_TIME]: number;
diff --git a/static/app/views/issueDetails/actions/newIssueExperienceButton.spec.tsx b/static/app/views/issueDetails/actions/newIssueExperienceButton.spec.tsx
index 30ec22c8c333c9..9db63cb0ffd117 100644
--- a/static/app/views/issueDetails/actions/newIssueExperienceButton.spec.tsx
+++ b/static/app/views/issueDetails/actions/newIssueExperienceButton.spec.tsx
@@ -35,6 +35,21 @@ describe('NewIssueExperienceButton', function () {
     expect(screen.getByTestId('test-id')).toBeEmptyDOMElement();
   });
 
+  it('does not appear when an organization has the enforce flag', function () {
+    render(
+      <div data-test-id="test-id">
+        <NewIssueExperienceButton />
+      </div>,
+      {
+        organization: {
+          ...organization,
+          features: [...organization.features, 'issue-details-streamline-enforce'],
+        },
+      }
+    );
+    expect(screen.getByTestId('test-id')).toBeEmptyDOMElement();
+  });
+
   it('appears when organization has flag', function () {
     render(
       <div data-test-id="test-id">
diff --git a/static/app/views/issueDetails/actions/newIssueExperienceButton.tsx b/static/app/views/issueDetails/actions/newIssueExperienceButton.tsx
index f38fe69da33582..18383fe84c58c7 100644
--- a/static/app/views/issueDetails/actions/newIssueExperienceButton.tsx
+++ b/static/app/views/issueDetails/actions/newIssueExperienceButton.tsx
@@ -1,20 +1,27 @@
 import {useCallback} from 'react';
 import styled from '@emotion/styled';
+import {motion} from 'framer-motion';
 
 import {Button} from 'sentry/components/button';
 import DropdownButton from 'sentry/components/dropdownButton';
 import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import {IconLab} from 'sentry/icons';
 import {t} from 'sentry/locale';
+import {defined} from 'sentry/utils';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {useFeedbackForm} from 'sentry/utils/useFeedbackForm';
 import useMutateUserOptions from 'sentry/utils/useMutateUserOptions';
 import useOrganization from 'sentry/utils/useOrganization';
+import {useUser} from 'sentry/utils/useUser';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
 export function NewIssueExperienceButton() {
+  const user = useUser();
   const organization = useOrganization();
   const hasStreamlinedUIFlag = organization.features.includes('issue-details-streamline');
+  const hasEnforceStreamlinedUIFlag = organization.features.includes(
+    'issue-details-streamline-enforce'
+  );
   const hasStreamlinedUI = useHasStreamlinedUI();
   const openForm = useFeedbackForm();
   const {mutate} = useMutateUserOptions();
@@ -27,7 +34,8 @@ export function NewIssueExperienceButton() {
     });
   }, [mutate, organization, hasStreamlinedUI]);
 
-  if (!hasStreamlinedUIFlag) {
+  // We hide the toggle if the org doesn't have the 'opt-in' flag, or has the 'remove opt-out' flag.
+  if (!hasStreamlinedUIFlag || hasEnforceStreamlinedUIFlag) {
     return null;
   }
 
@@ -37,14 +45,38 @@ export function NewIssueExperienceButton() {
       : t('Switch to the new issue experience');
 
     return (
-      <StyledButton
-        enabled={hasStreamlinedUI}
-        size={hasStreamlinedUI ? 'xs' : 'sm'}
-        icon={<IconLab isSolid={hasStreamlinedUI} />}
-        title={label}
-        aria-label={label}
-        onClick={handleToggle}
-      />
+      <ToggleButtonWrapper>
+        <ToggleButton
+          enabled={hasStreamlinedUI}
+          size={hasStreamlinedUI ? 'xs' : 'sm'}
+          icon={
+            defined(user?.options?.prefersIssueDetailsStreamlinedUI) ? (
+              <IconLab isSolid={hasStreamlinedUI} />
+            ) : (
+              <motion.div
+                style={{height: 14}}
+                animate={{
+                  rotate: [null, 6, -6, 12, -12, 6, -6, 0],
+                }}
+                transition={{
+                  duration: 1,
+                  delay: 1,
+                  repeatDelay: 3,
+                  repeat: 3,
+                }}
+              >
+                <IconLab isSolid={hasStreamlinedUI} />
+              </motion.div>
+            )
+          }
+          title={label}
+          aria-label={label}
+          borderless={!hasStreamlinedUI}
+          onClick={handleToggle}
+        >
+          <ToggleBorder />
+        </ToggleButton>
+      </ToggleButtonWrapper>
     );
   }
 
@@ -74,8 +106,12 @@ export function NewIssueExperienceButton() {
           onAction: () => {
             openForm({
               messagePlaceholder: t(
-                'Excluding bribes, what can we do to have you willing to use the new UI?'
+                'Excluding bribes, what would make you excited to use the new UI?'
               ),
+              tags: {
+                ['feedback.source']: 'streamlined_issue_details',
+                ['feedback.owner']: 'issues',
+              },
             });
           },
         },
@@ -92,9 +128,46 @@ const StyledDropdownButton = styled(DropdownButton)<{enabled: boolean}>`
   }
 `;
 
-const StyledButton = styled(Button)<{enabled: boolean}>`
+const ToggleButtonWrapper = styled('div')`
+  overflow: hidden;
+  margin: 0 -1px;
+  border-radius: 7px;
+`;
+
+const ToggleButton = styled(Button)<{enabled: boolean}>`
+  position: relative;
   color: ${p => (p.enabled ? p.theme.button.primary.background : 'inherit')};
   :hover {
     color: ${p => (p.enabled ? p.theme.button.primary.background : 'inherit')};
   }
+  &:after {
+    position: absolute;
+    content: '';
+    inset: 0;
+    background: ${p => p.theme.background};
+    border-radius: ${p => p.theme.borderRadius};
+  }
+  span {
+    z-index: 1;
+    margin: 0;
+  }
+`;
+
+const ToggleBorder = styled('div')`
+  @keyframes rotating {
+    from {
+      transform: rotate(0deg);
+    }
+    to {
+      transform: rotate(360deg);
+    }
+  }
+  position: absolute;
+  content: '';
+  z-index: -1;
+  width: 46px;
+  height: 46px;
+  border-radius: 7px;
+  background: ${p => p.theme.badge.beta.background};
+  animation: rotating 10s linear infinite;
 `;
diff --git a/static/app/views/issueDetails/actions/shareModal.tsx b/static/app/views/issueDetails/actions/shareModal.tsx
index 8c35e702f50eb0..79c691efb5e8af 100644
--- a/static/app/views/issueDetails/actions/shareModal.tsx
+++ b/static/app/views/issueDetails/actions/shareModal.tsx
@@ -28,6 +28,12 @@ interface ShareIssueModalProps extends ModalRenderProps {
 
 type UrlRef = React.ElementRef<typeof AutoSelectText>;
 
+export function getShareUrl(group: Group) {
+  const path = `/share/issue/${group.shareId}/`;
+  const {host, protocol} = window.location;
+  return `${protocol}//${host}${path}`;
+}
+
 function ShareIssueModal({
   Header,
   Body,
@@ -86,13 +92,7 @@ function ShareIssueModal({
     // eslint-disable-next-line react-hooks/exhaustive-deps -- we only want to run this on open
   }, []);
 
-  function getShareUrl() {
-    const path = `/share/issue/${group!.shareId}/`;
-    const {host, protocol} = window.location;
-    return `${protocol}//${host}${path}`;
-  }
-
-  const shareUrl = group?.shareId ? getShareUrl() : null;
+  const shareUrl = group?.shareId ? getShareUrl(group) : null;
 
   const {onClick: handleCopy} = useCopyToClipboard({
     text: shareUrl!,
diff --git a/static/app/views/issueDetails/activitySection.tsx b/static/app/views/issueDetails/activitySection.tsx
index acaff80c78ab4d..71e2566acd8f20 100644
--- a/static/app/views/issueDetails/activitySection.tsx
+++ b/static/app/views/issueDetails/activitySection.tsx
@@ -9,6 +9,7 @@ import type {NoteType} from 'sentry/types/alerts';
 import type {Group, GroupActivity} from 'sentry/types/group';
 import {GroupActivityType} from 'sentry/types/group';
 import type {User} from 'sentry/types/user';
+import {trackAnalytics} from 'sentry/utils/analytics';
 import {uniqueId} from 'sentry/utils/guid';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useUser} from 'sentry/utils/useUser';
@@ -46,6 +47,10 @@ function ActivitySection(props: Props) {
           itemKey={group.id}
           onCreate={n => {
             onCreate(n, me);
+            trackAnalytics('issue_details.comment_created', {
+              organization,
+              streamline: false,
+            });
             setInputId(uniqueId());
           }}
           source="activity"
@@ -66,10 +71,20 @@ function ActivitySection(props: Props) {
                 user={item.user as User}
                 dateCreated={item.dateCreated}
                 authorName={authorName}
-                onDelete={() => onDelete(item)}
+                onDelete={() => {
+                  onDelete(item);
+                  trackAnalytics('issue_details.comment_deleted', {
+                    organization,
+                    streamline: false,
+                  });
+                }}
                 onUpdate={n => {
                   item.data.text = n.text;
                   onUpdate(item, n);
+                  trackAnalytics('issue_details.comment_updated', {
+                    organization,
+                    streamline: false,
+                  });
                 }}
                 {...noteProps}
               />
diff --git a/static/app/views/issueDetails/groupActivity.spec.tsx b/static/app/views/issueDetails/groupActivity.spec.tsx
index 30f2e3f60d23b4..9614f009b7ea0d 100644
--- a/static/app/views/issueDetails/groupActivity.spec.tsx
+++ b/static/app/views/issueDetails/groupActivity.spec.tsx
@@ -1,5 +1,4 @@
 import {GroupFixture} from 'sentry-fixture/group';
-import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
 import {ReleaseFixture} from 'sentry-fixture/release';
 import {RepositoryFixture} from 'sentry-fixture/repository';
@@ -8,7 +7,6 @@ import {UserFixture} from 'sentry-fixture/user';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {
-  act,
   render,
   renderGlobalModal,
   screen,
@@ -23,7 +21,6 @@ import ProjectsStore from 'sentry/stores/projectsStore';
 import TeamStore from 'sentry/stores/teamStore';
 import type {Group} from 'sentry/types/group';
 import {GroupActivityType, PriorityLevel} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import GroupActivity from 'sentry/views/issueDetails/groupActivity';
 
@@ -46,10 +43,8 @@ describe('GroupActivity', function () {
 
   function createWrapper({
     activity,
-    organization: additionalOrg,
   }: {
     activity?: Group['activity'];
-    organization?: Organization;
   } = {}) {
     const group = GroupFixture({
       id: '1337',
@@ -65,28 +60,30 @@ describe('GroupActivity', function () {
       ],
       project,
     });
-    const {organization, routerProps, router} = initializeOrg({
-      organization: additionalOrg,
-    });
     GroupStore.add([group]);
+
+    const {organization, router} = initializeOrg({
+      router: {
+        params: {orgId: 'org-slug', groupId: group.id},
+      },
+    });
+
+    MockApiClient.addMockResponse({
+      url: `/organizations/${organization.slug}/issues/${group.id}/`,
+      body: group,
+    });
+
     TeamStore.loadInitialData([TeamFixture({id: '999', slug: 'no-team'})]);
     OrganizationStore.onUpdate(organization, {replace: true});
-    return render(
-      <GroupActivity
-        {...routerProps}
-        params={{orgId: 'org-slug', groupId: group.id}}
-        group={group}
-      />,
-      {router, organization}
-    );
+    return render(<GroupActivity />, {router, organization});
   }
 
-  it('renders a NoteInput', function () {
+  it('renders a NoteInput', async function () {
     createWrapper();
-    expect(screen.getByTestId('activity-note-body')).toBeInTheDocument();
+    expect(await screen.findByTestId('activity-note-body')).toBeInTheDocument();
   });
 
-  it('renders a marked reviewed activity', function () {
+  it('renders a marked reviewed activity', async function () {
     const user = UserFixture({name: 'Samwise'});
     createWrapper({
       activity: [
@@ -100,11 +97,11 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getByText('marked this issue as reviewed')).toBeInTheDocument();
+    expect(await screen.findByText('marked this issue as reviewed')).toBeInTheDocument();
     expect(screen.getByText(user.name)).toBeInTheDocument();
   });
 
-  it('renders a pr activity', function () {
+  it('renders a pr activity', async function () {
     const user = UserFixture({name: 'Test User'});
     const repository = RepositoryFixture();
     createWrapper({
@@ -126,12 +123,12 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    expect((await screen.findAllByTestId('activity-item')).at(-1)).toHaveTextContent(
       'Test User has created a PR for this issue:'
     );
   });
 
-  it('renders a assigned to self activity', function () {
+  it('renders a assigned to self activity', async function () {
     const user = UserFixture({id: '123', name: 'Mark'});
     createWrapper({
       activity: [
@@ -150,12 +147,12 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    expect((await screen.findAllByTestId('activity-item')).at(-1)).toHaveTextContent(
       /Mark assigned this issue to themselves/
     );
   });
 
-  it('renders an assigned via codeowners activity', function () {
+  it('renders an assigned via codeowners activity', async function () {
     createWrapper({
       activity: [
         {
@@ -175,12 +172,12 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    expect((await screen.findAllByTestId('activity-item')).at(-1)).toHaveTextContent(
       /Sentry auto-assigned this issue to anotheruser@sentry.io/
     );
   });
 
-  it('renders an assigned via slack activity', function () {
+  it('renders an assigned via slack activity', async function () {
     const user = UserFixture({id: '301', name: 'Mark'});
     createWrapper({
       activity: [
@@ -200,12 +197,12 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    const item = screen.getAllByTestId('activity-item').at(-1);
+    const item = (await screen.findAllByTestId('activity-item')).at(-1);
     expect(item).toHaveTextContent(/Mark assigned this issue to anotheruser@sentry.io/);
     expect(item).toHaveTextContent(/Assigned via Slack/);
   });
 
-  it('renders an assigned via suspect commit activity', function () {
+  it('renders an assigned via suspect commit activity', async function () {
     createWrapper({
       activity: [
         {
@@ -224,14 +221,14 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    const activity = screen.getAllByTestId('activity-item').at(-1);
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
     expect(activity).toHaveTextContent(
       /Sentry auto-assigned this issue to anotheruser@sentry.io/
     );
     expect(activity).toHaveTextContent(/Assigned via Suspect Commit/);
   });
 
-  it('does not render undefined when integration is not recognized', function () {
+  it('does not render undefined when integration is not recognized', async function () {
     createWrapper({
       activity: [
         // @ts-ignore-next-line -> committing type crimes on `integration`
@@ -252,14 +249,14 @@ describe('GroupActivity', function () {
       ],
     });
 
-    const activity = screen.getAllByTestId('activity-item').at(-1);
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
     expect(activity).toHaveTextContent(
       /Sentry assigned this issue to anotheruser@sentry.io/
     );
     expect(activity).not.toHaveTextContent(/Assigned via Suspect Commit/);
   });
 
-  it('resolved in commit with no releases', function () {
+  it('resolved in commit with no releases', async function () {
     createWrapper({
       activity: [
         {
@@ -280,12 +277,13 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent(
       'Foo Bar marked this issue as resolved in komal-commit'
     );
   });
 
-  it('resolved in commit with one release', function () {
+  it('resolved in commit with one release', async function () {
     createWrapper({
       activity: [
         {
@@ -312,12 +310,13 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent(
       'Foo Bar marked this issue as resolved in komal-commit This commit was released in random'
     );
   });
 
-  it('resolved in commit with multiple releases', function () {
+  it('resolved in commit with multiple releases', async function () {
     createWrapper({
       activity: [
         {
@@ -359,7 +358,8 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent(
       'Foo Bar marked this issue as resolved in komal-commit This commit was released in oldest-release and 3 others'
     );
   });
@@ -397,7 +397,7 @@ describe('GroupActivity', function () {
   });
 
   describe('Delete', function () {
-    let deleteMock;
+    let deleteMock: jest.Mock;
 
     beforeEach(function () {
       deleteMock = MockApiClient.addMockResponse({
@@ -407,29 +407,12 @@ describe('GroupActivity', function () {
       ConfigStore.set('user', UserFixture({id: '123', isSuperuser: true}));
     });
 
-    it('should do nothing if not present in GroupStore', async function () {
-      createWrapper();
-      renderGlobalModal();
-      act(() => {
-        // Remove note from group activity
-        GroupStore.removeActivity('1337', 'note-1');
-      });
-
-      await userEvent.click(screen.getByRole('button', {name: 'Comment Actions'}));
-      await userEvent.click(screen.getByRole('menuitemradio', {name: 'Remove'}));
-      expect(
-        screen.getByText('Are you sure you wish to delete this comment?')
-      ).toBeInTheDocument();
-      await userEvent.click(screen.getByRole('button', {name: 'Confirm'}));
-
-      expect(deleteMock).not.toHaveBeenCalled();
-    });
-
     it('should remove remove the item from the GroupStore make a DELETE API request', async function () {
       createWrapper();
       renderGlobalModal();
 
-      await userEvent.click(screen.getByRole('button', {name: 'Comment Actions'}));
+      const commentActions = await screen.findByRole('button', {name: 'Comment Actions'});
+      await userEvent.click(commentActions);
       await userEvent.click(screen.getByRole('menuitemradio', {name: 'Remove'}));
       expect(
         screen.getByText('Are you sure you wish to delete this comment?')
@@ -440,7 +423,7 @@ describe('GroupActivity', function () {
     });
   });
 
-  it('renders archived until escalating', function () {
+  it('renders archived until escalating', async function () {
     createWrapper({
       activity: [
         {
@@ -454,14 +437,12 @@ describe('GroupActivity', function () {
           dateCreated,
         },
       ],
-      organization: OrganizationFixture(),
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
-      'Foo Bar archived this issue until it escalates'
-    );
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent('Foo Bar archived this issue until it escalates');
   });
 
-  it('renders escalating with forecast and plural events', function () {
+  it('renders escalating with forecast and plural events', async function () {
     createWrapper({
       activity: [
         {
@@ -485,17 +466,17 @@ describe('GroupActivity', function () {
           dateCreated: '2021-10-05T15:31:38.950115Z',
         },
       ],
-      organization: OrganizationFixture(),
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    const activities = await screen.findAllByTestId('activity-item');
+    expect(activities.at(-1)).toHaveTextContent(
       'Sentry flagged this issue as escalating because over 400 events happened in an hour'
     );
-    expect(screen.getAllByTestId('activity-item').at(-2)).toHaveTextContent(
+    expect(activities.at(-2)).toHaveTextContent(
       'Sentry flagged this issue as escalating because over 200 events happened in an hour'
     );
   });
 
-  it('renders escalating with forecast and singular event', function () {
+  it('renders escalating with forecast and singular event', async function () {
     createWrapper({
       activity: [
         {
@@ -509,14 +490,14 @@ describe('GroupActivity', function () {
           dateCreated,
         },
       ],
-      organization: OrganizationFixture(),
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent(
       'Sentry flagged this issue as escalating because over 1 event happened in an hour'
     );
   });
 
-  it('renders issue unresvoled via jira', function () {
+  it('renders issue unresvoled via jira', async function () {
     createWrapper({
       activity: [
         {
@@ -533,12 +514,11 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
-      'Sentry marked this issue as unresolved via Jira'
-    );
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent('Sentry marked this issue as unresolved via Jira');
   });
 
-  it('renders issue resolved via jira', function () {
+  it('renders issue resolved via jira', async function () {
     createWrapper({
       activity: [
         {
@@ -555,12 +535,11 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
-      'Sentry marked this issue as resolved via Jira'
-    );
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent('Sentry marked this issue as resolved via Jira');
   });
 
-  it('renders escalating since it happened x times in time window', function () {
+  it('renders escalating since it happened x times in time window', async function () {
     createWrapper({
       activity: [
         {
@@ -580,12 +559,13 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent(
       'Sentry flagged this issue as escalating because 400 events happened in 1 minute'
     );
   });
 
-  it('renders escalating since x users were affected in time window', function () {
+  it('renders escalating since x users were affected in time window', async function () {
     createWrapper({
       activity: [
         {
@@ -605,12 +585,13 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent(
       'Sentry flagged this issue as escalating because 1 user was affected in 1 minute'
     );
   });
 
-  it('renders escalating since until date passed', function () {
+  it('renders escalating since until date passed', async function () {
     const date = new Date('2018-10-30');
     createWrapper({
       activity: [
@@ -631,12 +612,13 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent(
       'Sentry flagged this issue as escalating because Oct 30, 2018 12:00 AM passed'
     );
   });
 
-  it('renders archived forever', function () {
+  it('renders archived forever', async function () {
     createWrapper({
       activity: [
         {
@@ -648,14 +630,12 @@ describe('GroupActivity', function () {
           dateCreated,
         },
       ],
-      organization: OrganizationFixture(),
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
-      'Foo Bar archived this issue forever'
-    );
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent('Foo Bar archived this issue forever');
   });
 
-  it('renders resolved in release with semver information', function () {
+  it('renders resolved in release with semver information', async function () {
     createWrapper({
       activity: [
         {
@@ -670,12 +650,13 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent(
       'Foo Bar marked this issue as resolved in 1.0.0 (semver)'
     );
   });
 
-  it('renders resolved in next release with semver information', function () {
+  it('renders resolved in next release with semver information', async function () {
     createWrapper({
       activity: [
         {
@@ -690,13 +671,14 @@ describe('GroupActivity', function () {
         },
       ],
     });
-    expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+    const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+    expect(activity).toHaveTextContent(
       'Foo Bar marked this issue as resolved in releases greater than 1.0.0 (semver)'
     );
   });
 
   describe('regression', function () {
-    it('renders basic regression', function () {
+    it('renders basic regression', async function () {
       createWrapper({
         activity: [
           {
@@ -708,11 +690,11 @@ describe('GroupActivity', function () {
           },
         ],
       });
-      expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
-        'Sentry marked this issue as a regression'
-      );
+      const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+      expect(activity).toHaveTextContent('Sentry marked this issue as a regression');
     });
-    it('renders regression with version', function () {
+
+    it('renders regression with version', async function () {
       createWrapper({
         activity: [
           {
@@ -726,11 +708,13 @@ describe('GroupActivity', function () {
           },
         ],
       });
-      expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+      const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+      expect(activity).toHaveTextContent(
         'Sentry marked this issue as a regression in 1.0.0'
       );
     });
-    it('renders regression with semver description', function () {
+
+    it('renders regression with semver description', async function () {
       createWrapper({
         activity: [
           {
@@ -746,7 +730,7 @@ describe('GroupActivity', function () {
           },
         ],
       });
-      const activity = screen.getAllByTestId('activity-item').at(-1);
+      const activity = (await screen.findAllByTestId('activity-item')).at(-1);
       expect(activity).toHaveTextContent(
         'Sentry marked this issue as a regression in 2.0.0'
       );
@@ -754,7 +738,8 @@ describe('GroupActivity', function () {
         '2.0.0 is greater than or equal to 1.0.0 compared via semver'
       );
     });
-    it('renders regression with non-semver description', function () {
+
+    it('renders regression with non-semver description', async function () {
       createWrapper({
         activity: [
           {
@@ -770,7 +755,7 @@ describe('GroupActivity', function () {
           },
         ],
       });
-      const activity = screen.getAllByTestId('activity-item').at(-1);
+      const activity = (await screen.findAllByTestId('activity-item')).at(-1);
       expect(activity).toHaveTextContent(
         'Sentry marked this issue as a regression in abc1'
       );
@@ -779,7 +764,7 @@ describe('GroupActivity', function () {
       );
     });
 
-    it('renders a set priority activity for escalating issues', function () {
+    it('renders a set priority activity for escalating issues', async function () {
       createWrapper({
         activity: [
           {
@@ -794,11 +779,13 @@ describe('GroupActivity', function () {
           },
         ],
       });
-      expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+      const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+      expect(activity).toHaveTextContent(
         'Sentry updated the priority value of this issue to be high after it escalated'
       );
     });
-    it('renders a set priority activity for ongoing issues', function () {
+
+    it('renders a set priority activity for ongoing issues', async function () {
       createWrapper({
         activity: [
           {
@@ -813,12 +800,13 @@ describe('GroupActivity', function () {
           },
         ],
       });
-      expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
+      const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+      expect(activity).toHaveTextContent(
         'Sentry updated the priority value of this issue to be low after it was marked as ongoing'
       );
     });
 
-    it('renders a deleted attachment activity', function () {
+    it('renders a deleted attachment activity', async function () {
       createWrapper({
         activity: [
           {
@@ -831,9 +819,8 @@ describe('GroupActivity', function () {
           },
         ],
       });
-      expect(screen.getAllByTestId('activity-item').at(-1)).toHaveTextContent(
-        'deleted an attachment'
-      );
+      const activity = (await screen.findAllByTestId('activity-item')).at(-1);
+      expect(activity).toHaveTextContent('deleted an attachment');
     });
   });
 });
diff --git a/static/app/views/issueDetails/groupActivity.tsx b/static/app/views/issueDetails/groupActivity.tsx
index 41942938922756..692f549a36ddf8 100644
--- a/static/app/views/issueDetails/groupActivity.tsx
+++ b/static/app/views/issueDetails/groupActivity.tsx
@@ -1,4 +1,4 @@
-import {Fragment, useCallback, useEffect, useMemo} from 'react';
+import {Fragment, useCallback, useMemo} from 'react';
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import type {
@@ -9,6 +9,8 @@ import type {
 } from 'sentry/components/feedback/useMutateActivity';
 import useMutateActivity from 'sentry/components/feedback/useMutateActivity';
 import * as Layout from 'sentry/components/layouts/thirds';
+import LoadingError from 'sentry/components/loadingError';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
 import ReprocessedBox from 'sentry/components/reprocessedBox';
 import {t} from 'sentry/locale';
 import GroupStore from 'sentry/stores/groupStore';
@@ -19,13 +21,13 @@ import type {
   GroupActivityNote,
   GroupActivityReprocess,
 } from 'sentry/types/group';
-import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {User} from 'sentry/types/user';
 import type {MutateOptions} from 'sentry/utils/queryClient';
-import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
+import {useParams} from 'sentry/utils/useParams';
 import ActivitySection from 'sentry/views/issueDetails/activitySection';
-import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
+import GroupEventDetails from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
+import {useGroup} from 'sentry/views/issueDetails/useGroup';
 import {
   getGroupMostRecentActivity,
   getGroupReprocessingStatus,
@@ -33,13 +35,13 @@ import {
   useHasStreamlinedUI,
 } from 'sentry/views/issueDetails/utils';
 
-type Props = {
-  group: Group;
-} & RouteComponentProps<{groupId: string; orgId: string}, {}>;
-
 export type MutateActivityOptions = MutateOptions<TData, TError, TVariables, TContext>;
 
-function GroupActivity({group}: Props) {
+interface GroupActivityProps {
+  group: Group;
+}
+
+export function GroupActivity({group}: GroupActivityProps) {
   const organization = useOrganization();
   const {activity: activities, count, id: groupId} = group;
   const groupCount = Number(count);
@@ -122,47 +124,59 @@ function GroupActivity({group}: Props) {
     <Fragment>
       {(reprocessingStatus === ReprocessingStatus.REPROCESSED_AND_HASNT_EVENT ||
         reprocessingStatus === ReprocessingStatus.REPROCESSED_AND_HAS_EVENT) && (
-        <ReprocessedBox
-          reprocessActivity={mostRecentActivity as GroupActivityReprocess}
-          groupCount={groupCount}
-          orgSlug={organization.slug}
-          groupId={groupId}
-        />
-      )}
-
-      <Layout.Body>
-        <Layout.Main>
-          <ActivitySection
-            group={group}
-            onDelete={handleDelete}
-            onCreate={handleCreate}
-            onUpdate={handleUpdate}
-            placeholderText={t(
-              'Add details or updates to this event. \nTag users with @, or teams with #'
-            )}
+        <Layout.Main fullWidth>
+          <ReprocessedBox
+            reprocessActivity={mostRecentActivity as GroupActivityReprocess}
+            groupCount={groupCount}
+            orgSlug={organization.slug}
+            groupId={groupId}
           />
         </Layout.Main>
-      </Layout.Body>
+      )}
+
+      <Layout.Main>
+        <ActivitySection
+          group={group}
+          onDelete={handleDelete}
+          onCreate={handleCreate}
+          onUpdate={handleUpdate}
+          placeholderText={t(
+            'Add details or updates to this event. \nTag users with @, or teams with #'
+          )}
+        />
+      </Layout.Main>
     </Fragment>
   );
 }
 
-function GroupActivityRoute(props: Props) {
+function GroupActivityRoute() {
   const hasStreamlinedUI = useHasStreamlinedUI();
-  const navigate = useNavigate();
-  const {baseUrl} = useGroupDetailsRoute();
-
-  // TODO(streamlined-ui): Activity will become a router redirect to the event details page
-  useEffect(() => {
-    if (hasStreamlinedUI) {
-      navigate({
-        ...props.location,
-        pathname: baseUrl,
-      });
-    }
-  }, [hasStreamlinedUI, navigate, baseUrl, props.location]);
-
-  return <GroupActivity {...props} />;
+  const params = useParams<{groupId: string}>();
+
+  const {
+    data: group,
+    isPending: isGroupPending,
+    isError: isGroupError,
+    refetch: refetchGroup,
+  } = useGroup({groupId: params.groupId});
+
+  if (hasStreamlinedUI) {
+    return <GroupEventDetails />;
+  }
+
+  if (isGroupPending) {
+    return <LoadingIndicator />;
+  }
+
+  if (isGroupError) {
+    return <LoadingError onRetry={refetchGroup} />;
+  }
+
+  return (
+    <Layout.Body>
+      <GroupActivity group={group} />
+    </Layout.Body>
+  );
 }
 
 export default GroupActivityRoute;
diff --git a/static/app/views/issueDetails/groupDetails.spec.tsx b/static/app/views/issueDetails/groupDetails.spec.tsx
index d49dc5522b06cf..bfdfc26c4cb75b 100644
--- a/static/app/views/issueDetails/groupDetails.spec.tsx
+++ b/static/app/views/issueDetails/groupDetails.spec.tsx
@@ -15,13 +15,9 @@ import GroupStore from 'sentry/stores/groupStore';
 import OrganizationStore from 'sentry/stores/organizationStore';
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
-import type {Group} from 'sentry/types/group';
 import {IssueCategory} from 'sentry/types/group';
-import type {Environment} from 'sentry/types/project';
 import GroupDetails from 'sentry/views/issueDetails/groupDetails';
 
-jest.unmock('sentry/utils/recreateRoute');
-
 const SAMPLE_EVENT_ALERT_TEXT =
   'You are viewing a sample error. Configure Sentry to start viewing real errors.';
 
@@ -76,23 +72,8 @@ describe('groupDetails', () => {
     },
   });
 
-  function MockComponent({
-    group: groupProp,
-    environments,
-    eventError,
-  }: {
-    environments?: Environment[];
-    eventError?: boolean;
-    group?: Group;
-  }) {
-    return (
-      <div>
-        Group Details Mock
-        <div>title: {groupProp?.title}</div>
-        <div>environment: {environments?.join(' ')}</div>
-        {eventError && <div>eventError</div>}
-      </div>
-    );
+  function MockComponent() {
+    return <div>Group Details Mock</div>;
   }
 
   const createWrapper = (init = defaultInit) => {
@@ -179,7 +160,7 @@ describe('groupDetails', () => {
 
     act(() => ProjectsStore.loadInitialData(defaultInit.projects));
 
-    expect(await screen.findByText(group.title, {exact: false})).toBeInTheDocument();
+    expect(await screen.findByText(group.shortId)).toBeInTheDocument();
 
     // Sample event alert should not show up
     expect(screen.queryByText(SAMPLE_EVENT_ALERT_TEXT)).not.toBeInTheDocument();
@@ -217,11 +198,6 @@ describe('groupDetails', () => {
     });
 
     createWrapper();
-
-    await waitFor(() =>
-      expect(screen.queryByTestId('loading-indicator')).not.toBeInTheDocument()
-    );
-
     expect(
       await screen.findByText(
         'No teams have access to this project yet. Ask an admin to add your team to this project.'
@@ -230,6 +206,11 @@ describe('groupDetails', () => {
   });
 
   it('fetches issue details for a given environment', async function () {
+    const mock = MockApiClient.addMockResponse({
+      url: `/organizations/${defaultInit.organization.slug}/issues/${group.id}/`,
+      body: group,
+    });
+
     const init = initializeOrg({
       router: {
         ...initRouter,
@@ -242,19 +223,17 @@ describe('groupDetails', () => {
     createWrapper(init);
 
     await waitFor(() =>
-      expect(screen.queryByTestId('loading-indicator')).not.toBeInTheDocument()
+      expect(mock).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          query: {
+            collapse: ['release', 'tags'],
+            environment: ['staging'],
+            expand: ['inbox', 'owners'],
+          },
+        })
+      )
     );
-
-    expect(await screen.findByText('environment: staging')).toBeInTheDocument();
-  });
-
-  it('renders issue event error', async function () {
-    MockApiClient.addMockResponse({
-      url: `/organizations/${defaultInit.organization.slug}/issues/${group.id}/events/recommended/`,
-      statusCode: 404,
-    });
-    createWrapper();
-    expect(await screen.findByText('eventError')).toBeInTheDocument();
   });
 
   it('renders substatus badge', async function () {
diff --git a/static/app/views/issueDetails/groupDetails.tsx b/static/app/views/issueDetails/groupDetails.tsx
index 1486e4bd52ae3b..9e0da594d3b0e1 100644
--- a/static/app/views/issueDetails/groupDetails.tsx
+++ b/static/app/views/issueDetails/groupDetails.tsx
@@ -1,11 +1,4 @@
-import {
-  cloneElement,
-  Fragment,
-  isValidElement,
-  useCallback,
-  useEffect,
-  useState,
-} from 'react';
+import {Fragment, useCallback, useEffect, useState} from 'react';
 import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
 import * as qs from 'query-string';
@@ -39,7 +32,7 @@ import {
 } from 'sentry/utils/events';
 import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
 import {getAnalyicsDataForProject} from 'sentry/utils/projects';
-import {setApiQueryData, useApiQuery, useQueryClient} from 'sentry/utils/queryClient';
+import {setApiQueryData, useQueryClient} from 'sentry/utils/queryClient';
 import recreateRoute from 'sentry/utils/recreateRoute';
 import useDisableRouteAnalytics from 'sentry/utils/routeAnalytics/useDisableRouteAnalytics';
 import useRouteAnalyticsEventNames from 'sentry/utils/routeAnalytics/useRouteAnalyticsEventNames';
@@ -60,13 +53,14 @@ import {useGroupTagsDrawer} from 'sentry/views/issueDetails/groupTags/useGroupTa
 import GroupHeader from 'sentry/views/issueDetails/header';
 import SampleEventAlert from 'sentry/views/issueDetails/sampleEventAlert';
 import {GroupDetailsLayout} from 'sentry/views/issueDetails/streamline/groupDetailsLayout';
-import {useMergedIssuesDrawer} from 'sentry/views/issueDetails/streamline/useMergedIssuesDrawer';
-import {useSimilarIssuesDrawer} from 'sentry/views/issueDetails/streamline/useSimilarIssuesDrawer';
+import {useIssueActivityDrawer} from 'sentry/views/issueDetails/streamline/hooks/useIssueActivityDrawer';
+import {useMergedIssuesDrawer} from 'sentry/views/issueDetails/streamline/hooks/useMergedIssuesDrawer';
+import {useSimilarIssuesDrawer} from 'sentry/views/issueDetails/streamline/hooks/useSimilarIssuesDrawer';
 import {Tab} from 'sentry/views/issueDetails/types';
 import {makeFetchGroupQueryKey, useGroup} from 'sentry/views/issueDetails/useGroup';
 import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
+import {useGroupEvent} from 'sentry/views/issueDetails/useGroupEvent';
 import {
-  getGroupEventQueryKey,
   getGroupReprocessingStatus,
   markEventSeen,
   ReprocessingStatus,
@@ -89,9 +83,7 @@ type FetchGroupDetailsState = {
   error: boolean;
   errorType: Error;
   event: Event | null;
-  eventError: boolean;
   group: Group | null;
-  loadingEvent: boolean;
   loadingGroup: boolean;
   refetchData: () => void;
   refetchGroup: () => void;
@@ -191,61 +183,6 @@ function useRefetchGroupForReprocessing({
   }, [refetchGroup]);
 }
 
-function useEventApiQuery({
-  groupId,
-  eventId,
-  environments,
-}: {
-  environments: string[];
-  groupId: string;
-  eventId?: string;
-}) {
-  const organization = useOrganization();
-  const location = useLocation<{query?: string}>();
-  const navigate = useNavigate();
-  const defaultIssueEvent = useDefaultIssueEvent();
-  const eventIdUrl = eventId ?? defaultIssueEvent;
-  const recommendedEventQuery =
-    typeof location.query.query === 'string' ? location.query.query : undefined;
-
-  const isLatestOrRecommendedEvent =
-    eventIdUrl === 'latest' || eventIdUrl === 'recommended';
-
-  const queryKey = getGroupEventQueryKey({
-    orgSlug: organization.slug,
-    groupId,
-    eventId: eventIdUrl,
-    environments,
-    recommendedEventQuery: isLatestOrRecommendedEvent ? recommendedEventQuery : undefined,
-  });
-
-  const eventQuery = useApiQuery<Event>(queryKey, {
-    // Latest/recommended event will change over time, so only cache for 30 seconds
-    // Oldest/specific events will never change
-    staleTime: isLatestOrRecommendedEvent ? 30000 : Infinity,
-    retry: false,
-  });
-
-  useEffect(() => {
-    if (isLatestOrRecommendedEvent && eventQuery.isError && location.query.query) {
-      // If we get an error from the helpful event endpoint, it probably means
-      // the query failed validation. We should remove the query to try again.
-      navigate(
-        {
-          ...location,
-          query: {
-            ...location.query,
-            query: undefined,
-          },
-        },
-        {replace: true}
-      );
-    }
-  }, [isLatestOrRecommendedEvent, eventQuery.isError, navigate, location]);
-
-  return eventQuery;
-}
-
 /**
  * This is a temporary measure to ensure that the GroupStore and query cache
  * are both up to date while we are still using both in the issue details page.
@@ -286,6 +223,8 @@ function useFetchGroupDetails(): FetchGroupDetailsState {
   const organization = useOrganization();
   const router = useRouter();
   const params = router.params;
+  const navigate = useNavigate();
+  const defaultIssueEvent = useDefaultIssueEvent();
 
   const [allProjectChanged, setAllProjectChanged] = useState<boolean>(false);
 
@@ -297,9 +236,9 @@ function useFetchGroupDetails(): FetchGroupDetailsState {
   const {
     data: event,
     isPending: loadingEvent,
-    isError,
+    isError: isEventError,
     refetch: refetchEvent,
-  } = useEventApiQuery({
+  } = useGroupEvent({
     groupId,
     eventId: params.eventId,
     environments,
@@ -313,6 +252,27 @@ function useFetchGroupDetails(): FetchGroupDetailsState {
     refetch: refetchGroupCall,
   } = useGroup({groupId});
 
+  useEffect(() => {
+    const eventIdUrl = params.eventId ?? defaultIssueEvent;
+    const isLatestOrRecommendedEvent =
+      eventIdUrl === 'latest' || eventIdUrl === 'recommended';
+
+    if (isLatestOrRecommendedEvent && isEventError && router.location.query.query) {
+      // If we get an error from the helpful event endpoint, it probably means
+      // the query failed validation. We should remove the query to try again.
+      navigate(
+        {
+          ...router.location,
+          query: {
+            ...router.location.query,
+            query: undefined,
+          },
+        },
+        {replace: true}
+      );
+    }
+  }, [defaultIssueEvent, isEventError, navigate, router.location, params.eventId]);
+
   /**
    * Allows the GroupEventHeader to display the previous event while the new event is loading.
    * This is not closer to the GroupEventHeader because it is unmounted
@@ -447,13 +407,11 @@ function useFetchGroupDetails(): FetchGroupDetailsState {
 
   return {
     loadingGroup,
-    loadingEvent,
     group,
     // Allow previous event to be displayed while new event is loading
     event: (loadingEvent ? event ?? previousEvent : event) ?? null,
     errorType,
     error: isGroupError,
-    eventError: isError,
     refetchData,
     refetchGroup,
   };
@@ -607,21 +565,16 @@ function GroupDetailsContent({
   children,
   group,
   project,
-  loadingEvent,
-  eventError,
   event,
-  refetchData,
 }: GroupDetailsContentProps) {
   const organization = useOrganization();
   const {openTagsDrawer} = useGroupTagsDrawer({group});
   const {openSimilarIssuesDrawer} = useSimilarIssuesDrawer({group, project});
   const {openMergedIssuesDrawer} = useMergedIssuesDrawer({group, project});
+  const {openIssueActivityDrawer} = useIssueActivityDrawer({group, project});
   const {isDrawerOpen} = useDrawer();
-  const router = useRouter();
 
   const {currentTab, baseUrl} = useGroupDetailsRoute();
-  const groupReprocessingStatus = getGroupReprocessingStatus(group);
-  const environments = useEnvironmentsFromUrl();
 
   const hasStreamlinedUI = useHasStreamlinedUI();
 
@@ -636,6 +589,8 @@ function GroupDetailsContent({
       openSimilarIssuesDrawer();
     } else if (currentTab === Tab.MERGED) {
       openMergedIssuesDrawer();
+    } else if (currentTab === Tab.ACTIVITY) {
+      openIssueActivityDrawer();
     }
   }, [
     currentTab,
@@ -644,51 +599,25 @@ function GroupDetailsContent({
     openTagsDrawer,
     openSimilarIssuesDrawer,
     openMergedIssuesDrawer,
+    openIssueActivityDrawer,
   ]);
 
   useTrackView({group, event, project, tab: currentTab});
 
-  const childProps = {
-    environments,
-    group,
-    project,
-    event,
-    loadingEvent,
-    eventError,
-    groupReprocessingStatus,
-    onRetry: refetchData,
-    baseUrl,
-  };
-
   const isDisplayingEventDetails = [
     Tab.DETAILS,
     Tab.TAGS,
     Tab.SIMILAR_ISSUES,
     Tab.MERGED,
+    Tab.ACTIVITY,
   ].includes(currentTab);
 
   return hasStreamlinedUI ? (
-    <GroupDetailsLayout
-      group={group}
-      event={event ?? undefined}
-      project={project}
-      groupReprocessingStatus={groupReprocessingStatus}
-    >
+    <GroupDetailsLayout group={group} event={event ?? undefined} project={project}>
       {isDisplayingEventDetails ? (
         // The router displays a loading indicator when switching to any of these tabs
         // Avoid lazy loading spinner by force rendering the GroupEventDetails component
-        <GroupEventDetails
-          {...childProps}
-          event={event ?? undefined}
-          location={router.location}
-          route={router.routes.at(-1)!}
-          router={router}
-          routes={router.routes}
-          routeParams={router.params}
-          params={router.params}
-        />
-      ) : isValidElement(children) ? (
-        cloneElement(children, childProps)
+        <GroupEventDetails />
       ) : (
         children
       )}
@@ -700,16 +629,13 @@ function GroupDetailsContent({
     >
       <GroupHeader
         organization={organization}
-        groupReprocessingStatus={groupReprocessingStatus}
         event={event}
         group={group}
         baseUrl={baseUrl}
         project={project as Project}
       />
       <GroupTabPanels>
-        <TabPanels.Item key={currentTab}>
-          {isValidElement(children) ? cloneElement(children, childProps) : children}
-        </TabPanels.Item>
+        <TabPanels.Item key={currentTab}>{children}</TabPanels.Item>
       </GroupTabPanels>
     </Tabs>
   );
diff --git a/static/app/views/issueDetails/groupEventAttachments/index.tsx b/static/app/views/issueDetails/groupEventAttachments/index.tsx
index 713545169f3b73..49a6dc946a26f3 100644
--- a/static/app/views/issueDetails/groupEventAttachments/index.tsx
+++ b/static/app/views/issueDetails/groupEventAttachments/index.tsx
@@ -4,22 +4,36 @@ import styled from '@emotion/styled';
 import Feature from 'sentry/components/acl/feature';
 import FeatureDisabled from 'sentry/components/acl/featureDisabled';
 import * as Layout from 'sentry/components/layouts/thirds';
+import LoadingError from 'sentry/components/loadingError';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {Group} from 'sentry/types/group';
-import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import useOrganization from 'sentry/utils/useOrganization';
+import {useParams} from 'sentry/utils/useParams';
+import {useGroup} from 'sentry/views/issueDetails/useGroup';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
 import GroupEventAttachments from './groupEventAttachments';
 
-type Props = RouteComponentProps<{groupId: string}, {}> & {
-  group: Group;
-};
-
-function GroupEventAttachmentsContainer({group}: Props) {
+function GroupEventAttachmentsContainer() {
   const organization = useOrganization();
   const hasStreamlinedUI = useHasStreamlinedUI();
+  const params = useParams();
+
+  const {
+    data: group,
+    isPending: isGroupPending,
+    isError: isGroupError,
+    refetch: refetchGroup,
+  } = useGroup({groupId: params.groupId});
+
+  if (isGroupPending) {
+    return <LoadingIndicator />;
+  }
+
+  if (isGroupError) {
+    return <LoadingError onRetry={refetchGroup} />;
+  }
 
   return (
     <Feature
diff --git a/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx b/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx
index 32c024b625eea8..5239843a3fe155 100644
--- a/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx
+++ b/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx
@@ -1,16 +1,15 @@
-import type {Location} from 'history';
 import {CommitFixture} from 'sentry-fixture/commit';
 import {CommitAuthorFixture} from 'sentry-fixture/commitAuthor';
 import {EventFixture} from 'sentry-fixture/event';
 import {GroupFixture} from 'sentry-fixture/group';
 import {LocationFixture} from 'sentry-fixture/locationFixture';
+import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
 import {RouterFixture} from 'sentry-fixture/routerFixture';
 import {SentryAppFixture} from 'sentry-fixture/sentryApp';
 import {SentryAppComponentFixture} from 'sentry-fixture/sentryAppComponent';
 import {SentryAppInstallationFixture} from 'sentry-fixture/sentryAppInstallation';
 
-import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen, waitFor, within} from 'sentry-test/reactTestingLibrary';
 
 import type {Event} from 'sentry/types/event';
@@ -22,10 +21,7 @@ import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import type {QuickTraceEvent} from 'sentry/utils/performance/quickTrace/types';
-import type {GroupEventDetailsProps} from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
 import GroupEventDetails from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
-import {ReprocessingStatus} from 'sentry/views/issueDetails/utils';
-import {RouteContext} from 'sentry/views/routeContext';
 
 const TRACE_ID = '797cda4e24844bdc90e0efe741616047';
 
@@ -40,15 +36,19 @@ const makeDefaultMockData = (
   project: Project;
   router: InjectedRouter;
 } => {
+  const group = GroupFixture();
+  const org = organization ?? OrganizationFixture();
+
   return {
-    organization: organization ?? initializeOrg().organization,
-    project: project ?? initializeOrg().project,
-    group: GroupFixture(),
+    project: project ?? ProjectFixture(),
+    organization: org,
     router: RouterFixture({
+      params: {orgId: org.slug, groupId: group.id},
       location: LocationFixture({
         query: query ?? {},
       }),
     }),
+    group,
     event: EventFixture({
       size: 1,
       dateCreated: '2019-03-20T00:00:00.000Z',
@@ -102,50 +102,6 @@ const makeDefaultMockData = (
   };
 };
 
-function TestComponent(
-  props: Partial<GroupEventDetailsProps> & {
-    organization?: Organization;
-    query?: Record<string, string | string[]>;
-  }
-) {
-  const {organization, project, group, event, router} = makeDefaultMockData(
-    props.organization,
-    props.project,
-    props.query ?? {environment: ['dev']}
-  );
-
-  const mergedProps: GroupEventDetailsProps = {
-    group,
-    event,
-    project,
-    params: {groupId: group.id, orgId: organization.slug, eventId: '1'},
-    router,
-    location: {} as Location<any>,
-    route: {},
-    eventError: props.eventError ?? false,
-    groupReprocessingStatus:
-      props.groupReprocessingStatus ?? ReprocessingStatus.NO_STATUS,
-    onRetry: props?.onRetry ?? jest.fn(),
-    loadingEvent: props.loadingEvent ?? false,
-    routes: [],
-    routeParams: {},
-    ...props,
-  };
-
-  return (
-    <RouteContext.Provider
-      value={{
-        router,
-        location: router.location,
-        params: router.params,
-        routes: router.routes,
-      }}
-    >
-      <GroupEventDetails {...mergedProps} />
-    </RouteContext.Provider>
-  );
-}
-
 const mockedTrace = (project: Project) => {
   return {
     event_id: '8806ea4691c24fc7b1c77ecd78df574f',
@@ -203,11 +159,24 @@ const mockGroupApis = (
   replayId?: string,
   trace?: QuickTraceEvent
 ) => {
+  MockApiClient.addMockResponse({
+    url: '/organizations/org-slug/issues/1/events/',
+    body: [],
+  });
+  MockApiClient.addMockResponse({
+    url: '/organizations/org-slug/flags/logs/',
+    body: {data: []},
+  });
   MockApiClient.addMockResponse({
     url: `/organizations/${organization.slug}/issues/${group.id}/`,
     body: group,
   });
 
+  MockApiClient.addMockResponse({
+    url: `/organizations/${organization.slug}/issues/${group.id}/events/recommended/`,
+    body: event,
+  });
+
   MockApiClient.addMockResponse({
     url: `/organizations/${organization.slug}/replays/${replayId}/`,
     body: {},
@@ -382,12 +351,23 @@ describe('groupEventDetails', () => {
 
   it('redirects on switching to an invalid environment selection for event', async function () {
     const props = makeDefaultMockData();
+    props.router.params.eventId = props.event.id;
     mockGroupApis(props.organization, props.project, props.group, props.event);
 
-    const {rerender} = render(<TestComponent {...props} />);
+    MockApiClient.addMockResponse({
+      url: `/organizations/${props.organization.slug}/issues/${props.group.id}/events/${props.event.id}/`,
+      body: props.event,
+    });
+
+    const {rerender} = render(<GroupEventDetails />, {
+      organization: props.organization,
+      router: props.router,
+    });
+    expect(await screen.findByTestId('group-event-details')).toBeInTheDocument();
     expect(browserHistory.replace).not.toHaveBeenCalled();
 
-    rerender(<TestComponent query={{environment: ['prod']}} />);
+    props.router.location.query.environment = ['prod'];
+    rerender(<GroupEventDetails />);
 
     await waitFor(() => expect(browserHistory.replace).toHaveBeenCalled());
   });
@@ -396,10 +376,14 @@ describe('groupEventDetails', () => {
     const props = makeDefaultMockData();
     mockGroupApis(props.organization, props.project, props.group, props.event);
 
-    const {rerender} = render(<TestComponent {...props} />);
+    const {rerender} = render(<GroupEventDetails />, {
+      organization: props.organization,
+      router: props.router,
+    });
 
     expect(browserHistory.replace).not.toHaveBeenCalled();
-    rerender(<TestComponent query={{environment: []}} />);
+    props.router.location.query.environment = [];
+    rerender(<GroupEventDetails />);
 
     expect(await screen.findByTestId('group-event-details')).toBeInTheDocument();
 
@@ -424,7 +408,15 @@ describe('groupEventDetails', () => {
       })
     );
 
-    render(<TestComponent event={undefined} eventError />);
+    MockApiClient.addMockResponse({
+      url: `/organizations/${props.organization.slug}/issues/${props.group.id}/events/recommended/`,
+      statusCode: 500,
+    });
+
+    render(<GroupEventDetails />, {
+      organization: props.organization,
+      router: props.router,
+    });
 
     expect(
       await screen.findByText(/events for this issue could not be found/)
@@ -437,26 +429,14 @@ describe('groupEventDetails', () => {
       issueCategory: IssueCategory.PERFORMANCE,
       issueType: IssueType.PERFORMANCE_N_PLUS_ONE_DB_QUERIES,
     });
-    const transaction = EventFixture({
+    const transactionEvent = EventFixture({
       entries: [{type: EntryType.SPANS, data: []}],
     });
 
-    mockGroupApis(
-      props.organization,
-      props.project,
-      props.group,
-      EventFixture({
-        size: 1,
-        dateCreated: '2019-03-20T00:00:00.000Z',
-        errors: [],
-        entries: [],
-        tags: [{key: 'environment', value: 'dev'}],
-        previousEventID: 'prev-event-id',
-        nextEventID: 'next-event-id',
-      })
-    );
+    mockGroupApis(props.organization, props.project, group, transactionEvent);
 
-    render(<TestComponent group={group} event={transaction} />, {
+    render(<GroupEventDetails />, {
+      router: props.router,
       organization: props.organization,
     });
 
@@ -473,7 +453,7 @@ describe('groupEventDetails', () => {
       issueCategory: IssueCategory.PERFORMANCE,
       issueType: IssueType.PROFILE_FILE_IO_MAIN_THREAD,
     });
-    const transaction = EventFixture({
+    const transactionEvent = EventFixture({
       entries: [],
       occurrence: {
         evidenceDisplay: [],
@@ -484,22 +464,12 @@ describe('groupEventDetails', () => {
       },
     });
 
-    mockGroupApis(
-      props.organization,
-      props.project,
-      props.group,
-      EventFixture({
-        size: 1,
-        dateCreated: '2019-03-20T00:00:00.000Z',
-        errors: [],
-        entries: [],
-        tags: [{key: 'environment', value: 'dev'}],
-        previousEventID: 'prev-event-id',
-        nextEventID: 'next-event-id',
-      })
-    );
+    mockGroupApis(props.organization, props.project, group, transactionEvent);
 
-    render(<TestComponent group={group} event={transaction} />, {});
+    render(<GroupEventDetails />, {
+      organization: props.organization,
+      router: props.router,
+    });
 
     expect(
       await screen.findByRole('heading', {
@@ -511,7 +481,10 @@ describe('groupEventDetails', () => {
   it('renders event tags ui', async () => {
     const props = makeDefaultMockData();
     mockGroupApis(props.organization, props.project, props.group, props.event);
-    render(<TestComponent group={props.group} event={props.event} />, {});
+    render(<GroupEventDetails />, {
+      organization: props.organization,
+      router: props.router,
+    });
 
     expect(await screen.findByText('Event ID:')).toBeInTheDocument();
     expect(screen.queryByTestId('context-summary')).not.toBeInTheDocument();
@@ -572,14 +545,17 @@ describe('EventCause', () => {
       },
     });
 
-    render(<TestComponent project={props.project} />);
+    render(<GroupEventDetails />, {
+      organization: props.organization,
+      router: props.router,
+    });
 
     expect(await screen.findByTestId(/suspect-commit/)).toBeInTheDocument();
   });
 });
 
 describe('Platform Integrations', () => {
-  let componentsRequest;
+  let componentsRequest: jest.Mock;
 
   beforeEach(() => {
     MockApiClient.clearMockResponses();
@@ -639,7 +615,10 @@ describe('Platform Integrations', () => {
       match: [MockApiClient.matchQuery({projectId: props.project.id})],
     });
 
-    render(<TestComponent />);
+    render(<GroupEventDetails />, {
+      organization: props.organization,
+      router: props.router,
+    });
 
     expect(await screen.findByText('Sample App Issue')).toBeInTheDocument();
     expect(componentsRequest).toHaveBeenCalled();
@@ -660,8 +639,9 @@ describe('Platform Integrations', () => {
         mockedTrace(props.project)
       );
 
-      render(<TestComponent group={props.group} event={props.event} />, {
+      render(<GroupEventDetails />, {
         organization: props.organization,
+        router: props.router,
       });
 
       expect(
@@ -687,8 +667,9 @@ describe('Platform Integrations', () => {
         }
       );
 
-      render(<TestComponent group={props.group} event={props.event} />, {
+      render(<GroupEventDetails />, {
         organization: props.organization,
+        router: props.router,
       });
 
       // mechanism: ANR
diff --git a/static/app/views/issueDetails/groupEventDetails/groupEventDetails.tsx b/static/app/views/issueDetails/groupEventDetails/groupEventDetails.tsx
index d882cbfd437a9b..a59ed95901ba03 100644
--- a/static/app/views/issueDetails/groupEventDetails/groupEventDetails.tsx
+++ b/static/app/views/issueDetails/groupEventDetails/groupEventDetails.tsx
@@ -1,4 +1,4 @@
-import {Fragment, useEffect} from 'react';
+import {Fragment, useEffect, useMemo} from 'react';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 import isEqual from 'lodash/isEqual';
@@ -8,68 +8,81 @@ import ArchivedBox from 'sentry/components/archivedBox';
 import GroupEventDetailsLoadingError from 'sentry/components/errors/groupEventDetailsLoadingError';
 import {withMeta} from 'sentry/components/events/meta/metaProxy';
 import * as Layout from 'sentry/components/layouts/thirds';
+import LoadingError from 'sentry/components/loadingError';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
-import {TransactionProfileIdProvider} from 'sentry/components/profiling/transactionProfileIdProvider';
 import ResolutionBox from 'sentry/components/resolutionBox';
 import useSentryAppComponentsData from 'sentry/stores/useSentryAppComponentsData';
 import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
-import type {Group, GroupActivityReprocess, GroupReprocessing} from 'sentry/types/group';
-import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
-import type {Project} from 'sentry/types/project';
+import type {GroupActivityReprocess, GroupReprocessing} from 'sentry/types/group';
 import {defined} from 'sentry/utils';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
 import {VisuallyCompleteWithData} from 'sentry/utils/performanceForSentry';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useMemoWithPrevious} from 'sentry/utils/useMemoWithPrevious';
 import useOrganization from 'sentry/utils/useOrganization';
+import {useParams} from 'sentry/utils/useParams';
 import usePrevious from 'sentry/utils/usePrevious';
+import useProjectFromSlug from 'sentry/utils/useProjectFromSlug';
 import GroupEventDetailsContent from 'sentry/views/issueDetails/groupEventDetails/groupEventDetailsContent';
 import {GroupEventDetailsLoading} from 'sentry/views/issueDetails/groupEventDetails/groupEventDetailsLoading';
 import GroupEventHeader from 'sentry/views/issueDetails/groupEventHeader';
 import GroupSidebar from 'sentry/views/issueDetails/groupSidebar';
+import {useGroup} from 'sentry/views/issueDetails/useGroup';
+import {useGroupEvent} from 'sentry/views/issueDetails/useGroupEvent';
 
 import ReprocessingProgress from '../reprocessingProgress';
 import {
   getEventEnvironment,
   getGroupMostRecentActivity,
+  getGroupReprocessingStatus,
   ReprocessingStatus,
   useEnvironmentsFromUrl,
   useHasStreamlinedUI,
 } from '../utils';
 
-export interface GroupEventDetailsProps
-  extends RouteComponentProps<{groupId: string; orgId: string; eventId?: string}, {}> {
-  eventError: boolean;
-  group: Group;
-  groupReprocessingStatus: ReprocessingStatus;
-  loadingEvent: boolean;
-  onRetry: () => void;
-  project: Project;
-  event?: Event;
-}
-
-function GroupEventDetails(props: GroupEventDetailsProps) {
+function GroupEventDetails() {
   const organization = useOrganization();
-  const {
-    group,
-    project,
-    location,
-    event,
-    groupReprocessingStatus,
-    loadingEvent,
-    onRetry,
-    eventError,
-    params,
-  } = props;
-  const projectId = project.id;
+  const location = useLocation();
+  const params = useParams<{groupId: string; orgId: string; eventId?: string}>();
   const environments = useEnvironmentsFromUrl();
+
+  const {
+    data: event,
+    isPending: isLoadingEvent,
+    isError: isEventError,
+    refetch: refetchEvent,
+  } = useGroupEvent({
+    groupId: params.groupId,
+    eventId: params.eventId,
+    environments,
+  });
+
+  const {
+    data: group,
+    isPending: isGroupPending,
+    isError: isGroupError,
+    refetch: refetchGroup,
+  } = useGroup({groupId: params.groupId});
+
+  const eventWithMeta = useMemo(() => withMeta(event), [event]);
+  const project = useProjectFromSlug({organization, projectSlug: group?.project?.slug});
   const prevEnvironment = usePrevious(environments);
-  const prevEvent = usePrevious(event);
+  const prevEvent = useMemoWithPrevious<typeof event | null>(
+    previousInstance => {
+      if (event) {
+        return event;
+      }
+      return previousInstance;
+    },
+    [event]
+  );
   const hasStreamlinedUI = useHasStreamlinedUI();
 
   // load the data
-  useSentryAppComponentsData({projectId});
+  useSentryAppComponentsData({projectId: project?.id});
 
   // If environments are being actively changed and will no longer contain the
   // current event's environment, redirect to latest
@@ -106,6 +119,19 @@ function GroupEventDetails(props: GroupEventDetailsProps) {
     prevEvent,
   ]);
 
+  // Group and project should already be loaded, but we can render a loading state if it's not
+  if (isGroupPending || !project) {
+    if (hasStreamlinedUI) {
+      return <GroupEventDetailsLoading />;
+    }
+
+    return <LoadingIndicator />;
+  }
+
+  if (isGroupError) {
+    return <LoadingError onRetry={refetchGroup} />;
+  }
+
   const renderGroupStatusBanner = () => {
     if (group.status === 'ignored') {
       return (
@@ -135,16 +161,22 @@ function GroupEventDetails(props: GroupEventDetailsProps) {
   };
 
   const renderContent = () => {
-    if (loadingEvent) {
+    if (isLoadingEvent) {
       if (hasStreamlinedUI) {
         return <GroupEventDetailsLoading />;
       }
       return <LoadingIndicator />;
     }
 
-    if (eventError) {
+    if (isEventError) {
       return (
-        <GroupEventDetailsLoadingError environments={environments} onRetry={onRetry} />
+        <GroupEventDetailsLoadingError
+          environments={environments}
+          onRetry={() => {
+            refetchEvent();
+            refetchGroup();
+          }}
+        />
       );
     }
 
@@ -153,66 +185,57 @@ function GroupEventDetails(props: GroupEventDetailsProps) {
     );
   };
 
-  const eventWithMeta = withMeta(event);
   const issueTypeConfig = getConfigForIssueType(group, project);
   const LayoutBody = hasStreamlinedUI ? 'div' : StyledLayoutBody;
   const MainLayoutComponent = hasStreamlinedUI ? 'div' : StyledLayoutMain;
+  const groupReprocessingStatus = getGroupReprocessingStatus(group);
 
   return (
     <AnalyticsArea name="issue_details">
-      <TransactionProfileIdProvider
-        projectId={event?.projectID}
-        transactionId={event?.type === 'transaction' ? event.id : undefined}
-        timestamp={event?.dateReceived}
+      <VisuallyCompleteWithData
+        id="IssueDetails-EventBody"
+        hasData={!isLoadingEvent && !isEventError && defined(eventWithMeta)}
+        isLoading={isLoadingEvent}
       >
-        <VisuallyCompleteWithData
-          id="IssueDetails-EventBody"
-          hasData={!loadingEvent && !eventError && defined(eventWithMeta)}
-          isLoading={loadingEvent}
-        >
-          <LayoutBody data-test-id="group-event-details">
-            {groupReprocessingStatus === ReprocessingStatus.REPROCESSING ? (
-              <ReprocessingProgress
-                totalEvents={
-                  (getGroupMostRecentActivity(group.activity) as GroupActivityReprocess)
-                    .data.eventCount
-                }
-                pendingEvents={
-                  (group.statusDetails as GroupReprocessing['statusDetails'])
-                    .pendingEvents
-                }
-              />
-            ) : (
-              <Fragment>
-                <MainLayoutComponent>
-                  {!hasStreamlinedUI && renderGroupStatusBanner()}
-                  {eventWithMeta &&
-                    issueTypeConfig.stats.enabled &&
-                    !hasStreamlinedUI && (
-                      <GroupEventHeader
-                        group={group}
-                        event={eventWithMeta}
-                        project={project}
-                      />
-                    )}
-                  {renderContent()}
-                </MainLayoutComponent>
-                {hasStreamlinedUI ? null : (
-                  <StyledLayoutSide hasStreamlinedUi={hasStreamlinedUI}>
-                    <GroupSidebar
-                      organization={organization}
-                      project={project}
-                      group={group}
-                      event={eventWithMeta}
-                      environments={environments}
-                    />
-                  </StyledLayoutSide>
+        <LayoutBody data-test-id="group-event-details">
+          {groupReprocessingStatus === ReprocessingStatus.REPROCESSING ? (
+            <ReprocessingProgress
+              totalEvents={
+                (getGroupMostRecentActivity(group.activity) as GroupActivityReprocess)
+                  .data.eventCount
+              }
+              pendingEvents={
+                (group.statusDetails as GroupReprocessing['statusDetails']).pendingEvents
+              }
+            />
+          ) : (
+            <Fragment>
+              <MainLayoutComponent>
+                {!hasStreamlinedUI && renderGroupStatusBanner()}
+                {eventWithMeta && issueTypeConfig.stats.enabled && !hasStreamlinedUI && (
+                  <GroupEventHeader
+                    group={group}
+                    event={eventWithMeta}
+                    project={project}
+                  />
                 )}
-              </Fragment>
-            )}
-          </LayoutBody>
-        </VisuallyCompleteWithData>
-      </TransactionProfileIdProvider>
+                {renderContent()}
+              </MainLayoutComponent>
+              {hasStreamlinedUI ? null : (
+                <StyledLayoutSide hasStreamlinedUi={hasStreamlinedUI}>
+                  <GroupSidebar
+                    organization={organization}
+                    project={project}
+                    group={group}
+                    event={eventWithMeta}
+                    environments={environments}
+                  />
+                </StyledLayoutSide>
+              )}
+            </Fragment>
+          )}
+        </LayoutBody>
+      </VisuallyCompleteWithData>
     </AnalyticsArea>
   );
 }
diff --git a/static/app/views/issueDetails/groupEventDetails/groupEventDetailsContent.tsx b/static/app/views/issueDetails/groupEventDetails/groupEventDetailsContent.tsx
index 2e44d77a63ccd4..7abe655495f2e6 100644
--- a/static/app/views/issueDetails/groupEventDetails/groupEventDetailsContent.tsx
+++ b/static/app/views/issueDetails/groupEventDetails/groupEventDetailsContent.tsx
@@ -19,13 +19,10 @@ import EventReplay from 'sentry/components/events/eventReplay';
 import {EventSdk} from 'sentry/components/events/eventSdk';
 import AggregateSpanDiff from 'sentry/components/events/eventStatisticalDetector/aggregateSpanDiff';
 import EventBreakpointChart from 'sentry/components/events/eventStatisticalDetector/breakpointChart';
-import {EventAffectedTransactions} from 'sentry/components/events/eventStatisticalDetector/eventAffectedTransactions';
 import EventComparison from 'sentry/components/events/eventStatisticalDetector/eventComparison';
 import {EventDifferentialFlamegraph} from 'sentry/components/events/eventStatisticalDetector/eventDifferentialFlamegraph';
-import {EventFunctionComparisonList} from 'sentry/components/events/eventStatisticalDetector/eventFunctionComparisonList';
 import {EventRegressionSummary} from 'sentry/components/events/eventStatisticalDetector/eventRegressionSummary';
 import {EventFunctionBreakpointChart} from 'sentry/components/events/eventStatisticalDetector/functionBreakpointChart';
-import {TransactionsDeltaProvider} from 'sentry/components/events/eventStatisticalDetector/transactionsDeltaProvider';
 import {EventTagsAndScreenshot} from 'sentry/components/events/eventTagsAndScreenshot';
 import {ScreenshotDataSection} from 'sentry/components/events/eventTagsAndScreenshot/screenshot/screenshotDataSection';
 import EventTagsDataSection from 'sentry/components/events/eventTagsAndScreenshot/tags';
@@ -110,7 +107,6 @@ export function EventDetailsContent({
   const mechanism = event.tags?.find(({key}) => key === 'mechanism')?.value;
   const isANR = mechanism === 'ANR' || mechanism === 'AppExitInfo';
   const groupingCurrentLevel = group?.metadata?.current_level;
-  const hasFeatureFlagSection = organization.features.includes('feature-flag-ui');
 
   const hasActionableItems = actionableItemsEnabled({
     eventId: event.id,
@@ -141,6 +137,9 @@ export function EventDetailsContent({
       {hasActionableItems && !hasStreamlinedUI && (
         <ActionableItems event={event} project={project} isShare={false} />
       )}
+      {issueTypeConfig.tags.enabled && (
+        <HighlightsDataSection event={event} project={project} viewAllRef={tagsRef} />
+      )}
       <StyledDataSection>
         {!hasStreamlinedUI && <TraceDataSection event={event} />}
         {!hasStreamlinedUI && (
@@ -221,9 +220,7 @@ export function EventDetailsContent({
           project={project}
         />
       )}
-      {!hasStreamlinedUI && issueTypeConfig.tags.enabled && (
-        <HighlightsDataSection event={event} project={project} viewAllRef={tagsRef} />
-      )}
+
       <EventEvidence event={event} group={group} project={project} />
       {defined(eventEntries[EntryType.MESSAGE]) && (
         <EntryErrorBoundary type={EntryType.MESSAGE}>
@@ -333,35 +330,23 @@ export function EventDetailsContent({
       )}
       {issueTypeConfig.profilingDurationRegression.enabled && (
         <Fragment>
-          <TransactionsDeltaProvider event={event} project={project}>
-            <ErrorBoundary mini>
-              <EventFunctionBreakpointChart event={event} />
-            </ErrorBoundary>
-            <ErrorBoundary mini>
-              <EventAffectedTransactions event={event} group={group} project={project} />
-            </ErrorBoundary>
-            <ErrorBoundary mini>
-              <InterimSection
-                type={SectionKey.REGRESSION_FLAMEGRAPH}
-                title={t('Regression Flamegraph')}
-              >
-                <b>{t('Largest Changes in Call Stack Frequency')}</b>
-                <p>
-                  {t(`See which functions changed the most before and after the regression. The
-              frame with the largest increase in call stack population likely
-              contributed to the cause for the duration regression.`)}
-                </p>
-                <EventDifferentialFlamegraph event={event} />
-              </InterimSection>
-            </ErrorBoundary>
-            <ErrorBoundary mini>
-              <EventFunctionComparisonList
-                event={event}
-                group={group}
-                project={project}
-              />
-            </ErrorBoundary>
-          </TransactionsDeltaProvider>
+          <ErrorBoundary mini>
+            <EventFunctionBreakpointChart event={event} />
+          </ErrorBoundary>
+          <ErrorBoundary mini>
+            <InterimSection
+              type={SectionKey.REGRESSION_FLAMEGRAPH}
+              title={t('Regression Flamegraph')}
+            >
+              <b>{t('Largest Changes in Call Stack Frequency')}</b>
+              <p>
+                {t(`See which functions changed the most before and after the regression. The
+            frame with the largest increase in call stack population likely
+            contributed to the cause for the duration regression.`)}
+              </p>
+              <EventDifferentialFlamegraph event={event} />
+            </InterimSection>
+          </ErrorBoundary>
         </Fragment>
       )}
       <EventHydrationDiff event={event} group={group} />
@@ -404,7 +389,7 @@ export function EventDetailsContent({
         </EntryErrorBoundary>
       )}
       <BreadcrumbsDataSection event={event} group={group} project={project} />
-      {hasStreamlinedUI && (
+      {hasStreamlinedUI && event.contexts.trace?.trace_id && (
         <EventTraceView group={group} event={event} organization={organization} />
       )}
       {defined(eventEntries[EntryType.REQUEST]) && (
@@ -415,18 +400,11 @@ export function EventDetailsContent({
       {issueTypeConfig.tags.enabled ? (
         <Fragment>
           {hasStreamlinedUI ? (
-            <Fragment>
-              <HighlightsDataSection
-                event={event}
-                project={project}
-                viewAllRef={tagsRef}
-              />
-              <EventTagsDataSection
-                event={event}
-                projectSlug={project.slug}
-                ref={tagsRef}
-              />
-            </Fragment>
+            <EventTagsDataSection
+              event={event}
+              projectSlug={project.slug}
+              ref={tagsRef}
+            />
           ) : (
             <div ref={tagsRef}>
               <EventTagsAndScreenshot event={event} projectSlug={project.slug} />
@@ -435,9 +413,9 @@ export function EventDetailsContent({
         </Fragment>
       ) : null}
       <EventContexts group={group} event={event} />
-      {hasFeatureFlagSection && (
+      <ErrorBoundary mini message={t('There was a problem loading feature flags.')}>
         <EventFeatureFlagList group={group} project={project} event={event} />
-      )}
+      </ErrorBoundary>
       <EventExtraData event={event} />
       <EventPackageData event={event} />
       <EventDevice event={event} />
diff --git a/static/app/views/issueDetails/groupMerged/groupMergedTab.tsx b/static/app/views/issueDetails/groupMerged/groupMergedTab.tsx
index 45061206cc04d5..19992244a1bd30 100644
--- a/static/app/views/issueDetails/groupMerged/groupMergedTab.tsx
+++ b/static/app/views/issueDetails/groupMerged/groupMergedTab.tsx
@@ -1,27 +1,50 @@
 import * as Layout from 'sentry/components/layouts/thirds';
+import LoadingError from 'sentry/components/loadingError';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
 import type {Group} from 'sentry/types/group';
 import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
-import GroupEventDetails, {
-  type GroupEventDetailsProps,
-} from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
+import useProjectFromSlug from 'sentry/utils/useProjectFromSlug';
+import GroupEventDetails from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
 import GroupMergedView from 'sentry/views/issueDetails/groupMerged';
+import {useGroup} from 'sentry/views/issueDetails/useGroup';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
-function GroupMergedTab(props: GroupEventDetailsProps) {
-  const {groupId} = useParams<{groupId: Group['id']}>();
+function GroupMergedTab() {
+  const params = useParams<{groupId: Group['id']}>();
   const location = useLocation();
   const hasStreamlinedUI = useHasStreamlinedUI();
+  const organization = useOrganization();
+
+  const {
+    data: group,
+    isPending: isGroupPending,
+    isError: isGroupError,
+    refetch: refetchGroup,
+  } = useGroup({groupId: params.groupId});
+  const project = useProjectFromSlug({
+    organization,
+    projectSlug: group?.project.slug,
+  });
 
   // TODO(streamline-ui): Point router to event details page since merged issues opens in a drawer.
   if (hasStreamlinedUI) {
-    return <GroupEventDetails {...props} />;
+    return <GroupEventDetails />;
+  }
+
+  if (isGroupPending || !project) {
+    return <LoadingIndicator />;
+  }
+
+  if (isGroupError) {
+    return <LoadingError onRetry={refetchGroup} />;
   }
 
   return (
     <Layout.Body>
       <Layout.Main fullWidth>
-        <GroupMergedView project={props.project} params={{groupId}} location={location} />
+        <GroupMergedView project={project} groupId={params.groupId} location={location} />
       </Layout.Main>
     </Layout.Body>
   );
diff --git a/static/app/views/issueDetails/groupMerged/index.spec.tsx b/static/app/views/issueDetails/groupMerged/index.spec.tsx
index f42f2a1d2a24c2..f317f53ceb3f03 100644
--- a/static/app/views/issueDetails/groupMerged/index.spec.tsx
+++ b/static/app/views/issueDetails/groupMerged/index.spec.tsx
@@ -1,4 +1,5 @@
 import {DetailedEventsFixture} from 'sentry-fixture/events';
+import {GroupFixture} from 'sentry-fixture/group';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {act, render, screen} from 'sentry-test/reactTestingLibrary';
@@ -8,6 +9,7 @@ import GroupMergedView from 'sentry/views/issueDetails/groupMerged';
 
 describe('Issues -> Merged View', function () {
   const events = DetailedEventsFixture();
+  const group = GroupFixture();
   const mockData = {
     merged: [
       {
@@ -27,7 +29,7 @@ describe('Issues -> Merged View', function () {
     GroupingStore.init();
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/groupId/hashes/?limit=50&query=',
+      url: `/organizations/org-slug/issues/${group.id}/hashes/?limit=50&query=`,
       body: mockData.merged,
     });
   });
@@ -43,7 +45,7 @@ describe('Issues -> Merged View', function () {
       <GroupMergedView
         organization={organization}
         project={project}
-        params={{groupId: 'groupId'}}
+        groupId={group.id}
         location={router.location}
       />,
       {router, organization}
@@ -64,7 +66,7 @@ describe('Issues -> Merged View', function () {
       <GroupMergedView
         organization={organization}
         project={project}
-        params={{groupId: 'groupId'}}
+        groupId={group.id}
         location={router.location}
       />,
       {router, organization}
diff --git a/static/app/views/issueDetails/groupMerged/index.tsx b/static/app/views/issueDetails/groupMerged/index.tsx
index ac8b3a58adca08..0a6e7b58350742 100644
--- a/static/app/views/issueDetails/groupMerged/index.tsx
+++ b/static/app/views/issueDetails/groupMerged/index.tsx
@@ -1,5 +1,6 @@
 import {Component, Fragment} from 'react';
 import styled from '@emotion/styled';
+import type {Location, Query} from 'history';
 import * as qs from 'query-string';
 
 import LoadingError from 'sentry/components/loadingError';
@@ -10,7 +11,6 @@ import type {Fingerprint} from 'sentry/stores/groupingStore';
 import GroupingStore from 'sentry/stores/groupingStore';
 import {space} from 'sentry/styles/space';
 import type {Group} from 'sentry/types/group';
-import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {trackAnalytics} from 'sentry/utils/analytics';
@@ -18,10 +18,9 @@ import withOrganization from 'sentry/utils/withOrganization';
 
 import MergedList from './mergedList';
 
-type Props = Pick<
-  RouteComponentProps<{groupId: Group['id']}, {}>,
-  'params' | 'location'
-> & {
+type Props = {
+  groupId: Group['id'];
+  location: Location<Query>;
   organization: Organization;
   project: Project;
 };
@@ -39,7 +38,7 @@ class GroupMergedView extends Component<Props, State> {
     mergedItems: [],
     loading: true,
     error: false,
-    query: this.props.location.query.query || '',
+    query: (this.props.location.query.query ?? '') as string,
   };
 
   componentDidMount() {
@@ -48,13 +47,12 @@ class GroupMergedView extends Component<Props, State> {
 
   UNSAFE_componentWillReceiveProps(nextProps: Props) {
     if (
-      nextProps.params.groupId !== this.props.params.groupId ||
+      nextProps.groupId !== this.props.groupId ||
       nextProps.location.search !== this.props.location.search
     ) {
-      const queryParams = nextProps.location.query;
       this.setState(
         {
-          query: queryParams.query,
+          query: (nextProps.location.query.query ?? '') as string,
         },
         this.fetchData
       );
@@ -79,8 +77,7 @@ class GroupMergedView extends Component<Props, State> {
   listener = GroupingStore.listen(this.onGroupingChange, undefined);
 
   getEndpoint() {
-    const {params, location, organization} = this.props;
-    const {groupId} = params;
+    const {groupId, location, organization} = this.props;
 
     const queryParams = {
       ...location.query,
@@ -104,9 +101,9 @@ class GroupMergedView extends Component<Props, State> {
   };
 
   handleUnmerge = () => {
-    const {organization, params} = this.props;
+    const {organization, groupId} = this.props;
     GroupingStore.onUnmerge({
-      groupId: params.groupId,
+      groupId,
       orgSlug: organization.slug,
       loadingMessage: t('Unmerging events\u2026'),
       successMessage: t('Events successfully queued for unmerging.'),
@@ -115,15 +112,14 @@ class GroupMergedView extends Component<Props, State> {
     const unmergeKeys = [...GroupingStore.getState().unmergeList.values()];
     trackAnalytics('issue_details.merged_tab.unmerge_clicked', {
       organization,
-      group_id: params.groupId,
+      group_id: groupId,
       event_ids_unmerged: unmergeKeys.join(','),
       total_unmerged: unmergeKeys.length,
     });
   };
 
   render() {
-    const {project, organization, params} = this.props;
-    const {groupId} = params;
+    const {project, organization, groupId} = this.props;
     const {loading: isLoading, error, mergedItems, mergedLinks} = this.state;
     const isError = error && !isLoading;
     const isLoadedSuccessfully = !isError && !isLoading;
diff --git a/static/app/views/issueDetails/groupMerged/mergedIssuesDrawer.tsx b/static/app/views/issueDetails/groupMerged/mergedIssuesDrawer.tsx
index 58a6e9dfa4c8e5..43f33cb1ba6cf0 100644
--- a/static/app/views/issueDetails/groupMerged/mergedIssuesDrawer.tsx
+++ b/static/app/views/issueDetails/groupMerged/mergedIssuesDrawer.tsx
@@ -39,11 +39,7 @@ export function MergedIssuesDrawer({group, project}: {group: Group; project: Pro
         <Header>{t('Merged Issues')}</Header>
       </EventNavigator>
       <EventDrawerBody>
-        <GroupMergedView
-          project={project}
-          params={{groupId: group.id}}
-          location={location}
-        />
+        <GroupMergedView project={project} groupId={group.id} location={location} />
       </EventDrawerBody>
     </EventDrawerContainer>
   );
diff --git a/static/app/views/issueDetails/groupRelatedIssues/index.spec.tsx b/static/app/views/issueDetails/groupRelatedIssues/index.spec.tsx
index 60c02d6000a1fc..eabc482e06aa14 100644
--- a/static/app/views/issueDetails/groupRelatedIssues/index.spec.tsx
+++ b/static/app/views/issueDetails/groupRelatedIssues/index.spec.tsx
@@ -1,4 +1,6 @@
+import {GroupFixture} from 'sentry-fixture/group';
 import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
@@ -10,14 +12,17 @@ describe('Related Issues View', function () {
   let issuesMock: jest.Mock;
 
   const organization = OrganizationFixture();
-  const orgSlug = organization.slug;
   const groupId = '12345678';
+  const group = GroupFixture({id: groupId});
+  const router = RouterFixture({
+    params: {groupId: group.id},
+  });
+  const orgSlug = organization.slug;
   const group1 = '15';
   const group2 = '20';
   // query=issue.id:[15,20] -> query=issue.id%3A%5B15%2C20%5D
   const orgIssuesEndpoint = `/organizations/${orgSlug}/issues/?query=issue.id%3A%5B${group1}%2C${group2}%5D`;
 
-  const params = {groupId: groupId};
   const errorType = 'RuntimeError';
   const onlySameRootData = {
     type: 'same_root_cause',
@@ -62,6 +67,10 @@ describe('Related Issues View', function () {
       url: `/organizations/${orgSlug}/users/`,
       body: {},
     });
+    MockApiClient.addMockResponse({
+      url: `/organizations/org-slug/issues/${group.id}/`,
+      body: group,
+    });
   });
 
   afterEach(() => {
@@ -83,7 +92,7 @@ describe('Related Issues View', function () {
       body: issuesData,
     });
 
-    render(<GroupRelatedIssues params={params} />);
+    render(<GroupRelatedIssues />, {router, organization});
 
     // Wait for the issues showing up on the table
     expect(await screen.findByText(`EARTH-${group1}`)).toBeInTheDocument();
@@ -112,7 +121,7 @@ describe('Related Issues View', function () {
       url: orgIssuesEndpoint,
       body: issuesData,
     });
-    render(<GroupRelatedIssues params={params} />);
+    render(<GroupRelatedIssues />, {router, organization});
 
     // Wait for the issues showing up on the table
     expect(await screen.findByText(`EARTH-${group1}`)).toBeInTheDocument();
diff --git a/static/app/views/issueDetails/groupRelatedIssues/index.tsx b/static/app/views/issueDetails/groupRelatedIssues/index.tsx
index 6df574ee21d625..5f825c1dd9ffc8 100644
--- a/static/app/views/issueDetails/groupRelatedIssues/index.tsx
+++ b/static/app/views/issueDetails/groupRelatedIssues/index.tsx
@@ -8,15 +8,9 @@ import LoadingError from 'sentry/components/loadingError';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
-
-type RouteParams = {
-  groupId: string;
-};
-
-type Props = Pick<RouteComponentProps<RouteParams, {}>, 'params'>;
+import {useParams} from 'sentry/utils/useParams';
 
 type RelatedIssuesResponse = {
   data: number[];
@@ -33,8 +27,8 @@ interface RelatedIssuesSectionProps {
   relationType: string;
 }
 
-function GroupRelatedIssues({params}: Props) {
-  const {groupId} = params;
+function GroupRelatedIssues() {
+  const params = useParams<{groupId: string}>();
 
   const organization = useOrganization();
   const orgSlug = organization.slug;
@@ -42,12 +36,12 @@ function GroupRelatedIssues({params}: Props) {
   return (
     <Fragment>
       <RelatedIssuesSection
-        groupId={groupId}
+        groupId={params.groupId}
         orgSlug={orgSlug}
         relationType="same_root_cause"
       />
       <RelatedIssuesSection
-        groupId={groupId}
+        groupId={params.groupId}
         orgSlug={orgSlug}
         relationType="trace_connected"
       />
@@ -80,47 +74,28 @@ function RelatedIssuesSection({
   // This is important for traces since issues can be for any project in the org
   const baseUrl = `/organizations/${orgSlug}/issues/?project=-1`;
   let title: React.ReactNode = null;
-  let linkToTrace: React.ReactNode = null;
+  let extraInfo: React.ReactNode = null;
   let openIssuesButton: React.ReactNode = null;
   if (relationType === 'trace_connected' && traceMeta) {
-    title = t('Issues in the same trace');
-    linkToTrace = (
-      <small>
-        {t('These issues were all found within ')}
-        <Link
-          to={`/organizations/${orgSlug}/performance/trace/${traceMeta.trace_id}/?node=error-${traceMeta.event_id}`}
-        >
-          {t('this trace')}
-        </Link>
-        .
-      </small>
-    );
-    openIssuesButton = (
-      <LinkButton
-        to={`${baseUrl}&query=trace:${traceMeta.trace_id}`}
-        size="xs"
-        analyticsEventName="Clicked Open Issues from trace-connected related issues"
-        analyticsEventKey="similar_issues.trace_connected_issues_clicked_open_issues"
-      >
-        {t('Open in Issues')}
-      </LinkButton>
-    );
+    ({title, extraInfo, openIssuesButton} = getTraceConnectedContent(
+      traceMeta,
+      baseUrl,
+      orgSlug
+    ));
   } else {
-    title = t('Issues caused by the same root cause');
-    openIssuesButton = (
-      <LinkButton
-        to={`${baseUrl}&query=issue.id:[${groupId},${issues}]`}
-        size="xs"
-        analyticsEventName="Clicked Open Issues from same-root related issues"
-        analyticsEventKey="similar_issues.same_root_cause_clicked_open_issues"
-      >
-        {t('Open in Issues')}
-      </LinkButton>
+    title = t('Issues with similar titles');
+    extraInfo = t(
+      'These issues have the same title and may have been caused by the same root cause.'
+    );
+    openIssuesButton = getLinkButton(
+      `${baseUrl}&query=issue.id:[${groupId},${issues}]`,
+      'Clicked Open Issues from same-root related issues',
+      'similar_issues.same_root_cause_clicked_open_issues'
     );
   }
 
   return (
-    <HeaderWrapper>
+    <Fragment>
       {isPending ? (
         <LoadingIndicator />
       ) : isError ? (
@@ -130,28 +105,67 @@ function RelatedIssuesSection({
         />
       ) : issues.length > 0 ? (
         <Fragment>
-          <Title>{title}</Title>
-          <TextButtonWrapper>
-            {linkToTrace}
-            {openIssuesButton}
-          </TextButtonWrapper>
+          <HeaderWrapper>
+            <Title>{title}</Title>
+            <TextButtonWrapper>
+              <span>{extraInfo}</span>
+              {openIssuesButton}
+            </TextButtonWrapper>
+          </HeaderWrapper>
           <GroupList
             orgSlug={orgSlug}
             queryParams={{query: query}}
             source="similar-issues-tab"
             canSelectGroups={false}
             withChart={false}
+            withColumns={['event']}
           />
         </Fragment>
       ) : null}
-    </HeaderWrapper>
+    </Fragment>
   );
 }
 
+const getTraceConnectedContent = (
+  traceMeta: RelatedIssuesResponse['meta'],
+  baseUrl: string,
+  orgSlug: string
+) => {
+  const title = t('Issues in the same trace');
+  const url = `/organizations/${orgSlug}/performance/trace/${traceMeta.trace_id}/?node=error-${traceMeta.event_id}`;
+  const extraInfo = (
+    <small>
+      {t('These issues were all found within')}
+      <Link to={url}>{t('this trace')}</Link>.
+    </small>
+  );
+  const openIssuesButton = getLinkButton(
+    `${baseUrl}&query=trace:${traceMeta.trace_id}`,
+    'Clicked Open Issues from trace-connected related issues',
+    'similar_issues.trace_connected_issues_clicked_open_issues'
+  );
+
+  return {title, extraInfo, openIssuesButton};
+};
+
+const getLinkButton = (to: string, eventName: string, eventKey: string) => {
+  return (
+    <LinkButton
+      to={to}
+      size="xs"
+      analyticsEventName={eventName}
+      analyticsEventKey={eventKey}
+    >
+      {t('Open in Issues')}
+    </LinkButton>
+  );
+};
+
 // Export the component without feature flag controls
 export {GroupRelatedIssues};
 
 const Title = styled('h4')`
+  font-size: ${p => p.theme.fontSizeLarge};
   margin-bottom: ${space(0.75)};
 `;
 
@@ -164,7 +178,9 @@ const HeaderWrapper = styled('div')`
 `;
 
 const TextButtonWrapper = styled('div')`
+  align-items: center;
   display: flex;
   justify-content: space-between;
   margin-bottom: ${space(1)};
+  width: 100%;
 `;
diff --git a/static/app/views/issueDetails/groupReplays/groupReplays.tsx b/static/app/views/issueDetails/groupReplays/groupReplays.tsx
index b8984c4c865475..a5321df37b74ac 100644
--- a/static/app/views/issueDetails/groupReplays/groupReplays.tsx
+++ b/static/app/views/issueDetails/groupReplays/groupReplays.tsx
@@ -271,11 +271,17 @@ function GroupReplaysTable({
     <StyledLayoutPage withPadding hasStreamlinedUI={hasStreamlinedUI}>
       <ReplayCountHeader>
         <IconUser size="sm" />
-        {t(
-          'There %s for this issue across %s.',
-          tn('is %s replay', 'are %s replays', replayCount ?? 0),
-          tn('%s event', '%s events', group.count)
-        )}
+        {(replayCount ?? 0) > 50
+          ? tn(
+              'There are 50+ replays for this issue across %s event',
+              'There are 50+ replays for this issue across %s events',
+              group.count
+            )
+          : t(
+              'There %s for this issue across %s.',
+              tn('is %s replay', 'are %s replays', replayCount ?? 0),
+              tn('%s event', '%s events', group.count)
+            )}
       </ReplayCountHeader>
       {inner}
     </StyledLayoutPage>
diff --git a/static/app/views/issueDetails/groupSidebar.tsx b/static/app/views/issueDetails/groupSidebar.tsx
index 27da16ddb2f5c9..7417bbc70a9564 100644
--- a/static/app/views/issueDetails/groupSidebar.tsx
+++ b/static/app/views/issueDetails/groupSidebar.tsx
@@ -8,7 +8,6 @@ import ErrorBoundary from 'sentry/components/errorBoundary';
 import {EventThroughput} from 'sentry/components/events/eventStatisticalDetector/eventThroughput';
 import AssignedTo from 'sentry/components/group/assignedTo';
 import ExternalIssueList from 'sentry/components/group/externalIssuesList';
-import {StreamlinedExternalIssueList} from 'sentry/components/group/externalIssuesList/streamlinedExternalIssueList';
 import GroupReleaseStats from 'sentry/components/group/releaseStats';
 import TagFacets, {
   BACKEND_TAGS,
@@ -40,7 +39,8 @@ import {useApiQuery} from 'sentry/utils/queryClient';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useUser} from 'sentry/utils/useUser';
 import {ParticipantList} from 'sentry/views/issueDetails/participantList';
-import SolutionsSection from 'sentry/views/issueDetails/streamline/solutionsSection';
+import {ExternalIssueList as StreamlinedExternalIssueList} from 'sentry/views/issueDetails/streamline/sidebar/externalIssueList';
+import SolutionsSection from 'sentry/views/issueDetails/streamline/sidebar/solutionsSection';
 import {makeFetchGroupQueryKey} from 'sentry/views/issueDetails/useGroup';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
@@ -259,8 +259,9 @@ export default function GroupSidebar({
 
   return (
     <Container>
-      {((organization.features.includes('ai-summary') &&
-        issueTypeConfig.issueSummary.enabled) ||
+      {((organization.features.includes('gen-ai-features') &&
+        issueTypeConfig.issueSummary.enabled &&
+        !organization.hideAiFeatures) ||
         issueTypeConfig.resources) && (
         <SolutionsSectionContainer>
           <SolutionsSection group={group} project={project} event={event} />
diff --git a/static/app/views/issueDetails/groupSimilarIssues/groupSimilarIssuesTab.tsx b/static/app/views/issueDetails/groupSimilarIssues/groupSimilarIssuesTab.tsx
index 51d99b9a5cac37..31239f665ac2f8 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/groupSimilarIssuesTab.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/groupSimilarIssuesTab.tsx
@@ -1,23 +1,21 @@
 import * as Layout from 'sentry/components/layouts/thirds';
-import GroupEventDetails, {
-  type GroupEventDetailsProps,
-} from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
+import GroupEventDetails from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
 import GroupSimilarIssues from 'sentry/views/issueDetails/groupSimilarIssues/similarIssues';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
-function GroupSimilarIssuesTab(props: GroupEventDetailsProps) {
+function GroupSimilarIssuesTab() {
   const hasStreamlinedUI = useHasStreamlinedUI();
 
   // TODO(streamlined-ui): Remove this component and point router to GroupEventDetails
   // Similar issues will open in a drawer
   if (hasStreamlinedUI) {
-    return <GroupEventDetails {...props} />;
+    return <GroupEventDetails />;
   }
 
   return (
     <Layout.Body>
       <Layout.Main fullWidth>
-        <GroupSimilarIssues {...props} />
+        <GroupSimilarIssues />
       </Layout.Main>
     </Layout.Body>
   );
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarIssues.spec.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarIssues.spec.tsx
index 5327250539acc4..bfc533abf92e7c 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarIssues.spec.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarIssues.spec.tsx
@@ -1,3 +1,4 @@
+import {GroupFixture} from 'sentry-fixture/group';
 import {GroupsFixture} from 'sentry-fixture/groups';
 import {ProjectFixture} from 'sentry-fixture/project';
 import {RouterFixture} from 'sentry-fixture/routerFixture';
@@ -10,6 +11,7 @@ import {
   waitFor,
 } from 'sentry-test/reactTestingLibrary';
 
+import ProjectsStore from 'sentry/stores/projectsStore';
 import GroupSimilarIssues from 'sentry/views/issueDetails/groupSimilarIssues/similarIssues';
 
 const MockNavigate = jest.fn();
@@ -25,8 +27,9 @@ describe('Issues Similar View', function () {
     features: ['similarity-view'],
   });
 
+  const group = GroupFixture();
   const router = RouterFixture({
-    params: {orgId: 'org-slug', projectId: 'project-slug', groupId: 'group-id'},
+    params: {orgId: 'org-slug', groupId: group.id},
   });
 
   const scores = [
@@ -42,9 +45,19 @@ describe('Issues Similar View', function () {
 
   beforeEach(function () {
     mock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/group-id/similar/?limit=50',
+      url: `/organizations/org-slug/issues/${group.id}/similar/?limit=50`,
       body: mockData.similar,
     });
+    MockApiClient.addMockResponse({
+      url: `/organizations/org-slug/issues/${group.id}/`,
+      body: group,
+    });
+    MockApiClient.addMockResponse({
+      url: `/projects/org-slug/project-slug/`,
+      body: {features: ['similarity-view']},
+    });
+    ProjectsStore.init();
+    ProjectsStore.loadInitialData([project]);
   });
 
   afterEach(() => {
@@ -63,14 +76,7 @@ describe('Issues Similar View', function () {
   };
 
   it('renders with mocked data', async function () {
-    render(
-      <GroupSimilarIssues
-        project={project}
-        params={{orgId: 'org-slug', groupId: 'group-id'}}
-        location={router.location}
-      />,
-      {router}
-    );
+    render(<GroupSimilarIssues />, {router});
 
     expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
 
@@ -88,14 +94,7 @@ describe('Issues Similar View', function () {
       },
     });
 
-    render(
-      <GroupSimilarIssues
-        project={project}
-        params={{orgId: 'org-slug', groupId: 'group-id'}}
-        location={router.location}
-      />,
-      {router}
-    );
+    render(<GroupSimilarIssues />, {router});
     renderGlobalModal();
 
     await selectNthSimilarItem(0);
@@ -117,14 +116,7 @@ describe('Issues Similar View', function () {
   });
 
   it('correctly shows merge count', async function () {
-    render(
-      <GroupSimilarIssues
-        project={project}
-        params={{orgId: 'org-slug', groupId: 'group-id'}}
-        location={router.location}
-      />,
-      {router}
-    );
+    render(<GroupSimilarIssues />, {router});
     renderGlobalModal();
 
     await selectNthSimilarItem(0);
@@ -136,26 +128,14 @@ describe('Issues Similar View', function () {
   });
 
   it('shows empty message', async function () {
-    // Manually clear responses and add an empty response
-    MockApiClient.clearMockResponses();
-    jest.clearAllMocks();
     mock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/group-id/similar/?limit=50',
+      url: `/organizations/org-slug/issues/${group.id}/similar/?limit=50`,
       body: [],
     });
 
-    render(
-      <GroupSimilarIssues
-        project={project}
-        params={{orgId: 'org-slug', groupId: 'group-id'}}
-        location={router.location}
-      />,
-      {router}
-    );
+    render(<GroupSimilarIssues />, {router});
     renderGlobalModal();
 
-    expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
-
     await waitFor(() => expect(mock).toHaveBeenCalled());
 
     expect(
@@ -170,14 +150,15 @@ describe('Issues Similar View', function () {
 });
 
 describe('Issues Similar Embeddings View', function () {
-  let mock;
+  let mock: jest.Mock;
 
+  const group = GroupFixture();
   const project = ProjectFixture({
-    features: ['similarity-view', 'similarity-embeddings'],
+    features: ['similarity-view'],
   });
 
   const router = RouterFixture({
-    params: {orgId: 'org-slug', projectId: 'project-slug', groupId: 'group-id'},
+    params: {orgId: 'org-slug', groupId: group.id},
   });
 
   const similarEmbeddingsScores = [
@@ -188,7 +169,7 @@ describe('Issues Similar Embeddings View', function () {
   ];
 
   const mockData = {
-    simlarEmbeddings: GroupsFixture().map((issue, i) => [
+    similarEmbeddings: GroupsFixture().map((issue, i) => [
       issue,
       similarEmbeddingsScores[i],
     ]),
@@ -196,9 +177,19 @@ describe('Issues Similar Embeddings View', function () {
 
   beforeEach(function () {
     mock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/group-id/similar-issues-embeddings/?k=10&threshold=0.01&useReranking=true',
-      body: mockData.simlarEmbeddings,
+      url: `/organizations/org-slug/issues/${group.id}/similar-issues-embeddings/?k=10&threshold=0.01&useReranking=true`,
+      body: mockData.similarEmbeddings,
     });
+    MockApiClient.addMockResponse({
+      url: `/organizations/org-slug/issues/${group.id}/`,
+      body: group,
+    });
+    MockApiClient.addMockResponse({
+      url: `/projects/org-slug/project-slug/`,
+      body: {features: ['similarity-embeddings']},
+    });
+    ProjectsStore.init();
+    ProjectsStore.loadInitialData([project]);
   });
 
   afterEach(() => {
@@ -217,16 +208,7 @@ describe('Issues Similar Embeddings View', function () {
   };
 
   it('renders with mocked data', async function () {
-    render(
-      <GroupSimilarIssues
-        project={project}
-        params={{orgId: 'org-slug', groupId: 'group-id'}}
-        location={router.location}
-      />,
-      {router}
-    );
-
-    expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
+    render(<GroupSimilarIssues />, {router});
 
     await waitFor(() => expect(mock).toHaveBeenCalled());
 
@@ -242,14 +224,7 @@ describe('Issues Similar Embeddings View', function () {
       },
     });
 
-    render(
-      <GroupSimilarIssues
-        project={project}
-        params={{orgId: 'org-slug', groupId: 'group-id'}}
-        location={router.location}
-      />,
-      {router}
-    );
+    render(<GroupSimilarIssues />, {router});
     renderGlobalModal();
 
     await selectNthSimilarItem(0);
@@ -271,14 +246,7 @@ describe('Issues Similar Embeddings View', function () {
   });
 
   it('correctly shows merge count', async function () {
-    render(
-      <GroupSimilarIssues
-        project={project}
-        params={{orgId: 'org-slug', groupId: 'group-id'}}
-        location={router.location}
-      />,
-      {router}
-    );
+    render(<GroupSimilarIssues />, {router});
     renderGlobalModal();
 
     await selectNthSimilarItem(0);
@@ -290,26 +258,14 @@ describe('Issues Similar Embeddings View', function () {
   });
 
   it('shows empty message', async function () {
-    // Manually clear responses and add an empty response
-    MockApiClient.clearMockResponses();
-    jest.clearAllMocks();
     mock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/group-id/similar-issues-embeddings/?k=10&threshold=0.01&useReranking=true',
+      url: `/organizations/org-slug/issues/${group.id}/similar-issues-embeddings/?k=10&threshold=0.01&useReranking=true`,
       body: [],
     });
 
-    render(
-      <GroupSimilarIssues
-        project={project}
-        params={{orgId: 'org-slug', groupId: 'group-id'}}
-        location={router.location}
-      />,
-      {router}
-    );
+    render(<GroupSimilarIssues />, {router});
     renderGlobalModal();
 
-    expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
-
     await waitFor(() => expect(mock).toHaveBeenCalled());
 
     expect(
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarIssues.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarIssues.tsx
index 139351cfa40e38..ed78f418a0ff01 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarIssues.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarIssues.tsx
@@ -1,20 +1,45 @@
 import {Fragment} from 'react';
 
 import Feature from 'sentry/components/acl/feature';
+import LoadingError from 'sentry/components/loadingError';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
+import useOrganization from 'sentry/utils/useOrganization';
+import {useParams} from 'sentry/utils/useParams';
+import useProjectFromSlug from 'sentry/utils/useProjectFromSlug';
 import {GroupRelatedIssues} from 'sentry/views/issueDetails/groupRelatedIssues';
+import {useGroup} from 'sentry/views/issueDetails/useGroup';
 
 import SimilarStackTrace from './similarStackTrace';
 
-type Props = React.ComponentProps<typeof SimilarStackTrace>;
+function GroupSimilarIssues() {
+  const params = useParams<{groupId: string}>();
+  const organization = useOrganization();
+  const {
+    data: group,
+    isPending: isGroupPending,
+    isError: isGroupError,
+    refetch: refetchGroup,
+  } = useGroup({groupId: params.groupId});
+  const project = useProjectFromSlug({
+    organization,
+    projectSlug: group?.project.slug,
+  });
+
+  if (isGroupPending || !project) {
+    return <LoadingIndicator />;
+  }
+
+  if (isGroupError) {
+    return <LoadingError onRetry={refetchGroup} />;
+  }
 
-function GroupSimilarIssues({project, ...props}: Props) {
   return (
     <Fragment>
-      <Feature features="related-issues">
-        <GroupRelatedIssues {...props} />
-      </Feature>
       <Feature features="similarity-view" project={project}>
-        <SimilarStackTrace project={project} {...props} />
+        <SimilarStackTrace project={project} />
+      </Feature>
+      <Feature features="related-issues">
+        <GroupRelatedIssues />
       </Feature>
     </Fragment>
   );
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.spec.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.spec.tsx
index 06528ae4ea17b9..f9d2cdc36e44d6 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.spec.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.spec.tsx
@@ -1,8 +1,9 @@
 import {GroupFixture} from 'sentry-fixture/group';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
-import {render, screen} from 'sentry-test/reactTestingLibrary';
+import {render, screen, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import GroupStore from 'sentry/stores/groupStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
@@ -12,6 +13,9 @@ describe('SimilarIssuesDrawer', function () {
   const organization = OrganizationFixture();
   const project = ProjectFixture({features: ['similarity-view']});
   const group = GroupFixture();
+  const router = RouterFixture({
+    params: {groupId: group.id},
+  });
   let mockSimilarIssues: jest.Mock;
 
   beforeEach(function () {
@@ -20,20 +24,34 @@ describe('SimilarIssuesDrawer', function () {
     GroupStore.init();
 
     mockSimilarIssues = MockApiClient.addMockResponse({
-      url: `/organizations/${organization.id}/issues/${group.id}/similar/?limit=50`,
+      url: `/organizations/${organization.slug}/issues/${group.id}/similar/?limit=50`,
       body: [[group, {'exception:stacktrace:pairs': 0.375}]],
       method: 'GET',
     });
+    MockApiClient.addMockResponse({
+      url: `/organizations/${organization.slug}/issues/${group.id}/`,
+      body: group,
+    });
+    MockApiClient.addMockResponse({
+      url: `/projects/${organization.slug}/${project.slug}/`,
+      body: {features: []},
+    });
   });
 
   it('renders the content as expected', async function () {
-    render(<SimilarIssuesDrawer group={group} project={project} />, {organization});
+    render(<SimilarIssuesDrawer group={group} project={project} />, {
+      organization,
+      router,
+    });
 
     expect(
       await screen.findByRole('heading', {name: 'Similar Issues'})
     ).toBeInTheDocument();
+
     expect(screen.getByText('Issues with a similar stack trace')).toBeInTheDocument();
-    expect(mockSimilarIssues).toHaveBeenCalled();
+    await waitFor(() => {
+      expect(mockSimilarIssues).toHaveBeenCalled();
+    });
     expect(screen.getByRole('button', {name: 'Close Drawer'})).toBeInTheDocument();
   });
 });
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.tsx
index c3a60f95332420..d643998e6c546d 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarIssuesDrawer.tsx
@@ -12,14 +12,9 @@ import {
 import {t} from 'sentry/locale';
 import type {Group} from 'sentry/types/group';
 import type {Project} from 'sentry/types/project';
-import {useLocation} from 'sentry/utils/useLocation';
-import useOrganization from 'sentry/utils/useOrganization';
 import GroupSimilarIssues from 'sentry/views/issueDetails/groupSimilarIssues/similarIssues';
 
 export function SimilarIssuesDrawer({group, project}: {group: Group; project: Project}) {
-  const organization = useOrganization();
-  const location = useLocation();
-
   return (
     <EventDrawerContainer>
       <EventDrawerHeader>
@@ -41,14 +36,7 @@ export function SimilarIssuesDrawer({group, project}: {group: Group; project: Pr
         <Header>{t('Similar Issues')}</Header>
       </EventNavigator>
       <EventDrawerBody>
-        <GroupSimilarIssues
-          location={location}
-          params={{
-            groupId: group.id,
-            orgId: organization.id,
-          }}
-          project={project}
-        />
+        <GroupSimilarIssues />
       </EventDrawerBody>
     </EventDrawerContainer>
   );
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx
index 86a9b693f64787..d6768927e767f6 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/index.tsx
@@ -1,6 +1,5 @@
 import {Fragment, useCallback, useEffect, useState} from 'react';
 import styled from '@emotion/styled';
-import type {Location} from 'history';
 import * as qs from 'query-string';
 
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
@@ -12,20 +11,17 @@ import {t} from 'sentry/locale';
 import type {SimilarItem} from 'sentry/stores/groupingStore';
 import GroupingStore from 'sentry/stores/groupingStore';
 import {space} from 'sentry/styles/space';
-import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Project} from 'sentry/types/project';
+import {useDetailedProject} from 'sentry/utils/useDetailedProject';
+import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
+import useOrganization from 'sentry/utils/useOrganization';
+import {useParams} from 'sentry/utils/useParams';
 import usePrevious from 'sentry/utils/usePrevious';
 
 import List from './list';
 
-type RouteParams = {
-  groupId: string;
-  orgId: string;
-};
-
-type Props = Pick<RouteComponentProps<RouteParams, {}>, 'params' | 'location'> & {
-  location: Location;
+type Props = {
   project: Project;
 };
 
@@ -39,8 +35,10 @@ const DataConsentBanner = HookOrDefault({
   hookName: 'component:data-consent-banner',
   defaultComponent: null,
 });
-function SimilarStackTrace({params, location, project}: Props) {
-  const {orgId, groupId} = params;
+function SimilarStackTrace({project}: Props) {
+  const location = useLocation();
+  const organization = useOrganization();
+  const params = useParams<{groupId: string; orgId: string}>();
 
   const [items, setItems] = useState<ItemState>({
     similar: [],
@@ -52,8 +50,13 @@ function SimilarStackTrace({params, location, project}: Props) {
   const navigate = useNavigate();
   const prevLocationSearch = usePrevious(location.search);
   const hasSimilarityFeature = project.features.includes('similarity-view');
+  const {data: projectData, isPending} = useDetailedProject({
+    orgSlug: organization.slug,
+    projectSlug: project.slug,
+  });
+  // similarity-embeddings feature is only available on project details
   const hasSimilarityEmbeddingsFeature =
-    project.features.includes('similarity-embeddings') ||
+    projectData?.features.includes('similarity-embeddings') ||
     location.query.similarityEmbeddings === '1';
   // Use reranking by default (assuming the `seer.similarity.similar_issues.use_reranking`
   // backend option is using its default value of `True`). This is just so we can turn it off
@@ -61,13 +64,16 @@ function SimilarStackTrace({params, location, project}: Props) {
   const useReranking = String(location.query.useReranking !== '0');
 
   const fetchData = useCallback(() => {
+    if (isPending) {
+      return;
+    }
     setStatus('loading');
 
     const reqs: Parameters<typeof GroupingStore.onFetch>[0] = [];
 
     if (hasSimilarityEmbeddingsFeature) {
       reqs.push({
-        endpoint: `/organizations/${orgId}/issues/${groupId}/similar-issues-embeddings/?${qs.stringify(
+        endpoint: `/organizations/${organization.slug}/issues/${params.groupId}/similar-issues-embeddings/?${qs.stringify(
           {
             k: 10,
             threshold: 0.01,
@@ -78,10 +84,12 @@ function SimilarStackTrace({params, location, project}: Props) {
       });
     } else if (hasSimilarityFeature) {
       reqs.push({
-        endpoint: `/organizations/${orgId}/issues/${groupId}/similar/?${qs.stringify({
-          ...location.query,
-          limit: 50,
-        })}`,
+        endpoint: `/organizations/${organization.slug}/issues/${params.groupId}/similar/?${qs.stringify(
+          {
+            ...location.query,
+            limit: 50,
+          }
+        )}`,
         dataKey: 'similar',
       });
     }
@@ -89,11 +97,12 @@ function SimilarStackTrace({params, location, project}: Props) {
     GroupingStore.onFetch(reqs);
   }, [
     location.query,
-    groupId,
-    orgId,
+    params.groupId,
+    organization.slug,
     hasSimilarityFeature,
     hasSimilarityEmbeddingsFeature,
     useReranking,
+    isPending,
   ]);
 
   const onGroupingChange = useCallback(
@@ -115,12 +124,12 @@ function SimilarStackTrace({params, location, project}: Props) {
         return;
       }
 
-      if (mergedParent && mergedParent !== groupId) {
+      if (mergedParent && mergedParent !== params.groupId) {
         // Merge success, since we can't specify target, we need to redirect to new parent
-        navigate(`/organizations/${orgId}/issues/${mergedParent}/similar/`);
+        navigate(`/organizations/${organization.slug}/issues/${mergedParent}/similar/`);
       }
     },
-    [navigate, groupId, orgId]
+    [navigate, params.groupId, organization.slug]
   );
 
   useEffect(() => {
@@ -155,7 +164,7 @@ function SimilarStackTrace({params, location, project}: Props) {
 
     GroupingStore.onMerge({
       params,
-      query: location.query,
+      query: location.query.query as string,
       projectId: firstIssue.issue.project.slug,
     });
   }, [params, location.query, items]);
@@ -184,7 +193,7 @@ function SimilarStackTrace({params, location, project}: Props) {
       {status === 'ready' && !hasSimilarItems && !hasSimilarityEmbeddingsFeature && (
         <Panel>
           <EmptyStateWarning>
-            <p>{t("There don't seem to be any similar issues.")}</p>
+            <Title>{t("There don't seem to be any similar issues.")}</Title>
           </EmptyStateWarning>
         </Panel>
       )}
@@ -204,11 +213,12 @@ function SimilarStackTrace({params, location, project}: Props) {
           items={items.similar}
           filteredItems={items.filtered}
           onMerge={handleMerge}
-          orgId={orgId}
+          orgId={organization.slug}
           project={project}
-          groupId={groupId}
+          groupId={params.groupId}
           pageLinks={items.pageLinks}
           location={location}
+          hasSimilarityEmbeddingsFeature={hasSimilarityEmbeddingsFeature}
         />
       )}
       {status === 'ready' && hasSimilarItems && hasSimilarityEmbeddingsFeature && (
@@ -216,11 +226,12 @@ function SimilarStackTrace({params, location, project}: Props) {
           items={items.similar.concat(items.filtered)}
           filteredItems={[]}
           onMerge={handleMerge}
-          orgId={orgId}
+          orgId={organization.slug}
           project={project}
-          groupId={groupId}
+          groupId={params.groupId}
           pageLinks={items.pageLinks}
           location={location}
+          hasSimilarityEmbeddingsFeature={hasSimilarityEmbeddingsFeature}
         />
       )}
       <DataConsentBanner source="grouping" />
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/item.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/item.tsx
index 4cc58a0b1999a7..27cbab8bfde3ad 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/item.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/item.tsx
@@ -23,6 +23,7 @@ import type {Project} from 'sentry/types/project';
 
 type Props = {
   groupId: Group['id'];
+  hasSimilarityEmbeddingsFeature: boolean;
   issue: Group;
   location: Location;
   orgId: Organization['id'];
@@ -106,11 +107,9 @@ class Item extends Component<Props, State> {
   };
 
   render() {
-    const {aggregate, scoresByInterface, issue, project, location} = this.props;
+    const {aggregate, scoresByInterface, issue, hasSimilarityEmbeddingsFeature} =
+      this.props;
     const {visible, busy} = this.state;
-    const hasSimilarityEmbeddingsFeature =
-      project.features.includes('similarity-embeddings') ||
-      location.query.similarityEmbeddings === '1';
     const similarInterfaces = hasSimilarityEmbeddingsFeature
       ? ['exception']
       : ['exception', 'message'];
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/list.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/list.tsx
index 040c6876f8dcec..1d837f879d0093 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/list.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/list.tsx
@@ -24,6 +24,7 @@ type DefaultProps = {
 
 type Props = {
   groupId: string;
+  hasSimilarityEmbeddingsFeature: boolean;
   items: Array<SimilarItem>;
   location: Location;
   onMerge: () => void;
@@ -53,15 +54,13 @@ function List({
   pageLinks,
   onMerge,
   location,
+  hasSimilarityEmbeddingsFeature,
 }: Props) {
   const [showAllItems, setShowAllItems] = useState(false);
 
   const hasHiddenItems = !!filteredItems.length;
   const hasResults = items.length > 0 || hasHiddenItems;
   const itemsWithFiltered = items.concat(showAllItems ? filteredItems : []);
-  const hasSimilarityEmbeddingsFeature =
-    project.features.includes('similarity-embeddings') ||
-    location.query.similarityEmbeddings === '1';
   const organization = useOrganization();
   const itemsWouldGroup = hasSimilarityEmbeddingsFeature
     ? itemsWithFiltered.map(item => ({
@@ -97,7 +96,7 @@ function List({
           project={project}
           organization={organization}
           itemsWouldGroup={itemsWouldGroup}
-          location={location}
+          hasSimilarityEmbeddingsFeature={hasSimilarityEmbeddingsFeature}
         />
 
         <PanelBody>
@@ -108,6 +107,7 @@ function List({
               groupId={groupId}
               project={project}
               location={location}
+              hasSimilarityEmbeddingsFeature={hasSimilarityEmbeddingsFeature}
               {...item}
             />
           ))}
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/toolbar.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/toolbar.tsx
index d68ffbaf8d1c66..e9949077399921 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/toolbar.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarStackTrace/toolbar.tsx
@@ -1,6 +1,5 @@
 import {Component} from 'react';
 import styled from '@emotion/styled';
-import type {Location} from 'history';
 
 import {addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {Button} from 'sentry/components/button';
@@ -15,7 +14,7 @@ import type {Project} from 'sentry/types/project';
 import {trackAnalytics} from 'sentry/utils/analytics';
 
 type Props = {
-  location: Location;
+  hasSimilarityEmbeddingsFeature: boolean;
   onMerge: () => void;
   groupId?: string;
   itemsWouldGroup?: Array<{id: string; shouldBeGrouped: string | undefined}> | undefined;
@@ -78,11 +77,8 @@ class SimilarToolbar extends Component<Props, State> {
   };
 
   render() {
-    const {onMerge, project, location} = this.props;
+    const {onMerge, hasSimilarityEmbeddingsFeature} = this.props;
     const {mergeCount} = this.state;
-    const hasSimilarityEmbeddingsFeature =
-      project?.features.includes('similarity-embeddings') ||
-      location.query.similarityEmbeddings === '1';
 
     return (
       <PanelHeader hasButtons>
diff --git a/static/app/views/issueDetails/groupTagValues.tsx b/static/app/views/issueDetails/groupTagValues.tsx
index 545669ff1152ce..9df5a771852304 100644
--- a/static/app/views/issueDetails/groupTagValues.tsx
+++ b/static/app/views/issueDetails/groupTagValues.tsx
@@ -32,9 +32,7 @@ import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
 import useProjectFromSlug from 'sentry/utils/useProjectFromSlug';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
-import GroupEventDetails, {
-  type GroupEventDetailsProps,
-} from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
+import GroupEventDetails from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
 import {useGroup} from 'sentry/views/issueDetails/useGroup';
 import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
 import {
@@ -219,7 +217,7 @@ export function GroupTagValues() {
               >
                 {key === 'user' ? (
                   <UserBadge
-                    user={{...tagValue, id: tagValue.id ?? ''}}
+                    user={{...tagValue, id: tagValue.id ?? tagValue.value}}
                     avatarSize={20}
                     hideEmail
                   />
@@ -340,12 +338,12 @@ export function GroupTagValues() {
   );
 }
 
-function GroupTagValuesRoute(props: GroupEventDetailsProps) {
+function GroupTagValuesRoute() {
   const hasStreamlinedUI = useHasStreamlinedUI();
 
   // TODO(streamlined-ui): Point the router directly to group event details
   if (hasStreamlinedUI) {
-    return <GroupEventDetails {...props} />;
+    return <GroupEventDetails />;
   }
 
   return <GroupTagValues />;
diff --git a/static/app/views/issueDetails/groupTags/groupTagsTab.tsx b/static/app/views/issueDetails/groupTags/groupTagsTab.tsx
index c1d2952f7963a0..111938f6dede32 100644
--- a/static/app/views/issueDetails/groupTags/groupTagsTab.tsx
+++ b/static/app/views/issueDetails/groupTags/groupTagsTab.tsx
@@ -19,9 +19,7 @@ import {space} from 'sentry/styles/space';
 import {percent} from 'sentry/utils';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useParams} from 'sentry/utils/useParams';
-import GroupEventDetails, {
-  type GroupEventDetailsProps,
-} from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
+import GroupEventDetails from 'sentry/views/issueDetails/groupEventDetails/groupEventDetails';
 import {useGroupTags} from 'sentry/views/issueDetails/groupTags/useGroupTags';
 import {useGroup} from 'sentry/views/issueDetails/useGroup';
 import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
@@ -148,12 +146,12 @@ export function GroupTagsTab() {
   );
 }
 
-function GroupTagsRoute(props: GroupEventDetailsProps) {
+function GroupTagsRoute() {
   const hasStreamlinedUI = useHasStreamlinedUI();
 
   // TODO(streamlined-ui): Point the router to group event details
   if (hasStreamlinedUI) {
-    return <GroupEventDetails {...props} />;
+    return <GroupEventDetails />;
   }
 
   return <GroupTagsTab />;
diff --git a/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx b/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx
index a0863016c6ec80..22514f4d7fdffe 100644
--- a/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx
+++ b/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.tsx
@@ -27,7 +27,7 @@ import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
 import {TagBar} from 'sentry/views/issueDetails/groupTags/tagDistribution';
-import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/useIssueDetailsDiscoverQuery';
+import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery';
 
 type TagSort = 'date' | 'count';
 const DEFAULT_SORT: TagSort = 'count';
@@ -241,7 +241,11 @@ function TagDetailsValue({
 }) {
   const valueComponent =
     tagKey === 'user' ? (
-      <UserBadge user={{...tagValue, id: tagValue.id ?? ''}} avatarSize={20} hideEmail />
+      <UserBadge
+        user={{...tagValue, id: tagValue.id ?? tagValue.value}}
+        avatarSize={20}
+        hideEmail
+      />
     ) : (
       <DeviceName value={tagValue.value} />
     );
diff --git a/static/app/views/issueDetails/groupTags/tagDistribution.tsx b/static/app/views/issueDetails/groupTags/tagDistribution.tsx
index 78f73037aa3d00..42b18e0077b728 100644
--- a/static/app/views/issueDetails/groupTags/tagDistribution.tsx
+++ b/static/app/views/issueDetails/groupTags/tagDistribution.tsx
@@ -22,7 +22,9 @@ export function TagDistribution({tag}: {tag: GroupTag}) {
   return (
     <div onMouseEnter={() => setIsHovered(true)} onMouseLeave={() => setIsHovered(false)}>
       <TagHeader>
-        <TagTitle>{tag.key}</TagTitle>
+        <Tooltip title={tag.key} showOnlyOnOverflow skipWrapper>
+          <TagTitle>{tag.key}</TagTitle>
+        </Tooltip>
         <TagDetailsButton
           borderless
           size="zero"
@@ -100,6 +102,7 @@ const TagHeader = styled('div')`
 const TagTitle = styled('div')`
   font-size: ${p => p.theme.fontSizeMedium};
   font-weight: ${p => p.theme.fontWeightBold};
+  ${p => p.theme.overflowEllipsis}
 `;
 
 const TagDetailsButton = styled(LinkButton)<{isVisible: boolean}>`
diff --git a/static/app/views/issueDetails/header.spec.tsx b/static/app/views/issueDetails/header.spec.tsx
index 83373a744a70bc..5b5ff2a608fa3c 100644
--- a/static/app/views/issueDetails/header.spec.tsx
+++ b/static/app/views/issueDetails/header.spec.tsx
@@ -243,7 +243,6 @@ describe('GroupHeader', () => {
             issueCategory: IssueCategory.UPTIME,
           })}
           project={ProjectFixture()}
-          groupReprocessingStatus={ReprocessingStatus.NO_STATUS}
           event={null}
         />
       );
@@ -265,7 +264,6 @@ describe('GroupHeader', () => {
           organization={OrganizationFixture()}
           group={GroupFixture({priority: PriorityLevel.MEDIUM})}
           project={ProjectFixture()}
-          groupReprocessingStatus={ReprocessingStatus.NO_STATUS}
           event={null}
         />
       );
diff --git a/static/app/views/issueDetails/header.tsx b/static/app/views/issueDetails/header.tsx
index 8c7667605f02f0..b8d4de874d3d0e 100644
--- a/static/app/views/issueDetails/header.tsx
+++ b/static/app/views/issueDetails/header.tsx
@@ -36,13 +36,12 @@ import {useIssueDetailsHeader} from 'sentry/views/issueDetails/useIssueDetailsHe
 
 import GroupActions from './actions';
 import {Tab} from './types';
-import type {ReprocessingStatus} from './utils';
+import {getGroupReprocessingStatus} from './utils';
 
 type Props = {
   baseUrl: string;
   event: Event | null;
   group: Group;
-  groupReprocessingStatus: ReprocessingStatus;
   organization: Organization;
   project: Project;
 };
@@ -177,15 +176,9 @@ export function GroupHeaderTabs({
   );
 }
 
-function GroupHeader({
-  baseUrl,
-  group,
-  groupReprocessingStatus,
-  organization,
-  event,
-  project,
-}: Props) {
+function GroupHeader({baseUrl, group, organization, event, project}: Props) {
   const location = useLocation();
+  const groupReprocessingStatus = getGroupReprocessingStatus(group);
 
   const {
     disabledTabs,
diff --git a/static/app/views/issueDetails/streamline/context.tsx b/static/app/views/issueDetails/streamline/context.tsx
index ca75e371ab421f..795c2e5e37cedb 100644
--- a/static/app/views/issueDetails/streamline/context.tsx
+++ b/static/app/views/issueDetails/streamline/context.tsx
@@ -25,6 +25,7 @@ export const enum SectionKey {
 
   EXCEPTION = 'exception',
   STACKTRACE = 'stacktrace',
+  THREADS = 'threads',
   SPANS = 'spans',
   EVIDENCE = 'evidence',
   MESSAGE = 'message',
diff --git a/static/app/views/issueDetails/streamline/eventDetailsHeader.spec.tsx b/static/app/views/issueDetails/streamline/eventDetailsHeader.spec.tsx
index 035540ba042233..917fddfa7c3d7e 100644
--- a/static/app/views/issueDetails/streamline/eventDetailsHeader.spec.tsx
+++ b/static/app/views/issueDetails/streamline/eventDetailsHeader.spec.tsx
@@ -33,6 +33,10 @@ describe('EventDetailsHeader', () => {
 
   beforeEach(() => {
     MockApiClient.clearMockResponses();
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/flags/logs/',
+      body: {data: []},
+    });
     MockApiClient.addMockResponse({
       url: `/organizations/${organization.slug}/issues/${group.id}/tags/`,
       body: TagsFixture(),
diff --git a/static/app/views/issueDetails/streamline/eventDetailsHeader.tsx b/static/app/views/issueDetails/streamline/eventDetailsHeader.tsx
index 7ac5ecd1d91ce7..6faffc4b77d80e 100644
--- a/static/app/views/issueDetails/streamline/eventDetailsHeader.tsx
+++ b/static/app/views/issueDetails/streamline/eventDetailsHeader.tsx
@@ -18,7 +18,7 @@ import {
   EventSearch,
   useEventQuery,
 } from 'sentry/views/issueDetails/streamline/eventSearch';
-import {ToggleSidebar} from 'sentry/views/issueDetails/streamline/toggleSidebar';
+import {ToggleSidebar} from 'sentry/views/issueDetails/streamline/sidebar/toggleSidebar';
 import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
 import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
 import {useEnvironmentsFromUrl} from 'sentry/views/issueDetails/utils';
diff --git a/static/app/views/issueDetails/streamline/eventGraph.spec.tsx b/static/app/views/issueDetails/streamline/eventGraph.spec.tsx
index 1f234fd00945ac..3a273b68867bcb 100644
--- a/static/app/views/issueDetails/streamline/eventGraph.spec.tsx
+++ b/static/app/views/issueDetails/streamline/eventGraph.spec.tsx
@@ -29,6 +29,10 @@ describe('EventGraph', () => {
 
   beforeEach(() => {
     MockApiClient.clearMockResponses();
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/flags/logs/',
+      body: {data: []},
+    });
     MockApiClient.addMockResponse({
       url: `/organizations/${organization.slug}/issues/${group.id}/tags/`,
       body: TagsFixture(),
@@ -115,7 +119,7 @@ describe('EventGraph', () => {
     );
   });
 
-  it('allows filtering by environment', async function () {
+  it('allows filtering by environment, and shows unfiltered stats', async function () {
     render(<EventDetailsHeader {...defaultProps} />, {organization});
     expect(await screen.findByTestId('event-graph-loading')).not.toBeInTheDocument();
 
@@ -130,6 +134,15 @@ describe('EventGraph', () => {
         }),
       })
     );
+    // Also makes request without environment filter
+    expect(mockEventStats).toHaveBeenCalledWith(
+      '/organizations/org-slug/events-stats/',
+      expect.objectContaining({
+        query: expect.objectContaining({
+          environment: [],
+        }),
+      })
+    );
   });
 
   it('updates query from location param change', async function () {
@@ -154,6 +167,15 @@ describe('EventGraph', () => {
         }),
       })
     );
+    // Also makes request without tag filter
+    expect(mockEventStats).toHaveBeenCalledWith(
+      '/organizations/org-slug/events-stats/',
+      expect.objectContaining({
+        query: expect.objectContaining({
+          query: persistantQuery,
+        }),
+      })
+    );
   });
 
   it('allows filtering by date', async function () {
diff --git a/static/app/views/issueDetails/streamline/eventGraph.tsx b/static/app/views/issueDetails/streamline/eventGraph.tsx
index fd96159dd70b87..b1122dedef020e 100644
--- a/static/app/views/issueDetails/streamline/eventGraph.tsx
+++ b/static/app/views/issueDetails/streamline/eventGraph.tsx
@@ -1,6 +1,7 @@
 import {type CSSProperties, useMemo, useState} from 'react';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
+import Color from 'color';
 
 import Alert from 'sentry/components/alert';
 import {Button, type ButtonProps} from 'sentry/components/button';
@@ -25,12 +26,12 @@ import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import {getBucketSize} from 'sentry/views/dashboards/widgetCard/utils';
-import useFlagSeries from 'sentry/views/issueDetails/streamline/useFlagSeries';
+import useFlagSeries from 'sentry/views/issueDetails/streamline/hooks/useFlagSeries';
 import {
   useIssueDetailsDiscoverQuery,
   useIssueDetailsEventView,
-} from 'sentry/views/issueDetails/streamline/useIssueDetailsDiscoverQuery';
-import {useReleaseMarkLineSeries} from 'sentry/views/issueDetails/streamline/useReleaseMarkLineSeries';
+} from 'sentry/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery';
+import {useReleaseMarkLineSeries} from 'sentry/views/issueDetails/streamline/hooks/useReleaseMarkLineSeries';
 
 export const enum EventGraphSeries {
   EVENT = 'event',
@@ -71,7 +72,6 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
     EventGraphSeries.EVENT
   );
   const eventView = useIssueDetailsEventView({group});
-  const hasFeatureFlagFeature = organization.features.includes('feature-flag-ui');
 
   const config = getConfigForIssueType(group, group.project);
 
@@ -87,6 +87,24 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
     },
   });
 
+  const noQueryEventView = eventView.clone();
+  noQueryEventView.query = `issue:${group.shortId}`;
+  noQueryEventView.environment = [];
+
+  const isUnfilteredStatsEnabled =
+    eventView.query !== noQueryEventView.query || eventView.environment.length > 0;
+  const {data: unfilteredGroupStats} =
+    useIssueDetailsDiscoverQuery<MultiSeriesEventsStats>({
+      options: {
+        enabled: isUnfilteredStatsEnabled,
+      },
+      params: {
+        route: 'events-stats',
+        eventView: noQueryEventView,
+        referrer: 'issue_details.streamline_graph',
+      },
+    });
+
   const {data: uniqueUsersCount, isPending: isPendingUniqueUsersCount} = useApiQuery<{
     data: Array<{count_unique: number}>;
   }>(
@@ -118,6 +136,19 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
     }
     return createSeriesAndCount(groupStats['count()']);
   }, [groupStats]);
+  const {series: unfilteredEventSeries} = useMemo(() => {
+    if (!unfilteredGroupStats?.['count()']) {
+      return {series: []};
+    }
+
+    return createSeriesAndCount(unfilteredGroupStats['count()']);
+  }, [unfilteredGroupStats]);
+  const {series: unfilteredUserSeries} = useMemo(() => {
+    if (!unfilteredGroupStats?.['count_unique(user)']) {
+      return {series: []};
+    }
+    return createSeriesAndCount(unfilteredGroupStats['count_unique(user)']);
+  }, [unfilteredGroupStats]);
   const userSeries = useMemo(() => {
     if (!groupStats['count_unique(user)']) {
       return [];
@@ -142,29 +173,56 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
 
   const series = useMemo((): BarChartSeries[] => {
     const seriesData: BarChartSeries[] = [];
+    const translucentGray300 = Color(theme.gray300).alpha(0.3).string();
 
     if (visibleSeries === EventGraphSeries.USER) {
+      if (isUnfilteredStatsEnabled) {
+        seriesData.push({
+          seriesName: t('Total users'),
+          itemStyle: {
+            borderRadius: [2, 2, 0, 0],
+            borderColor: theme.translucentGray200,
+            color: translucentGray300,
+          },
+          barGap: '-100%', // Makes bars overlap completely
+          data: unfilteredUserSeries,
+          animation: false,
+        });
+      }
+
       seriesData.push({
-        seriesName: t('Users'),
+        seriesName: isUnfilteredStatsEnabled ? t('Matching users') : t('Users'),
         itemStyle: {
           borderRadius: [2, 2, 0, 0],
           borderColor: theme.translucentGray200,
           color: theme.purple200,
         },
-        stack: 'stats',
         data: userSeries,
         animation: false,
       });
     }
     if (visibleSeries === EventGraphSeries.EVENT) {
+      if (isUnfilteredStatsEnabled) {
+        seriesData.push({
+          seriesName: t('Total events'),
+          itemStyle: {
+            borderRadius: [2, 2, 0, 0],
+            borderColor: theme.translucentGray200,
+            color: translucentGray300,
+          },
+          barGap: '-100%', // Makes bars overlap completely
+          data: unfilteredEventSeries,
+          animation: false,
+        });
+      }
+
       seriesData.push({
-        seriesName: t('Events'),
+        seriesName: isUnfilteredStatsEnabled ? t('Matching events') : t('Events'),
         itemStyle: {
           borderRadius: [2, 2, 0, 0],
           borderColor: theme.translucentGray200,
-          color: theme.gray200,
+          color: isUnfilteredStatsEnabled ? theme.purple200 : translucentGray300,
         },
-        stack: 'stats',
         data: eventSeries,
         animation: false,
       });
@@ -174,7 +232,7 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
       seriesData.push(releaseSeries as BarChartSeries);
     }
 
-    if (flagSeries.markLine && hasFeatureFlagFeature) {
+    if (flagSeries.markLine && flagSeries.type === 'line') {
       seriesData.push(flagSeries as BarChartSeries);
     }
 
@@ -186,7 +244,9 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
     releaseSeries,
     flagSeries,
     theme,
-    hasFeatureFlagFeature,
+    isUnfilteredStatsEnabled,
+    unfilteredEventSeries,
+    unfilteredUserSeries,
   ]);
 
   const bucketSize = eventSeries ? getBucketSize(series) : undefined;
@@ -206,7 +266,7 @@ export function EventGraph({group, event, ...styleProps}: EventGraphProps) {
     show: true,
     top: 4,
     right: 8,
-    data: hasFeatureFlagFeature ? ['Feature Flags', 'Releases'] : ['Releases'],
+    data: flagSeries.type === 'line' ? ['Feature Flags', 'Releases'] : ['Releases'],
     selected: legendSelected,
     zlevel: 10,
     inactiveColor: theme.gray200,
diff --git a/static/app/views/issueDetails/streamline/eventList.tsx b/static/app/views/issueDetails/streamline/eventList.tsx
index cfad1dd915dfaf..0d413fdde1ec3b 100644
--- a/static/app/views/issueDetails/streamline/eventList.tsx
+++ b/static/app/views/issueDetails/streamline/eventList.tsx
@@ -9,6 +9,7 @@ import {
   GridHead,
   GridHeadCell,
   GridResizer,
+  GridRow,
 } from 'sentry/components/gridEditable/styles';
 import Panel from 'sentry/components/panels/panel';
 import {IconChevron} from 'sentry/icons';
@@ -23,7 +24,7 @@ import useOrganization from 'sentry/utils/useOrganization';
 import {useRoutes} from 'sentry/utils/useRoutes';
 import {useEventColumns} from 'sentry/views/issueDetails/allEventsTable';
 import {ALL_EVENTS_EXCLUDED_TAGS} from 'sentry/views/issueDetails/groupEvents';
-import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/useIssueDetailsDiscoverQuery';
+import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery';
 import EventsTable from 'sentry/views/performance/transactionSummary/transactionEvents/eventsTable';
 
 interface EventListProps {
@@ -116,7 +117,7 @@ export function EventList({group}: EventListProps) {
             <EventListHeader>
               <EventListTitle>{t('All Events')}</EventListTitle>
               <EventListHeaderItem>
-                {isPending
+                {isPending || pageEventsCount === 0
                   ? null
                   : tct('Showing [start]-[end] of [count] matching events', {
                       start: start.toLocaleString(),
@@ -170,10 +171,10 @@ export function EventList({group}: EventListProps) {
 
 const EventListHeader = styled('div')`
   display: grid;
-  grid-template-columns: 1fr auto auto auto;
+  grid-template-columns: 1fr auto auto;
   gap: ${space(1.5)};
   align-items: center;
-  padding: ${space(1)} ${space(2)};
+  padding: ${space(1)} ${space(1)} ${space(1)} ${space(1.5)};
   background: ${p => p.theme.background};
   border-bottom: 1px solid ${p => p.theme.translucentBorder};
   position: sticky;
@@ -232,6 +233,9 @@ const StreamlineEventsTable = styled('div')`
     &:last-child {
       border: 0;
     }
+    &:first-child {
+      padding-left: ${space(1.5)};
+    }
   }
 
   ${GridBodyCell} {
@@ -241,13 +245,19 @@ const StreamlineEventsTable = styled('div')`
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    a {
-      color: ${p => p.theme.textColor};
-    }
   }
-  a {
-    text-decoration: underline;
-    text-decoration-style: dotted;
-    text-decoration-color: ${p => p.theme.border};
+
+  ${GridRow} {
+    td:nth-child(2) {
+      padding-left: ${space(1.5)};
+    }
+
+    td:not(:nth-child(2)) {
+      a {
+        color: ${p => p.theme.textColor};
+        text-decoration: underline;
+        text-decoration-color: ${p => p.theme.border};
+      }
+    }
   }
 `;
diff --git a/static/app/views/issueDetails/streamline/eventNavigation.tsx b/static/app/views/issueDetails/streamline/eventNavigation.tsx
index b52253220ae484..b74a644b3a6e8a 100644
--- a/static/app/views/issueDetails/streamline/eventNavigation.tsx
+++ b/static/app/views/issueDetails/streamline/eventNavigation.tsx
@@ -15,6 +15,7 @@ import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
 import type {Group} from 'sentry/types/group';
 import {defined} from 'sentry/utils';
+import {trackAnalytics} from 'sentry/utils/analytics';
 import {SavedQueryDatasets} from 'sentry/utils/discover/types';
 import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
 import parseLinkHeader from 'sentry/utils/parseLinkHeader';
@@ -27,7 +28,7 @@ import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
 import {useGroupEventAttachments} from 'sentry/views/issueDetails/groupEventAttachments/useGroupEventAttachments';
-import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/useIssueDetailsDiscoverQuery';
+import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery';
 import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
 import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
 import {
@@ -170,6 +171,13 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
     }
   }, [query, params.eventId, defaultIssueEvent]);
 
+  const onTabChange = (tabKey: typeof selectedOption) => {
+    trackAnalytics('issue_details.event_navigation_selected', {
+      organization,
+      content: EventNavLabels[tabKey],
+    });
+  };
+
   const baseEventsPath = `/organizations/${organization.slug}/issues/${group.id}/events/`;
 
   const grayText = css`
@@ -188,6 +196,12 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
     <EventNavigationWrapper role="navigation">
       <LargeDropdownButtonWrapper>
         <DropdownMenu
+          onAction={key => {
+            trackAnalytics('issue_details.issue_content_selected', {
+              organization,
+              content: TabName[key],
+            });
+          }}
           items={[
             {
               key: Tab.DETAILS,
@@ -206,7 +220,12 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
               key: Tab.REPLAYS,
               label: (
                 <DropdownCountWrapper isCurrentTab={currentTab === Tab.REPLAYS}>
-                  {TabName[Tab.REPLAYS]} <ItemCount value={replaysCount} />
+                  {TabName[Tab.REPLAYS]}{' '}
+                  {replaysCount > 50 ? (
+                    <CustomItemCount>50+</CustomItemCount>
+                  ) : (
+                    <ItemCount value={replaysCount} />
+                  )}
                 </DropdownCountWrapper>
               ),
               textValue: TabName[Tab.REPLAYS],
@@ -249,7 +268,7 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
             },
           ]}
           offset={[-2, 1]}
-          trigger={triggerProps =>
+          trigger={(triggerProps, isOpen) =>
             hideDropdownButton ? (
               <NavigationLabel>
                 {TabName[currentTab] ?? TabName[Tab.DETAILS]}
@@ -257,11 +276,14 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
             ) : (
               <NavigationDropdownButton
                 {...triggerProps}
+                isOpen={isOpen}
                 borderless
                 size="sm"
                 disabled={hideDropdownButton}
                 aria-label={t('Select issue content')}
                 aria-description={TabName[currentTab]}
+                analyticsEventName="Issue Details: Issue Content Dropdown Opened"
+                analyticsEventKey="issue_details.issue_content_dropdown_opened"
               >
                 {TabName[currentTab] ?? TabName[Tab.DETAILS]}
               </NavigationDropdownButton>
@@ -282,6 +304,8 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
                     size="xs"
                     icon={<IconChevron direction="left" />}
                     disabled={!defined(event.previousEventID)}
+                    analyticsEventKey="issue_details.previous_event_clicked"
+                    analyticsEventName="Issue Details: Previous Event Clicked"
                     to={{
                       pathname: `${baseEventsPath}${event.previousEventID}/`,
                       query: {...location.query, referrer: 'previous-event'},
@@ -304,6 +328,8 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
                     size="xs"
                     icon={<IconChevron direction="right" />}
                     disabled={!defined(event.nextEventID)}
+                    analyticsEventKey="issue_details.next_event_clicked"
+                    analyticsEventName="Issue Details: Next Event Clicked"
                     to={{
                       pathname: `${baseEventsPath}${event.nextEventID}/`,
                       query: {...location.query, referrer: 'next-event'},
@@ -320,7 +346,7 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
                   />
                 </Tooltip>
               </Navigation>
-              <Tabs value={selectedOption} disableOverflow>
+              <Tabs value={selectedOption} disableOverflow onChange={onTabChange}>
                 <TabList hideBorder variant="floating">
                   {EventNavOrder.map(label => {
                     const eventPath =
@@ -352,6 +378,8 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
                 query: location.query,
               }}
               size="xs"
+              analyticsEventKey="issue_details.all_events_clicked"
+              analyticsEventName="Issue Details: All Events Clicked"
             >
               {t('All Events')}
             </LinkButton>
@@ -364,6 +392,8 @@ export function IssueEventNavigation({event, group, query}: IssueEventNavigation
                 aria-label={t('Open in Discover')}
                 size="xs"
                 icon={<IconTelescope />}
+                analyticsEventKey="issue_details.discover_clicked"
+                analyticsEventName="Issue Details: Discover Clicked"
               >
                 {t('Discover')}
               </LinkButton>
@@ -444,6 +474,7 @@ const DropdownCountWrapper = styled('div')<{isCurrentTab: boolean}>`
   align-items: center;
   justify-content: space-between;
   gap: ${space(3)};
+  font-variant-numeric: tabular-nums;
   font-weight: ${p =>
     p.isCurrentTab ? p.theme.fontWeightBold : p.theme.fontWeightNormal};
 `;
diff --git a/static/app/views/issueDetails/streamline/eventTitle.tsx b/static/app/views/issueDetails/streamline/eventTitle.tsx
index ad969a07cde136..f44e638faa6136 100644
--- a/static/app/views/issueDetails/streamline/eventTitle.tsx
+++ b/static/app/views/issueDetails/streamline/eventTitle.tsx
@@ -8,7 +8,6 @@ import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import {useActionableItems} from 'sentry/components/events/interfaces/crashContent/exception/useActionableItems';
 import {ScrollCarousel} from 'sentry/components/scrollCarousel';
 import TimeSince from 'sentry/components/timeSince';
-import {Tooltip} from 'sentry/components/tooltip';
 import {IconWarning} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
@@ -47,13 +46,14 @@ type EventNavigationProps = {
 const sectionLabels = {
   [SectionKey.HIGHLIGHTS]: t('Highlights'),
   [SectionKey.STACKTRACE]: t('Stack Trace'),
-  [SectionKey.TRACE]: t('Trace'),
   [SectionKey.EXCEPTION]: t('Stack Trace'),
+  [SectionKey.THREADS]: t('Stack Trace'),
+  [SectionKey.REPLAY]: t('Replay'),
   [SectionKey.BREADCRUMBS]: t('Breadcrumbs'),
+  [SectionKey.TRACE]: t('Trace'),
   [SectionKey.TAGS]: t('Tags'),
   [SectionKey.CONTEXTS]: t('Context'),
   [SectionKey.USER_FEEDBACK]: t('User Feedback'),
-  [SectionKey.REPLAY]: t('Replay'),
   [SectionKey.FEATURE_FLAGS]: t('Flags'),
 };
 
@@ -118,51 +118,41 @@ export const EventTitle = forwardRef<HTMLDivElement, EventNavigationProps>(
       <div {...props} ref={ref}>
         <EventInfoJumpToWrapper>
           <EventInfo>
-            <EventIdInfo>
-              <DropdownMenu
-                trigger={(triggerProps, isOpen) => (
-                  // Tooltip split from button to prevent re-opening w/ focus event on close
-                  <Tooltip
-                    title={event.id}
-                    delay={500}
-                    overlayStyle={{maxWidth: 'max-content'}}
-                    disabled={isOpen}
-                  >
-                    <DropdownButton
-                      {...triggerProps}
-                      aria-label={t('Event actions')}
-                      size="zero"
-                      borderless
-                      isOpen={isOpen}
-                    >
-                      {getShortEventId(event.id)}
-                    </DropdownButton>
-                  </Tooltip>
-                )}
-                position="bottom"
-                size="xs"
-                items={[
-                  {
-                    key: 'copy-event-id',
-                    label: t('Copy Event ID'),
-                    onAction: copyEventId,
-                  },
-                  {
-                    key: 'copy-event-link',
-                    label: t('Copy Event Link'),
-                    onAction: copyLink,
-                  },
-                  {
-                    key: 'view-json',
-                    label: t('View JSON'),
-                    onAction: downloadJson,
-                  },
-                ]}
-              />
-            </EventIdInfo>
+            <DropdownMenu
+              trigger={(triggerProps, isOpen) => (
+                <EventIdDropdownButton
+                  {...triggerProps}
+                  aria-label={t('Event actions')}
+                  size="sm"
+                  borderless
+                  isOpen={isOpen}
+                >
+                  {getShortEventId(event.id)}
+                </EventIdDropdownButton>
+              )}
+              position="bottom"
+              size="xs"
+              items={[
+                {
+                  key: 'copy-event-id',
+                  label: t('Copy Event ID'),
+                  onAction: copyEventId,
+                },
+                {
+                  key: 'copy-event-link',
+                  label: t('Copy Event Link'),
+                  onAction: copyLink,
+                },
+                {
+                  key: 'view-json',
+                  label: t('View JSON'),
+                  onAction: downloadJson,
+                },
+              ]}
+            />
             <StyledTimeSince
               tooltipBody={<EventCreatedTooltip event={event} />}
-              tooltipProps={{overlayStyle: {maxWidth: 300}}}
+              tooltipProps={{maxWidth: 300}}
               date={event.dateCreated ?? event.dateReceived}
               css={grayText}
               aria-label={t('Event timestamp')}
@@ -236,6 +226,9 @@ function EventNavigationLink({
       borderless
       size="xs"
       css={propCss}
+      analyticsEventName="Issue Details: Jump To Clicked"
+      analyticsEventKey="issue_details.jump_to_clicked"
+      analyticsParams={{section: config.key}}
     >
       {sectionLabels[config.key]}
     </LinkButton>
@@ -254,18 +247,22 @@ const EventInfoJumpToWrapper = styled('div')`
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
-  padding: ${space(1)} ${space(2)};
+  padding: 0 ${space(2)} 0 ${space(0.5)};
   flex-wrap: wrap;
   min-height: ${MIN_NAV_HEIGHT}px;
   @media (min-width: ${p => p.theme.breakpoints.small}) {
     flex-wrap: nowrap;
   }
-  box-shadow: ${p => p.theme.translucentBorder} 0 1px;
+  border-bottom: 1px solid ${p => p.theme.translucentBorder};
+`;
+
+const EventIdDropdownButton = styled(DropdownButton)`
+  padding-right: ${space(0.5)};
 `;
 
 const EventInfo = styled('div')`
   display: flex;
-  gap: ${space(1)};
+  gap: ${space(0.5)};
   flex-direction: row;
   align-items: center;
   line-height: 1.2;
@@ -285,13 +282,6 @@ const JumpTo = styled('div')`
   }
 `;
 
-const EventIdInfo = styled('span')`
-  display: flex;
-  align-items: center;
-  gap: ${space(0.25)};
-  line-height: 1.2;
-`;
-
 const ProcessingErrorButton = styled(Button)`
   color: ${p => p.theme.red300};
   font-weight: ${p => p.theme.fontWeightNormal};
diff --git a/static/app/views/issueDetails/streamline/foldSection.tsx b/static/app/views/issueDetails/streamline/foldSection.tsx
index 7ce924fb597191..17a64e129b403d 100644
--- a/static/app/views/issueDetails/streamline/foldSection.tsx
+++ b/static/app/views/issueDetails/streamline/foldSection.tsx
@@ -184,7 +184,8 @@ const SectionExpander = styled('div')<{preventCollapse: boolean}>`
   display: grid;
   grid-template-columns: 1fr auto;
   align-items: center;
-  padding: ${space(1)} ${space(0.75)};
+  padding: ${space(0.5)} ${space(1.5)};
+  margin: 0 -${space(0.75)};
   border-radius: ${p => p.theme.borderRadius};
   cursor: ${p => (p.preventCollapse ? 'initial' : 'pointer')};
   position: relative;
diff --git a/static/app/views/issueDetails/streamline/groupDetailsLayout.spec.tsx b/static/app/views/issueDetails/streamline/groupDetailsLayout.spec.tsx
index 77fab90de0d700..70f4e3913347a4 100644
--- a/static/app/views/issueDetails/streamline/groupDetailsLayout.spec.tsx
+++ b/static/app/views/issueDetails/streamline/groupDetailsLayout.spec.tsx
@@ -8,7 +8,6 @@ import {TagsFixture} from 'sentry-fixture/tags';
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {ReprocessingStatus} from 'sentry/views/issueDetails/utils';
 
 import {GroupDetailsLayout} from './groupDetailsLayout';
 
@@ -21,6 +20,10 @@ describe('GroupDetailsLayout', () => {
   beforeEach(() => {
     ProjectsStore.init();
     ProjectsStore.loadInitialData([project]);
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/flags/logs/',
+      body: {data: []},
+    });
     MockApiClient.addMockResponse({
       url: `/organizations/${organization.slug}/issues/${group.id}/`,
       method: 'GET',
@@ -89,12 +92,7 @@ describe('GroupDetailsLayout', () => {
 
   it('renders children, can collapse sidebar', async () => {
     render(
-      <GroupDetailsLayout
-        group={group}
-        event={event}
-        project={project}
-        groupReprocessingStatus={ReprocessingStatus.NO_STATUS}
-      >
+      <GroupDetailsLayout group={group} event={event} project={project}>
         <div data-test-id="children" />
       </GroupDetailsLayout>
     );
diff --git a/static/app/views/issueDetails/streamline/groupDetailsLayout.tsx b/static/app/views/issueDetails/streamline/groupDetailsLayout.tsx
index 84c3d3fa98568b..5c819d1292cea3 100644
--- a/static/app/views/issueDetails/streamline/groupDetailsLayout.tsx
+++ b/static/app/views/issueDetails/streamline/groupDetailsLayout.tsx
@@ -13,16 +13,15 @@ import {useSyncedLocalStorageState} from 'sentry/utils/useSyncedLocalStorageStat
 import {EventDetailsHeader} from 'sentry/views/issueDetails/streamline/eventDetailsHeader';
 import {IssueEventNavigation} from 'sentry/views/issueDetails/streamline/eventNavigation';
 import {useEventQuery} from 'sentry/views/issueDetails/streamline/eventSearch';
-import StreamlinedGroupHeader from 'sentry/views/issueDetails/streamline/header';
-import StreamlinedSidebar from 'sentry/views/issueDetails/streamline/sidebar';
-import {ToggleSidebar} from 'sentry/views/issueDetails/streamline/toggleSidebar';
-import type {ReprocessingStatus} from 'sentry/views/issueDetails/utils';
+import StreamlinedGroupHeader from 'sentry/views/issueDetails/streamline/header/header';
+import StreamlinedSidebar from 'sentry/views/issueDetails/streamline/sidebar/sidebar';
+import {ToggleSidebar} from 'sentry/views/issueDetails/streamline/sidebar/toggleSidebar';
+import {getGroupReprocessingStatus} from 'sentry/views/issueDetails/utils';
 
 interface GroupDetailsLayoutProps {
   children: React.ReactNode;
   event: Event | undefined;
   group: Group;
-  groupReprocessingStatus: ReprocessingStatus;
   project: Project;
 }
 
@@ -30,7 +29,6 @@ export function GroupDetailsLayout({
   group,
   event,
   project,
-  groupReprocessingStatus,
   children,
 }: GroupDetailsLayoutProps) {
   const searchQuery = useEventQuery({group});
@@ -38,6 +36,7 @@ export function GroupDetailsLayout({
   const isScreenSmall = useMedia(`(max-width: ${theme.breakpoints.large})`);
   const shouldDisplaySidebar = sidebarOpen || isScreenSmall;
   const issueTypeConfig = getConfigForIssueType(group, group.project);
+  const groupReprocessingStatus = getGroupReprocessingStatus(group);
 
   return (
     <Fragment>
diff --git a/static/app/views/issueDetails/streamline/assigneeSelector.spec.tsx b/static/app/views/issueDetails/streamline/header/assigneeSelector.spec.tsx
similarity index 92%
rename from static/app/views/issueDetails/streamline/assigneeSelector.spec.tsx
rename to static/app/views/issueDetails/streamline/header/assigneeSelector.spec.tsx
index 526c1732621382..d5e7cd1d719b34 100644
--- a/static/app/views/issueDetails/streamline/assigneeSelector.spec.tsx
+++ b/static/app/views/issueDetails/streamline/header/assigneeSelector.spec.tsx
@@ -11,8 +11,7 @@ import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import type {EventOwners} from 'sentry/components/group/assignedTo';
 import MemberListStore from 'sentry/stores/memberListStore';
 import type {Committer} from 'sentry/types/integrations';
-
-import {GroupHeaderAssigneeSelector} from './assigneeSelector';
+import {GroupHeaderAssigneeSelector} from 'sentry/views/issueDetails/streamline/header/assigneeSelector';
 
 describe('GroupHeaderAssigneeSelector', () => {
   const organization = OrganizationFixture();
@@ -59,5 +58,6 @@ describe('GroupHeaderAssigneeSelector', () => {
 
     expect(screen.getByText(ownerActor.name)).toBeInTheDocument();
     expect(screen.getByText('Codeowners:/issues')).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'Ownership'})).toBeInTheDocument();
   });
 });
diff --git a/static/app/views/issueDetails/streamline/assigneeSelector.tsx b/static/app/views/issueDetails/streamline/header/assigneeSelector.tsx
similarity index 74%
rename from static/app/views/issueDetails/streamline/assigneeSelector.tsx
rename to static/app/views/issueDetails/streamline/header/assigneeSelector.tsx
index 11f87096633349..0594eba3ed1e6f 100644
--- a/static/app/views/issueDetails/streamline/assigneeSelector.tsx
+++ b/static/app/views/issueDetails/streamline/header/assigneeSelector.tsx
@@ -1,11 +1,15 @@
 import {useEffect} from 'react';
 
 import {fetchOrgMembers} from 'sentry/actionCreators/members';
+import {openIssueOwnershipRuleModal} from 'sentry/actionCreators/modal';
+import {Button} from 'sentry/components/button';
 import {getOwnerList} from 'sentry/components/group/assignedTo';
 import {
   AssigneeSelector,
   useHandleAssigneeChange,
 } from 'sentry/components/group/assigneeSelector';
+import {IconSettings} from 'sentry/icons';
+import {t} from 'sentry/locale';
 import type {Event} from 'sentry/types/event';
 import type {Group} from 'sentry/types/group';
 import type {Project} from 'sentry/types/project';
@@ -58,6 +62,23 @@ export function GroupHeaderAssigneeSelector({
       owners={owners}
       assigneeLoading={assigneeLoading}
       handleAssigneeChange={handleAssigneeChange}
+      additionalMenuFooterItems={
+        <Button
+          type="button"
+          onClick={() => {
+            openIssueOwnershipRuleModal({
+              project,
+              organization,
+              issueId: group.id,
+              eventData: event!,
+            });
+          }}
+          icon={<IconSettings />}
+          size="xs"
+        >
+          {t('Ownership')}
+        </Button>
+      }
     />
   );
 }
diff --git a/static/app/views/issueDetails/streamline/attachmentsBadge.spec.tsx b/static/app/views/issueDetails/streamline/header/attachmentsBadge.spec.tsx
similarity index 100%
rename from static/app/views/issueDetails/streamline/attachmentsBadge.spec.tsx
rename to static/app/views/issueDetails/streamline/header/attachmentsBadge.spec.tsx
diff --git a/static/app/views/issueDetails/streamline/attachmentsBadge.tsx b/static/app/views/issueDetails/streamline/header/attachmentsBadge.tsx
similarity index 100%
rename from static/app/views/issueDetails/streamline/attachmentsBadge.tsx
rename to static/app/views/issueDetails/streamline/header/attachmentsBadge.tsx
diff --git a/static/app/views/issueDetails/streamline/header.spec.tsx b/static/app/views/issueDetails/streamline/header/header.spec.tsx
similarity index 88%
rename from static/app/views/issueDetails/streamline/header.spec.tsx
rename to static/app/views/issueDetails/streamline/header/header.spec.tsx
index 7f57fe59a5ff33..c019cab67ef27a 100644
--- a/static/app/views/issueDetails/streamline/header.spec.tsx
+++ b/static/app/views/issueDetails/streamline/header/header.spec.tsx
@@ -9,7 +9,7 @@ import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import {IssueCategory} from 'sentry/types/group';
 import {formatAbbreviatedNumber} from 'sentry/utils/formatters';
-import StreamlinedGroupHeader from 'sentry/views/issueDetails/streamline/header';
+import StreamlinedGroupHeader from 'sentry/views/issueDetails/streamline/header/header';
 import {ReprocessingStatus} from 'sentry/views/issueDetails/utils';
 
 describe('StreamlinedGroupHeader', () => {
@@ -111,5 +111,24 @@ describe('StreamlinedGroupHeader', () => {
         await screen.findByRole('button', {name: 'Switch to the old issue experience'})
       ).toBeInTheDocument();
     });
+
+    it('displays share icon if issue has been shared', async () => {
+      render(
+        <StreamlinedGroupHeader
+          {...defaultProps}
+          group={{...group, isPublic: true, shareId: 'abc123'}}
+          project={project}
+          event={null}
+        />,
+        {
+          organization,
+          router,
+        }
+      );
+
+      expect(
+        await screen.findByRole('button', {name: 'View issue share settings'})
+      ).toBeInTheDocument();
+    });
   });
 });
diff --git a/static/app/views/issueDetails/streamline/header.tsx b/static/app/views/issueDetails/streamline/header/header.tsx
similarity index 73%
rename from static/app/views/issueDetails/streamline/header.tsx
rename to static/app/views/issueDetails/streamline/header/header.tsx
index 20984e1da98d52..88c5310e08facb 100644
--- a/static/app/views/issueDetails/streamline/header.tsx
+++ b/static/app/views/issueDetails/streamline/header/header.tsx
@@ -2,32 +2,39 @@ import {Fragment} from 'react';
 import styled from '@emotion/styled';
 import Color from 'color';
 
+import {openModal} from 'sentry/actionCreators/modal';
 import GuideAnchor from 'sentry/components/assistant/guideAnchor';
 import {Breadcrumbs} from 'sentry/components/breadcrumbs';
+import {Button, LinkButton} from 'sentry/components/button';
+import ButtonBar from 'sentry/components/buttonBar';
 import {Flex} from 'sentry/components/container/flex';
 import Count from 'sentry/components/count';
 import ErrorLevel from 'sentry/components/events/errorLevel';
 import {getBadgeProperties} from 'sentry/components/group/inboxBadges/statusBadge';
 import UnhandledTag from 'sentry/components/group/inboxBadges/unhandledTag';
+import ExternalLink from 'sentry/components/links/externalLink';
 import Link from 'sentry/components/links/link';
 import {Tooltip} from 'sentry/components/tooltip';
-import {t} from 'sentry/locale';
+import {IconGlobe, IconQuestion} from 'sentry/icons';
+import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
 import type {Group} from 'sentry/types/group';
 import type {Project} from 'sentry/types/project';
+import {trackAnalytics} from 'sentry/utils/analytics';
 import {getMessage, getTitle} from 'sentry/utils/events';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import GroupActions from 'sentry/views/issueDetails/actions/index';
 import {NewIssueExperienceButton} from 'sentry/views/issueDetails/actions/newIssueExperienceButton';
+import ShareIssueModal, {getShareUrl} from 'sentry/views/issueDetails/actions/shareModal';
 import {Divider} from 'sentry/views/issueDetails/divider';
 import GroupPriority from 'sentry/views/issueDetails/groupPriority';
 import {ShortIdBreadcrumb} from 'sentry/views/issueDetails/shortIdBreadcrumb';
-import {GroupHeaderAssigneeSelector} from 'sentry/views/issueDetails/streamline/assigneeSelector';
-import {AttachmentsBadge} from 'sentry/views/issueDetails/streamline/attachmentsBadge';
-import {ReplayBadge} from 'sentry/views/issueDetails/streamline/replayBadge';
-import {UserFeedbackBadge} from 'sentry/views/issueDetails/streamline/userFeedbackBadge';
+import {GroupHeaderAssigneeSelector} from 'sentry/views/issueDetails/streamline/header/assigneeSelector';
+import {AttachmentsBadge} from 'sentry/views/issueDetails/streamline/header/attachmentsBadge';
+import {ReplayBadge} from 'sentry/views/issueDetails/streamline/header/replayBadge';
+import {UserFeedbackBadge} from 'sentry/views/issueDetails/streamline/header/userFeedbackBadge';
 import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
 import {ReprocessingStatus} from 'sentry/views/issueDetails/utils';
 
@@ -58,32 +65,79 @@ export default function StreamlinedGroupHeader({
   ].includes(groupReprocessingStatus);
 
   const statusProps = getBadgeProperties(group.status, group.substatus);
+  const shareUrl = group?.shareId ? getShareUrl(group) : null;
 
   return (
     <Fragment>
       <Header>
         <Flex justify="space-between">
-          <Breadcrumbs
-            crumbs={[
-              {
-                label: 'Issues',
-                to: {
-                  pathname: `/organizations/${organization.slug}/issues/`,
-                  query,
+          <Flex align="center">
+            <Breadcrumbs
+              crumbs={[
+                {
+                  label: 'Issues',
+                  to: {
+                    pathname: `/organizations/${organization.slug}/issues/`,
+                    query,
+                  },
                 },
-              },
-              {
-                label: (
-                  <ShortIdBreadcrumb
-                    organization={organization}
-                    project={project}
-                    group={group}
+                {
+                  label: (
+                    <ShortIdBreadcrumb
+                      organization={organization}
+                      project={project}
+                      group={group}
+                    />
+                  ),
+                },
+              ]}
+            />
+            {group.isPublic && shareUrl ? (
+              <Button
+                size="xs"
+                borderless
+                aria-label={t('View issue share settings')}
+                title={tct('This issue has been shared [link:with a public link].', {
+                  link: <ExternalLink href={shareUrl} />,
+                })}
+                tooltipProps={{isHoverable: true}}
+                icon={
+                  <IconGlobe
+                    size="xs"
+                    color="subText"
+                    onClick={() =>
+                      openModal(modalProps => (
+                        <ShareIssueModal
+                          {...modalProps}
+                          organization={organization}
+                          projectSlug={group.project.slug}
+                          groupId={group.id}
+                          onToggle={() =>
+                            trackAnalytics('issue.shared_publicly', {
+                              organization,
+                            })
+                          }
+                        />
+                      ))
+                    }
                   />
-                ),
-              },
-            ]}
-          />
-          <NewIssueExperienceButton />
+                }
+              />
+            ) : null}
+          </Flex>
+          <ButtonBar gap={0.5}>
+            <LinkButton
+              size="xs"
+              external
+              title={t('Learn more about the new UI')}
+              aria-label={t('Learn more about the new UI')}
+              href={`https://sentry.zendesk.com/hc/en-us/articles/30882241712795`}
+              icon={<IconQuestion />}
+              analyticsEventKey="issue_details.streamline_ui_learn_more"
+              analyticsEventName="Issue Details: Streamline UI Learn More"
+            />
+            <NewIssueExperienceButton />
+          </ButtonBar>
         </Flex>
         <HeaderGrid>
           <Flex gap={space(0.75)} align="baseline">
diff --git a/static/app/views/issueDetails/streamline/replayBadge.tsx b/static/app/views/issueDetails/streamline/header/replayBadge.tsx
similarity index 93%
rename from static/app/views/issueDetails/streamline/replayBadge.tsx
rename to static/app/views/issueDetails/streamline/header/replayBadge.tsx
index 304fb65c761c89..c87c02e6d54f6e 100644
--- a/static/app/views/issueDetails/streamline/replayBadge.tsx
+++ b/static/app/views/issueDetails/streamline/header/replayBadge.tsx
@@ -41,7 +41,9 @@ export function ReplayBadge({group, project}: {group: Group; project: Project})
         }}
         aria-label={t("View this issue's replays")}
       >
-        {tn('%s Replay', '%s Replays', replaysCount)}
+        {replaysCount > 50
+          ? t('50+ Replays')
+          : tn('%s Replay', '%s Replays', replaysCount)}
       </ReplayButton>
     </Fragment>
   );
diff --git a/static/app/views/issueDetails/streamline/userFeedbackBadge.tsx b/static/app/views/issueDetails/streamline/header/userFeedbackBadge.tsx
similarity index 100%
rename from static/app/views/issueDetails/streamline/userFeedbackBadge.tsx
rename to static/app/views/issueDetails/streamline/header/userFeedbackBadge.tsx
diff --git a/static/app/views/issueDetails/streamline/hooks/useAiConfig.tsx b/static/app/views/issueDetails/streamline/hooks/useAiConfig.tsx
new file mode 100644
index 00000000000000..78c3a2ea7abfe9
--- /dev/null
+++ b/static/app/views/issueDetails/streamline/hooks/useAiConfig.tsx
@@ -0,0 +1,75 @@
+import {useAutofixSetup} from 'sentry/components/events/autofix/useAutofixSetup';
+import {EntryType, type Event} from 'sentry/types/event';
+import type {Group} from 'sentry/types/group';
+import type {Project} from 'sentry/types/project';
+import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
+import {getRegionDataFromOrganization} from 'sentry/utils/regions';
+import useOrganization from 'sentry/utils/useOrganization';
+import {useIsSampleEvent} from 'sentry/views/issueDetails/utils';
+
+// Autofix requires the event to have stack trace frames in order to work correctly.
+export function hasStacktraceWithFrames(event: Event) {
+  for (const entry of event.entries) {
+    if (entry.type === EntryType.EXCEPTION) {
+      if (entry.data.values?.some(value => value.stacktrace?.frames?.length)) {
+        return true;
+      }
+    }
+
+    if (entry.type === EntryType.THREADS) {
+      if (entry.data.values?.some(thread => thread.stacktrace?.frames?.length)) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+export const useAiConfig = (
+  group: Group,
+  event: Event | undefined | null,
+  project: Project
+) => {
+  const organization = useOrganization();
+  const {data: autofixSetupData, isPending: isAutofixSetupLoading} = useAutofixSetup({
+    groupId: group.id,
+  });
+
+  const isSampleError = useIsSampleEvent();
+  const hasStacktrace = event && hasStacktraceWithFrames(event);
+
+  const issueTypeConfig = getConfigForIssueType(group, project);
+
+  const areAiFeaturesAllowed =
+    !organization.hideAiFeatures &&
+    getRegionDataFromOrganization(organization)?.name !== 'de';
+
+  const isSummaryEnabled = issueTypeConfig.issueSummary.enabled;
+  const isAutofixEnabled = issueTypeConfig.autofix;
+  const hasResources = issueTypeConfig.resources;
+
+  const hasGenAIConsent = autofixSetupData?.genAIConsent.ok ?? organization.genAIConsent;
+
+  const hasSummary = hasGenAIConsent && isSummaryEnabled && areAiFeaturesAllowed;
+  const hasAutofix =
+    isAutofixEnabled && areAiFeaturesAllowed && hasStacktrace && !isSampleError;
+
+  const needsGenAIConsent =
+    !hasGenAIConsent && (isSummaryEnabled || isAutofixEnabled) && areAiFeaturesAllowed;
+
+  const needsAutofixSetup =
+    isAutofixEnabled &&
+    !isAutofixSetupLoading &&
+    (!autofixSetupData?.genAIConsent.ok || !autofixSetupData?.integration.ok) &&
+    areAiFeaturesAllowed;
+
+  return {
+    hasSummary,
+    hasAutofix,
+    needsGenAIConsent,
+    needsAutofixSetup,
+    hasResources,
+    isAutofixSetupLoading,
+  };
+};
diff --git a/static/app/views/issueDetails/streamline/useFlagSeries.tsx b/static/app/views/issueDetails/streamline/hooks/useFlagSeries.tsx
similarity index 81%
rename from static/app/views/issueDetails/streamline/useFlagSeries.tsx
rename to static/app/views/issueDetails/streamline/hooks/useFlagSeries.tsx
index ff3378f1bd3569..095c6661cc3a51 100644
--- a/static/app/views/issueDetails/streamline/useFlagSeries.tsx
+++ b/static/app/views/issueDetails/streamline/hooks/useFlagSeries.tsx
@@ -8,7 +8,7 @@ import {getFormattedDate} from 'sentry/utils/dates';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {hydrateToFlagSeries} from 'sentry/views/issueDetails/streamline/featureFlagUtils';
-import {useOrganizationFlagLog} from 'sentry/views/issueDetails/streamline/useOrganizationFlagLog';
+import {useOrganizationFlagLog} from 'sentry/views/issueDetails/streamline/hooks/useOrganizationFlagLog';
 
 interface FlagSeriesProps {
   event: Event | undefined;
@@ -25,7 +25,7 @@ export default function useFlagSeries({query = {}, event}: FlagSeriesProps) {
   } = useOrganizationFlagLog({organization, query});
   const {selection} = usePageFilters();
 
-  if (!rawFlagData || isError || isPending) {
+  if (!rawFlagData || !rawFlagData.data.length || isError || isPending) {
     return {
       seriesName: t('Feature Flags'),
       markLine: {},
@@ -34,7 +34,7 @@ export default function useFlagSeries({query = {}, event}: FlagSeriesProps) {
   }
 
   const hydratedFlagData = hydrateToFlagSeries(rawFlagData);
-  const evaluatedFlagNames = event?.contexts.flags?.values.map(f => f.flag);
+  const evaluatedFlagNames = event?.contexts?.flags?.values?.map(f => f.flag);
   const intersectionFlags = hydratedFlagData.filter(f =>
     evaluatedFlagNames?.includes(f.name)
   );
@@ -57,6 +57,13 @@ export default function useFlagSeries({query = {}, event}: FlagSeriesProps) {
         const time = getFormattedDate(data.xAxis, 'MMM D, YYYY LT z', {
           local: !selection.datetime.utc,
         });
+
+        const eventIsBefore = moment(event?.dateCreated).isBefore(moment(time));
+        const formattedDate = moment(time).from(event?.dateCreated, true);
+        const suffix = eventIsBefore
+          ? t(' (%s after this event)', formattedDate)
+          : t(' (%s before this event)', formattedDate);
+
         return [
           '<div class="tooltip-series">',
           `<div><span class="tooltip-label"><strong>${t(
@@ -66,8 +73,7 @@ export default function useFlagSeries({query = {}, event}: FlagSeriesProps) {
           '</div>',
           '<div class="tooltip-footer">',
           time,
-          event?.dateCreated &&
-            ` (${moment(time).from(event.dateCreated, true)} ${t('before this event')})`,
+          event?.dateCreated && suffix,
           '</div>',
           '<div class="tooltip-arrow"></div>',
         ].join('');
diff --git a/static/app/views/issueDetails/streamline/hooks/useIssueActivityDrawer.tsx b/static/app/views/issueDetails/streamline/hooks/useIssueActivityDrawer.tsx
new file mode 100644
index 00000000000000..59138ed5d7ab27
--- /dev/null
+++ b/static/app/views/issueDetails/streamline/hooks/useIssueActivityDrawer.tsx
@@ -0,0 +1,41 @@
+import {useCallback} from 'react';
+
+import useDrawer from 'sentry/components/globalDrawer';
+import {t} from 'sentry/locale';
+import type {Group} from 'sentry/types/group';
+import type {Project} from 'sentry/types/project';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import {ActivityDrawer} from 'sentry/views/issueDetails/streamline/sidebar/activityDrawer';
+import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
+
+interface UseIssueActivityDrawerProps {
+  group: Group;
+  project: Project;
+}
+
+export function useIssueActivityDrawer({group, project}: UseIssueActivityDrawerProps) {
+  const {openDrawer} = useDrawer();
+  const {baseUrl} = useGroupDetailsRoute();
+  const navigate = useNavigate();
+  const location = useLocation();
+
+  const openIssueActivityDrawer = useCallback(() => {
+    openDrawer(() => <ActivityDrawer group={group} project={project} />, {
+      ariaLabel: t('Issue Activity'),
+      shouldCloseOnInteractOutside: () => false,
+      onClose: () => {
+        navigate(
+          {
+            pathname: baseUrl,
+            query: location.query,
+          },
+          {replace: true}
+        );
+      },
+      transitionProps: {stiffness: 1000},
+    });
+  }, [openDrawer, baseUrl, navigate, location.query, group, project]);
+
+  return {openIssueActivityDrawer};
+}
diff --git a/static/app/views/issueDetails/streamline/useIssueDetailsDiscoverQuery.tsx b/static/app/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery.tsx
similarity index 100%
rename from static/app/views/issueDetails/streamline/useIssueDetailsDiscoverQuery.tsx
rename to static/app/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery.tsx
diff --git a/static/app/views/issueDetails/streamline/useMergedIssuesDrawer.tsx b/static/app/views/issueDetails/streamline/hooks/useMergedIssuesDrawer.tsx
similarity index 100%
rename from static/app/views/issueDetails/streamline/useMergedIssuesDrawer.tsx
rename to static/app/views/issueDetails/streamline/hooks/useMergedIssuesDrawer.tsx
diff --git a/static/app/views/issueDetails/streamline/useOrganizationFlagLog.tsx b/static/app/views/issueDetails/streamline/hooks/useOrganizationFlagLog.tsx
similarity index 87%
rename from static/app/views/issueDetails/streamline/useOrganizationFlagLog.tsx
rename to static/app/views/issueDetails/streamline/hooks/useOrganizationFlagLog.tsx
index 84316017512cd8..c5f13cac9b3b0b 100644
--- a/static/app/views/issueDetails/streamline/useOrganizationFlagLog.tsx
+++ b/static/app/views/issueDetails/streamline/hooks/useOrganizationFlagLog.tsx
@@ -13,7 +13,6 @@ export function useOrganizationFlagLog({
     [`/organizations/${organization.slug}/flags/logs/`, {query}],
     {
       staleTime: 0,
-      enabled: organization.features.includes('feature-flag-ui'),
     }
   );
 }
diff --git a/static/app/views/issueDetails/streamline/useReleaseMarkLineSeries.tsx b/static/app/views/issueDetails/streamline/hooks/useReleaseMarkLineSeries.tsx
similarity index 98%
rename from static/app/views/issueDetails/streamline/useReleaseMarkLineSeries.tsx
rename to static/app/views/issueDetails/streamline/hooks/useReleaseMarkLineSeries.tsx
index fa5805bfaf2c56..db48353a518d18 100644
--- a/static/app/views/issueDetails/streamline/useReleaseMarkLineSeries.tsx
+++ b/static/app/views/issueDetails/streamline/hooks/useReleaseMarkLineSeries.tsx
@@ -9,7 +9,7 @@ import {useApiQuery} from 'sentry/utils/queryClient';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {formatVersion} from 'sentry/utils/versions/formatVersion';
-import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/useIssueDetailsDiscoverQuery';
+import {useIssueDetailsEventView} from 'sentry/views/issueDetails/streamline/hooks/useIssueDetailsDiscoverQuery';
 
 interface ReleaseStat {
   date: string;
diff --git a/static/app/views/issueDetails/streamline/useSimilarIssuesDrawer.tsx b/static/app/views/issueDetails/streamline/hooks/useSimilarIssuesDrawer.tsx
similarity index 100%
rename from static/app/views/issueDetails/streamline/useSimilarIssuesDrawer.tsx
rename to static/app/views/issueDetails/streamline/hooks/useSimilarIssuesDrawer.tsx
diff --git a/static/app/views/issueDetails/streamline/useSuspectFlags.tsx b/static/app/views/issueDetails/streamline/hooks/useSuspectFlags.tsx
similarity index 94%
rename from static/app/views/issueDetails/streamline/useSuspectFlags.tsx
rename to static/app/views/issueDetails/streamline/hooks/useSuspectFlags.tsx
index 1fbefcd2f19093..28b7c791c30c41 100644
--- a/static/app/views/issueDetails/streamline/useSuspectFlags.tsx
+++ b/static/app/views/issueDetails/streamline/hooks/useSuspectFlags.tsx
@@ -28,7 +28,7 @@ export default function useSuspectFlags({
 
   // map flag data to arrays of flag names
   const auditLogFlagNames = hydratedFlagData.map(f => f.name);
-  const evaluatedFlagNames = event?.contexts.flags?.values.map(f => f.flag);
+  const evaluatedFlagNames = event?.contexts?.flags?.values?.map(f => f.flag);
   const intersectionFlags = useMemo(
     () => intersection(auditLogFlagNames, evaluatedFlagNames),
     [auditLogFlagNames, evaluatedFlagNames]
@@ -63,9 +63,7 @@ export default function useSuspectFlags({
     {
       staleTime: 0,
       // if no intersection, then there are no suspect flags
-      enabled: Boolean(
-        organization.features.includes('feature-flag-ui') && intersectionFlags.length
-      ),
+      enabled: Boolean(intersectionFlags.length),
     }
   );
 
diff --git a/static/app/views/issueDetails/streamline/sidebar/activityDrawer.tsx b/static/app/views/issueDetails/streamline/sidebar/activityDrawer.tsx
new file mode 100644
index 00000000000000..5884f93bd92f21
--- /dev/null
+++ b/static/app/views/issueDetails/streamline/sidebar/activityDrawer.tsx
@@ -0,0 +1,48 @@
+import ProjectAvatar from 'sentry/components/avatar/projectAvatar';
+import {
+  CrumbContainer,
+  EventDrawerBody,
+  EventDrawerContainer,
+  EventDrawerHeader,
+  EventNavigator,
+  Header,
+  NavigationCrumbs,
+  ShortId,
+} from 'sentry/components/events/eventDrawer';
+import {t} from 'sentry/locale';
+import type {Group} from 'sentry/types/group';
+import type {Project} from 'sentry/types/project';
+import StreamlinedActivitySection from 'sentry/views/issueDetails/streamline/sidebar/activitySection';
+
+interface ActivityDrawerProps {
+  group: Group;
+  project: Project;
+}
+
+export function ActivityDrawer({group, project}: ActivityDrawerProps) {
+  return (
+    <EventDrawerContainer>
+      <EventDrawerHeader>
+        <NavigationCrumbs
+          crumbs={[
+            {
+              label: (
+                <CrumbContainer>
+                  <ProjectAvatar project={project} />
+                  <ShortId>{group.shortId}</ShortId>
+                </CrumbContainer>
+              ),
+            },
+            {label: t('Activity')},
+          ]}
+        />
+      </EventDrawerHeader>
+      <EventNavigator>
+        <Header>{t('Activity')}</Header>
+      </EventNavigator>
+      <EventDrawerBody>
+        <StreamlinedActivitySection group={group} isDrawer />
+      </EventDrawerBody>
+    </EventDrawerContainer>
+  );
+}
diff --git a/static/app/views/issueDetails/streamline/activitySection.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/activitySection.spec.tsx
similarity index 66%
rename from static/app/views/issueDetails/streamline/activitySection.spec.tsx
rename to static/app/views/issueDetails/streamline/sidebar/activitySection.spec.tsx
index b3cc4fc73b7404..07aebcfa91abed 100644
--- a/static/app/views/issueDetails/streamline/activitySection.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/activitySection.spec.tsx
@@ -9,12 +9,13 @@ import {
   userEvent,
 } from 'sentry-test/reactTestingLibrary';
 
+import * as indicators from 'sentry/actionCreators/indicator';
 import ConfigStore from 'sentry/stores/configStore';
 import GroupStore from 'sentry/stores/groupStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
 import type {GroupActivity} from 'sentry/types/group';
 import {GroupActivityType} from 'sentry/types/group';
-import StreamlinedActivitySection from 'sentry/views/issueDetails/streamline/activitySection';
+import StreamlinedActivitySection from 'sentry/views/issueDetails/streamline/sidebar/activitySection';
 
 describe('StreamlinedActivitySection', function () {
   const project = ProjectFixture();
@@ -130,6 +131,55 @@ describe('StreamlinedActivitySection', function () {
     expect(screen.queryByText('Test Note')).not.toBeInTheDocument();
   });
 
+  it('renders note and allows for edit', async function () {
+    jest.spyOn(indicators, 'addSuccessMessage');
+
+    const editGroup = GroupFixture({
+      id: '1123',
+      activity: [
+        {
+          type: GroupActivityType.NOTE,
+          id: 'note-1',
+          data: {text: 'Group Test'},
+          dateCreated: '2020-01-01T00:00:00',
+          user: user,
+          project,
+        },
+      ],
+      project,
+    });
+    const editMock = MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/issues/1123/comments/note-1/',
+      method: 'PUT',
+      body: {
+        id: 'note-1',
+        data: {text: 'Group Test Updated'},
+      },
+    });
+
+    render(<StreamlinedActivitySection group={editGroup} />);
+    expect(await screen.findByText('Group Test')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button', {name: 'Comment Actions'}));
+    await userEvent.click(screen.getByRole('menuitemradio', {name: 'Edit'}));
+
+    await userEvent.type(screen.getByRole('textbox', {name: 'Edit comment'}), ' Updated');
+    await userEvent.click(screen.getByRole('button', {name: 'Cancel'}));
+
+    expect(editMock).not.toHaveBeenCalled();
+
+    expect(await screen.findByText('Group Test')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button', {name: 'Comment Actions'}));
+    await userEvent.click(screen.getByRole('menuitemradio', {name: 'Edit'}));
+
+    await userEvent.type(screen.getByRole('textbox', {name: 'Edit comment'}), ' Updated');
+    await userEvent.click(screen.getByRole('button', {name: 'Save comment'}));
+
+    expect(editMock).toHaveBeenCalledTimes(1);
+    expect(indicators.addSuccessMessage).toHaveBeenCalledWith('Comment updated');
+  });
+
   it('renders note but does not allow for deletion if written by someone else', async function () {
     const updatedActivityGroup = GroupFixture({
       id: '1338',
@@ -172,11 +222,35 @@ describe('StreamlinedActivitySection', function () {
 
     render(<StreamlinedActivitySection group={updatedActivityGroup} />);
     expect(await screen.findByText('Test Note 1')).toBeInTheDocument();
-    expect(await screen.findByText('Test Note 7')).toBeInTheDocument();
-    expect(screen.queryByText('Test Note 6')).not.toBeInTheDocument();
-    expect(await screen.findByText('4 activities hidden')).toBeInTheDocument();
+    expect(await screen.findByText('Test Note 3')).toBeInTheDocument();
+    expect(screen.queryByText('Test Note 7')).not.toBeInTheDocument();
+    expect(await screen.findByText('View 4 more')).toBeInTheDocument();
+  });
+
+  it('does not collapse activity when rendered in the drawer', function () {
+    const activities: GroupActivity[] = Array.from({length: 7}, (_, index) => ({
+      type: GroupActivityType.NOTE,
+      id: `note-${index + 1}`,
+      data: {text: `Test Note ${index + 1}`},
+      dateCreated: '2020-01-01T00:00:00',
+      user: UserFixture({id: '2'}),
+      project,
+    }));
+
+    const updatedActivityGroup = GroupFixture({
+      id: '1338',
+      activity: activities,
+      project,
+    });
+
+    render(<StreamlinedActivitySection group={updatedActivityGroup} isDrawer />);
+
+    for (const activity of activities) {
+      expect(
+        screen.getByText((activity.data as {text: string}).text)
+      ).toBeInTheDocument();
+    }
 
-    await userEvent.click(await screen.findByRole('button', {name: 'Show all activity'}));
-    expect(await screen.findByText('Test Note 6')).toBeInTheDocument();
+    expect(screen.queryByRole('button')).not.toBeInTheDocument();
   });
 });
diff --git a/static/app/views/issueDetails/streamline/activitySection.tsx b/static/app/views/issueDetails/streamline/sidebar/activitySection.tsx
similarity index 61%
rename from static/app/views/issueDetails/streamline/activitySection.tsx
rename to static/app/views/issueDetails/streamline/sidebar/activitySection.tsx
index 41b4470d1b6f78..041cd0f4a348c0 100644
--- a/static/app/views/issueDetails/streamline/activitySection.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/activitySection.tsx
@@ -4,7 +4,7 @@ import styled from '@emotion/styled';
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {NoteBody} from 'sentry/components/activity/note/body';
 import {NoteInputWithStorage} from 'sentry/components/activity/note/inputWithStorage';
-import {Button} from 'sentry/components/button';
+import {LinkButton} from 'sentry/components/button';
 import {Flex} from 'sentry/components/container/flex';
 import useMutateActivity from 'sentry/components/feedback/useMutateActivity';
 import Timeline from 'sentry/components/timeline';
@@ -16,37 +16,43 @@ import GroupStore from 'sentry/stores/groupStore';
 import {space} from 'sentry/styles/space';
 import textStyles from 'sentry/styles/text';
 import type {NoteType} from 'sentry/types/alerts';
-import type {Group, GroupActivity} from 'sentry/types/group';
+import type {Group, GroupActivity, GroupActivityNote} from 'sentry/types/group';
 import {GroupActivityType} from 'sentry/types/group';
 import type {Team} from 'sentry/types/organization';
 import type {User} from 'sentry/types/user';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {uniqueId} from 'sentry/utils/guid';
+import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useTeamsById} from 'sentry/utils/useTeamsById';
 import {useUser} from 'sentry/utils/useUser';
-import {groupActivityTypeIconMapping} from 'sentry/views/issueDetails/streamline/groupActivityIcons';
-import getGroupActivityItem from 'sentry/views/issueDetails/streamline/groupActivityItem';
-import {NoteDropdown} from 'sentry/views/issueDetails/streamline/noteDropdown';
-import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar';
+import {groupActivityTypeIconMapping} from 'sentry/views/issueDetails/streamline/sidebar/groupActivityIcons';
+import getGroupActivityItem from 'sentry/views/issueDetails/streamline/sidebar/groupActivityItem';
+import {NoteDropdown} from 'sentry/views/issueDetails/streamline/sidebar/noteDropdown';
+import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar/sidebar';
+import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
+import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
 
 function TimelineItem({
   item,
   handleDelete,
+  handleUpdate,
   group,
   teams,
 }: {
   group: Group;
   handleDelete: (item: GroupActivity) => void;
+  handleUpdate: (item: GroupActivity, n: NoteType) => void;
   item: GroupActivity;
   teams: Team[];
 }) {
   const organization = useOrganization();
+  const [editing, setEditing] = useState(false);
   const authorName = item.user ? item.user.name : 'Sentry';
   const {title, message} = getGroupActivityItem(
     item,
     organization,
-    group.project.id,
+    group.project,
     <strong>{authorName}</strong>,
     teams
   );
@@ -60,11 +66,15 @@ function TimelineItem({
     <ActivityTimelineItem
       title={
         <Flex gap={space(0.5)} align="center" justify="flex-start">
-          <TitleTooltip title={title} showOnlyOnOverflow skipWrapper>
+          <TitleTooltip title={title} showOnlyOnOverflow>
             {title}
           </TitleTooltip>
-          {item.type === GroupActivityType.NOTE && (
-            <TitleDropdown onDelete={() => handleDelete(item)} user={item.user} />
+          {item.type === GroupActivityType.NOTE && !editing && (
+            <TitleDropdown
+              onDelete={() => handleDelete(item)}
+              onEdit={() => setEditing(true)}
+              user={item.user}
+            />
           )}
         </Flex>
       }
@@ -79,7 +89,20 @@ function TimelineItem({
         )
       }
     >
-      {typeof message === 'string' ? (
+      {item.type === GroupActivityType.NOTE && editing ? (
+        <NoteInputWithStorage
+          itemKey={item.id}
+          storageKey={`groupinput:${item.id}`}
+          source="issue-details"
+          text={item.data.text}
+          noteId={item.id}
+          onUpdate={n => {
+            handleUpdate(item, n);
+            setEditing(false);
+          }}
+          onCancel={() => setEditing(false)}
+        />
+      ) : typeof message === 'string' ? (
         <NoteWrapper>
           <NoteBody text={message} />
         </NoteWrapper>
@@ -90,12 +113,24 @@ function TimelineItem({
   );
 }
 
-export default function StreamlinedActivitySection({group}: {group: Group}) {
+interface StreamlinedActivitySectionProps {
+  group: Group;
+  /**
+   * Whether the activity section is being rendered in the activity drawer.
+   * Disables collapse feature, and hides headers
+   */
+  isDrawer?: boolean;
+}
+
+export default function StreamlinedActivitySection({
+  group,
+  isDrawer,
+}: StreamlinedActivitySectionProps) {
   const organization = useOrganization();
   const {teams} = useTeamsById();
-  const [showAll, setShowAll] = useState(false);
-
-  const [inputId, setInputId] = useState(uniqueId());
+  const {baseUrl} = useGroupDetailsRoute();
+  const location = useLocation();
+  const [inputId, setInputId] = useState(() => uniqueId());
 
   const activeUser = useUser();
   const projectSlugs = group?.project ? [group.project.slug] : [];
@@ -128,7 +163,10 @@ export default function StreamlinedActivitySection({group}: {group: Group}) {
             addErrorMessage(t('Failed to delete comment'));
           },
           onSuccess: () => {
-            trackAnalytics('issue_details.comment_deleted', {organization});
+            trackAnalytics('issue_details.comment_deleted', {
+              organization,
+              streamline: true,
+            });
             addSuccessMessage(t('Comment removed'));
           },
         }
@@ -137,6 +175,26 @@ export default function StreamlinedActivitySection({group}: {group: Group}) {
     [group.activity, mutators, group.id, organization]
   );
 
+  const handleUpdate = useCallback(
+    (item: GroupActivity, n: NoteType) => {
+      mutators.handleUpdate(n, item.id, group.activity, {
+        onError: () => {
+          addErrorMessage(t('Unable to update comment'));
+        },
+        onSuccess: data => {
+          const d = data as GroupActivityNote;
+          GroupStore.updateActivity(group.id, data.id, {text: d.data.text});
+          addSuccessMessage(t('Comment updated'));
+          trackAnalytics('issue_details.comment_updated', {
+            organization,
+            streamline: true,
+          });
+        },
+      });
+    },
+    [group.activity, mutators, group.id, organization]
+  );
+
   const handleCreate = useCallback(
     (n: NoteType, _me: User) => {
       mutators.handleCreate(n, group.activity, {
@@ -148,7 +206,10 @@ export default function StreamlinedActivitySection({group}: {group: Group}) {
         },
         onSuccess: data => {
           GroupStore.addActivity(group.id, data);
-          trackAnalytics('issue_details.comment_created', {organization});
+          trackAnalytics('issue_details.comment_created', {
+            organization,
+            streamline: true,
+          });
           addSuccessMessage(t('Comment posted'));
         },
       });
@@ -158,21 +219,30 @@ export default function StreamlinedActivitySection({group}: {group: Group}) {
 
   return (
     <div>
-      <Flex justify="space-between" align="center">
-        <SidebarSectionTitle>{t('Activity')}</SidebarSectionTitle>
-        {showAll && (
-          <TextButton
+      {!isDrawer && (
+        <Flex justify="space-between" align="center">
+          <SidebarSectionTitle>{t('Activity')}</SidebarSectionTitle>
+          <TextLinkButton
             borderless
             size="zero"
-            onClick={() => setShowAll(false)}
-            analyticsEventKey="issue_details.activity_collapsed"
-            analyticsEventName="Issue Details: Activity Collapsed"
-            analyticsParams={{num_activities: group.activity.length}}
+            aria-label={t('Open activity drawer')}
+            to={{
+              pathname: `${baseUrl}${TabPaths[Tab.ACTIVITY]}`,
+              query: {
+                ...location.query,
+                cursor: undefined,
+              },
+            }}
+            analyticsEventKey="issue_details.activity_drawer_opened"
+            analyticsEventName="Issue Details: Activity Drawer Opened"
+            analyticsParams={{
+              num_activities: group.activity.length,
+            }}
           >
-            {t('Collapse')}
-          </TextButton>
-        )}
-      </Flex>
+            {t('View')}
+          </TextLinkButton>
+        </Flex>
+      )}
       <Timeline.Container>
         <NoteInputWithStorage
           key={inputId}
@@ -185,25 +255,27 @@ export default function StreamlinedActivitySection({group}: {group: Group}) {
           source="issue-details"
           {...noteProps}
         />
-        {(group.activity.length < 5 || showAll) &&
+        {(group.activity.length < 5 || isDrawer) &&
           group.activity.map(item => {
             return (
               <TimelineItem
                 item={item}
                 handleDelete={handleDelete}
+                handleUpdate={handleUpdate}
                 group={group}
                 teams={teams}
                 key={item.id}
               />
             );
           })}
-        {!showAll && group.activity.length >= 5 && (
+        {!isDrawer && group.activity.length >= 5 && (
           <Fragment>
-            {group.activity.slice(0, 2).map(item => {
+            {group.activity.slice(0, 3).map(item => {
               return (
                 <TimelineItem
                   item={item}
                   handleDelete={handleDelete}
+                  handleUpdate={handleUpdate}
                   group={group}
                   teams={teams}
                   key={item.id}
@@ -212,29 +284,27 @@ export default function StreamlinedActivitySection({group}: {group: Group}) {
             })}
             <ActivityTimelineItem
               title={
-                <TextButton
-                  aria-label={t('Show all activity')}
-                  onClick={() => setShowAll(true)}
-                  borderless
-                  size="zero"
+                <LinkButton
+                  aria-label={t('View all activity')}
+                  to={{
+                    pathname: `${baseUrl}${TabPaths[Tab.ACTIVITY]}`,
+                    query: {
+                      ...location.query,
+                      cursor: undefined,
+                    },
+                  }}
+                  size="xs"
                   analyticsEventKey="issue_details.activity_expanded"
                   analyticsEventName="Issue Details: Activity Expanded"
                   analyticsParams={{
                     num_activities_hidden: group.activity.length - 3,
                   }}
                 >
-                  {t('%s activities hidden', group.activity.length - 3)}
-                </TextButton>
+                  {t('View %s more', group.activity.length - 3)}
+                </LinkButton>
               }
               icon={<RotatedEllipsisIcon direction={'up'} />}
             />
-            <TimelineItem
-              item={group.activity[group.activity.length - 1]}
-              handleDelete={handleDelete}
-              group={group}
-              teams={teams}
-              key={group.activity[group.activity.length - 1].id}
-            />
           </Fragment>
         )}
       </Timeline.Container>
@@ -263,7 +333,7 @@ const Timestamp = styled(TimeSince)`
   white-space: nowrap;
 `;
 
-const TextButton = styled(Button)`
+const TextLinkButton = styled(LinkButton)`
   font-weight: ${p => p.theme.fontWeightNormal};
   font-size: ${p => p.theme.fontSizeSmall};
   color: ${p => p.theme.subText};
diff --git a/static/app/components/group/externalIssuesList/streamlinedExternalIssueList.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/externalIssueList.spec.tsx
similarity index 90%
rename from static/app/components/group/externalIssuesList/streamlinedExternalIssueList.spec.tsx
rename to static/app/views/issueDetails/streamline/sidebar/externalIssueList.spec.tsx
index 0c3a0755c188eb..2192881426171b 100644
--- a/static/app/components/group/externalIssuesList/streamlinedExternalIssueList.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/externalIssueList.spec.tsx
@@ -13,9 +13,9 @@ import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrar
 import SentryAppComponentsStore from 'sentry/stores/sentryAppComponentsStore';
 import SentryAppInstallationStore from 'sentry/stores/sentryAppInstallationsStore';
 
-import {StreamlinedExternalIssueList} from './streamlinedExternalIssueList';
+import {ExternalIssueList} from './externalIssueList';
 
-describe('StreamlinedExternalIssueList', () => {
+describe('ExternalIssueList', () => {
   const organization = OrganizationFixture();
   const event = EventFixture();
   const group = GroupFixture();
@@ -57,9 +57,7 @@ describe('StreamlinedExternalIssueList', () => {
       method: 'DELETE',
     });
 
-    render(
-      <StreamlinedExternalIssueList event={event} group={group} project={project} />
-    );
+    render(<ExternalIssueList event={event} group={group} project={project} />);
 
     expect(await screen.findByRole('button', {name: issueKey})).toBeInTheDocument();
     await userEvent.hover(screen.getByRole('button', {name: issueKey}));
@@ -121,19 +119,17 @@ describe('StreamlinedExternalIssueList', () => {
       }),
     ]);
 
-    render(
-      <StreamlinedExternalIssueList event={event} group={group} project={project} />
-    );
+    render(<ExternalIssueList event={event} group={group} project={project} />);
 
     expect(
-      await screen.findByRole('button', {name: 'Clickup Issue'})
+      await screen.findByRole('button', {name: 'ClickUp: hello#1'})
     ).toBeInTheDocument();
-    await userEvent.hover(screen.getByRole('button', {name: 'Clickup Issue'}));
+    await userEvent.hover(screen.getByRole('button', {name: 'ClickUp: hello#1'}));
     await userEvent.click(await screen.findByRole('button', {name: 'Unlink issue'}));
 
     await waitFor(() => {
       expect(
-        screen.queryByRole('button', {name: 'Clickup Issue'})
+        screen.queryByRole('button', {name: 'ClickUp: hello#1'})
       ).not.toBeInTheDocument();
     });
     expect(unlinkMock).toHaveBeenCalledTimes(1);
@@ -162,9 +158,7 @@ describe('StreamlinedExternalIssueList', () => {
       ],
     });
 
-    render(
-      <StreamlinedExternalIssueList event={event} group={group} project={project} />
-    );
+    render(<ExternalIssueList event={event} group={group} project={project} />);
 
     expect(await screen.findByRole('button', {name: 'GitHub'})).toBeInTheDocument();
     await userEvent.click(await screen.findByRole('button', {name: 'GitHub'}));
@@ -188,9 +182,7 @@ describe('StreamlinedExternalIssueList', () => {
       body: [],
     });
 
-    render(
-      <StreamlinedExternalIssueList event={event} group={group} project={project} />
-    );
+    render(<ExternalIssueList event={event} group={group} project={project} />);
 
     expect(
       await screen.findByText('Track this issue in Jira, GitHub, etc.')
@@ -223,9 +215,7 @@ describe('StreamlinedExternalIssueList', () => {
       ],
     });
 
-    render(
-      <StreamlinedExternalIssueList event={event} group={group} project={project} />
-    );
+    render(<ExternalIssueList event={event} group={group} project={project} />);
 
     expect(await screen.findByRole('button', {name: 'Jira'})).toBeInTheDocument();
     await userEvent.click(await screen.findByRole('button', {name: 'Jira'}));
diff --git a/static/app/components/group/externalIssuesList/streamlinedExternalIssueList.tsx b/static/app/views/issueDetails/streamline/sidebar/externalIssueList.tsx
similarity index 57%
rename from static/app/components/group/externalIssuesList/streamlinedExternalIssueList.tsx
rename to static/app/views/issueDetails/streamline/sidebar/externalIssueList.tsx
index 058d0d9d73059a..75d56f76166961 100644
--- a/static/app/components/group/externalIssuesList/streamlinedExternalIssueList.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/externalIssueList.tsx
@@ -1,3 +1,4 @@
+import {Fragment} from 'react';
 import styled from '@emotion/styled';
 
 import AlertLink from 'sentry/components/alertLink';
@@ -6,6 +7,7 @@ import DropdownButton from 'sentry/components/dropdownButton';
 import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import ErrorBoundary from 'sentry/components/errorBoundary';
 import type {ExternalIssueAction} from 'sentry/components/group/externalIssuesList/hooks/types';
+import useGroupExternalIssues from 'sentry/components/group/externalIssuesList/hooks/useGroupExternalIssues';
 import Placeholder from 'sentry/components/placeholder';
 import * as SidebarSection from 'sentry/components/sidebarSection';
 import {Tooltip} from 'sentry/components/tooltip';
@@ -15,10 +17,7 @@ import type {Event} from 'sentry/types/event';
 import type {Group} from 'sentry/types/group';
 import type {Project} from 'sentry/types/project';
 import useOrganization from 'sentry/utils/useOrganization';
-import {Divider} from 'sentry/views/issueDetails/divider';
-import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar';
-
-import useStreamLinedExternalIssueData from './hooks/useGroupExternalIssues';
+import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar/sidebar';
 
 function getActionLabelAndTextValue({
   action,
@@ -55,19 +54,15 @@ function getActionLabelAndTextValue({
   };
 }
 
-interface StreamlinedExternalIssueListProps {
+interface ExternalIssueListProps {
   event: Event;
   group: Group;
   project: Project;
 }
 
-export function StreamlinedExternalIssueList({
-  group,
-  event,
-  project,
-}: StreamlinedExternalIssueListProps) {
+export function ExternalIssueList({group, event, project}: ExternalIssueListProps) {
   const organization = useOrganization();
-  const {isLoading, integrations, linkedIssues} = useStreamLinedExternalIssueData({
+  const {isLoading, integrations, linkedIssues} = useGroupExternalIssues({
     group,
     event,
     project,
@@ -89,83 +84,88 @@ export function StreamlinedExternalIssueList({
       <SidebarSectionTitle>{t('Issue Tracking')}</SidebarSectionTitle>
       <SidebarSection.Content>
         {integrations.length || linkedIssues.length ? (
-          <IssueActionWrapper>
-            {linkedIssues.map(linkedIssue => (
-              <ErrorBoundary key={linkedIssue.key} mini>
-                <Tooltip
-                  overlayStyle={{maxWidth: '400px'}}
-                  position="bottom"
-                  title={
-                    <LinkedIssueTooltipWrapper>
-                      <LinkedIssueName>{linkedIssue.title}</LinkedIssueName>
-                      <HorizontalSeparator />
-                      <UnlinkButton
-                        priority="link"
-                        size="zero"
-                        onClick={linkedIssue.onUnlink}
-                      >
-                        {t('Unlink issue')}
-                      </UnlinkButton>
-                    </LinkedIssueTooltipWrapper>
-                  }
-                  isHoverable
-                >
-                  <LinkedIssue
-                    href={linkedIssue.url}
-                    external
-                    size="zero"
-                    icon={linkedIssue.displayIcon}
+          <Fragment>
+            <IssueActionWrapper>
+              {linkedIssues.map(linkedIssue => (
+                <ErrorBoundary key={linkedIssue.key} mini>
+                  <Tooltip
+                    overlayStyle={{maxWidth: '400px'}}
+                    position="bottom"
+                    title={
+                      <LinkedIssueTooltipWrapper>
+                        <LinkedIssueName>{linkedIssue.title}</LinkedIssueName>
+                        <HorizontalSeparator />
+                        <UnlinkButton
+                          priority="link"
+                          size="zero"
+                          onClick={linkedIssue.onUnlink}
+                        >
+                          {t('Unlink issue')}
+                        </UnlinkButton>
+                      </LinkedIssueTooltipWrapper>
+                    }
+                    isHoverable
                   >
-                    <IssueActionName>{linkedIssue.displayName}</IssueActionName>
-                  </LinkedIssue>
-                </Tooltip>
-              </ErrorBoundary>
-            ))}
-            {integrations.length > 0 && linkedIssues.length > 0 ? <Divider /> : null}
-            {integrations.map(integration => {
-              const sharedButtonProps: ButtonProps = {
-                size: 'zero',
-                icon: integration.displayIcon,
-                children: <IssueActionName>{integration.displayName}</IssueActionName>,
-              };
-
-              if (integration.actions.length === 1) {
+                    <LinkedIssue
+                      href={linkedIssue.url}
+                      external
+                      size="zero"
+                      icon={linkedIssue.displayIcon}
+                    >
+                      <IssueActionName>{linkedIssue.displayName}</IssueActionName>
+                    </LinkedIssue>
+                  </Tooltip>
+                </ErrorBoundary>
+              ))}
+            </IssueActionWrapper>
+            <IssueActionWrapper>
+              {integrations.map(integration => {
+                const sharedButtonProps: ButtonProps = {
+                  size: 'zero',
+                  icon: integration.displayIcon,
+                  children: <IssueActionName>{integration.displayName}</IssueActionName>,
+                };
+
+                if (integration.actions.length === 1) {
+                  return (
+                    <ErrorBoundary key={integration.key} mini>
+                      <IssueActionButton
+                        {...sharedButtonProps}
+                        disabled={integration.disabled}
+                        title={
+                          integration.disabled ? integration.disabledText : undefined
+                        }
+                        onClick={integration.actions[0].onClick}
+                      />
+                    </ErrorBoundary>
+                  );
+                }
+
                 return (
                   <ErrorBoundary key={integration.key} mini>
-                    <IssueActionButton
-                      {...sharedButtonProps}
-                      disabled={integration.disabled}
-                      title={integration.disabled ? integration.disabledText : undefined}
-                      onClick={integration.actions[0].onClick}
+                    <DropdownMenu
+                      trigger={triggerProps => (
+                        <IssueActionDropdownMenu
+                          {...sharedButtonProps}
+                          {...triggerProps}
+                          showChevron={false}
+                        />
+                      )}
+                      items={integration.actions.map(action => ({
+                        key: action.id,
+                        ...getActionLabelAndTextValue({
+                          action,
+                          integrationDisplayName: integration.displayName,
+                        }),
+                        onAction: action.onClick,
+                        disabled: integration.disabled,
+                      }))}
                     />
                   </ErrorBoundary>
                 );
-              }
-
-              return (
-                <ErrorBoundary key={integration.key} mini>
-                  <DropdownMenu
-                    trigger={triggerProps => (
-                      <IssueActionDropdownMenu
-                        {...sharedButtonProps}
-                        {...triggerProps}
-                        showChevron={false}
-                      />
-                    )}
-                    items={integration.actions.map(action => ({
-                      key: action.id,
-                      ...getActionLabelAndTextValue({
-                        action,
-                        integrationDisplayName: integration.displayName,
-                      }),
-                      onAction: action.onClick,
-                      disabled: integration.disabled,
-                    }))}
-                  />
-                </ErrorBoundary>
-              );
-            })}
-          </IssueActionWrapper>
+              })}
+            </IssueActionWrapper>
+          </Fragment>
         ) : (
           <AlertLink
             priority="muted"
@@ -186,6 +186,9 @@ const IssueActionWrapper = styled('div')`
   flex-wrap: wrap;
   gap: ${space(1)};
   line-height: 1.2;
+  &:not(:last-child) {
+    margin-bottom: ${space(1)};
+  }
 `;
 
 const LinkedIssue = styled(LinkButton)`
diff --git a/static/app/views/issueDetails/streamline/firstLastSeenSection.tsx b/static/app/views/issueDetails/streamline/sidebar/firstLastSeenSection.tsx
similarity index 100%
rename from static/app/views/issueDetails/streamline/firstLastSeenSection.tsx
rename to static/app/views/issueDetails/streamline/sidebar/firstLastSeenSection.tsx
diff --git a/static/app/views/issueDetails/streamline/groupActivityIcons.tsx b/static/app/views/issueDetails/streamline/sidebar/groupActivityIcons.tsx
similarity index 97%
rename from static/app/views/issueDetails/streamline/groupActivityIcons.tsx
rename to static/app/views/issueDetails/streamline/sidebar/groupActivityIcons.tsx
index 41c083c6b97bf7..d7a6bf6c8bf818 100644
--- a/static/app/views/issueDetails/streamline/groupActivityIcons.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/groupActivityIcons.tsx
@@ -11,6 +11,7 @@ import {
   IconFlag,
   IconGithub,
   IconGitlab,
+  IconGlobe,
   IconGraph,
   IconJira,
   IconLock,
@@ -53,7 +54,7 @@ export const groupActivityTypeIconMapping: Record<
   },
   [GroupActivityType.SET_UNRESOLVED]: {Component: IconClose, defaultProps: {}},
   [GroupActivityType.SET_IGNORED]: {Component: IconMute, defaultProps: {}},
-  [GroupActivityType.SET_PUBLIC]: {Component: IconLock, defaultProps: {}},
+  [GroupActivityType.SET_PUBLIC]: {Component: IconGlobe, defaultProps: {}},
   [GroupActivityType.SET_PRIVATE]: {Component: IconLock, defaultProps: {locked: true}},
   [GroupActivityType.SET_REGRESSION]: {Component: IconFire, defaultProps: {}},
   [GroupActivityType.CREATE_ISSUE]: {
diff --git a/static/app/views/issueDetails/streamline/groupActivityItem.tsx b/static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx
similarity index 90%
rename from static/app/views/issueDetails/streamline/groupActivityItem.tsx
rename to static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx
index 526b5f6e725364..a33b875909eb0e 100644
--- a/static/app/views/issueDetails/streamline/groupActivityItem.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/groupActivityItem.tsx
@@ -9,6 +9,7 @@ import ExternalLink from 'sentry/components/links/externalLink';
 import Link from 'sentry/components/links/link';
 import PullRequestLink from 'sentry/components/pullRequestLink';
 import Version from 'sentry/components/version';
+import VersionHoverCard from 'sentry/components/versionHoverCard';
 import {t, tct, tn} from 'sentry/locale';
 import type {
   GroupActivity,
@@ -20,12 +21,13 @@ import {GroupActivityType} from 'sentry/types/group';
 import type {Organization, Team} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import type {User} from 'sentry/types/user';
+import useOrganization from 'sentry/utils/useOrganization';
 import {isSemverRelease} from 'sentry/utils/versions/isSemverRelease';
 
 export default function getGroupActivityItem(
   activity: GroupActivity,
   organization: Organization,
-  projectId: Project['id'],
+  project: Project,
   author: React.ReactNode,
   teams: Team[]
 ) {
@@ -289,15 +291,7 @@ export default function getGroupActivityItem(
             title: t('Resolved'),
             message: tct('by [author] in releases greater than [version] [semver]', {
               author,
-              version: (
-                <ReleaseWrapper>
-                  <Version
-                    version={currentVersion}
-                    projectId={projectId}
-                    tooltipRawVersion
-                  />
-                </ReleaseWrapper>
-              ),
+              version: <ActivityRelease project={project} version={currentVersion} />,
               semver: isSemverRelease(currentVersion) ? t('(semver)') : t('(non-semver)'),
             }),
           };
@@ -308,11 +302,7 @@ export default function getGroupActivityItem(
           message: version
             ? tct('by [author] in [version] [semver]', {
                 author,
-                version: (
-                  <ReleaseWrapper>
-                    <Version version={version} projectId={projectId} tooltipRawVersion />
-                  </ReleaseWrapper>
-                ),
+                version: <ActivityRelease project={project} version={version} />,
                 semver: isSemverRelease(version) ? t('(semver)') : t('(non-semver)'),
               })
             : tct('by [author] in the upcoming release', {
@@ -340,13 +330,10 @@ export default function getGroupActivityItem(
                   />
                 ),
                 release: (
-                  <ReleaseWrapper>
-                    <Version
-                      version={deployedReleases[0].version}
-                      projectId={projectId}
-                      tooltipRawVersion
-                    />
-                  </ReleaseWrapper>
+                  <ActivityRelease
+                    project={project}
+                    version={deployedReleases[0].version}
+                  />
                 ),
               }
             ),
@@ -368,13 +355,10 @@ export default function getGroupActivityItem(
                   />
                 ),
                 release: (
-                  <ReleaseWrapper>
-                    <Version
-                      version={deployedReleases[0].version}
-                      projectId={projectId}
-                      tooltipRawVersion
-                    />
-                  </ReleaseWrapper>
+                  <ActivityRelease
+                    project={project}
+                    version={deployedReleases[0].version}
+                  />
                 ),
               }
             ),
@@ -478,22 +462,13 @@ export default function getGroupActivityItem(
                 '[regressionVersion] is greater than or equal to [resolvedVersion] compared via [comparison]',
                 {
                   regressionVersion: (
-                    <ReleaseWrapper>
-                      <Version
-                        version={data.version}
-                        projectId={projectId}
-                        tooltipRawVersion
-                      />
-                    </ReleaseWrapper>
+                    <ActivityRelease project={project} version={data.version} />
                   ),
                   resolvedVersion: (
-                    <ReleaseWrapper>
-                      <Version
-                        version={data.resolved_in_version}
-                        projectId={projectId}
-                        tooltipRawVersion
-                      />
-                    </ReleaseWrapper>
+                    <ActivityRelease
+                      project={project}
+                      version={data.resolved_in_version}
+                    />
                   ),
                   comparison: data.follows_semver ? t('semver') : t('release date'),
                 }
@@ -507,15 +482,7 @@ export default function getGroupActivityItem(
           message: data.version
             ? tct('by [author] in [version]. [subtext]', {
                 author,
-                version: (
-                  <ReleaseWrapper>
-                    <Version
-                      version={data.version}
-                      projectId={projectId}
-                      tooltipRawVersion
-                    />
-                  </ReleaseWrapper>
-                ),
+                version: <ActivityRelease project={project} version={data.version} />,
                 subtext,
               })
             : tct('by [author]', {
@@ -573,8 +540,8 @@ export default function getGroupActivityItem(
         return {
           title: t('Unmerged'),
           message: tn(
-            '%1$s fingerprint to %3$s by %2$s',
-            '%1$s fingerprints to %3$s by %2$s',
+            '%1$s fingerprint from %3$s by %2$s',
+            '%1$s fingerprints from %3$s by %2$s',
             fingerprints.length,
             author,
             source ? (
@@ -694,6 +661,19 @@ export default function getGroupActivityItem(
   return renderContent();
 }
 
+function ActivityRelease({project, version}: {project: Project; version: string}) {
+  const organization = useOrganization();
+  return (
+    <VersionHoverCard
+      organization={organization}
+      projectSlug={project.slug}
+      releaseVersion={version}
+    >
+      <ReleaseVersion version={version} projectId={project.id} />
+    </VersionHoverCard>
+  );
+}
+
 const Subtext = styled('div')`
   font-size: ${p => p.theme.fontSizeSmall};
 `;
@@ -707,10 +687,7 @@ const StyledRuleSpan = styled('span')`
   font-family: ${p => p.theme.text.familyMono};
 `;
 
-const ReleaseWrapper = styled('span')`
-  a {
-    color: ${p => p.theme.gray300};
-    text-decoration: underline;
-    text-decoration-style: dotted;
-  }
+const ReleaseVersion = styled(Version)`
+  color: ${p => p.theme.gray300};
+  text-decoration: underline;
 `;
diff --git a/static/app/views/issueDetails/streamline/sidebar/mergedSidebarSection.tsx b/static/app/views/issueDetails/streamline/sidebar/mergedSidebarSection.tsx
index 539cf147c49303..93e64de82ddcbc 100644
--- a/static/app/views/issueDetails/streamline/sidebar/mergedSidebarSection.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/mergedSidebarSection.tsx
@@ -4,7 +4,7 @@ import {LinkButton} from 'sentry/components/button';
 import {Flex} from 'sentry/components/container/flex';
 import {t} from 'sentry/locale';
 import {useLocation} from 'sentry/utils/useLocation';
-import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar';
+import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar/sidebar';
 import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
 import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
 
diff --git a/static/app/views/issueDetails/streamline/note.tsx b/static/app/views/issueDetails/streamline/sidebar/note.tsx
similarity index 89%
rename from static/app/views/issueDetails/streamline/note.tsx
rename to static/app/views/issueDetails/streamline/sidebar/note.tsx
index c9c512759a853f..5d89159aa9295c 100644
--- a/static/app/views/issueDetails/streamline/note.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/note.tsx
@@ -12,6 +12,7 @@ import type {
   Mentioned,
 } from 'sentry/components/activity/note/types';
 import {Button} from 'sentry/components/button';
+import ButtonBar from 'sentry/components/buttonBar';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {NoteType} from 'sentry/types/alerts';
@@ -26,6 +27,7 @@ type Props = {
    * you are editing an existing item
    */
   noteId?: string;
+  onCancel?: () => void;
   onChange?: (e: MentionChangeEvent, extra: {updating?: boolean}) => void;
   onCreate?: (data: NoteType) => void;
   onUpdate?: (data: NoteType) => void;
@@ -41,6 +43,7 @@ function StreamlinedNoteInput({
   onCreate,
   onChange,
   onUpdate,
+  onCancel,
   noteId,
   errorJSON,
   placeholder,
@@ -143,7 +146,7 @@ function StreamlinedNoteInput({
   return (
     <NoteInputForm data-test-id="note-input-form" noValidate onSubmit={handleSubmit}>
       <MentionsInput
-        aria-label={t('Add a comment')}
+        aria-label={existingItem ? t('Edit comment') : t('Add a comment')}
         aria-errormessage={errorMessage ? errorId : undefined}
         style={{
           ...mentionStyle({theme, minHeight: 14, streamlined: true}),
@@ -172,16 +175,23 @@ function StreamlinedNoteInput({
           appendSpaceOnAdd
         />
       </MentionsInput>
-      {isSubmitVisible && (
-        <Button
-          priority="primary"
-          size="xs"
-          disabled={!canSubmit}
-          aria-label={t('Submit comment')}
-          type="submit"
-        >
-          {t('Comment')}
-        </Button>
+      {(isSubmitVisible || existingItem) && (
+        <ButtonBar gap={0.5}>
+          {existingItem && (
+            <Button size="xs" onClick={onCancel}>
+              {t('Cancel')}
+            </Button>
+          )}
+          <Button
+            priority="primary"
+            size="xs"
+            disabled={!canSubmit}
+            aria-label={existingItem ? t('Save comment') : t('Submit comment')}
+            type="submit"
+          >
+            {existingItem ? t('Save') : t('Comment')}
+          </Button>
+        </ButtonBar>
       )}
     </NoteInputForm>
   );
diff --git a/static/app/views/issueDetails/streamline/noteDropdown.tsx b/static/app/views/issueDetails/streamline/sidebar/noteDropdown.tsx
similarity index 79%
rename from static/app/views/issueDetails/streamline/noteDropdown.tsx
rename to static/app/views/issueDetails/streamline/sidebar/noteDropdown.tsx
index ba512498d26cd6..eae7143a18f3ad 100644
--- a/static/app/views/issueDetails/streamline/noteDropdown.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/noteDropdown.tsx
@@ -7,10 +7,16 @@ import {useUser} from 'sentry/utils/useUser';
 
 type Props = {
   onDelete: () => void;
+  onEdit: () => void;
   user?: User | null;
 };
 
-function NoteDropdown({user, onDelete, ...props}: Props & Partial<DropdownMenuProps>) {
+function NoteDropdown({
+  user,
+  onDelete,
+  onEdit,
+  ...props
+}: Props & Partial<DropdownMenuProps>) {
   const activeUser = useUser();
   const canEdit = activeUser && (activeUser.isSuperuser || user?.id === activeUser.id);
 
@@ -30,6 +36,14 @@ function NoteDropdown({user, onDelete, ...props}: Props & Partial<DropdownMenuPr
         'aria-label': t('Comment Actions'),
       }}
       items={[
+        {
+          key: 'edit',
+          label: t('Edit'),
+          onAction: onEdit,
+          tooltip: activeUser.isSuperuser
+            ? t('You can edit this comment due to your superuser status')
+            : undefined,
+        },
         {
           key: 'delete',
           label: t('Remove'),
diff --git a/static/app/components/group/streamlinedParticipantList.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/participantList.spec.tsx
similarity index 63%
rename from static/app/components/group/streamlinedParticipantList.spec.tsx
rename to static/app/views/issueDetails/streamline/sidebar/participantList.spec.tsx
index 915f31e17a660f..b462c898bf7888 100644
--- a/static/app/components/group/streamlinedParticipantList.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/participantList.spec.tsx
@@ -3,12 +3,22 @@ import {UserFixture} from 'sentry-fixture/user';
 
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
-import ParticipantList from 'sentry/components/group/streamlinedParticipantList';
+import ParticipantList from 'sentry/views/issueDetails/streamline/sidebar/participantList';
 
 describe('ParticipantList', () => {
   const users = [
-    UserFixture({id: '1', name: 'John Doe', email: 'john.doe@example.com'}),
-    UserFixture({id: '2', name: 'Bob Alice', email: 'bob.alice@example.com'}),
+    UserFixture({
+      id: '1',
+      name: 'John Doe',
+      email: 'john.doe@example.com',
+      lastSeen: '2024-01-01T00:00:00.000Z',
+    }),
+    UserFixture({
+      id: '2',
+      name: 'Bob Alice',
+      email: 'bob.alice@example.com',
+      lastSeen: '2024-01-02T00:00:00.000Z',
+    }),
   ];
 
   const teams = [
@@ -47,4 +57,16 @@ describe('ParticipantList', () => {
     // Would find two elements if it was duplicated
     expect(await screen.findByText('john.doe@example.com')).toBeInTheDocument();
   });
+
+  it('displays information about last seen, if available', async () => {
+    render(<ParticipantList users={users} teams={teams} />);
+    await userEvent.click(screen.getByText('JD'), {skipHover: true});
+    expect(await screen.findByText('John Doe')).toBeInTheDocument();
+    expect(await screen.findByText('Jan 1, 2024 12:00 AM')).toBeInTheDocument();
+    expect(await screen.findByText('Bob Alice')).toBeInTheDocument();
+    expect(await screen.findByText('Jan 2, 2024 12:00 AM')).toBeInTheDocument();
+    // Still display teams/users without timestamps
+    expect(await screen.findByText('#team-1')).toBeInTheDocument();
+    expect(await screen.findByText('#team-2')).toBeInTheDocument();
+  });
 });
diff --git a/static/app/components/group/streamlinedParticipantList.tsx b/static/app/views/issueDetails/streamline/sidebar/participantList.tsx
similarity index 86%
rename from static/app/components/group/streamlinedParticipantList.tsx
rename to static/app/views/issueDetails/streamline/sidebar/participantList.tsx
index b64409f0f81fd4..8f4b5e88557879 100644
--- a/static/app/components/group/streamlinedParticipantList.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/participantList.tsx
@@ -1,3 +1,4 @@
+import {Fragment} from 'react';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 
@@ -5,11 +6,13 @@ import Avatar from 'sentry/components/avatar';
 import AvatarList from 'sentry/components/avatar/avatarList';
 import TeamAvatar from 'sentry/components/avatar/teamAvatar';
 import {Button} from 'sentry/components/button';
+import {DateTime} from 'sentry/components/dateTime';
 import {Overlay, PositionWrapper} from 'sentry/components/overlay';
 import {t, tn} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Team} from 'sentry/types/organization';
-import type {User} from 'sentry/types/user';
+import type {AvatarUser, User} from 'sentry/types/user';
+import {userDisplayName} from 'sentry/utils/formatters';
 import useOverlay from 'sentry/utils/useOverlay';
 
 interface DropdownListProps {
@@ -35,6 +38,13 @@ export default function ParticipantList({users, teams}: DropdownListProps) {
           users={users}
           avatarSize={24}
           maxVisibleAvatars={3}
+          renderTooltip={user => (
+            <Fragment>
+              {userDisplayName(user)}
+              <br />
+              <LastSeen date={(user as AvatarUser).lastSeen} />
+            </Fragment>
+          )}
         />
       </Button>
       {isOpen && (
@@ -66,6 +76,7 @@ export default function ParticipantList({users, teams}: DropdownListProps) {
                     {user.email !== user.name ? (
                       <SmallText>{user.email}</SmallText>
                     ) : null}
+                    <LastSeen date={(user as AvatarUser).lastSeen} />
                   </NameWrapper>
                 </UserRow>
               ))}
@@ -128,3 +139,8 @@ const StyledAvatarList = styled(AvatarList)`
   justify-content: flex-end;
   padding-left: ${space(0.75)};
 `;
+
+const LastSeen = styled(DateTime)`
+  color: ${p => p.theme.subText};
+  font-size: ${p => p.theme.fontSizeExtraSmall};
+`;
diff --git a/static/app/views/issueDetails/streamline/peopleSection.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/peopleSection.spec.tsx
similarity index 98%
rename from static/app/views/issueDetails/streamline/peopleSection.spec.tsx
rename to static/app/views/issueDetails/streamline/sidebar/peopleSection.spec.tsx
index f28f6e38db56ec..e68a5a9907f07e 100644
--- a/static/app/views/issueDetails/streamline/peopleSection.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/peopleSection.spec.tsx
@@ -4,7 +4,7 @@ import {UserFixture} from 'sentry-fixture/user';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import type {TeamParticipant, UserParticipant} from 'sentry/types/group';
-import PeopleSection from 'sentry/views/issueDetails/streamline/peopleSection';
+import PeopleSection from 'sentry/views/issueDetails/streamline/sidebar/peopleSection';
 
 describe('PeopleSection', () => {
   const teams: TeamParticipant[] = [{...TeamFixture(), type: 'team'}];
diff --git a/static/app/views/issueDetails/streamline/peopleSection.tsx b/static/app/views/issueDetails/streamline/sidebar/peopleSection.tsx
similarity index 90%
rename from static/app/views/issueDetails/streamline/peopleSection.tsx
rename to static/app/views/issueDetails/streamline/sidebar/peopleSection.tsx
index db3a02a096800d..5367cf9cceb876 100644
--- a/static/app/views/issueDetails/streamline/peopleSection.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/peopleSection.tsx
@@ -1,10 +1,10 @@
 import {Flex} from 'sentry/components/container/flex';
-import ParticipantList from 'sentry/components/group/streamlinedParticipantList';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {TeamParticipant, UserParticipant} from 'sentry/types/group';
 import type {User} from 'sentry/types/user';
-import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar';
+import ParticipantList from 'sentry/views/issueDetails/streamline/sidebar/participantList';
+import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar/sidebar';
 
 export default function PeopleSection({
   userParticipants,
diff --git a/static/app/views/issueDetails/streamline/resources.tsx b/static/app/views/issueDetails/streamline/sidebar/resources.tsx
similarity index 92%
rename from static/app/views/issueDetails/streamline/resources.tsx
rename to static/app/views/issueDetails/streamline/sidebar/resources.tsx
index fbe5f27506d439..9b961737d9c74e 100644
--- a/static/app/views/issueDetails/streamline/resources.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/resources.tsx
@@ -4,7 +4,6 @@ import {LinkButton} from 'sentry/components/button';
 import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
 import type {Group} from 'sentry/types/group';
-import {IssueCategory} from 'sentry/types/group';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import type {IssueTypeConfig, ResourceLink} from 'sentry/utils/issueTypeConfig/types';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -24,7 +23,7 @@ export default function Resources({configResources, eventPlatform, group}: Props
 
   return (
     <div>
-      {group.issueCategory !== IssueCategory.ERROR && configResources.description}
+      <p>{configResources.description}</p>
       <LinkSection>
         {links.map(({link, text}) => (
           <LinkButton
diff --git a/static/app/views/issueDetails/streamline/sidebar.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/sidebar.spec.tsx
similarity index 98%
rename from static/app/views/issueDetails/streamline/sidebar.spec.tsx
rename to static/app/views/issueDetails/streamline/sidebar/sidebar.spec.tsx
index cdb1cdd7fcdfa0..679ee5a33d7fa4 100644
--- a/static/app/views/issueDetails/streamline/sidebar.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/sidebar.spec.tsx
@@ -11,7 +11,7 @@ import ConfigStore from 'sentry/stores/configStore';
 import GroupStore from 'sentry/stores/groupStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
 import {GroupActivityType} from 'sentry/types/group';
-import StreamlinedSidebar from 'sentry/views/issueDetails/streamline/sidebar';
+import StreamlinedSidebar from 'sentry/views/issueDetails/streamline/sidebar/sidebar';
 
 describe('StreamlinedSidebar', function () {
   const user = UserFixture();
@@ -22,7 +22,7 @@ describe('StreamlinedSidebar', function () {
   const issueTrackingKey = 'issue-key';
 
   const organization = OrganizationFixture({
-    features: ['ai-summary'],
+    features: ['gen-ai-features'],
   });
   const project = ProjectFixture();
   const group = GroupFixture({
diff --git a/static/app/views/issueDetails/streamline/sidebar.tsx b/static/app/views/issueDetails/streamline/sidebar/sidebar.tsx
similarity index 87%
rename from static/app/views/issueDetails/streamline/sidebar.tsx
rename to static/app/views/issueDetails/streamline/sidebar/sidebar.tsx
index c2772c81410ba9..47ec3828f4038b 100644
--- a/static/app/views/issueDetails/streamline/sidebar.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/sidebar.tsx
@@ -3,7 +3,6 @@ import styled from '@emotion/styled';
 
 import GuideAnchor from 'sentry/components/assistant/guideAnchor';
 import ErrorBoundary from 'sentry/components/errorBoundary';
-import {StreamlinedExternalIssueList} from 'sentry/components/group/externalIssuesList/streamlinedExternalIssueList';
 import * as Layout from 'sentry/components/layouts/thirds';
 import * as SidebarSection from 'sentry/components/sidebarSection';
 import {space} from 'sentry/styles/space';
@@ -13,12 +12,13 @@ import type {Project} from 'sentry/types/project';
 import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useUser} from 'sentry/utils/useUser';
-import StreamlinedActivitySection from 'sentry/views/issueDetails/streamline/activitySection';
-import FirstLastSeenSection from 'sentry/views/issueDetails/streamline/firstLastSeenSection';
-import PeopleSection from 'sentry/views/issueDetails/streamline/peopleSection';
+import StreamlinedActivitySection from 'sentry/views/issueDetails/streamline/sidebar/activitySection';
+import {ExternalIssueList} from 'sentry/views/issueDetails/streamline/sidebar/externalIssueList';
+import FirstLastSeenSection from 'sentry/views/issueDetails/streamline/sidebar/firstLastSeenSection';
 import {MergedIssuesSidebarSection} from 'sentry/views/issueDetails/streamline/sidebar/mergedSidebarSection';
+import PeopleSection from 'sentry/views/issueDetails/streamline/sidebar/peopleSection';
 import {SimilarIssuesSidebarSection} from 'sentry/views/issueDetails/streamline/sidebar/similarIssuesSidebarSection';
-import SolutionsSection from 'sentry/views/issueDetails/streamline/solutionsSection';
+import SolutionsSection from 'sentry/views/issueDetails/streamline/sidebar/solutionsSection';
 
 type Props = {
   group: Group;
@@ -51,17 +51,18 @@ export default function StreamlinedSidebar({group, event, project}: Props) {
         <FirstLastSeenSection group={group} />
       </GuideAnchor>
       <StyledBreak />
-      {((organization.features.includes('ai-summary') &&
-        issueTypeConfig.issueSummary.enabled) ||
+      {((organization.features.includes('gen-ai-features') &&
+        issueTypeConfig.issueSummary.enabled &&
+        !organization.hideAiFeatures) ||
         issueTypeConfig.resources) && (
-        <Fragment>
+        <ErrorBoundary mini>
           <SolutionsSection group={group} project={project} event={event} />
           <StyledBreak />
-        </Fragment>
+        </ErrorBoundary>
       )}
       {event && (
         <ErrorBoundary mini>
-          <StreamlinedExternalIssueList group={group} event={event} project={project} />
+          <ExternalIssueList group={group} event={event} project={project} />
           <StyledBreak style={{marginBottom: space(0.5)}} />
         </ErrorBoundary>
       )}
diff --git a/static/app/views/issueDetails/streamline/sidebar/similarIssuesSidebarSection.tsx b/static/app/views/issueDetails/streamline/sidebar/similarIssuesSidebarSection.tsx
index 72080725be85db..6911eb2bcab01e 100644
--- a/static/app/views/issueDetails/streamline/sidebar/similarIssuesSidebarSection.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/similarIssuesSidebarSection.tsx
@@ -4,7 +4,7 @@ import {LinkButton} from 'sentry/components/button';
 import {Flex} from 'sentry/components/container/flex';
 import {t} from 'sentry/locale';
 import {useLocation} from 'sentry/utils/useLocation';
-import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar';
+import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar/sidebar';
 import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
 import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
 
diff --git a/static/app/views/issueDetails/streamline/solutionsHubDrawer.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.spec.tsx
similarity index 57%
rename from static/app/views/issueDetails/streamline/solutionsHubDrawer.spec.tsx
rename to static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.spec.tsx
index e10948c9a082e7..ee3a30a2e4cf4b 100644
--- a/static/app/views/issueDetails/streamline/solutionsHubDrawer.spec.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.spec.tsx
@@ -6,14 +6,24 @@ import {GroupFixture} from 'sentry-fixture/group';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
 
-import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
+import {
+  render,
+  screen,
+  userEvent,
+  waitFor,
+  waitForElementToBeRemoved,
+} from 'sentry-test/reactTestingLibrary';
 
 import {t} from 'sentry/locale';
 import {EntryType} from 'sentry/types/event';
-import {SolutionsHubDrawer} from 'sentry/views/issueDetails/streamline/solutionsHubDrawer';
+import {SolutionsHubDrawer} from 'sentry/views/issueDetails/streamline/sidebar/solutionsHubDrawer';
 
-describe('AutofixDrawer', () => {
-  const organization = OrganizationFixture({genAIConsent: true, hideAiFeatures: false});
+describe('SolutionsHubDrawer', () => {
+  const organization = OrganizationFixture({
+    genAIConsent: true,
+    hideAiFeatures: false,
+    features: ['gen-ai-features'],
+  });
 
   const mockEvent = EventFixture({
     entries: [
@@ -51,10 +61,18 @@ describe('AutofixDrawer', () => {
     });
   });
 
-  it('renders properly', () => {
+  it('renders consent state if not consented', async () => {
+    MockApiClient.addMockResponse({
+      url: `/issues/${mockGroup.id}/autofix/setup/`,
+      body: {
+        genAIConsent: {ok: false},
+        integration: {ok: false},
+        githubWriteIntegration: {ok: false},
+      },
+    });
     MockApiClient.addMockResponse({
       url: `/issues/${mockGroup.id}/autofix/`,
-      body: {autofix: mockAutofixData},
+      body: {autofix: null},
     });
 
     render(
@@ -62,12 +80,38 @@ describe('AutofixDrawer', () => {
       {organization}
     );
 
-    expect(screen.getByText(mockGroup.shortId)).toBeInTheDocument();
+    expect(screen.getByTestId('ai-setup-loading-indicator')).toBeInTheDocument();
+
+    await waitForElementToBeRemoved(() =>
+      screen.queryByTestId('ai-setup-loading-indicator')
+    );
 
     expect(screen.getByText(mockEvent.id)).toBeInTheDocument();
 
     expect(screen.getByRole('heading', {name: 'Solutions Hub'})).toBeInTheDocument();
 
+    expect(screen.getByTestId('ai-setup-data-consent')).toBeInTheDocument();
+  });
+
+  it('renders initial state correctly', async () => {
+    MockApiClient.addMockResponse({
+      url: `/issues/${mockGroup.id}/autofix/`,
+      body: {autofix: null},
+    });
+
+    render(
+      <SolutionsHubDrawer event={mockEvent} group={mockGroup} project={mockProject} />,
+      {organization}
+    );
+
+    expect(screen.getByTestId('ai-setup-loading-indicator')).toBeInTheDocument();
+
+    await waitForElementToBeRemoved(() =>
+      screen.queryByTestId('ai-setup-loading-indicator')
+    );
+
+    expect(screen.getByRole('heading', {name: 'Solutions Hub'})).toBeInTheDocument();
+
     const startButton = screen.getByRole('button', {name: 'Start Autofix'});
     expect(startButton).toBeInTheDocument();
   });
@@ -89,6 +133,12 @@ describe('AutofixDrawer', () => {
       {organization}
     );
 
+    expect(screen.getByTestId('ai-setup-loading-indicator')).toBeInTheDocument();
+
+    await waitForElementToBeRemoved(() =>
+      screen.queryByTestId('ai-setup-loading-indicator')
+    );
+
     const startButton = screen.getByRole('button', {name: 'Start Autofix'});
     await userEvent.click(startButton);
 
@@ -132,4 +182,40 @@ describe('AutofixDrawer', () => {
       expect(screen.getByRole('button', {name: 'Start Autofix'})).toBeInTheDocument();
     });
   });
+
+  it('shows setup if not complete', async () => {
+    MockApiClient.addMockResponse({
+      url: `/issues/${mockGroup.id}/autofix/setup/`,
+      body: {
+        genAIConsent: {ok: true},
+        integration: {ok: false},
+        githubWriteIntegration: {ok: false, repos: []},
+      },
+    });
+    MockApiClient.addMockResponse({
+      url: `/issues/${mockGroup.id}/autofix/`,
+      body: {autofix: null},
+    });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/integrations/?provider_key=github&includeConfig=0',
+      body: [],
+    });
+
+    render(
+      <SolutionsHubDrawer event={mockEvent} group={mockGroup} project={mockProject} />,
+      {organization}
+    );
+
+    expect(screen.getByTestId('ai-setup-loading-indicator')).toBeInTheDocument();
+
+    await waitForElementToBeRemoved(() =>
+      screen.queryByTestId('ai-setup-loading-indicator')
+    );
+
+    expect(screen.getByRole('heading', {name: 'Solutions Hub'})).toBeInTheDocument();
+
+    expect(screen.queryByRole('button', {name: 'Start Autofix'})).not.toBeInTheDocument();
+
+    expect(await screen.findByText('Install the GitHub Integration')).toBeInTheDocument();
+  });
 });
diff --git a/static/app/views/issueDetails/streamline/solutionsHubDrawer.tsx b/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx
similarity index 53%
rename from static/app/views/issueDetails/streamline/solutionsHubDrawer.tsx
rename to static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx
index c643e7278e5898..f05321c6ad29f9 100644
--- a/static/app/views/issueDetails/streamline/solutionsHubDrawer.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx
@@ -3,6 +3,7 @@ import styled from '@emotion/styled';
 
 import starImage from 'sentry-images/spot/banner-star.svg';
 
+import {SeerIcon} from 'sentry/components/ai/SeerIcon';
 import ProjectAvatar from 'sentry/components/avatar/projectAvatar';
 import FeatureBadge from 'sentry/components/badge/featureBadge';
 import {Breadcrumbs as NavigationBreadcrumbs} from 'sentry/components/breadcrumbs';
@@ -12,28 +13,23 @@ import AutofixFeedback from 'sentry/components/events/autofix/autofixFeedback';
 import {AutofixSetupContent} from 'sentry/components/events/autofix/autofixSetupModal';
 import {AutofixSteps} from 'sentry/components/events/autofix/autofixSteps';
 import {useAiAutofix} from 'sentry/components/events/autofix/useAutofix';
-import {useAutofixSetup} from 'sentry/components/events/autofix/useAutofixSetup';
 import {DrawerBody, DrawerHeader} from 'sentry/components/globalDrawer/components';
-import {GroupSummaryBody, useGroupSummary} from 'sentry/components/group/groupSummary';
+import {GroupSummary, useGroupSummary} from 'sentry/components/group/groupSummary';
+import HookOrDefault from 'sentry/components/hookOrDefault';
 import Input from 'sentry/components/input';
-import {IconDocs, IconSeer} from 'sentry/icons';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
+import {IconDocs} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {EntryType, type Event} from 'sentry/types/event';
+import type {Event} from 'sentry/types/event';
 import type {Group} from 'sentry/types/group';
-import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {getShortEventId} from 'sentry/utils/events';
-import {
-  getConfigForIssueType,
-  shouldShowCustomErrorResourceConfig,
-} from 'sentry/utils/issueTypeConfig';
-import {getRegionDataFromOrganization} from 'sentry/utils/regions';
+import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
 import useRouteAnalyticsParams from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
-import useOrganization from 'sentry/utils/useOrganization';
 import {MIN_NAV_HEIGHT} from 'sentry/views/issueDetails/streamline/eventTitle';
-import Resources from 'sentry/views/issueDetails/streamline/resources';
-import {useIsSampleEvent} from 'sentry/views/issueDetails/utils';
+import {useAiConfig} from 'sentry/views/issueDetails/streamline/hooks/useAiConfig';
+import Resources from 'sentry/views/issueDetails/streamline/sidebar/resources';
 
 interface AutofixStartBoxProps {
   groupId: string;
@@ -43,106 +39,107 @@ interface AutofixStartBoxProps {
 function AutofixStartBox({onSend, groupId}: AutofixStartBoxProps) {
   const [message, setMessage] = useState('');
 
-  const send = () => {
+  const stars = [
+    {size: 10, left: 20, top: 5, rotation: 30, opacity: 0.15},
+    {size: 12, left: 50, top: 8, rotation: 45, opacity: 0.2},
+    {size: 10, left: 80, top: 12, rotation: 15, opacity: 0.2},
+    {size: 14, left: 15, top: 20, rotation: 60, opacity: 0.3},
+    {size: 16, left: 45, top: 25, rotation: 30, opacity: 0.35},
+    {size: 14, left: 75, top: 22, rotation: 45, opacity: 0.3},
+    {size: 18, left: 25, top: 35, rotation: 20, opacity: 0.4},
+    {size: 20, left: 60, top: 38, rotation: 50, opacity: 0.45},
+    {size: 18, left: 85, top: 42, rotation: 35, opacity: 0.4},
+    {size: 22, left: 15, top: 55, rotation: 25, opacity: 0.5},
+    {size: 24, left: 40, top: 58, rotation: 40, opacity: 0.55},
+    {size: 22, left: 70, top: 52, rotation: 30, opacity: 0.5},
+    {size: 26, left: 30, top: 70, rotation: 35, opacity: 0.65},
+    {size: 28, left: 50, top: 75, rotation: 45, opacity: 0.7},
+    {size: 26, left: 80, top: 72, rotation: 25, opacity: 0.7},
+  ];
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
     onSend(message);
   };
 
   return (
     <StartBox>
       <StarTrail>
-        {[...Array(8)].map((_, i) => (
+        {stars.map((star, i) => (
           <TrailStar
             key={i}
             src={starImage}
-            index={i}
-            size={14 + i * 2}
-            offset={(i % 2) * 50 - 15}
+            style={{
+              left: `${star.left}%`,
+              top: `${star.top}%`,
+              width: `${star.size}px`,
+              height: `${star.size}px`,
+              opacity: star.opacity,
+              transform: `rotate(${star.rotation}deg)`,
+            }}
           />
         ))}
       </StarTrail>
       <ContentContainer>
         <HeaderText>Autofix</HeaderText>
         <p>Work together with Autofix to find the root cause and fix the issue.</p>
-        <Row>
-          <Input
-            type="text"
-            value={message}
-            onChange={e => setMessage(e.target.value)}
-            placeholder={'(Optional) Share helpful context here...'}
-          />
-          <ButtonWithStars>
-            <StarLarge1 src={starImage} />
-            <StarLarge2 src={starImage} />
-            <StarLarge3 src={starImage} />
-            <Button
-              priority="primary"
-              onClick={send}
-              analyticsEventKey={
-                message
-                  ? 'autofix.give_instructions_clicked'
-                  : 'autofix.start_fix_clicked'
-              }
-              analyticsEventName={
-                message
-                  ? 'Autofix: Give Instructions Clicked'
-                  : 'Autofix: Start Fix Clicked'
-              }
-              analyticsParams={{group_id: groupId}}
-            >
-              {message ? 'Start' : 'Start Autofix'}
-            </Button>
-          </ButtonWithStars>
-        </Row>
+        <form onSubmit={handleSubmit}>
+          <Row>
+            <Input
+              type="text"
+              value={message}
+              onChange={e => setMessage(e.target.value)}
+              placeholder={'(Optional) Share helpful context here...'}
+            />
+            <ButtonWithStars>
+              <StarLarge1 src={starImage} />
+              <StarLarge2 src={starImage} />
+              <StarLarge3 src={starImage} />
+              <Button
+                type="submit"
+                priority="primary"
+                analyticsEventKey={
+                  message
+                    ? 'autofix.give_instructions_clicked'
+                    : 'autofix.start_fix_clicked'
+                }
+                analyticsEventName={
+                  message
+                    ? 'Autofix: Give Instructions Clicked'
+                    : 'Autofix: Start Fix Clicked'
+                }
+                analyticsParams={{group_id: groupId}}
+                aria-label="Start Autofix"
+              >
+                {t('Start Autofix')}
+              </Button>
+            </ButtonWithStars>
+          </Row>
+        </form>
       </ContentContainer>
     </StartBox>
   );
 }
 
-const shouldDisplayAiAutofixForOrganization = (organization: Organization) => {
-  return (
-    ((organization.features.includes('autofix') &&
-      organization.features.includes('issue-details-autofix-ui')) ||
-      organization.genAIConsent) &&
-    !organization.hideAiFeatures &&
-    getRegionDataFromOrganization(organization)?.name !== 'de'
-  );
-};
-
-// Autofix requires the event to have stack trace frames in order to work correctly.
-function hasStacktraceWithFrames(event: Event) {
-  for (const entry of event.entries) {
-    if (entry.type === EntryType.EXCEPTION) {
-      if (entry.data.values?.some(value => value.stacktrace?.frames?.length)) {
-        return true;
-      }
-    }
-
-    if (entry.type === EntryType.THREADS) {
-      if (entry.data.values?.some(thread => thread.stacktrace?.frames?.length)) {
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
 interface SolutionsHubDrawerProps {
   event: Event;
   group: Group;
   project: Project;
 }
 
+const AiSetupDataConsent = HookOrDefault({
+  hookName: 'component:ai-setup-data-consent',
+  defaultComponent: () => <div data-test-id="ai-setup-data-consent" />,
+});
+
 export function SolutionsHubDrawer({group, project, event}: SolutionsHubDrawerProps) {
   const {autofixData, triggerAutofix, reset} = useAiAutofix(group, event);
-  const {data: summaryData, isError} = useGroupSummary(group.id, group.issueCategory);
   const {
-    data: setupData,
-    isPending: isSetupLoading,
-    refetch: refetchSetup,
-  } = useAutofixSetup({
-    groupId: group.id,
-  });
+    data: summaryData,
+    isError,
+    isPending: isSummaryLoading,
+  } = useGroupSummary(group, event, project);
+  const aiConfig = useAiConfig(group, event, project);
 
   useRouteAnalyticsParams({
     autofix_status: autofixData?.status ?? 'none',
@@ -150,20 +147,8 @@ export function SolutionsHubDrawer({group, project, event}: SolutionsHubDrawerPr
 
   const config = getConfigForIssueType(group, project);
 
-  const isSetupComplete = setupData?.integration.ok && setupData?.genAIConsent.ok;
-  const hasSummary = summaryData && !isError && setupData?.genAIConsent.ok;
-
-  const organization = useOrganization();
-  const isSampleError = useIsSampleEvent();
-  const displayAiAutofix =
-    shouldDisplayAiAutofixForOrganization(organization) &&
-    config.autofix &&
-    !shouldShowCustomErrorResourceConfig(group, project) &&
-    hasStacktraceWithFrames(event) &&
-    !isSampleError;
-
   return (
-    <SolutionsDrawerContainer>
+    <SolutionsDrawerContainer className="solutions-drawer-container">
       <SolutionsDrawerHeader>
         <NavigationCrumbs
           crumbs={[
@@ -182,22 +167,6 @@ export function SolutionsHubDrawer({group, project, event}: SolutionsHubDrawerPr
       </SolutionsDrawerHeader>
       <SolutionsDrawerNavigator>
         <Header>{t('Solutions Hub')}</Header>
-        {autofixData && (
-          <ButtonBar gap={1}>
-            <AutofixFeedback />
-            <Button
-              size="xs"
-              onClick={reset}
-              title={
-                autofixData.created_at
-                  ? `Last run at ${autofixData.created_at.split('T')[0]}`
-                  : null
-              }
-            >
-              {t('Start Over')}
-            </Button>
-          </ButtonBar>
-        )}
       </SolutionsDrawerNavigator>
       <SolutionsDrawerBody>
         {config.resources && (
@@ -216,42 +185,68 @@ export function SolutionsHubDrawer({group, project, event}: SolutionsHubDrawerPr
           </ResourcesContainer>
         )}
         <HeaderText>
-          <IconSeer size="lg" />
-          {t('Sentry AI')}
-          <StyledFeatureBadge
-            type="beta"
-            title={tct(
-              'This feature is in beta. Try it out and let us know your feedback at [email:autofix@sentry.io].',
-              {
-                email: <a href="mailto:autofix@sentry.io" />,
-              }
-            )}
-          />
+          <HeaderContainer>
+            <SeerIcon size="lg" />
+            {t('Sentry AI')}
+            <StyledFeatureBadge
+              type="beta"
+              title={tct(
+                'This feature is in beta. Try it out and let us know your feedback at [email:autofix@sentry.io].',
+                {
+                  email: <a href="mailto:autofix@sentry.io" />,
+                }
+              )}
+            />
+          </HeaderContainer>
+          {autofixData && (
+            <ButtonBar gap={1}>
+              <AutofixFeedback />
+              <Button
+                size="xs"
+                onClick={reset}
+                title={
+                  autofixData.created_at
+                    ? `Last run at ${autofixData.created_at.split('T')[0]}`
+                    : null
+                }
+              >
+                {t('Start Over')}
+              </Button>
+            </ButtonBar>
+          )}
         </HeaderText>
-        {hasSummary && (
-          <StyledCard>
-            <GroupSummaryBody data={summaryData} isError={isError} />
-          </StyledCard>
-        )}
-        {displayAiAutofix && (
+        {aiConfig.isAutofixSetupLoading ? (
+          <div data-test-id="ai-setup-loading-indicator">
+            <LoadingIndicator />
+          </div>
+        ) : aiConfig.needsGenAIConsent ? (
+          <AiSetupDataConsent groupId={group.id} />
+        ) : (
           <Fragment>
-            {!isSetupLoading && !isSetupComplete ? (
-              <SetupContainer>
-                <AutofixSetupContent
-                  projectId={project.id}
-                  groupId={group.id}
-                  onComplete={refetchSetup}
+            {aiConfig.hasSummary && (
+              <StyledCard>
+                <GroupSummary
+                  data={summaryData}
+                  isError={isError}
+                  isPending={isSummaryLoading}
                 />
-              </SetupContainer>
-            ) : !autofixData ? (
-              <AutofixStartBox onSend={triggerAutofix} groupId={group.id} />
-            ) : (
-              <AutofixSteps
-                data={autofixData}
-                groupId={group.id}
-                runId={autofixData.run_id}
-                onRetry={reset}
-              />
+              </StyledCard>
+            )}
+            {aiConfig.hasAutofix && (
+              <Fragment>
+                {aiConfig.needsAutofixSetup ? (
+                  <AutofixSetupContent groupId={group.id} projectId={project.id} />
+                ) : !autofixData ? (
+                  <AutofixStartBox onSend={triggerAutofix} groupId={group.id} />
+                ) : (
+                  <AutofixSteps
+                    data={autofixData}
+                    groupId={group.id}
+                    runId={autofixData.run_id}
+                    onRetry={reset}
+                  />
+                )}
+              </Fragment>
             )}
           </Fragment>
         )}
@@ -290,6 +285,7 @@ const SolutionsDrawerContainer = styled('div')`
   height: 100%;
   display: grid;
   grid-template-rows: auto auto 1fr;
+  position: relative;
 `;
 
 const SolutionsDrawerHeader = styled(DrawerHeader)`
@@ -301,9 +297,8 @@ const SolutionsDrawerHeader = styled(DrawerHeader)`
 
 const SolutionsDrawerNavigator = styled('div')`
   display: grid;
-  grid-template-columns: 1fr auto;
+  grid-template-columns: 1fr;
   align-items: center;
-  column-gap: ${space(1)};
   padding: ${space(0.75)} 24px;
   background: ${p => p.theme.background};
   z-index: 1;
@@ -383,23 +378,13 @@ const StarLarge3 = styled(StarLarge)`
   height: 28px;
 `;
 
-const SetupContainer = styled('div')`
-  padding: ${space(2)};
-
-  /* Override some modal-specific styles */
-  h3 {
-    font-size: ${p => p.theme.fontSizeLarge};
-    margin-bottom: ${space(2)};
-  }
-`;
-
 const StyledCard = styled('div')`
   background: ${p => p.theme.backgroundElevated};
   border-radius: ${p => p.theme.borderRadius};
   border: 1px solid ${p => p.theme.border};
   overflow: hidden;
   box-shadow: ${p => p.theme.dropShadowMedium};
-  padding-bottom: ${space(1)};
+  padding: ${space(1.5)} ${space(2)};
 `;
 
 const HeaderText = styled('div')`
@@ -409,6 +394,7 @@ const HeaderText = styled('div')`
   align-items: center;
   gap: ${space(0.5)};
   padding-bottom: ${space(2)};
+  justify-content: space-between;
 `;
 
 const StyledFeatureBadge = styled(FeatureBadge)`
@@ -416,29 +402,35 @@ const StyledFeatureBadge = styled(FeatureBadge)`
   padding-bottom: 3px;
 `;
 
-const ResourcesHeader = styled(HeaderText)`
+const ResourcesHeader = styled('div')`
   gap: ${space(1)};
+  font-weight: bold;
+  font-size: ${p => p.theme.fontSizeLarge};
+  display: flex;
+  align-items: center;
+  padding-bottom: ${space(2)};
 `;
 
 const StarTrail = styled('div')`
-  height: 400px;
+  height: 450px;
   width: 100%;
-  display: flex;
-  justify-content: center;
   position: absolute;
-  bottom: 7rem;
+  bottom: 5rem;
   left: 0;
   right: 0;
   z-index: -1;
   pointer-events: none;
+  overflow: hidden;
 `;
 
-const TrailStar = styled('img')<{index: number; offset: number; size: number}>`
+const TrailStar = styled('img')`
   position: absolute;
-  width: ${p => p.size}px;
-  height: ${p => p.size}px;
-  top: ${p => p.index * 50}px;
-  transform: translateX(${p => p.offset}px) rotate(${p => p.index * 40}deg);
-  opacity: ${p => Math.min(1, 0.2 + p.index * 0.1)};
   filter: sepia(1) saturate(3) hue-rotate(290deg);
+  transition: all 0.2s ease-in-out;
+`;
+
+const HeaderContainer = styled('div')`
+  display: flex;
+  align-items: center;
+  gap: ${space(0.5)};
 `;
diff --git a/static/app/views/issueDetails/streamline/sidebar/solutionsSection.spec.tsx b/static/app/views/issueDetails/streamline/sidebar/solutionsSection.spec.tsx
new file mode 100644
index 00000000000000..d9988961a5afb5
--- /dev/null
+++ b/static/app/views/issueDetails/streamline/sidebar/solutionsSection.spec.tsx
@@ -0,0 +1,347 @@
+import {EventFixture} from 'sentry-fixture/event';
+import {FrameFixture} from 'sentry-fixture/frame';
+import {GroupFixture} from 'sentry-fixture/group';
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {ProjectFixture} from 'sentry-fixture/project';
+
+import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
+
+import {EntryType} from 'sentry/types/event';
+import {IssueCategory} from 'sentry/types/group';
+import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
+import SolutionsSection from 'sentry/views/issueDetails/streamline/sidebar/solutionsSection';
+
+jest.mock('sentry/utils/issueTypeConfig');
+
+describe('SolutionsSection', () => {
+  const mockEvent = EventFixture({
+    entries: [
+      {
+        type: EntryType.EXCEPTION,
+        data: {values: [{stacktrace: {frames: [FrameFixture()]}}]},
+      },
+    ],
+  });
+  const mockGroup = GroupFixture();
+  const mockProject = ProjectFixture();
+  const organization = OrganizationFixture({genAIConsent: true, hideAiFeatures: false});
+
+  beforeEach(() => {
+    MockApiClient.clearMockResponses();
+
+    MockApiClient.addMockResponse({
+      url: `/issues/${mockGroup.id}/autofix/setup/`,
+      body: {
+        genAIConsent: {ok: true},
+        integration: {ok: true},
+        githubWriteIntegration: {ok: true},
+      },
+    });
+
+    jest.mocked(getConfigForIssueType).mockReturnValue({
+      issueSummary: {
+        enabled: true,
+      },
+      resources: {
+        description: 'Test Resource',
+        links: [{link: 'https://example.com', text: 'Test Link'}],
+        linksByPlatform: {},
+      },
+      actions: {
+        archiveUntilOccurrence: {enabled: false},
+        delete: {enabled: false},
+        deleteAndDiscard: {enabled: false},
+        ignore: {enabled: false},
+        merge: {enabled: false},
+        resolveInRelease: {enabled: false},
+        share: {enabled: false},
+      },
+      attachments: {enabled: false},
+      autofix: true,
+      discover: {enabled: false},
+      events: {enabled: false},
+      evidence: null,
+      filterAndSearchHeader: {enabled: false},
+      mergedIssues: {enabled: false},
+      performanceDurationRegression: {enabled: false},
+      profilingDurationRegression: {enabled: false},
+      regression: {enabled: false},
+      replays: {enabled: false},
+      showFeedbackWidget: false,
+      similarIssues: {enabled: false},
+      spanEvidence: {enabled: false},
+      stacktrace: {enabled: false},
+      stats: {enabled: false},
+      tags: {enabled: false},
+      tagsTab: {enabled: false},
+      userFeedback: {enabled: false},
+      usesIssuePlatform: false,
+    });
+  });
+
+  it('renders loading state when summary is pending', () => {
+    // Use a delayed response to simulate loading state
+    MockApiClient.addMockResponse({
+      url: `/organizations/${mockProject.organization.slug}/issues/${mockGroup.id}/summarize/`,
+      method: 'POST',
+      statusCode: 200,
+      body: new Promise(() => {}), // Never resolves, keeping the loading state
+    });
+
+    render(
+      <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
+      {
+        organization,
+      }
+    );
+
+    expect(screen.getByText('Solutions Hub')).toBeInTheDocument();
+    expect(screen.getAllByTestId('loading-placeholder')).toHaveLength(3);
+  });
+
+  it('renders summary when AI features are enabled and data is available', async () => {
+    const mockSummary = 'This is a test summary';
+    MockApiClient.addMockResponse({
+      url: `/organizations/${mockProject.organization.slug}/issues/${mockGroup.id}/summarize/`,
+      method: 'POST',
+      body: {
+        whatsWrong: mockSummary,
+      },
+    });
+
+    render(
+      <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
+      {
+        organization,
+      }
+    );
+
+    await waitFor(() => {
+      expect(screen.getByText(mockSummary)).toBeInTheDocument();
+    });
+  });
+
+  it('renders resources section when AI features are disabled', () => {
+    const customOrganization = OrganizationFixture({
+      hideAiFeatures: true,
+      genAIConsent: false,
+    });
+
+    render(
+      <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
+      {
+        organization: customOrganization,
+      }
+    );
+
+    expect(screen.getByText('Test Link')).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'READ MORE'})).toBeInTheDocument();
+  });
+
+  it('toggles resources content when clicking Read More/Show Less', async () => {
+    const customOrganization = OrganizationFixture({
+      hideAiFeatures: true,
+      genAIConsent: false,
+    });
+
+    render(
+      <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
+      {
+        organization: customOrganization,
+      }
+    );
+
+    const readMoreButton = screen.getByRole('button', {name: 'READ MORE'});
+    await userEvent.click(readMoreButton);
+
+    expect(screen.getByRole('button', {name: 'SHOW LESS'})).toBeInTheDocument();
+
+    const showLessButton = screen.getByRole('button', {name: 'SHOW LESS'});
+    await userEvent.click(showLessButton);
+
+    expect(screen.queryByRole('button', {name: 'SHOW LESS'})).not.toBeInTheDocument();
+    expect(screen.getByRole('button', {name: 'READ MORE'})).toBeInTheDocument();
+  });
+
+  describe('Solutions Hub button text', () => {
+    it('shows "Set up Sentry AI" when AI needs setup', async () => {
+      const customOrganization = OrganizationFixture({
+        genAIConsent: false,
+        hideAiFeatures: false,
+      });
+
+      MockApiClient.addMockResponse({
+        url: `/issues/${mockGroup.id}/autofix/setup/`,
+        body: {
+          genAIConsent: {ok: false},
+          integration: {ok: false},
+          githubWriteIntegration: {ok: false},
+        },
+      });
+
+      render(
+        <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
+        {
+          organization: customOrganization,
+        }
+      );
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('loading-placeholder')).not.toBeInTheDocument();
+      });
+
+      expect(
+        screen.getByText('Explore potential root causes and solutions with Sentry AI.')
+      ).toBeInTheDocument();
+
+      expect(screen.getByRole('button', {name: 'Set up Sentry AI'})).toBeInTheDocument();
+    });
+
+    it('shows "Set up Autofix" when autofix needs setup', async () => {
+      MockApiClient.addMockResponse({
+        url: `/issues/${mockGroup.id}/autofix/setup/`,
+        body: {
+          genAIConsent: {ok: true},
+          integration: {ok: false},
+          githubWriteIntegration: {ok: false},
+        },
+      });
+      MockApiClient.addMockResponse({
+        url: `/organizations/${mockProject.organization.slug}/issues/${mockGroup.id}/summarize/`,
+        method: 'POST',
+        body: {
+          whatsWrong: 'Test summary',
+        },
+      });
+
+      render(
+        <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
+        {
+          organization,
+        }
+      );
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('loading-placeholder')).not.toBeInTheDocument();
+      });
+
+      expect(screen.getByRole('button', {name: 'Set up Autofix'})).toBeInTheDocument();
+    });
+
+    it('shows "Open Resources & Autofix" when both are available', async () => {
+      // Mock successful summary response
+      MockApiClient.addMockResponse({
+        url: `/organizations/${mockProject.organization.slug}/issues/${mockGroup.id}/summarize/`,
+        method: 'POST',
+        body: {
+          whatsWrong: 'Test summary',
+        },
+      });
+
+      // Mock successful autofix setup
+      MockApiClient.addMockResponse({
+        url: `/issues/${mockGroup.id}/autofix/setup/`,
+        body: {
+          genAIConsent: {ok: true},
+          integration: {ok: true},
+          githubWriteIntegration: {ok: true},
+        },
+      });
+
+      MockApiClient.addMockResponse({
+        url: `/organizations/${mockProject.organization.slug}/issues/${mockGroup.id}/summarize/`,
+        method: 'POST',
+        body: {
+          whatsWrong: 'Test summary',
+        },
+      });
+
+      render(
+        <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
+        {
+          organization,
+        }
+      );
+
+      await waitFor(() => {
+        expect(
+          screen.getByRole('button', {name: 'Open Resources & Autofix'})
+        ).toBeInTheDocument();
+      });
+    });
+
+    it('shows "Open Autofix" when only autofix is available', async () => {
+      // Mock successful autofix setup but disable resources
+      MockApiClient.addMockResponse({
+        url: `/issues/${mockGroup.id}/autofix/setup/`,
+        body: {
+          genAIConsent: {ok: true},
+          integration: {ok: true},
+          githubWriteIntegration: {ok: true},
+        },
+      });
+
+      MockApiClient.addMockResponse({
+        url: `/organizations/${mockProject.organization.slug}/issues/${mockGroup.id}/summarize/`,
+        method: 'POST',
+        body: {
+          whatsWrong: 'Test summary',
+        },
+      });
+
+      jest.mocked(getConfigForIssueType).mockReturnValue({
+        ...jest.mocked(getConfigForIssueType)(mockGroup, mockGroup.project),
+        resources: null,
+      });
+
+      render(
+        <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
+        {
+          organization,
+        }
+      );
+
+      await waitFor(() => {
+        expect(screen.getByRole('button', {name: 'Open Autofix'})).toBeInTheDocument();
+      });
+    });
+
+    it('shows "READ MORE" when only resources are available', async () => {
+      mockGroup.issueCategory = IssueCategory.UPTIME;
+
+      // Mock config with autofix disabled
+      MockApiClient.addMockResponse({
+        url: `/issues/${mockGroup.id}/autofix/setup/`,
+        body: {
+          genAIConsent: {ok: true},
+          integration: {ok: true},
+          githubWriteIntegration: {ok: true},
+        },
+      });
+
+      jest.mocked(getConfigForIssueType).mockReturnValue({
+        ...jest.mocked(getConfigForIssueType)(mockGroup, mockGroup.project),
+        autofix: false,
+        issueSummary: {enabled: false},
+        resources: {
+          description: '',
+          links: [],
+          linksByPlatform: {},
+        },
+      });
+
+      render(
+        <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
+        {
+          organization,
+        }
+      );
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('loading-placeholder')).not.toBeInTheDocument();
+      });
+
+      expect(screen.getByRole('button', {name: 'READ MORE'})).toBeInTheDocument();
+    });
+  });
+});
diff --git a/static/app/views/issueDetails/streamline/solutionsSection.tsx b/static/app/views/issueDetails/streamline/sidebar/solutionsSection.tsx
similarity index 50%
rename from static/app/views/issueDetails/streamline/solutionsSection.tsx
rename to static/app/views/issueDetails/streamline/sidebar/solutionsSection.tsx
index d5f01c665d1666..bc163738764866 100644
--- a/static/app/views/issueDetails/streamline/solutionsSection.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/solutionsSection.tsx
@@ -1,30 +1,24 @@
 import {useRef, useState} from 'react';
 import styled from '@emotion/styled';
 
+import FeatureBadge from 'sentry/components/badge/featureBadge';
 import {Button} from 'sentry/components/button';
+import {Chevron} from 'sentry/components/chevron';
 import useDrawer from 'sentry/components/globalDrawer';
-import {useGroupSummary} from 'sentry/components/group/groupSummary';
+import {GroupSummary, useGroupSummary} from 'sentry/components/group/groupSummary';
 import Placeholder from 'sentry/components/placeholder';
-import {IconChevron} from 'sentry/icons';
-import {t} from 'sentry/locale';
+import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
 import type {Group} from 'sentry/types/group';
 import type {Project} from 'sentry/types/project';
 import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
 import {singleLineRenderer} from 'sentry/utils/marked';
-import useOrganization from 'sentry/utils/useOrganization';
-import Resources from 'sentry/views/issueDetails/streamline/resources';
-import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar';
-import {SolutionsHubDrawer} from 'sentry/views/issueDetails/streamline/solutionsHubDrawer';
-
-const isSummaryEnabled = (
-  hasGenAIConsent: boolean,
-  hasIssueSummary: boolean,
-  hideAiFeatures: boolean
-) => {
-  return hasGenAIConsent && hasIssueSummary && !hideAiFeatures;
-};
+import {useAiConfig} from 'sentry/views/issueDetails/streamline/hooks/useAiConfig';
+import Resources from 'sentry/views/issueDetails/streamline/sidebar/resources';
+import {SidebarSectionTitle} from 'sentry/views/issueDetails/streamline/sidebar/sidebar';
+import {SolutionsHubDrawer} from 'sentry/views/issueDetails/streamline/sidebar/solutionsHubDrawer';
+import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
 export default function SolutionsSection({
   group,
@@ -35,10 +29,10 @@ export default function SolutionsSection({
   group: Group;
   project: Project;
 }) {
-  const organization = useOrganization();
   const [isExpanded, setIsExpanded] = useState(false);
   const openButtonRef = useRef<HTMLButtonElement>(null);
   const {openDrawer} = useDrawer();
+  const hasStreamlinedUI = useHasStreamlinedUI();
 
   const openSolutionsDrawer = () => {
     if (!event) {
@@ -54,7 +48,9 @@ export default function SolutionsSection({
           const viewAllButton = openButtonRef.current;
           if (
             viewAllButton?.contains(element) ||
-            document.getElementById('sentry-feedback')?.contains(element)
+            document.getElementById('sentry-feedback')?.contains(element) ||
+            document.getElementById('autofix-rethink-input')?.contains(element) ||
+            document.getElementById('autofix-write-access-modal')?.contains(element)
           ) {
             return false;
           }
@@ -65,56 +61,68 @@ export default function SolutionsSection({
     );
   };
 
-  const hasGenAIConsent = organization.genAIConsent;
-  const {data: summaryData} = useGroupSummary(group.id, group.issueCategory);
+  const {
+    data: summaryData,
+    isPending: isSummaryLoading,
+    isError: isSummaryError,
+  } = useGroupSummary(group, event, project);
 
-  const issueTypeConfig = getConfigForIssueType(group, group.project);
-  const hasSummary = isSummaryEnabled(
-    hasGenAIConsent,
-    issueTypeConfig.issueSummary.enabled,
-    organization.hideAiFeatures
-  );
-  const aiNeedsSetup =
-    !hasGenAIConsent &&
-    issueTypeConfig.issueSummary.enabled &&
-    !organization.hideAiFeatures;
-  const hasResources = issueTypeConfig.resources;
+  const aiConfig = useAiConfig(group, event, project);
 
-  return (
-    <div>
-      <SidebarSectionTitle style={{marginTop: 0}}>
-        {t('Solutions Hub')}
-      </SidebarSectionTitle>
-      {hasSummary && !summaryData && (
-        <Placeholder
-          height="60px"
-          style={{marginBottom: space(1)}}
-          testId="loading-placeholder"
-        />
-      )}
-      {hasSummary && summaryData && (
+  const issueTypeConfig = getConfigForIssueType(group, project);
+
+  const showCtaButton =
+    aiConfig.needsGenAIConsent ||
+    aiConfig.hasAutofix ||
+    (aiConfig.hasSummary && aiConfig.hasResources);
+  const isButtonLoading = aiConfig.isAutofixSetupLoading;
+
+  const getButtonText = () => {
+    if (aiConfig.needsGenAIConsent) {
+      return t('Set up Sentry AI');
+    }
+
+    if (aiConfig.hasAutofix) {
+      if (aiConfig.needsAutofixSetup) {
+        return t('Set up Autofix');
+      }
+      return aiConfig.hasResources ? t('Open Resources & Autofix') : t('Open Autofix');
+    }
+
+    return t('Open Resources');
+  };
+
+  const renderContent = () => {
+    if (aiConfig.needsGenAIConsent) {
+      return (
         <Summary>
           <HeadlineText
             dangerouslySetInnerHTML={{
               __html: singleLineRenderer(
-                summaryData.whatsWrong?.replaceAll('**', '') ?? ''
+                'Explore potential root causes and solutions with Sentry AI.'
               ),
             }}
           />
         </Summary>
-      )}
-      {aiNeedsSetup && (
+      );
+    }
+
+    // Show the summary's loading state if we're still loading the autofix setup
+    if (aiConfig.hasSummary) {
+      return (
         <Summary>
-          <HeadlineText
-            dangerouslySetInnerHTML={{
-              __html: singleLineRenderer(
-                'Explore potential root causes and solutions with Sentry AI.'
-              ),
-            }}
+          <GroupSummary
+            data={summaryData ?? undefined}
+            isError={isSummaryError}
+            isPending={isSummaryLoading}
+            preview
           />
         </Summary>
-      )}
-      {!hasSummary && hasResources && !aiNeedsSetup && (
+      );
+    }
+
+    if (!aiConfig.hasSummary && issueTypeConfig.resources) {
+      return (
         <ResourcesWrapper isExpanded={isExpanded}>
           <ResourcesContent isExpanded={isExpanded}>
             <Resources
@@ -127,19 +135,61 @@ export default function SolutionsSection({
             {isExpanded ? t('SHOW LESS') : t('READ MORE')}
           </ExpandButton>
         </ResourcesWrapper>
-      )}
-      {(hasSummary || aiNeedsSetup) && (
-        <StyledButton ref={openButtonRef} onClick={() => openSolutionsDrawer()}>
-          {t('Open Solutions Hub')}
-          <IconChevron direction="right" size="xs" />
+      );
+    }
+
+    return null;
+  };
+
+  return (
+    <SolutionsSectionContainer>
+      <SidebarSectionTitle style={{marginTop: 0}}>
+        <HeaderContainer>
+          {t('Solutions Hub')}
+          {aiConfig.hasSummary && (
+            <StyledFeatureBadge
+              type="beta"
+              title={tct(
+                'This feature is in beta. Try it out and let us know your feedback at [email:autofix@sentry.io].',
+                {
+                  email: <a href="mailto:autofix@sentry.io" />,
+                }
+              )}
+            />
+          )}
+        </HeaderContainer>
+      </SidebarSectionTitle>
+      {renderContent()}
+      {isButtonLoading ? (
+        <ButtonPlaceholder />
+      ) : showCtaButton ? (
+        <StyledButton
+          ref={openButtonRef}
+          onClick={() => openSolutionsDrawer()}
+          analyticsEventKey="issue_details.solutions_hub_opened"
+          analyticsEventName="Issue Details: Solutions Hub Opened"
+          analyticsParams={{
+            has_streamlined_ui: hasStreamlinedUI,
+          }}
+        >
+          {getButtonText()}
+          <ChevronContainer>
+            <Chevron direction="right" size="large" />
+          </ChevronContainer>
         </StyledButton>
-      )}
-    </div>
+      ) : null}
+    </SolutionsSectionContainer>
   );
 }
 
+const SolutionsSectionContainer = styled('div')`
+  display: flex;
+  flex-direction: column;
+`;
+
 const Summary = styled('div')`
   margin-bottom: ${space(0.5)};
+  position: relative;
 `;
 
 const HeadlineText = styled('span')`
@@ -194,3 +244,27 @@ const StyledButton = styled(Button)`
     linear-gradient(to right, ${p => p.theme.background}, ${p => p.theme.pink400}20);
   color: ${p => p.theme.pink400};
 `;
+
+const ChevronContainer = styled('div')`
+  margin-left: ${space(0.5)};
+  height: 16px;
+  width: 16px;
+`;
+
+const HeaderContainer = styled('div')`
+  display: flex;
+  align-items: center;
+  gap: ${space(0.5)};
+`;
+
+const StyledFeatureBadge = styled(FeatureBadge)`
+  margin-left: ${space(0.25)};
+  padding-bottom: 3px;
+`;
+
+const ButtonPlaceholder = styled(Placeholder)`
+  width: 100%;
+  height: 38px;
+  border-radius: ${p => p.theme.borderRadius};
+  margin-top: ${space(1)};
+`;
diff --git a/static/app/views/issueDetails/streamline/toggleSidebar.tsx b/static/app/views/issueDetails/streamline/sidebar/toggleSidebar.tsx
similarity index 100%
rename from static/app/views/issueDetails/streamline/toggleSidebar.tsx
rename to static/app/views/issueDetails/streamline/sidebar/toggleSidebar.tsx
diff --git a/static/app/views/issueDetails/streamline/solutionsSection.spec.tsx b/static/app/views/issueDetails/streamline/solutionsSection.spec.tsx
deleted file mode 100644
index f4f8cd505c3432..00000000000000
--- a/static/app/views/issueDetails/streamline/solutionsSection.spec.tsx
+++ /dev/null
@@ -1,178 +0,0 @@
-import {EventFixture} from 'sentry-fixture/event';
-import {GroupFixture} from 'sentry-fixture/group';
-import {OrganizationFixture} from 'sentry-fixture/organization';
-import {ProjectFixture} from 'sentry-fixture/project';
-
-import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
-import SolutionsSection from 'sentry/views/issueDetails/streamline/solutionsSection';
-
-jest.mock('sentry/utils/issueTypeConfig');
-
-describe('SolutionsSection', () => {
-  const mockEvent = EventFixture();
-  const mockGroup = GroupFixture();
-  const mockProject = ProjectFixture();
-  const organization = OrganizationFixture({genAIConsent: true, hideAiFeatures: false});
-
-  beforeEach(() => {
-    MockApiClient.clearMockResponses();
-
-    MockApiClient.addMockResponse({
-      url: `/issues/${mockGroup.id}/autofix/setup/`,
-      body: {
-        genAIConsent: {ok: true},
-        integration: {ok: true},
-        githubWriteIntegration: {ok: true},
-      },
-    });
-
-    jest.mocked(getConfigForIssueType).mockReturnValue({
-      issueSummary: {
-        enabled: true,
-      },
-      resources: {
-        description: 'Test Resource',
-        links: [{link: 'https://example.com', text: 'Test Link'}],
-        linksByPlatform: {},
-      },
-      actions: {
-        archiveUntilOccurrence: {enabled: false},
-        delete: {enabled: false},
-        deleteAndDiscard: {enabled: false},
-        ignore: {enabled: false},
-        merge: {enabled: false},
-        resolveInRelease: {enabled: false},
-        share: {enabled: false},
-      },
-      aiSuggestedSolution: false,
-      attachments: {enabled: false},
-      autofix: true,
-      discover: {enabled: false},
-      events: {enabled: false},
-      evidence: null,
-      filterAndSearchHeader: {enabled: false},
-      mergedIssues: {enabled: false},
-      performanceDurationRegression: {enabled: false},
-      profilingDurationRegression: {enabled: false},
-      regression: {enabled: false},
-      replays: {enabled: false},
-      showFeedbackWidget: false,
-      similarIssues: {enabled: false},
-      spanEvidence: {enabled: false},
-      stacktrace: {enabled: false},
-      stats: {enabled: false},
-      tags: {enabled: false},
-      tagsTab: {enabled: false},
-      userFeedback: {enabled: false},
-      usesIssuePlatform: false,
-    });
-  });
-
-  it('renders loading state when summary is pending', () => {
-    // Use a delayed response to simulate loading state
-    MockApiClient.addMockResponse({
-      url: `/organizations/${mockProject.organization.slug}/issues/${mockGroup.id}/summarize/`,
-      method: 'POST',
-      statusCode: 200,
-      body: new Promise(() => {}), // Never resolves, keeping the loading state
-    });
-
-    render(
-      <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
-      {
-        organization,
-      }
-    );
-
-    expect(screen.getByText('Solutions Hub')).toBeInTheDocument();
-    expect(screen.getByTestId('loading-placeholder')).toBeInTheDocument();
-  });
-
-  it('renders summary when AI features are enabled and data is available', async () => {
-    const mockSummary = 'This is a test summary';
-    MockApiClient.addMockResponse({
-      url: `/organizations/${mockProject.organization.slug}/issues/${mockGroup.id}/summarize/`,
-      method: 'POST',
-      body: {
-        whatsWrong: mockSummary,
-      },
-    });
-
-    render(
-      <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
-      {
-        organization,
-      }
-    );
-
-    await waitFor(() => {
-      expect(screen.getByText(mockSummary)).toBeInTheDocument();
-      expect(
-        screen.getByRole('button', {name: 'Open Solutions Hub'})
-      ).toBeInTheDocument();
-    });
-  });
-
-  it('renders AI setup prompt when consent is not given', () => {
-    const customOrganization = OrganizationFixture({
-      genAIConsent: false,
-      hideAiFeatures: false,
-    });
-
-    render(
-      <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
-      {
-        organization: customOrganization,
-      }
-    );
-
-    expect(
-      screen.getByText('Explore potential root causes and solutions with Sentry AI.')
-    ).toBeInTheDocument();
-    expect(screen.getByRole('button', {name: 'Open Solutions Hub'})).toBeInTheDocument();
-  });
-
-  it('renders resources section when AI features are disabled', () => {
-    const customOrganization = OrganizationFixture({
-      hideAiFeatures: true,
-      genAIConsent: false,
-    });
-
-    render(
-      <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
-      {
-        organization: customOrganization,
-      }
-    );
-
-    expect(screen.getByText('Test Link')).toBeInTheDocument();
-    expect(screen.getByRole('button', {name: 'READ MORE'})).toBeInTheDocument();
-  });
-
-  it('toggles resources content when clicking Read More/Show Less', async () => {
-    const customOrganization = OrganizationFixture({
-      hideAiFeatures: true,
-      genAIConsent: false,
-    });
-
-    render(
-      <SolutionsSection event={mockEvent} group={mockGroup} project={mockProject} />,
-      {
-        organization: customOrganization,
-      }
-    );
-
-    const readMoreButton = screen.getByRole('button', {name: 'READ MORE'});
-    await userEvent.click(readMoreButton);
-
-    expect(screen.getByRole('button', {name: 'SHOW LESS'})).toBeInTheDocument();
-
-    const showLessButton = screen.getByRole('button', {name: 'SHOW LESS'});
-    await userEvent.click(showLessButton);
-
-    expect(screen.queryByRole('button', {name: 'SHOW LESS'})).not.toBeInTheDocument();
-    expect(screen.getByRole('button', {name: 'READ MORE'})).toBeInTheDocument();
-  });
-});
diff --git a/static/app/views/issueDetails/useGroupEvent.tsx b/static/app/views/issueDetails/useGroupEvent.tsx
new file mode 100644
index 00000000000000..257d9ade179769
--- /dev/null
+++ b/static/app/views/issueDetails/useGroupEvent.tsx
@@ -0,0 +1,43 @@
+import type {Event} from 'sentry/types/event';
+import {useApiQuery} from 'sentry/utils/queryClient';
+import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
+import {
+  getGroupEventQueryKey,
+  useDefaultIssueEvent,
+} from 'sentry/views/issueDetails/utils';
+
+interface UseGroupEventOptions {
+  environments: string[];
+  eventId: string | undefined;
+  groupId: string;
+}
+
+export function useGroupEvent({groupId, eventId, environments}: UseGroupEventOptions) {
+  const organization = useOrganization();
+  const location = useLocation<{query?: string}>();
+  const defaultIssueEvent = useDefaultIssueEvent();
+  const eventIdUrl = eventId ?? defaultIssueEvent;
+  const recommendedEventQuery =
+    typeof location.query.query === 'string' ? location.query.query : undefined;
+
+  const isLatestOrRecommendedEvent =
+    eventIdUrl === 'latest' || eventIdUrl === 'recommended';
+
+  const queryKey = getGroupEventQueryKey({
+    orgSlug: organization.slug,
+    groupId,
+    eventId: eventIdUrl,
+    environments,
+    recommendedEventQuery: isLatestOrRecommendedEvent ? recommendedEventQuery : undefined,
+  });
+
+  const eventQuery = useApiQuery<Event>(queryKey, {
+    // Latest/recommended event will change over time, so only cache for 30 seconds
+    // Oldest/specific events will never change
+    staleTime: isLatestOrRecommendedEvent ? 30000 : Infinity,
+    retry: false,
+  });
+
+  return eventQuery;
+}
diff --git a/static/app/views/issueDetails/utils.spec.tsx b/static/app/views/issueDetails/utils.spec.tsx
index c4552926b337e8..12393a44fad7ce 100644
--- a/static/app/views/issueDetails/utils.spec.tsx
+++ b/static/app/views/issueDetails/utils.spec.tsx
@@ -1,16 +1,21 @@
 import {LocationFixture} from 'sentry-fixture/locationFixture';
+import {OrganizationFixture} from 'sentry-fixture/organization';
 import {UserFixture} from 'sentry-fixture/user';
 
 import {act, renderHook} from 'sentry-test/reactTestingLibrary';
 
 import ConfigStore from 'sentry/stores/configStore';
 import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
 jest.mock('sentry/utils/useLocation');
+jest.mock('sentry/utils/useOrganization');
 
 describe('useHasStreamlinedUI', () => {
   it("respects the 'streamline' query param", () => {
+    jest.mocked(useOrganization).mockReturnValue(OrganizationFixture());
+
     const location = LocationFixture({query: {streamline: '1'}});
     jest.mocked(useLocation).mockReturnValue(location);
     const {result: queryParamEnabled} = renderHook(useHasStreamlinedUI);
@@ -28,8 +33,7 @@ describe('useHasStreamlinedUI', () => {
     user.options.prefersIssueDetailsStreamlinedUI = true;
     act(() => ConfigStore.set('user', user));
 
-    const location = LocationFixture();
-    jest.mocked(useLocation).mockReturnValue(location);
+    jest.mocked(useLocation).mockReturnValue(LocationFixture());
     const {result: userPrefersStreamline} = renderHook(useHasStreamlinedUI);
     expect(userPrefersStreamline.current).toBe(true);
 
@@ -39,7 +43,12 @@ describe('useHasStreamlinedUI', () => {
     expect(userPrefersLegacy.current).toBe(false);
   });
 
-  it('values query param above user preferences', () => {
+  it('values query param above user preferences and organization flags', () => {
+    const enforceOrg = OrganizationFixture({
+      features: ['issue-details-streamline-enforce'],
+    });
+    jest.mocked(useOrganization).mockReturnValue(enforceOrg);
+
     ConfigStore.init();
     const user = UserFixture();
     user.options.prefersIssueDetailsStreamlinedUI = false;
@@ -57,4 +66,20 @@ describe('useHasStreamlinedUI', () => {
       renderHook(useHasStreamlinedUI);
     expect(prefersStreamlineButQueryParamDisabled.current).toBe(false);
   });
+
+  it('ignores preferences if enforce flag is set', () => {
+    const enforceOrg = OrganizationFixture({
+      features: ['issue-details-streamline-enforce'],
+    });
+    jest.mocked(useOrganization).mockReturnValue(enforceOrg);
+
+    ConfigStore.init();
+    const user = UserFixture();
+    user.options.prefersIssueDetailsStreamlinedUI = false;
+    act(() => ConfigStore.set('user', user));
+
+    jest.mocked(useLocation).mockReturnValue(LocationFixture());
+    const {result} = renderHook(useHasStreamlinedUI);
+    expect(result.current).toBe(true);
+  });
 });
diff --git a/static/app/views/issueDetails/utils.tsx b/static/app/views/issueDetails/utils.tsx
index b8c8dacdeffcb0..7abe559db33865 100644
--- a/static/app/views/issueDetails/utils.tsx
+++ b/static/app/views/issueDetails/utils.tsx
@@ -12,6 +12,7 @@ import type {Group, GroupActivity, TagValue} from 'sentry/types/group';
 import {defined} from 'sentry/utils';
 import type {ApiQueryKey} from 'sentry/utils/queryClient';
 import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
 import {useUser} from 'sentry/utils/useUser';
 import {useGroupTagsReadable} from 'sentry/views/issueDetails/groupTags/useGroupTags';
@@ -238,12 +239,20 @@ export function getGroupEventQueryKey({
 export function useHasStreamlinedUI() {
   const location = useLocation();
   const user = useUser();
-  if (location.query.streamline === '0') {
-    return false;
+  const organization = useOrganization();
+
+  // Allow query param to override all other settings to set the UI.
+  if (defined(location.query.streamline)) {
+    return location.query.streamline === '1';
   }
-  return (
-    location.query.streamline === '1' || !!user?.options?.prefersIssueDetailsStreamlinedUI
-  );
+
+  // If the enforce flag is set for the organization, ignore user preferences and enable the UI
+  if (organization.features.includes('issue-details-streamline-enforce')) {
+    return true;
+  }
+
+  // Apply the UI based on user preferences
+  return !!user?.options?.prefersIssueDetailsStreamlinedUI;
 }
 
 export function useIsSampleEvent(): boolean {
diff --git a/static/app/views/monitors/components/detailsSidebar.tsx b/static/app/views/monitors/components/detailsSidebar.tsx
index 095880c500d9ac..92f1e3b1f6a00e 100644
--- a/static/app/views/monitors/components/detailsSidebar.tsx
+++ b/static/app/views/monitors/components/detailsSidebar.tsx
@@ -4,11 +4,13 @@ import styled from '@emotion/styled';
 import ActorAvatar from 'sentry/components/avatar/actorAvatar';
 import {SectionHeading} from 'sentry/components/charts/styles';
 import {KeyValueTable, KeyValueTableRow} from 'sentry/components/keyValueTable';
+import ExternalLink from 'sentry/components/links/externalLink';
+import QuestionTooltip from 'sentry/components/questionTooltip';
 import Text from 'sentry/components/text';
 import TimeSince from 'sentry/components/timeSince';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconCopy} from 'sentry/icons';
-import {t, tn} from 'sentry/locale';
+import {t, tct, tn} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {getFormattedDate} from 'sentry/utils/dates';
 import useCopyToClipboard from 'sentry/utils/useCopyToClipboard';
@@ -24,9 +26,13 @@ import {scheduleAsText} from 'sentry/views/monitors/utils/scheduleAsText';
 interface Props {
   monitor: Monitor;
   monitorEnv?: MonitorEnvironment;
+  /**
+   * Include the UNKNOWN status in the check-in type legend
+   */
+  showUnknownLegend?: boolean;
 }
 
-export default function DetailsSidebar({monitorEnv, monitor}: Props) {
+export default function DetailsSidebar({monitorEnv, monitor, showUnknownLegend}: Props) {
   const {checkin_margin, schedule, schedule_type, max_runtime, timezone} = monitor.config;
   const {onClick, label} = useCopyToClipboard({text: monitor.slug});
 
@@ -78,26 +84,51 @@ export default function DetailsSidebar({monitorEnv, monitor}: Props) {
         )}
       </Schedule>
       <SectionHeading>{t('Legend')}</SectionHeading>
-      <Thresholds>
-        <MonitorIndicator status={CheckInStatus.MISSED} size={12} />
-        <Text>
-          {tn(
-            'Check-in missed after %s min',
-            'Check-in missed after %s mins',
-            checkin_margin ?? DEFAULT_CHECKIN_MARGIN
-          )}
-        </Text>
-        <MonitorIndicator status={CheckInStatus.ERROR} size={12} />
-        <Text>{t('Check-in reported as failed')}</Text>
-        <MonitorIndicator status={CheckInStatus.TIMEOUT} size={12} />
-        <Text>
-          {tn(
-            'Check-in timed out after %s min',
-            'Check-in timed out after %s mins',
-            max_runtime ?? DEFAULT_MAX_RUNTIME
-          )}
-        </Text>
-      </Thresholds>
+      <CheckInLegend>
+        <CheckInLegendItem>
+          <MonitorIndicator status={CheckInStatus.MISSED} size={12} />
+          <Text>
+            {tn(
+              'Check-in missed after %s min',
+              'Check-in missed after %s mins',
+              checkin_margin ?? DEFAULT_CHECKIN_MARGIN
+            )}
+          </Text>
+        </CheckInLegendItem>
+        <CheckInLegendItem>
+          <MonitorIndicator status={CheckInStatus.ERROR} size={12} />
+          <Text>{t('Check-in reported as failed')}</Text>
+        </CheckInLegendItem>
+        <CheckInLegendItem>
+          <MonitorIndicator status={CheckInStatus.TIMEOUT} size={12} />
+          <Text>
+            {tn(
+              'Check-in timed out after %s min',
+              'Check-in timed out after %s mins',
+              max_runtime ?? DEFAULT_MAX_RUNTIME
+            )}
+          </Text>
+        </CheckInLegendItem>
+        {showUnknownLegend && (
+          <CheckInLegendItem>
+            <MonitorIndicator status={CheckInStatus.UNKNOWN} size={12} />
+            <UnknownText>
+              {t('Unknown Status')}
+              <QuestionTooltip
+                size="sm"
+                title={tct(
+                  'Sentry was unable to determine the check-in status. [link:Learn More].',
+                  {
+                    link: (
+                      <ExternalLink href="https://docs.sentry.io/product/crons/monitor-details/#check-in-statuses" />
+                    ),
+                  }
+                )}
+              />
+            </UnknownText>
+          </CheckInLegendItem>
+        )}
+      </CheckInLegend>
       <SectionHeading>{t('Cron Details')}</SectionHeading>
       <KeyValueTable>
         <KeyValueTableRow keyName={t('Monitor Slug')} value={slug} />
@@ -138,12 +169,25 @@ const CrontabText = styled(Text)`
   color: ${p => p.theme.subText};
 `;
 
-const Thresholds = styled('div')`
+const CheckInLegend = styled('ul')`
   display: grid;
   grid-template-columns: max-content 1fr;
   margin-bottom: ${space(2)};
+  padding: 0;
+  gap: ${space(1)};
+`;
+
+const CheckInLegendItem = styled('li')`
+  display: grid;
+  grid-template-columns: subgrid;
   align-items: center;
+  grid-column: 1 / -1;
+`;
+
+const UnknownText = styled(Text)`
+  display: flex;
   gap: ${space(1)};
+  align-items: center;
 `;
 
 const MonitorSlug = styled('button')`
diff --git a/static/app/views/monitors/components/detailsTimeline.tsx b/static/app/views/monitors/components/detailsTimeline.tsx
index dc77bcbd52454a..8534f76f48cb16 100644
--- a/static/app/views/monitors/components/detailsTimeline.tsx
+++ b/static/app/views/monitors/components/detailsTimeline.tsx
@@ -1,4 +1,4 @@
-import {useRef} from 'react';
+import {useEffect, useRef} from 'react';
 import styled from '@emotion/styled';
 
 import {
@@ -9,24 +9,30 @@ import Panel from 'sentry/components/panels/panel';
 import Text from 'sentry/components/text';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {Organization} from 'sentry/types/organization';
 import {setApiQueryData, useQueryClient} from 'sentry/utils/queryClient';
 import useApi from 'sentry/utils/useApi';
 import {useDimensions} from 'sentry/utils/useDimensions';
 import {useLocation} from 'sentry/utils/useLocation';
+import useOrganization from 'sentry/utils/useOrganization';
 import type {Monitor} from 'sentry/views/monitors/types';
 import {makeMonitorDetailsQueryKey} from 'sentry/views/monitors/utils';
 
 import {OverviewRow} from './overviewTimeline/overviewRow';
 import {GridLineLabels, GridLineOverlay} from './timeline/gridLines';
+import {useMonitorStats} from './timeline/hooks/useMonitorStats';
 import {useTimeWindowConfig} from './timeline/hooks/useTimeWindowConfig';
+import type {MonitorBucket} from './timeline/types';
 
 interface Props {
   monitor: Monitor;
-  organization: Organization;
+  /**
+   * Called when monitor stats have been loaded for this timeline.
+   */
+  onStatsLoaded: (stats: MonitorBucket[]) => void;
 }
 
-export function DetailsTimeline({monitor, organization}: Props) {
+export function DetailsTimeline({monitor, onStatsLoaded}: Props) {
+  const organization = useOrganization();
   const location = useLocation();
   const api = useApi();
   const queryClient = useQueryClient();
@@ -43,6 +49,16 @@ export function DetailsTimeline({monitor, organization}: Props) {
     {...location.query}
   );
 
+  const {data: monitorStats} = useMonitorStats({
+    monitors: [monitor.id],
+    timeWindowConfig,
+  });
+
+  useEffect(
+    () => monitorStats?.[monitor.id] && onStatsLoaded?.(monitorStats[monitor.id]),
+    [onStatsLoaded, monitorStats, monitor.id]
+  );
+
   const handleDeleteEnvironment = async (env: string) => {
     const success = await deleteMonitorEnvironment(api, organization.slug, monitor, env);
     if (!success) {
diff --git a/static/app/views/monitors/components/monitorCheckIns.tsx b/static/app/views/monitors/components/monitorCheckIns.tsx
index 13599492d9b1b6..7f3573b83b2f0e 100644
--- a/static/app/views/monitors/components/monitorCheckIns.tsx
+++ b/static/app/views/monitors/components/monitorCheckIns.tsx
@@ -46,6 +46,7 @@ export const checkStatusToIndicatorStatus: Record<
   [CheckInStatus.IN_PROGRESS]: 'muted',
   [CheckInStatus.MISSED]: 'warning',
   [CheckInStatus.TIMEOUT]: 'error',
+  [CheckInStatus.UNKNOWN]: 'muted',
 };
 
 function MonitorCheckIns({monitor, monitorEnvs, orgSlug}: Props) {
@@ -168,7 +169,7 @@ function MonitorCheckIns({monitor, monitorEnvs, orgSlug}: Props) {
                               avatarSize={12}
                             />
                           }
-                          to={`/issues/${id}`}
+                          to={`/organizations/${organization.slug}/issues/${id}/`}
                         />
                       </QuickContextHovercard>
                     ))}
diff --git a/static/app/views/monitors/components/overviewTimeline/overviewRow.tsx b/static/app/views/monitors/components/overviewTimeline/overviewRow.tsx
index fcd94e8b571008..eef91478be8297 100644
--- a/static/app/views/monitors/components/overviewTimeline/overviewRow.tsx
+++ b/static/app/views/monitors/components/overviewTimeline/overviewRow.tsx
@@ -1,6 +1,7 @@
 import {useState} from 'react';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
+import pick from 'lodash/pick';
 
 import Tag from 'sentry/components/badge/tag';
 import {Button} from 'sentry/components/button';
@@ -14,7 +15,7 @@ import {t, tct} from 'sentry/locale';
 import {fadeIn} from 'sentry/styles/animations';
 import {space} from 'sentry/styles/space';
 import type {ObjectStatus} from 'sentry/types/core';
-import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import type {Monitor} from 'sentry/views/monitors/types';
 import {scheduleAsText} from 'sentry/views/monitors/utils/scheduleAsText';
@@ -67,12 +68,16 @@ export function OverviewRow({
 
   const isDisabled = monitor.status === 'disabled';
 
+  const location = useLocation();
+  const query = pick(location.query, ['start', 'end', 'statsPeriod', 'environment']);
+
   const monitorDetails = singleMonitorView ? null : (
     <DetailsArea>
       <DetailsLink
-        to={normalizeUrl(
-          `/organizations/${organization.slug}/crons/${monitor.project.slug}/${monitor.slug}/`
-        )}
+        to={{
+          pathname: `/organizations/${organization.slug}/crons/${monitor.project.slug}/${monitor.slug}/`,
+          query,
+        }}
       >
         <DetailsHeadline>
           <Name>{monitor.name}</Name>
@@ -115,9 +120,7 @@ export function OverviewRow({
     (env: string) => ({
       label: t('View Environment'),
       key: 'view',
-      to: normalizeUrl(
-        `/organizations/${organization.slug}/crons/${monitor.project.slug}/${monitor.slug}/?environment=${env}`
-      ),
+      to: {pathname: location.pathname, query: {...query, environment: env}},
     }),
     ...(onToggleMuteEnvironment
       ? [
@@ -168,7 +171,8 @@ export function OverviewRow({
           const {name, isMuted} = env;
           return (
             <EnvRow key={name}>
-              <DropdownMenu
+              <MonitorEnvironmentLabel monitorEnv={env} />
+              <EnvDropdown
                 size="sm"
                 trigger={triggerProps => (
                   <EnvActionButton
@@ -182,7 +186,6 @@ export function OverviewRow({
                   actionCreator(name, isMuted)
                 )}
               />
-              <MonitorEnvironmentLabel monitorEnv={env} />
             </EnvRow>
           );
         })}
@@ -344,6 +347,10 @@ const MonitorEnvContainer = styled('div')`
   text-align: right;
 `;
 
+const EnvDropdown = styled(DropdownMenu)`
+  text-align: left;
+`;
+
 const EnvRow = styled('div')`
   display: flex;
   gap: ${space(0.5)};
diff --git a/static/app/views/monitors/components/quickStartEntries.tsx b/static/app/views/monitors/components/quickStartEntries.tsx
index 56338330c90fca..fefd9e19b64271 100644
--- a/static/app/views/monitors/components/quickStartEntries.tsx
+++ b/static/app/views/monitors/components/quickStartEntries.tsx
@@ -109,9 +109,7 @@ sentry-cli monitors run ${slug} -- python path/to/file`;
         {tct(
           'Make sure to [installLink:install the Sentry CLI] (min v2.16.1), then instrument your monitor:',
           {
-            installLink: (
-              <ExternalLink href="https://docs.sentry.io/product/cli/installation/" />
-            ),
+            installLink: <ExternalLink href="https://docs.sentry.io/cli/installation/" />,
           }
         )}
       </div>
@@ -169,7 +167,7 @@ $checkInId = \\Sentry\\captureCheckIn(
   const checkInFailCode = `// 🔴 Notify Sentry your job has failed:
 \\Sentry\\captureCheckIn(
     slug: '${slug}',
-    status: CheckInStatus::error()
+    status: CheckInStatus::error(),
     checkInId: $checkInId,
 );`;
 
diff --git a/static/app/views/monitors/components/timeline/checkInTooltip.spec.tsx b/static/app/views/monitors/components/timeline/checkInTooltip.spec.tsx
index 248f3a2bbc958c..433ffbe284e2ec 100644
--- a/static/app/views/monitors/components/timeline/checkInTooltip.spec.tsx
+++ b/static/app/views/monitors/components/timeline/checkInTooltip.spec.tsx
@@ -11,12 +11,13 @@ type StatusCounts = [
   missed: number,
   timeout: number,
   error: number,
+  unknown: number,
 ];
 
 export function generateEnvMapping(name: string, counts: StatusCounts) {
-  const [in_progress, ok, missed, timeout, error] = counts;
+  const [in_progress, ok, missed, timeout, error, unknown] = counts;
   return {
-    [name]: {in_progress, ok, missed, timeout, error},
+    [name]: {in_progress, ok, missed, timeout, error, unknown},
   };
 }
 
@@ -38,7 +39,7 @@ describe('CheckInTooltip', function () {
   it('renders tooltip representing single job run', async function () {
     const startTs = new Date('2023-06-15T11:00:00Z').valueOf();
     const endTs = startTs;
-    const envMapping = generateEnvMapping('prod', [0, 0, 1, 0, 0]);
+    const envMapping = generateEnvMapping('prod', [0, 0, 1, 0, 0, 0]);
     const jobTick = {
       startTs,
       envMapping,
@@ -63,7 +64,7 @@ describe('CheckInTooltip', function () {
   it('renders tooltip representing multiple job runs 1 env', async function () {
     const startTs = new Date('2023-06-15T11:00:00Z').valueOf();
     const endTs = startTs;
-    const envMapping = generateEnvMapping('prod', [0, 1, 1, 1, 1]);
+    const envMapping = generateEnvMapping('prod', [0, 1, 1, 1, 1, 0]);
     const jobTick = {
       startTs,
       envMapping,
@@ -101,8 +102,8 @@ describe('CheckInTooltip', function () {
   it('renders tooltip representing multiple job runs multiple envs', async function () {
     const startTs = new Date('2023-06-15T11:00:00Z').valueOf();
     const endTs = startTs;
-    const prodEnvMapping = generateEnvMapping('prod', [0, 0, 1, 0, 0]);
-    const devEnvMapping = generateEnvMapping('dev', [0, 1, 2, 1, 0]);
+    const prodEnvMapping = generateEnvMapping('prod', [0, 0, 1, 0, 0, 0]);
+    const devEnvMapping = generateEnvMapping('dev', [0, 1, 2, 1, 0, 0]);
     const envMapping = {...prodEnvMapping, ...devEnvMapping};
     const jobTick = {
       startTs,
diff --git a/static/app/views/monitors/components/timeline/types.tsx b/static/app/views/monitors/components/timeline/types.tsx
index 7aecb1b158b032..597e0a36480fbe 100644
--- a/static/app/views/monitors/components/timeline/types.tsx
+++ b/static/app/views/monitors/components/timeline/types.tsx
@@ -68,6 +68,7 @@ export type StatsBucket = {
   [CheckInStatus.MISSED]: number;
   [CheckInStatus.TIMEOUT]: number;
   [CheckInStatus.ERROR]: number;
+  [CheckInStatus.UNKNOWN]: number;
 };
 
 export type MonitorBucketEnvMapping = Record<string, StatsBucket>;
diff --git a/static/app/views/monitors/components/timeline/utils/constants.tsx b/static/app/views/monitors/components/timeline/utils/constants.tsx
index ab061431fc91de..f9ca6084cd8b18 100644
--- a/static/app/views/monitors/components/timeline/utils/constants.tsx
+++ b/static/app/views/monitors/components/timeline/utils/constants.tsx
@@ -9,4 +9,5 @@ export const CHECKIN_STATUS_PRECEDENT = [
   CheckInStatus.MISSED,
   CheckInStatus.TIMEOUT,
   CheckInStatus.ERROR,
+  CheckInStatus.UNKNOWN,
 ] satisfies Array<keyof StatsBucket>;
diff --git a/static/app/views/monitors/components/timeline/utils/filterMonitorStatsBucketByEnv.spec.tsx b/static/app/views/monitors/components/timeline/utils/filterMonitorStatsBucketByEnv.spec.tsx
index c2bf81d153be84..0d845b10e70a5a 100644
--- a/static/app/views/monitors/components/timeline/utils/filterMonitorStatsBucketByEnv.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/filterMonitorStatsBucketByEnv.spec.tsx
@@ -7,15 +7,15 @@ describe('filterMonitorStatsBucketByEnvs', function () {
     const bucket = [
       1,
       {
-        prod: {in_progress: 0, ok: 0, missed: 0, timeout: 1, error: 0},
-        dev: {in_progress: 0, ok: 1, missed: 0, timeout: 0, error: 0},
+        prod: {in_progress: 0, ok: 0, missed: 0, timeout: 1, error: 0, unknown: 0},
+        dev: {in_progress: 0, ok: 1, missed: 0, timeout: 0, error: 0, unknown: 0},
       },
     ] as MonitorBucket;
     const filteredBucket = filterMonitorStatsBucketByEnv(bucket, 'prod');
     expect(filteredBucket).toEqual([
       1,
       {
-        prod: {in_progress: 0, ok: 0, missed: 0, timeout: 1, error: 0},
+        prod: {in_progress: 0, ok: 0, missed: 0, timeout: 1, error: 0, unknown: 0},
       },
     ]);
   });
diff --git a/static/app/views/monitors/components/timeline/utils/getAggregateStatus.spec.tsx b/static/app/views/monitors/components/timeline/utils/getAggregateStatus.spec.tsx
index 6acf62265b9cba..ddb73855482981 100644
--- a/static/app/views/monitors/components/timeline/utils/getAggregateStatus.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/getAggregateStatus.spec.tsx
@@ -8,20 +8,21 @@ type StatusCounts = [
   missed: number,
   timeout: number,
   error: number,
+  unknown: number,
 ];
 
 export function generateEnvMapping(name: string, counts: StatusCounts) {
-  const [in_progress, ok, missed, timeout, error] = counts;
+  const [in_progress, ok, missed, timeout, error, unknown] = counts;
   return {
-    [name]: {in_progress, ok, missed, timeout, error},
+    [name]: {in_progress, ok, missed, timeout, error, unknown},
   };
 }
 
 describe('getAggregateStatus', function () {
   it('aggregates correctly across multiple envs', function () {
     const envData = {
-      ...generateEnvMapping('prod', [0, 1, 2, 0, 1]),
-      ...generateEnvMapping('dev', [0, 1, 0, 1, 0]),
+      ...generateEnvMapping('prod', [0, 1, 2, 0, 1, 0]),
+      ...generateEnvMapping('dev', [0, 1, 0, 1, 0, 0]),
     };
     expect(getAggregateStatus(envData)).toEqual(CheckInStatus.ERROR);
   });
diff --git a/static/app/views/monitors/components/timeline/utils/getAggregateStatusFromMultipleBuckets.spec.tsx b/static/app/views/monitors/components/timeline/utils/getAggregateStatusFromMultipleBuckets.spec.tsx
index c9c85d0c138a8d..2a3e023fde162e 100644
--- a/static/app/views/monitors/components/timeline/utils/getAggregateStatusFromMultipleBuckets.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/getAggregateStatusFromMultipleBuckets.spec.tsx
@@ -8,20 +8,21 @@ type StatusCounts = [
   missed: number,
   timeout: number,
   error: number,
+  unknown: number,
 ];
 
 export function generateEnvMapping(name: string, counts: StatusCounts) {
-  const [in_progress, ok, missed, timeout, error] = counts;
+  const [in_progress, ok, missed, timeout, error, unknown] = counts;
   return {
-    [name]: {in_progress, ok, missed, timeout, error},
+    [name]: {in_progress, ok, missed, timeout, error, unknown},
   };
 }
 
 describe('getAggregateStatusFromMultipleBuckets', function () {
   it('aggregates correctly across multiple envs', function () {
-    const envData1 = generateEnvMapping('prod', [2, 1, 2, 1, 0]);
-    const envData2 = generateEnvMapping('dev', [1, 2, 0, 0, 0]);
-    const envData3 = generateEnvMapping('prod', [1, 1, 1, 3, 0]);
+    const envData1 = generateEnvMapping('prod', [2, 1, 2, 1, 0, 0]);
+    const envData2 = generateEnvMapping('dev', [1, 2, 0, 0, 0, 0]);
+    const envData3 = generateEnvMapping('prod', [1, 1, 1, 3, 0, 0]);
 
     const status = getAggregateStatusFromMultipleBuckets([envData1, envData2, envData3]);
 
diff --git a/static/app/views/monitors/components/timeline/utils/isEnvMappingEmpty.spec.tsx b/static/app/views/monitors/components/timeline/utils/isEnvMappingEmpty.spec.tsx
index 64c85c24ae4d99..eba38eac4c7e47 100644
--- a/static/app/views/monitors/components/timeline/utils/isEnvMappingEmpty.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/isEnvMappingEmpty.spec.tsx
@@ -7,7 +7,9 @@ describe('isEnvMappingEmpty', function () {
   });
 
   it('returns false for a filled env', function () {
-    const envMapping = {prod: {ok: 1, missed: 0, timeout: 0, error: 0, in_progress: 0}};
+    const envMapping = {
+      prod: {ok: 1, missed: 0, timeout: 0, error: 0, in_progress: 0, unknown: 0},
+    };
     expect(isEnvMappingEmpty(envMapping)).toEqual(false);
   });
 });
diff --git a/static/app/views/monitors/components/timeline/utils/mergeBuckets.spec.tsx b/static/app/views/monitors/components/timeline/utils/mergeBuckets.spec.tsx
index 880c02467323ad..0bc05f1828975f 100644
--- a/static/app/views/monitors/components/timeline/utils/mergeBuckets.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/mergeBuckets.spec.tsx
@@ -10,12 +10,13 @@ type StatusCounts = [
   missed: number,
   timeout: number,
   error: number,
+  unknown: number,
 ];
 
 export function generateEnvMapping(name: string, counts: StatusCounts) {
-  const [in_progress, ok, missed, timeout, error] = counts;
+  const [in_progress, ok, missed, timeout, error, unknown] = counts;
   return {
-    [name]: {in_progress, ok, missed, timeout, error},
+    [name]: {in_progress, ok, missed, timeout, error, unknown},
   };
 }
 
@@ -26,9 +27,9 @@ function generateJobRun(envName: string, jobStatus: CheckInStatus) {
     CheckInStatus.MISSED,
     CheckInStatus.TIMEOUT,
     CheckInStatus.ERROR,
-    CheckInStatus.IN_PROGRESS,
+    CheckInStatus.UNKNOWN,
   ];
-  const counts: StatusCounts = [0, 0, 0, 0, 0];
+  const counts: StatusCounts = [0, 0, 0, 0, 0, 0];
   counts[sortedStatuses.indexOf(jobStatus)] = 1;
   return generateEnvMapping(envName, counts);
 }
@@ -53,7 +54,7 @@ describe('mergeBuckets', function () {
         width: 8,
         roundedLeft: true,
         roundedRight: true,
-        envMapping: generateEnvMapping('prod', [0, 7, 0, 0, 0]),
+        envMapping: generateEnvMapping('prod', [0, 7, 0, 0, 0, 0]),
       },
     ];
 
@@ -79,7 +80,7 @@ describe('mergeBuckets', function () {
         width: 4,
         roundedLeft: true,
         roundedRight: false,
-        envMapping: generateEnvMapping('prod', [0, 4, 0, 0, 0]),
+        envMapping: generateEnvMapping('prod', [0, 4, 0, 0, 0, 0]),
       },
       {
         startTs: 5,
@@ -87,7 +88,7 @@ describe('mergeBuckets', function () {
         width: 4,
         roundedLeft: false,
         roundedRight: true,
-        envMapping: generateEnvMapping('prod', [0, 0, 3, 1, 0]),
+        envMapping: generateEnvMapping('prod', [0, 0, 3, 1, 0, 0]),
       },
     ];
 
@@ -113,7 +114,7 @@ describe('mergeBuckets', function () {
         width: 8,
         roundedLeft: true,
         roundedRight: true,
-        envMapping: generateEnvMapping('prod', [0, 1, 2, 5, 0]),
+        envMapping: generateEnvMapping('prod', [0, 1, 2, 5, 0, 0]),
       },
     ];
 
@@ -158,7 +159,7 @@ describe('mergeBuckets', function () {
         width: 4,
         roundedLeft: true,
         roundedRight: true,
-        envMapping: generateEnvMapping('dev', [0, 1, 1, 1, 0]),
+        envMapping: generateEnvMapping('dev', [0, 1, 1, 1, 0, 0]),
       },
     ];
 
diff --git a/static/app/views/monitors/components/timeline/utils/mergeEnvMappings.spec.tsx b/static/app/views/monitors/components/timeline/utils/mergeEnvMappings.spec.tsx
index bea532587dd063..87bfd6b4a7b373 100644
--- a/static/app/views/monitors/components/timeline/utils/mergeEnvMappings.spec.tsx
+++ b/static/app/views/monitors/components/timeline/utils/mergeEnvMappings.spec.tsx
@@ -14,7 +14,7 @@ describe('mergeEnvMappings', function () {
   it('merges one empty mapping with one filled mapping', function () {
     const envMappingA: MonitorBucketEnvMapping = {};
     const envMappingB: MonitorBucketEnvMapping = {
-      prod: {in_progress: 0, ok: 1, missed: 0, timeout: 0, error: 0},
+      prod: {in_progress: 0, ok: 1, missed: 0, timeout: 0, error: 0, unknown: 0},
     };
     const mergedMapping = mergeEnvMappings(envMappingA, envMappingB);
 
@@ -23,13 +23,13 @@ describe('mergeEnvMappings', function () {
 
   it('merges two filled mappings', function () {
     const envMappingA: MonitorBucketEnvMapping = {
-      prod: {in_progress: 0, ok: 0, missed: 1, timeout: 2, error: 1},
+      prod: {in_progress: 0, ok: 0, missed: 1, timeout: 2, error: 1, unknown: 0},
     };
     const envMappingB: MonitorBucketEnvMapping = {
-      prod: {in_progress: 2, ok: 1, missed: 1, timeout: 0, error: 2},
+      prod: {in_progress: 2, ok: 1, missed: 1, timeout: 0, error: 2, unknown: 0},
     };
     const expectedMerged: MonitorBucketEnvMapping = {
-      prod: {in_progress: 2, ok: 1, missed: 2, timeout: 2, error: 3},
+      prod: {in_progress: 2, ok: 1, missed: 2, timeout: 2, error: 3, unknown: 0},
     };
     const mergedMapping = mergeEnvMappings(envMappingA, envMappingB);
 
@@ -38,14 +38,14 @@ describe('mergeEnvMappings', function () {
 
   it('merges two filled mappings with differing envs', function () {
     const envMappingA: MonitorBucketEnvMapping = {
-      prod: {in_progress: 1, ok: 0, missed: 1, timeout: 2, error: 1},
+      prod: {in_progress: 1, ok: 0, missed: 1, timeout: 2, error: 1, unknown: 0},
     };
     const envMappingB: MonitorBucketEnvMapping = {
-      dev: {in_progress: 0, ok: 1, missed: 1, timeout: 0, error: 2},
+      dev: {in_progress: 0, ok: 1, missed: 1, timeout: 0, error: 2, unknown: 0},
     };
     const expectedMerged: MonitorBucketEnvMapping = {
-      prod: {in_progress: 1, ok: 0, missed: 1, timeout: 2, error: 1},
-      dev: {in_progress: 0, ok: 1, missed: 1, timeout: 0, error: 2},
+      prod: {in_progress: 1, ok: 0, missed: 1, timeout: 2, error: 1, unknown: 0},
+      dev: {in_progress: 0, ok: 1, missed: 1, timeout: 0, error: 2, unknown: 0},
     };
     const mergedMapping = mergeEnvMappings(envMappingA, envMappingB);
 
diff --git a/static/app/views/monitors/details.tsx b/static/app/views/monitors/details.tsx
index 249b0416ad88e0..350436d9c4cbf0 100644
--- a/static/app/views/monitors/details.tsx
+++ b/static/app/views/monitors/details.tsx
@@ -1,4 +1,4 @@
-import {Fragment} from 'react';
+import {Fragment, useCallback, useState} from 'react';
 import styled from '@emotion/styled';
 import sortBy from 'lodash/sortBy';
 
@@ -32,6 +32,7 @@ import MonitorIssues from './components/monitorIssues';
 import MonitorStats from './components/monitorStats';
 import MonitorOnboarding from './components/onboarding';
 import {StatusToggleButton} from './components/statusToggleButton';
+import type {MonitorBucket} from './components/timeline/types';
 import type {CheckinProcessingError, Monitor, ProcessingErrorType} from './types';
 
 const DEFAULT_POLL_INTERVAL_MS = 5000;
@@ -110,6 +111,17 @@ function MonitorDetails({params, location}: Props) {
     refetchErrors();
   }
 
+  // Only display the unknown legend when there are visible unknown check-ins
+  // in the timeline
+  const [showUnknownLegend, setShowUnknownLegend] = useState(false);
+
+  const checkHasUnknown = useCallback((stats: MonitorBucket[]) => {
+    const hasUnknown = stats.some(bucket =>
+      Object.values(bucket[1]).some(envBucket => Boolean(envBucket.unknown))
+    );
+    setShowUnknownLegend(hasUnknown);
+  }, []);
+
   if (isError) {
     return (
       <LoadingError message={t('The monitor you were looking for was not found.')} />
@@ -169,7 +181,7 @@ function MonitorDetails({params, location}: Props) {
               <MonitorOnboarding monitor={monitor} />
             ) : (
               <Fragment>
-                <DetailsTimeline organization={organization} monitor={monitor} />
+                <DetailsTimeline monitor={monitor} onStatsLoaded={checkHasUnknown} />
                 <MonitorStats
                   orgSlug={organization.slug}
                   monitor={monitor}
@@ -194,6 +206,7 @@ function MonitorDetails({params, location}: Props) {
             <DetailsSidebar
               monitorEnv={envsSortedByLastCheck[envsSortedByLastCheck.length - 1]}
               monitor={monitor}
+              showUnknownLegend={showUnknownLegend}
             />
           </Layout.Side>
         </Layout.Body>
diff --git a/static/app/views/monitors/types.tsx b/static/app/views/monitors/types.tsx
index 401b34b7c377fd..8b5b4ab5e54a52 100644
--- a/static/app/views/monitors/types.tsx
+++ b/static/app/views/monitors/types.tsx
@@ -33,6 +33,7 @@ export enum CheckInStatus {
   IN_PROGRESS = 'in_progress',
   MISSED = 'missed',
   TIMEOUT = 'timeout',
+  UNKNOWN = 'unknown',
 }
 
 interface BaseConfig {
diff --git a/static/app/views/monitors/utils.tsx b/static/app/views/monitors/utils.tsx
index 2cc69adc56dbb2..46f1c059fd621c 100644
--- a/static/app/views/monitors/utils.tsx
+++ b/static/app/views/monitors/utils.tsx
@@ -48,6 +48,7 @@ export const statusToText: Record<CheckInStatus, string> = {
   [CheckInStatus.IN_PROGRESS]: t('In Progress'),
   [CheckInStatus.MISSED]: t('Missed'),
   [CheckInStatus.TIMEOUT]: t('Timed Out'),
+  [CheckInStatus.UNKNOWN]: t('Unknown'),
 };
 
 interface TickStyle {
@@ -88,6 +89,11 @@ export const tickStyle: Record<CheckInStatus, TickStyle> = {
     labelColor: 'disabled',
     tickColor: 'disabled',
   },
+  [CheckInStatus.UNKNOWN]: {
+    labelColor: 'gray400',
+    tickColor: 'gray300',
+    hatchTick: 'gray200',
+  },
 };
 
 export const getScheduleIntervals = (n: number): SelectValue<string>[] => [
diff --git a/static/app/views/organizationStats/getReasonGroupName.ts b/static/app/views/organizationStats/getReasonGroupName.ts
index ebbce6ba7b5de0..c7b398b4bbcf11 100644
--- a/static/app/views/organizationStats/getReasonGroupName.ts
+++ b/static/app/views/organizationStats/getReasonGroupName.ts
@@ -108,7 +108,7 @@ const invalidReasonsGroup: Record<string, DiscardReason[]> = {
   minidump: [DiscardReason.MISSING_MINIDUMP_UPLOAD, DiscardReason.INVALID_MINIDUMP],
   security_report: [DiscardReason.SECURITY_REPORT, DiscardReason.SECURITY_REPORT_TYPE],
   unreal: [DiscardReason.PROCESS_UNREAL],
-  cors: [DiscardReason.CORS],
+  disallowed_domain: [DiscardReason.CORS],
   empty: [
     DiscardReason.NO_EVENT_PAYLOAD,
     DiscardReason.EMPTY_ENVELOPE,
diff --git a/static/app/views/organizationStats/index.spec.tsx b/static/app/views/organizationStats/index.spec.tsx
index fea4c5c22eb5db..19a929190da3a3 100644
--- a/static/app/views/organizationStats/index.spec.tsx
+++ b/static/app/views/organizationStats/index.spec.tsx
@@ -125,7 +125,7 @@ describe('OrganizationStats', function () {
         groupBy: ['outcome', 'reason'],
         project: [-1],
         field: ['sum(quantity)'],
-        category: 'error',
+        category: ['error'],
       },
       UsageStatsPerMin: {
         statsPeriod: '5m',
@@ -140,7 +140,7 @@ describe('OrganizationStats', function () {
         groupBy: ['outcome', 'project'],
         project: [-1],
         field: ['sum(quantity)'],
-        category: 'error',
+        category: ['error'],
       },
     };
     for (const query of Object.values(mockExpectations)) {
@@ -325,7 +325,7 @@ describe('OrganizationStats', function () {
           groupBy: ['outcome', 'reason'],
           project: selectedProjects,
           field: ['sum(quantity)'],
-          category: 'error',
+          category: ['error'],
         },
       })
     );
@@ -367,7 +367,7 @@ describe('OrganizationStats', function () {
           groupBy: ['outcome', 'reason'],
           project: selectedProject,
           field: ['sum(quantity)'],
-          category: 'error',
+          category: ['error'],
         },
       })
     );
@@ -414,6 +414,90 @@ describe('OrganizationStats', function () {
       expect(screen.queryByText('My Projects')).not.toBeInTheDocument();
     }
   });
+
+  /**
+   * Feature Flagging - Continuous Profiling
+   */
+  it('shows only profile duration category with continuous-profiling-stats feature', async () => {
+    const newOrg = initializeOrg({
+      organization: {
+        features: ['global-views', 'team-insights', 'continuous-profiling-stats'],
+      },
+    });
+
+    render(<OrganizationStats {...defaultProps} organization={newOrg.organization} />, {
+      router: newOrg.router,
+    });
+
+    await userEvent.click(await screen.findByText('Category'));
+
+    // Should show Profile Hours option
+    expect(screen.getByRole('option', {name: 'Profile Hours'})).toBeInTheDocument();
+    // Should not show Profiles (transaction) option
+    expect(screen.queryByRole('option', {name: 'Profiles'})).not.toBeInTheDocument();
+  });
+
+  it('shows both profile hours and profiles categories with continuous-profiling feature', async () => {
+    const newOrg = initializeOrg({
+      organization: {
+        features: ['global-views', 'team-insights', 'continuous-profiling'],
+      },
+    });
+
+    render(<OrganizationStats {...defaultProps} organization={newOrg.organization} />, {
+      router: newOrg.router,
+    });
+
+    await userEvent.click(await screen.findByText('Category'));
+
+    // Should show Profile Hours option
+    expect(screen.getByRole('option', {name: 'Profile Hours'})).toBeInTheDocument();
+    // Should show Profiles (transaction) option
+    expect(screen.queryByRole('option', {name: 'Profiles'})).toBeInTheDocument();
+  });
+
+  it('shows only profile duration category when both profiling features are enabled', async () => {
+    const newOrg = initializeOrg({
+      organization: {
+        features: [
+          'global-views',
+          'team-insights',
+          'continuous-profiling-stats',
+          'continuous-profiling',
+        ],
+      },
+    });
+
+    render(<OrganizationStats {...defaultProps} organization={newOrg.organization} />, {
+      router: newOrg.router,
+    });
+
+    await userEvent.click(await screen.findByText('Category'));
+
+    // Should show Profile Hours option
+    expect(screen.getByRole('option', {name: 'Profile Hours'})).toBeInTheDocument();
+    // Should not show Profiles (transaction) option
+    expect(screen.queryByRole('option', {name: 'Profiles'})).not.toBeInTheDocument();
+  });
+
+  it('shows only Profiles category without profiling features', async () => {
+    const newOrg = initializeOrg({
+      organization: {
+        features: ['global-views', 'team-insights'],
+      },
+    });
+
+    render(<OrganizationStats {...defaultProps} organization={newOrg.organization} />, {
+      router: newOrg.router,
+    });
+
+    await userEvent.click(await screen.findByText('Category'));
+
+    // Should show Profile Hours option
+    expect(screen.queryByRole('option', {name: 'Profile Hours'})).not.toBeInTheDocument();
+    // Should show Profiles (transaction) option
+    expect(screen.getByRole('option', {name: 'Profiles'})).toBeInTheDocument();
+  });
 });
 
 const mockStatsResponse = {
diff --git a/static/app/views/organizationStats/index.tsx b/static/app/views/organizationStats/index.tsx
index 6833804200e7d7..ad91859c178895 100644
--- a/static/app/views/organizationStats/index.tsx
+++ b/static/app/views/organizationStats/index.tsx
@@ -30,6 +30,7 @@ import {
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
+import {hasDynamicSamplingCustomFeature} from 'sentry/utils/dynamicSampling/features';
 import withOrganization from 'sentry/utils/withOrganization';
 import withPageFilters from 'sentry/utils/withPageFilters';
 import HeaderTabs from 'sentry/views/organizationStats/header';
@@ -75,7 +76,8 @@ export class OrganizationStats extends Component<OrganizationStatsProps> {
 
     if (
       info?.name === DataCategoryExact.SPAN &&
-      this.props.organization.features.includes('spans-usage-tracking')
+      this.props.organization.features.includes('spans-usage-tracking') &&
+      !hasDynamicSamplingCustomFeature(this.props.organization)
     ) {
       return {
         ...info,
@@ -257,7 +259,10 @@ export class OrganizationStats extends Component<OrganizationStatsProps> {
         return !organization.features.includes('spans-usage-tracking');
       }
       if (DATA_CATEGORY_INFO.profileDuration.plural === opt.value) {
-        return organization.features.includes('continuous-profiling-stats');
+        return (
+          organization.features.includes('continuous-profiling-stats') ||
+          organization.features.includes('continuous-profiling')
+        );
       }
       if (DATA_CATEGORY_INFO.profile.plural === opt.value) {
         return !organization.features.includes('continuous-profiling-stats');
diff --git a/static/app/views/organizationStats/mapSeriesToChart.spec.ts b/static/app/views/organizationStats/mapSeriesToChart.spec.ts
index 5960ae63ac35b3..34d1739b5f7235 100644
--- a/static/app/views/organizationStats/mapSeriesToChart.spec.ts
+++ b/static/app/views/organizationStats/mapSeriesToChart.spec.ts
@@ -108,4 +108,71 @@ describe('mapSeriesToChart func', function () {
       },
     ]);
   });
+
+  it('should correctly sum up the rate limited count', function () {
+    const mappedSeries = mapSeriesToChart({
+      orgStats: {
+        start: '2021-01-01T00:00:00Z',
+        end: '2021-01-07T00:00:00Z',
+        intervals: [
+          '2021-01-01T00:00:00Z',
+          '2021-01-02T00:00:00Z',
+          '2021-01-03T00:00:00Z',
+        ],
+        groups: [
+          {
+            by: {
+              outcome: 'accepted',
+            },
+            totals: {
+              'sum(quantity)': 99,
+            },
+            series: {
+              'sum(quantity)': [99],
+            },
+          },
+          {
+            by: {
+              outcome: 'rate_limited',
+            },
+            totals: {
+              'sum(quantity)': 6,
+            },
+            series: {
+              'sum(quantity)': [1, 2, 3],
+            },
+          },
+          {
+            by: {
+              outcome: 'abuse',
+            },
+            totals: {
+              'sum(quantity)': 2,
+            },
+            series: {
+              'sum(quantity)': [1, 1],
+            },
+          },
+          {
+            by: {
+              outcome: 'cardinality_limited',
+            },
+            totals: {
+              'sum(quantity)': 3,
+            },
+            series: {
+              'sum(quantity)': [1, 2],
+            },
+          },
+        ],
+      },
+      chartDateInterval: '1h',
+      chartDateUtc: true,
+      dataCategory: 'transactions',
+      endpointQuery: {},
+    });
+
+    // sums up rate limited, abuse, and cardinality limited
+    expect(mappedSeries.cardStats.rateLimited).toEqual('11');
+  });
 });
diff --git a/static/app/views/organizationStats/mapSeriesToChart.ts b/static/app/views/organizationStats/mapSeriesToChart.ts
index 8a852bc56c8e01..58d0744778c5cf 100644
--- a/static/app/views/organizationStats/mapSeriesToChart.ts
+++ b/static/app/views/organizationStats/mapSeriesToChart.ts
@@ -28,6 +28,7 @@ export function mapSeriesToChart({
 }): {
   cardStats: {
     accepted?: string;
+    accepted_stored?: string;
     filtered?: string;
     invalid?: string;
     rateLimited?: string;
@@ -40,19 +41,21 @@ export function mapSeriesToChart({
   const cardStats = {
     total: undefined,
     accepted: undefined,
+    accepted_stored: undefined,
     filtered: undefined,
     invalid: undefined,
     rateLimited: undefined,
   };
   const chartStats: ChartStats = {
     accepted: [],
+    accepted_stored: [],
     filtered: [],
     rateLimited: [],
     invalid: [],
     clientDiscard: [],
     projected: [],
   };
-  const chartSubLabels: TooltipSubLabel[] = [];
+  let chartSubLabels: TooltipSubLabel[] = [];
 
   if (!orgStats) {
     return {cardStats, chartStats, chartSubLabels};
@@ -66,6 +69,7 @@ export function mapSeriesToChart({
         date: getDateFromMoment(dateTime, chartDateInterval, chartDateUtc),
         total: 0,
         accepted: 0,
+        accepted_stored: 0,
         filtered: 0,
         rateLimited: 0,
         invalid: 0,
@@ -85,14 +89,28 @@ export function mapSeriesToChart({
       [Outcome.ABUSE]: 0, // Combined with dropped later
     };
 
+    let countAcceptedStored = 0;
+
     orgStats.groups.forEach(group => {
-      const {outcome} = group.by;
+      const {outcome, category} = group.by;
 
-      if (outcome !== Outcome.CLIENT_DISCARD) {
-        count.total += group.totals['sum(quantity)'];
+      // For spans, we additionally query for `span_indexed` data
+      // to get the `accepted_stored` count
+      if (category !== 'span_indexed') {
+        if (outcome !== Outcome.CLIENT_DISCARD) {
+          count.total += group.totals['sum(quantity)'];
+        }
+        count[outcome] += group.totals['sum(quantity)'];
+      } else {
+        if (outcome === Outcome.ACCEPTED) {
+          countAcceptedStored += group.totals['sum(quantity)'];
+        }
       }
 
-      count[outcome] += group.totals['sum(quantity)'];
+      if (category === 'span_indexed' && outcome !== Outcome.ACCEPTED) {
+        // we need `span_indexed` data for `accepted_stored` only
+        return;
+      }
 
       group.series['sum(quantity)'].forEach((stat, i) => {
         const dataObject = {name: orgStats.intervals[i], value: stat};
@@ -100,14 +118,11 @@ export function mapSeriesToChart({
         const strigfiedReason = String(group.by.reason ?? '');
         const reason = getReasonGroupName(outcome, strigfiedReason);
 
-        const label = startCase(reason.replace(/-|_/g, ' '));
-
-        // Combine rate limited counts
-        count[Outcome.RATE_LIMITED] +=
-          count[Outcome.ABUSE] + count[Outcome.CARDINALITY_LIMITED];
-
         // Function to handle chart sub-label updates
-        const updateChartSubLabels = (parentLabel: SeriesTypes) => {
+        const updateChartSubLabels = (
+          parentLabel: SeriesTypes,
+          label = startCase(reason.replace(/-|_/g, ' '))
+        ) => {
           const existingSubLabel = chartSubLabels.find(
             subLabel => subLabel.label === label && subLabel.parentLabel === parentLabel
           );
@@ -130,6 +145,15 @@ export function mapSeriesToChart({
           }
         };
 
+        // Add accepted indexed spans as sub-label to accepted
+        if (category === 'span_indexed') {
+          if (outcome === Outcome.ACCEPTED) {
+            usageStats[i].accepted_stored += stat;
+            updateChartSubLabels(SeriesTypes.ACCEPTED, 'Stored');
+            return;
+          }
+        }
+
         switch (outcome) {
           case Outcome.FILTERED:
             usageStats[i].filtered += stat;
@@ -158,6 +182,15 @@ export function mapSeriesToChart({
       });
     });
 
+    // Combine rate limited counts
+    count[Outcome.RATE_LIMITED] +=
+      count[Outcome.ABUSE] + count[Outcome.CARDINALITY_LIMITED];
+
+    const isSampled =
+      dataCategory === 'spans' &&
+      countAcceptedStored > 0 &&
+      countAcceptedStored !== count[Outcome.ACCEPTED];
+
     usageStats.forEach(stat => {
       stat.total = [
         stat.accepted,
@@ -169,7 +202,11 @@ export function mapSeriesToChart({
 
       // Chart Data
       const chartData = [
-        {key: 'accepted', value: stat.accepted},
+        {
+          key: 'accepted',
+          value: stat.accepted,
+        },
+        ...(isSampled ? [{key: 'accepted_stored', value: stat.accepted_stored}] : []),
         {key: 'filtered', value: stat.filtered},
         {key: 'rateLimited', value: stat.rateLimited},
         {key: 'invalid', value: stat.invalid},
@@ -181,6 +218,12 @@ export function mapSeriesToChart({
       });
     });
 
+    if (!isSampled) {
+      chartSubLabels = chartSubLabels.filter(
+        subLabel => subLabel.parentLabel !== SeriesTypes.ACCEPTED
+      );
+    }
+
     return {
       cardStats: {
         total: formatUsageWithUnits(
@@ -193,6 +236,13 @@ export function mapSeriesToChart({
           dataCategory,
           getFormatUsageOptions(dataCategory)
         ),
+        accepted_stored: isSampled
+          ? formatUsageWithUnits(
+              countAcceptedStored,
+              dataCategory,
+              getFormatUsageOptions(dataCategory)
+            )
+          : undefined,
         filtered: formatUsageWithUnits(
           count[Outcome.FILTERED],
           dataCategory,
diff --git a/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx b/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx
index fb5b7a33c443a8..e64dd98a3e602f 100644
--- a/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx
@@ -135,16 +135,21 @@ function TeamIssuesBreakdown({
     .map(([projectId, {total}]) => ({projectId, total}))
     .sort((a, b) => b.total - a.total);
 
-  const allSeries = Object.keys(allReviewedByDay).map(
-    (projectId, idx): BarChartSeries => ({
-      seriesName: ProjectsStore.getById(projectId)?.slug ?? projectId,
-      data: sortSeriesByDay(convertDayValueObjectToSeries(allReviewedByDay[projectId])),
-      animationDuration: 500,
-      animationDelay: idx * 500,
-      silent: true,
-      barCategoryGap: '5%',
-    })
-  );
+  // There are projects with more than 0 results
+  const hasResults = sortedProjectIds.some(({total}) => total !== 0);
+  const allSeries = Object.keys(allReviewedByDay)
+    // Hide projects with no results when there are other projects with results
+    .filter(projectId => (hasResults ? projectTotals[projectId].total !== 0 : true))
+    .map(
+      (projectId, idx): BarChartSeries => ({
+        seriesName: ProjectsStore.getById(projectId)?.slug ?? projectId,
+        data: sortSeriesByDay(convertDayValueObjectToSeries(allReviewedByDay[projectId])),
+        animationDuration: 500,
+        animationDelay: idx * 500,
+        silent: true,
+        barCategoryGap: '5%',
+      })
+    );
 
   if (isError) {
     return <LoadingError onRetry={refetch} />;
diff --git a/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.spec.tsx b/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.spec.tsx
index ba585b544b82f1..e70d77780ff92e 100644
--- a/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.spec.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.spec.tsx
@@ -11,6 +11,7 @@ describe('TeamUnresolvedIssues', () => {
     const team = TeamFixture();
     const project = ProjectFixture();
     const organization = OrganizationFixture();
+    const lastDayCount = 37;
     const issuesApi = MockApiClient.addMockResponse({
       url: `/teams/${organization.slug}/${team.slug}/all-unresolved-issues/`,
       body: {
@@ -26,9 +27,9 @@ describe('TeamUnresolvedIssues', () => {
           '2021-12-18T00:00:00+00:00': {unresolved: 44},
           '2021-12-19T00:00:00+00:00': {unresolved: 43},
           '2021-12-20T00:00:00+00:00': {unresolved: 40},
-          '2021-12-21T00:00:00+00:00': {unresolved: 37},
+          '2021-12-21T00:00:00+00:00': {unresolved: 38},
           '2021-12-22T00:00:00+00:00': {unresolved: 36},
-          '2021-12-23T00:00:00+00:00': {unresolved: 37},
+          '2021-12-23T00:00:00+00:00': {unresolved: lastDayCount},
         },
       },
     });
@@ -44,6 +45,7 @@ describe('TeamUnresolvedIssues', () => {
     // Project
     expect(await screen.findByText('project-slug')).toBeInTheDocument();
     expect(screen.getByText('-14%')).toBeInTheDocument();
+    expect(screen.getByText(lastDayCount)).toBeInTheDocument();
     expect(issuesApi).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx b/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
index fbedbace501495..9f4310b7ccde35 100644
--- a/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
@@ -66,6 +66,9 @@ export function TeamUnresolvedIssues({
   function getTotalUnresolved(projectId: number): number {
     const entries = Object.values(periodIssues?.[projectId] ?? {});
     const total = entries.reduce((acc, current) => acc + current.unresolved, 0);
+    if (total === 0) {
+      return 0;
+    }
 
     return Math.round(total / entries.length);
   }
@@ -76,8 +79,10 @@ export function TeamUnresolvedIssues({
   > = {};
   for (const projectId of Object.keys(periodIssues)) {
     const periodAvg = getTotalUnresolved(Number(projectId));
-    const projectPeriodEntries = Object.values(periodIssues?.[projectId] ?? {});
-    const today = projectPeriodEntries[projectPeriodEntries.length - 1]?.unresolved ?? 0;
+    const projectPeriodEntries = Object.entries(periodIssues?.[projectId] ?? {}).sort(
+      (a, b) => new Date(b[0]).getTime() - new Date(a[0]).getTime()
+    );
+    const today = projectPeriodEntries[0]?.[1]?.unresolved ?? 0;
     const percentChange = (today - periodAvg) / periodAvg;
     projectTotals[projectId] = {
       projectId,
diff --git a/static/app/views/organizationStats/types.tsx b/static/app/views/organizationStats/types.tsx
index 0d0b27328d38e6..621032e14a029d 100644
--- a/static/app/views/organizationStats/types.tsx
+++ b/static/app/views/organizationStats/types.tsx
@@ -12,6 +12,7 @@ export interface UsageSeries extends SeriesApi {
 
 export type UsageStat = {
   accepted: number;
+  accepted_stored: number;
   clientDiscard: number;
   date: string;
   filtered: number;
diff --git a/static/app/views/organizationStats/usageChart/index.tsx b/static/app/views/organizationStats/usageChart/index.tsx
index 130084adac3dd9..02daeb9f36225c 100644
--- a/static/app/views/organizationStats/usageChart/index.tsx
+++ b/static/app/views/organizationStats/usageChart/index.tsx
@@ -108,6 +108,7 @@ export const CHART_OPTIONS_DATA_TRANSFORM: SelectValue<ChartDataTransform>[] = [
 
 export const enum SeriesTypes {
   ACCEPTED = 'Accepted',
+  ACCEPTED_STORED = 'Accepted (stored)',
   FILTERED = 'Filtered',
   RATE_LIMITED = 'Rate Limited',
   INVALID = 'Invalid',
@@ -216,6 +217,7 @@ const getUnitYaxisFormatter =
 export type ChartStats = {
   accepted: NonNullable<BarSeriesOption['data']>;
   projected: NonNullable<BarSeriesOption['data']>;
+  accepted_stored?: NonNullable<BarSeriesOption['data']>;
   clientDiscard?: NonNullable<BarSeriesOption['data']>;
   dropped?: NonNullable<BarSeriesOption['data']>;
   filtered?: NonNullable<BarSeriesOption['data']>;
@@ -432,6 +434,28 @@ function UsageChartBody({
       stack: 'usage',
       legendHoverLink: false,
     }),
+    ...(chartData.accepted_stored
+      ? [
+          barSeries({
+            name: SeriesTypes.ACCEPTED,
+            data: chartData.accepted_stored,
+            barMinHeight: 1,
+            barGap: '-100%',
+            z: 3,
+            silent: true,
+            tooltip: {show: false},
+            itemStyle: {
+              decal: {
+                color: 'rgba(255, 255, 255, 0.2)',
+                dashArrayX: [1, 0],
+                dashArrayY: [3, 5],
+                rotation: -Math.PI / 4,
+              },
+            },
+            legendHoverLink: false,
+          }),
+        ]
+      : []),
     barSeries({
       name: SeriesTypes.FILTERED,
       data: chartData.filtered,
@@ -472,6 +496,13 @@ function UsageChartBody({
   return (
     <BaseChart
       colors={colors}
+      options={{
+        aria: {
+          decal: {
+            show: true,
+          },
+        },
+      }}
       grid={{bottom: '3px', left: '3px', right: '10px', top: '40px'}}
       xAxis={xAxis({
         show: true,
diff --git a/static/app/views/organizationStats/usageChart/utils.tsx b/static/app/views/organizationStats/usageChart/utils.tsx
index 5bca3a94e7dc0a..7fbd2db25f6039 100644
--- a/static/app/views/organizationStats/usageChart/utils.tsx
+++ b/static/app/views/organizationStats/usageChart/utils.tsx
@@ -55,8 +55,12 @@ export function getXAxisDates(
   interval: IntervalPeriod = '1d'
 ): string[] {
   const range: string[] = [];
-  const start = moment(dateStart).startOf('h');
-  const end = moment(dateEnd).startOf('h');
+  let startOfUnit: moment.unitOfTime.StartOf = 'h';
+  if (interval <= '6h') {
+    startOfUnit = 'm';
+  }
+  const start = moment(dateStart).startOf(startOfUnit);
+  const end = moment(dateEnd).startOf(startOfUnit);
 
   if (!start.isValid() || !end.isValid()) {
     return range;
diff --git a/static/app/views/organizationStats/usageStatsOrg.tsx b/static/app/views/organizationStats/usageStatsOrg.tsx
index 4b5cb0e915e9ed..8e46c350145c4c 100644
--- a/static/app/views/organizationStats/usageStatsOrg.tsx
+++ b/static/app/views/organizationStats/usageStatsOrg.tsx
@@ -5,6 +5,7 @@ import isEqual from 'lodash/isEqual';
 import moment from 'moment-timezone';
 
 import {navigateTo} from 'sentry/actionCreators/navigation';
+import {LinkButton} from 'sentry/components/button';
 import type {TooltipSubLabel} from 'sentry/components/charts/components/tooltip';
 import OptionSelector from 'sentry/components/charts/optionSelector';
 import {InlineContainer, SectionHeading} from 'sentry/components/charts/styles';
@@ -20,6 +21,7 @@ import type {ScoreCardProps} from 'sentry/components/scoreCard';
 import ScoreCard from 'sentry/components/scoreCard';
 import SwitchButton from 'sentry/components/switchButton';
 import {DEFAULT_STATS_PERIOD} from 'sentry/constants';
+import {IconSettings} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {DataCategoryInfo, IntervalPeriod} from 'sentry/types/core';
@@ -27,6 +29,7 @@ import type {WithRouterProps} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {parsePeriodToHours} from 'sentry/utils/duration/parsePeriodToHours';
+import {hasDynamicSamplingCustomFeature} from 'sentry/utils/dynamicSampling/features';
 
 import {
   FORMAT_DATETIME_DAILY,
@@ -134,19 +137,31 @@ class UsageStatsOrganization<
 
     const queryDatetime = this.endpointQueryDatetime;
 
+    const groupBy = ['outcome', 'reason'];
+    const category: string[] = [dataCategoryApiName];
+
+    if (
+      hasDynamicSamplingCustomFeature(this.props.organization) &&
+      dataCategoryApiName === 'span'
+    ) {
+      groupBy.push('category');
+      category.push('span_indexed');
+    }
+
     return {
       ...queryDatetime,
       interval: getSeriesApiInterval(dataDatetime),
-      groupBy: ['outcome', 'reason'],
+      groupBy,
       project: projectIds,
       field: ['sum(quantity)'],
-      category: dataCategoryApiName,
+      category,
     };
   }
 
   get chartData(): {
     cardStats: {
       accepted?: string;
+      accepted_stored?: string;
       filtered?: string;
       invalid?: string;
       rateLimited?: string;
@@ -342,7 +357,8 @@ class UsageStatsOrganization<
       router,
       dataCategoryApiName,
     } = this.props;
-    const {total, accepted, invalid, rateLimited, filtered} = this.chartData.cardStats;
+    const {total, accepted, accepted_stored, invalid, rateLimited, filtered} =
+      this.chartData.cardStats;
     const dataCategoryNameLower = dataCategoryName.toLowerCase();
 
     const navigateToInboundFilterSettings = (event: ReactMouseEvent) => {
@@ -373,14 +389,17 @@ class UsageStatsOrganization<
           }
         ),
         score: accepted,
-        trend: (
-          <UsageStatsPerMin
-            dataCategoryApiName={dataCategoryApiName}
-            dataCategory={dataCategory}
-            organization={organization}
-            projectIds={projectIds}
-          />
-        ),
+        trend:
+          dataCategoryApiName === 'span' && accepted_stored ? (
+            <SpansStored organization={organization} acceptedStored={accepted_stored} />
+          ) : (
+            <UsageStatsPerMin
+              dataCategoryApiName={dataCategoryApiName}
+              dataCategory={dataCategory}
+              organization={organization}
+              projectIds={projectIds}
+            />
+          ),
       },
       filtered: {
         title: tct('Filtered [dataCategory]', {dataCategory: dataCategoryName}),
@@ -591,3 +610,35 @@ const FooterDate = styled('div')`
     font-size: ${p => p.theme.fontSizeMedium};
   }
 `;
+
+type SpansStoredProps = {
+  acceptedStored: string;
+  organization: Organization;
+};
+
+const StyledSettingsButton = styled(LinkButton)`
+  top: 2px;
+`;
+
+const StyledTextWrapper = styled('div')`
+  min-height: 22px;
+`;
+
+function SpansStored({organization, acceptedStored}: SpansStoredProps) {
+  return (
+    <StyledTextWrapper>
+      {t('%s stored', acceptedStored)}{' '}
+      {organization.access.includes('org:read') &&
+        hasDynamicSamplingCustomFeature(organization) && (
+          <StyledSettingsButton
+            borderless
+            size="zero"
+            icon={<IconSettings color="subText" />}
+            title={t('Dynamic Sampling Settings')}
+            aria-label={t('Dynamic Sampling Settings')}
+            to={`/settings/${organization.slug}/dynamic-sampling/`}
+          />
+        )}
+    </StyledTextWrapper>
+  );
+}
diff --git a/static/app/views/organizationStats/usageStatsProjects.tsx b/static/app/views/organizationStats/usageStatsProjects.tsx
index 14bbe7b8c176c7..6aa298b390d2d6 100644
--- a/static/app/views/organizationStats/usageStatsProjects.tsx
+++ b/static/app/views/organizationStats/usageStatsProjects.tsx
@@ -19,6 +19,7 @@ import type {DataCategoryInfo} from 'sentry/types/core';
 import {Outcome} from 'sentry/types/core';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
+import {hasDynamicSamplingCustomFeature} from 'sentry/utils/dynamicSampling/features';
 import withProjects from 'sentry/utils/withProjects';
 
 import type {UsageSeries} from './types';
@@ -57,6 +58,7 @@ export enum SortBy {
   PROJECT = 'project',
   TOTAL = 'total',
   ACCEPTED = 'accepted',
+  ACCEPTED_STORED = 'accepted_stored',
   FILTERED = 'filtered',
   INVALID = 'invalid',
   RATE_LIMITED = 'rate_limited',
@@ -112,24 +114,42 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
             statsPeriod: dataDatetime.period || DEFAULT_STATS_PERIOD,
           };
 
+    const groupBy = ['outcome', 'project'];
+    const category: string[] = [dataCategory.apiName];
+
+    if (
+      hasDynamicSamplingCustomFeature(this.props.organization) &&
+      dataCategory.apiName === 'span'
+    ) {
+      groupBy.push('category');
+      category.push('span_indexed');
+    }
+
     // We do not need more granularity in the data so interval is '1d'
     return {
       ...queryDatetime,
       interval: getSeriesApiInterval(dataDatetime),
-      groupBy: ['outcome', 'project'],
+      groupBy,
       field: ['sum(quantity)'],
       // If only one project is in selected, display the entire project list
       project: isSingleProject ? [ALL_ACCESS_PROJECTS] : projectIds,
-      category: dataCategory.apiName,
+      category,
     };
   }
 
   get tableData() {
     const {projectStats} = this.state;
+    const seriesData = this.mapSeriesToTable(projectStats);
+
+    const showStoredOutcome =
+      hasDynamicSamplingCustomFeature(this.props.organization) &&
+      this.props.dataCategory.apiName === 'span' &&
+      seriesData.hasStoredOutcome;
 
     return {
-      headers: this.tableHeader,
-      ...this.mapSeriesToTable(projectStats),
+      headers: this.getTableHeader({showStoredOutcome}),
+      showStoredOutcome,
+      ...seriesData,
     };
   }
 
@@ -211,7 +231,7 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
       : projects.filter(p => p.hasAccess && this.projectSelectionFilter(p));
   }
 
-  get tableHeader() {
+  getTableHeader({showStoredOutcome}: {showStoredOutcome: boolean}) {
     const {key, direction} = this.tableSort;
 
     const getArrowDirection = (linkKey: SortBy): Directions => {
@@ -239,7 +259,7 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
       },
       {
         key: SortBy.ACCEPTED,
-        title: t('Accepted'),
+        title: showStoredOutcome ? t('Accepted (Stored)') : t('Accepted'),
         align: 'right',
         direction: getArrowDirection(SortBy.ACCEPTED),
         onClick: () => this.handleChangeSort(SortBy.ACCEPTED),
@@ -341,11 +361,12 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
   };
 
   mapSeriesToTable(projectStats?: UsageSeries): {
+    hasStoredOutcome: boolean;
     tableStats: TableStat[];
     error?: Error;
   } {
     if (!projectStats) {
-      return {tableStats: []};
+      return {tableStats: [], hasStoredOutcome: false};
     }
 
     const stats: Record<number, object> = {};
@@ -354,6 +375,7 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
       const baseStat: Partial<TableStat> = {
         [SortBy.TOTAL]: 0,
         [SortBy.ACCEPTED]: 0,
+        [SortBy.ACCEPTED_STORED]: 0,
         [SortBy.FILTERED]: 0,
         [SortBy.INVALID]: 0,
         [SortBy.RATE_LIMITED]: 0,
@@ -363,9 +385,14 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
       const projectSet = new Set(projectList.map(p => p.id));
 
       projectStats.groups.forEach(group => {
-        const {outcome, project: projectId} = group.by;
+        const {outcome, category, project: projectId} = group.by;
         // Backend enum is singlar. Frontend enum is plural.
 
+        if (category === 'span_indexed' && outcome !== Outcome.ACCEPTED) {
+          // we need `span_indexed` data for `accepted_stored` only
+          return;
+        }
+
         if (!projectSet.has(projectId.toString())) {
           return;
         }
@@ -374,10 +401,15 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
           stats[projectId] = {...baseStat};
         }
 
-        if (outcome !== Outcome.CLIENT_DISCARD) {
+        if (outcome !== Outcome.CLIENT_DISCARD && category !== 'span_indexed') {
           stats[projectId].total += group.totals['sum(quantity)'];
         }
 
+        if (category === 'span_indexed' && outcome === Outcome.ACCEPTED) {
+          stats[projectId].accepted_stored += group.totals['sum(quantity)'];
+          return;
+        }
+
         if (
           outcome === Outcome.ACCEPTED ||
           outcome === Outcome.FILTERED ||
@@ -396,8 +428,15 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
       });
 
       // For projects without stats, fill in with zero
+      let hasStoredOutcome = false;
       const tableStats: TableStat[] = projectList.map(proj => {
         const stat = stats[proj.id] ?? {...baseStat};
+        if (
+          stat[SortBy.ACCEPTED_STORED] > 0 &&
+          stat[SortBy.ACCEPTED_STORED] !== stat[SortBy.ACCEPTED]
+        ) {
+          hasStoredOutcome = true;
+        }
         return {
           project: {...proj},
           ...this.getProjectLink(proj),
@@ -423,6 +462,7 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
           offset,
           offset + UsageStatsProjects.MAX_ROWS_USAGE_TABLE
         ),
+        hasStoredOutcome,
       };
     } catch (err) {
       Sentry.withScope(scope => {
@@ -433,6 +473,7 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
 
       return {
         tableStats: [],
+        hasStoredOutcome: false,
         error: err,
       };
     }
@@ -441,7 +482,7 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
   renderComponent() {
     const {error, errors, loading} = this.state;
     const {dataCategory, loadingProjects, tableQuery, isSingleProject} = this.props;
-    const {headers, tableStats} = this.tableData;
+    const {headers, tableStats, showStoredOutcome} = this.tableData;
     return (
       <Fragment>
         {isSingleProject && (
@@ -469,6 +510,7 @@ class UsageStatsProjects extends DeprecatedAsyncComponent<Props, State> {
             headers={headers}
             dataCategory={dataCategory}
             usageStats={tableStats}
+            showStoredOutcome={showStoredOutcome}
           />
           <Pagination pageLinks={this.pageLink} />
         </Container>
diff --git a/static/app/views/organizationStats/usageTable.tsx b/static/app/views/organizationStats/usageTable.tsx
index 77dcc448266611..7981d0eaf99227 100644
--- a/static/app/views/organizationStats/usageTable.tsx
+++ b/static/app/views/organizationStats/usageTable.tsx
@@ -13,6 +13,7 @@ import Panel from 'sentry/components/panels/panel';
 import {PanelTable} from 'sentry/components/panels/panelTable';
 import {IconGraph, IconSettings, IconWarning} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
 import type {DataCategoryInfo} from 'sentry/types/core';
 import type {WithRouterProps} from 'sentry/types/legacyReactRouter';
 import type {Project} from 'sentry/types/project';
@@ -30,10 +31,12 @@ type Props = {
   isEmpty?: boolean;
   isError?: boolean;
   isLoading?: boolean;
+  showStoredOutcome?: boolean;
 } & WithRouterProps<{}, {}>;
 
 export type TableStat = {
   accepted: number;
+  accepted_stored: number;
   filtered: number;
   invalid: number;
   project: Project;
@@ -70,8 +73,9 @@ class UsageTable extends Component<Props> {
   }
 
   renderTableRow(stat: TableStat & {project: Project}) {
-    const {dataCategory} = this.props;
-    const {project, total, accepted, filtered, invalid, rate_limited} = stat;
+    const {dataCategory, showStoredOutcome} = this.props;
+    const {project, total, accepted, accepted_stored, filtered, invalid, rate_limited} =
+      stat;
 
     return [
       <CellProject key={0}>
@@ -98,6 +102,15 @@ class UsageTable extends Component<Props> {
           dataCategory.plural,
           getFormatUsageOptions(dataCategory.plural)
         )}
+        {showStoredOutcome && (
+          <SubText>
+            {`(${formatUsageWithUnits(
+              accepted_stored,
+              dataCategory.plural,
+              getFormatUsageOptions(dataCategory.plural)
+            )})`}
+          </SubText>
+        )}
       </CellStat>,
       <CellStat key={3}>
         {formatUsageWithUnits(
@@ -168,7 +181,6 @@ export default withSentryRouter(UsageTable);
 
 const StyledPanelTable = styled(PanelTable)`
   grid-template-columns: repeat(7, auto);
-
   @media (min-width: ${p => p.theme.breakpoints.small}) {
     grid-template-columns: 1fr repeat(6, minmax(0, auto));
   }
@@ -190,3 +202,8 @@ const StyledIdBadge = styled(IdBadge)`
   white-space: nowrap;
   flex-shrink: 1;
 `;
+
+const SubText = styled('span')`
+  color: ${p => p.theme.subText};
+  margin-left: ${space(0.5)};
+`;
diff --git a/static/app/views/performance/landing/index.tsx b/static/app/views/performance/landing/index.tsx
index d8697a86ef02c5..5bdbfcd3243cb6 100644
--- a/static/app/views/performance/landing/index.tsx
+++ b/static/app/views/performance/landing/index.tsx
@@ -95,7 +95,6 @@ export function PerformanceLanding(props: Props) {
   const {setPageInfo, pageAlert} = usePageAlert();
   const {teams, initiallyLoaded} = useTeams({provideUserTeams: true});
   const {slug} = organization;
-  const hasDomainViews = organization.features.includes('insights-domain-view');
 
   const performanceMovingAlert = useMemo(() => {
     if (!slug) {
@@ -106,13 +105,19 @@ export function PerformanceLanding(props: Props) {
         {t(
           `To make it easier to see what's relevant for you, Sentry's Performance landing page is now being split into separate `
         )}
-        <Link to={getPerformanceBaseUrl(slug, 'frontend')}>{FRONTEND_SIDEBAR_LABEL}</Link>
+        <Link to={`${getPerformanceBaseUrl(slug, 'frontend')}/`}>
+          {FRONTEND_SIDEBAR_LABEL}
+        </Link>
         {`, `}
-        <Link to={getPerformanceBaseUrl(slug, 'backend')}>{BACKEND_SIDEBAR_LABEL}</Link>
+        <Link to={`${getPerformanceBaseUrl(slug, 'backend')}/`}>
+          {BACKEND_SIDEBAR_LABEL}
+        </Link>
         {`, `}
-        <Link to={getPerformanceBaseUrl(slug, 'mobile')}>{MOBILE_SIDEBAR_LABEL}</Link>
+        <Link to={`${getPerformanceBaseUrl(slug, 'mobile')}/`}>
+          {MOBILE_SIDEBAR_LABEL}
+        </Link>
         {t(', and ')}
-        <Link to={getPerformanceBaseUrl(slug, 'ai')}>{AI_SIDEBAR_LABEL}</Link>
+        <Link to={`${getPerformanceBaseUrl(slug, 'ai')}/`}>{AI_SIDEBAR_LABEL}</Link>
         {t(' performance pages. They can all be found in the Insights tab.')}
       </Fragment>
     );
@@ -127,13 +132,11 @@ export function PerformanceLanding(props: Props) {
   const landingDisplay = paramLandingDisplay ?? defaultLandingDisplayForProjects;
   const showOnboarding = onboardingProject !== undefined;
 
-  if (
-    hasDomainViews &&
-    performanceMovingAlert &&
-    pageAlert?.message !== performanceMovingAlert
-  ) {
-    setPageInfo(performanceMovingAlert);
-  }
+  useEffect(() => {
+    if (performanceMovingAlert && pageAlert?.message !== performanceMovingAlert) {
+      setPageInfo(performanceMovingAlert);
+    }
+  }, [pageAlert?.message, performanceMovingAlert, setPageInfo]);
 
   useEffect(() => {
     if (hasMounted.current) {
diff --git a/static/app/views/performance/landing/widgets/components/widgetContainer.spec.tsx b/static/app/views/performance/landing/widgets/components/widgetContainer.spec.tsx
index de775eec556819..052a2a0f04d3dd 100644
--- a/static/app/views/performance/landing/widgets/components/widgetContainer.spec.tsx
+++ b/static/app/views/performance/landing/widgets/components/widgetContainer.spec.tsx
@@ -869,7 +869,7 @@ describe('Performance > Widgets > WidgetContainer', function () {
     );
     expect(await screen.findByRole('button', {name: 'View All'})).toHaveAttribute(
       'href',
-      '/insights/database/'
+      '/insights/backend/database/'
     );
     expect(eventsMock).toHaveBeenCalledTimes(1);
     expect(eventsMock).toHaveBeenNthCalledWith(
@@ -915,7 +915,7 @@ describe('Performance > Widgets > WidgetContainer', function () {
     );
     expect(await screen.findByRole('button', {name: 'View All'})).toHaveAttribute(
       'href',
-      '/insights/http/'
+      '/insights/backend/http/'
     );
     expect(eventsMock).toHaveBeenCalledTimes(1);
     expect(eventsMock).toHaveBeenNthCalledWith(
@@ -959,7 +959,7 @@ describe('Performance > Widgets > WidgetContainer', function () {
     );
     expect(await screen.findByRole('button', {name: 'View All'})).toHaveAttribute(
       'href',
-      '/insights/assets/'
+      '/insights/frontend/assets/'
     );
     expect(eventsMock).toHaveBeenCalledTimes(1);
     expect(eventsMock).toHaveBeenNthCalledWith(
@@ -1008,7 +1008,7 @@ describe('Performance > Widgets > WidgetContainer', function () {
     );
     expect(await screen.findByRole('button', {name: 'View All'})).toHaveAttribute(
       'href',
-      '/insights/caches/'
+      '/insights/backend/caches/'
     );
     expect(eventsMock).toHaveBeenCalledTimes(1);
     expect(eventsMock).toHaveBeenNthCalledWith(
diff --git a/static/app/views/performance/landing/widgets/widgets/lineChartListWidget.tsx b/static/app/views/performance/landing/widgets/widgets/lineChartListWidget.tsx
index 073e5278d645c5..c7b44d49c93d88 100644
--- a/static/app/views/performance/landing/widgets/widgets/lineChartListWidget.tsx
+++ b/static/app/views/performance/landing/widgets/widgets/lineChartListWidget.tsx
@@ -26,7 +26,7 @@ import {useLocation} from 'sentry/utils/useLocation';
 import withApi from 'sentry/utils/withApi';
 import {getResourcesEventViewQuery} from 'sentry/views/insights/browser/common/queries/useResourcesQuery';
 import {DEFAULT_RESOURCE_TYPES} from 'sentry/views/insights/browser/resources/settings';
-import {BASE_FILTERS, CACHE_BASE_URL} from 'sentry/views/insights/cache/settings';
+import {BASE_FILTERS} from 'sentry/views/insights/cache/settings';
 import {SpanDescriptionCell} from 'sentry/views/insights/common/components/tableCells/spanDescriptionCell';
 import {TimeSpentCell} from 'sentry/views/insights/common/components/tableCells/timeSpentCell';
 import {STARFISH_CHART_INTERVAL_FIDELITY} from 'sentry/views/insights/common/utils/constants';
@@ -687,10 +687,13 @@ export function LineChartListWidget(props: PerformanceWidgetProps) {
             </Fragment>
           );
         case PerformanceWidgetSetting.HIGHEST_CACHE_MISS_RATE_TRANSACTIONS:
+          const moduleRoute = moduleURLBuilder('cache', 'backend');
           const cacheMissRate = listItem[fieldString] as any;
+
           const target = normalizeUrl(
-            `${CACHE_BASE_URL}/?${qs.stringify({transaction: transaction, project: listItem['project.id']})}`
+            `/${moduleRoute}/?${qs.stringify({transaction: transaction, project: listItem['project.id']})}`
           );
+
           return (
             <Fragment>
               <GrowLink to={target}>
diff --git a/static/app/views/performance/newTraceDetails/index.tsx b/static/app/views/performance/newTraceDetails/index.tsx
index 628cfec5d3fbfe..f4d61818f025ab 100644
--- a/static/app/views/performance/newTraceDetails/index.tsx
+++ b/static/app/views/performance/newTraceDetails/index.tsx
@@ -1,186 +1,50 @@
-import type React from 'react';
-import {
-  Fragment,
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useMemo,
-  useReducer,
-  useRef,
-  useState,
-} from 'react';
-import {flushSync} from 'react-dom';
+import {useMemo} from 'react';
 import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
-import * as qs from 'query-string';
 
-import {addSuccessMessage} from 'sentry/actionCreators/indicator';
-import {Button} from 'sentry/components/button';
-import useFeedbackWidget from 'sentry/components/feedback/widget/useFeedbackWidget';
-import LoadingIndicator from 'sentry/components/loadingIndicator';
 import NoProjectMessage from 'sentry/components/noProjectMessage';
-import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
-import {ALL_ACCESS_PROJECTS} from 'sentry/constants/pageFilters';
-import {t, tct} from 'sentry/locale';
+import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {EventTransaction} from 'sentry/types/event';
-import type {Organization} from 'sentry/types/organization';
-import type {Project} from 'sentry/types/project';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {browserHistory} from 'sentry/utils/browserHistory';
-import EventView from 'sentry/utils/discover/eventView';
-import type {TraceSplitResults} from 'sentry/utils/performance/quickTrace/types';
-import {
-  cancelAnimationTimeout,
-  requestAnimationTimeout,
-} from 'sentry/utils/profiling/hooks/useVirtualizedTree/virtualizedTreeUtils';
-import type {UseApiQueryResult} from 'sentry/utils/queryClient';
-import {decodeScalar} from 'sentry/utils/queryString';
-import type RequestError from 'sentry/utils/requestError/requestError';
-import {capitalize} from 'sentry/utils/string/capitalize';
-import useApi from 'sentry/utils/useApi';
-import type {DispatchingReducerMiddleware} from 'sentry/utils/useDispatchingReducer';
 import useOrganization from 'sentry/utils/useOrganization';
-import usePageFilters from 'sentry/utils/usePageFilters';
 import {useParams} from 'sentry/utils/useParams';
-import useProjects from 'sentry/utils/useProjects';
-import type {ReplayTrace} from 'sentry/views/replays/detail/trace/useReplayTraces';
-import type {ReplayRecord} from 'sentry/views/replays/types';
+import {TraceContextPanel} from 'sentry/views/performance/newTraceDetails/traceContextPanel';
+import {TraceWaterfall} from 'sentry/views/performance/newTraceDetails/traceWaterfall';
+import {useHasTraceNewUi} from 'sentry/views/performance/newTraceDetails/useHasTraceNewUi';
 
 import {useTrace} from './traceApi/useTrace';
-import {type TraceMetaQueryResults, useTraceMeta} from './traceApi/useTraceMeta';
+import {useTraceMeta} from './traceApi/useTraceMeta';
 import {useTraceRootEvent} from './traceApi/useTraceRootEvent';
 import {useTraceTree} from './traceApi/useTraceTree';
-import {TraceDrawer} from './traceDrawer/traceDrawer';
-import {TraceShape, TraceTree} from './traceModels/traceTree';
-import type {TraceTreeNode} from './traceModels/traceTreeNode';
-import {
-  TraceEventPriority,
-  type TraceEvents,
-  TraceScheduler,
-} from './traceRenderers/traceScheduler';
-import {TraceView as TraceViewModel} from './traceRenderers/traceView';
-import {
-  type ViewManagerScrollAnchor,
-  VirtualizedViewManager,
-} from './traceRenderers/virtualizedViewManager';
-import {
-  searchInTraceTreeText,
-  searchInTraceTreeTokens,
-} from './traceSearch/traceSearchEvaluator';
-import {TraceSearchInput} from './traceSearch/traceSearchInput';
-import {parseTraceSearch} from './traceSearch/traceTokenConverter';
 import {
   DEFAULT_TRACE_VIEW_PREFERENCES,
   loadTraceViewPreferences,
 } from './traceState/tracePreferences';
-import {
-  TraceStateProvider,
-  useTraceState,
-  useTraceStateDispatch,
-  useTraceStateEmitter,
-} from './traceState/traceStateProvider';
-import {Trace} from './trace';
-import {traceAnalytics} from './traceAnalytics';
-import {
-  isAutogroupedNode,
-  isParentAutogroupedNode,
-  isSiblingAutogroupedNode,
-  isTraceNode,
-} from './traceGuards';
+import {TraceStateProvider} from './traceState/traceStateProvider';
 import {TraceMetaDataHeader} from './traceHeader';
-import {TracePreferencesDropdown} from './tracePreferencesDropdown';
-import {TraceShortcuts} from './traceShortcutsModal';
-import type {TraceReducer, TraceReducerState} from './traceState';
-import {
-  traceNodeAdjacentAnalyticsProperties,
-  traceNodeAnalyticsName,
-} from './traceTreeAnalytics';
-import TraceTypeWarnings from './traceTypeWarnings';
-import {useTraceOnLoad} from './useTraceOnLoad';
-import {useTraceQueryParamStateSync} from './useTraceQueryParamStateSync';
-import {useTraceScrollToPath} from './useTraceScrollToPath';
+import {useTraceEventView} from './useTraceEventView';
+import {useTraceQueryParams} from './useTraceQueryParams';
+
+function decodeTraceSlug(maybeSlug: string | undefined): string {
+  if (!maybeSlug || maybeSlug === 'null' || maybeSlug === 'undefined') {
+    Sentry.withScope(scope => {
+      scope.setFingerprint(['trace-null-slug']);
+      Sentry.captureMessage(`Trace slug is empty`);
+    });
 
-function logTraceMetadata(
-  tree: TraceTree,
-  projects: Project[],
-  organization: Organization
-) {
-  switch (tree.shape) {
-    case TraceShape.BROKEN_SUBTRACES:
-    case TraceShape.EMPTY_TRACE:
-    case TraceShape.MULTIPLE_ROOTS:
-    case TraceShape.ONE_ROOT:
-    case TraceShape.NO_ROOT:
-    case TraceShape.ONLY_ERRORS:
-    case TraceShape.BROWSER_MULTIPLE_ROOTS:
-      traceAnalytics.trackTraceMetadata(tree, projects, organization);
-      break;
-    default: {
-      Sentry.captureMessage('Unknown trace type');
-    }
+    return '';
   }
+
+  return maybeSlug.trim();
 }
 
 export function TraceView() {
-  const params = useParams<{traceSlug?: string}>();
   const organization = useOrganization();
-  const traceSlug = useMemo(() => {
-    const slug = params.traceSlug?.trim() ?? '';
-    // null and undefined are not valid trace slugs, but they can be passed
-    // in the URL and need to check for their string coerced values.
-    if (!slug || slug === 'null' || slug === 'undefined') {
-      Sentry.withScope(scope => {
-        scope.setFingerprint(['trace-null-slug']);
-        Sentry.captureMessage(`Trace slug is empty`);
-      });
-    }
-    return slug;
-  }, [params.traceSlug]);
-
-  const queryParams = useMemo(() => {
-    const normalizedParams = normalizeDateTimeParams(qs.parse(location.search), {
-      allowAbsolutePageDatetime: true,
-    });
-    const start = decodeScalar(normalizedParams.start);
-    const timestamp: string | undefined = decodeScalar(normalizedParams.timestamp);
-    const end = decodeScalar(normalizedParams.end);
-    const statsPeriod = decodeScalar(normalizedParams.statsPeriod);
-    const numberTimestamp = timestamp ? Number(timestamp) : undefined;
-
-    return {start, end, statsPeriod, timestamp: numberTimestamp, useSpans: 1};
-  }, []);
-
-  const traceEventView = useMemo(() => {
-    const {start, end, statsPeriod, timestamp} = queryParams;
-
-    let startTimeStamp = start;
-    let endTimeStamp = end;
-
-    // If timestamp exists in the query params, we want to use it to set the start and end time
-    // with a buffer of 1.5 days, for retrieving events belonging to the trace.
-    if (typeof timestamp === 'number') {
-      const buffer = 36 * 60 * 60 * 1000; // 1.5 days in milliseconds
-      const dateFromTimestamp = new Date(timestamp * 1000);
-
-      startTimeStamp = new Date(dateFromTimestamp.getTime() - buffer).toISOString();
-      endTimeStamp = new Date(dateFromTimestamp.getTime() + buffer).toISOString();
-    }
-
-    return EventView.fromSavedQuery({
-      id: undefined,
-      name: `Events with Trace ID ${traceSlug}`,
-      fields: ['title', 'event.type', 'project', 'timestamp'],
-      orderby: '-timestamp',
-      query: `trace:${traceSlug}`,
-      projects: [ALL_ACCESS_PROJECTS],
-      version: 2,
-      start: startTimeStamp,
-      end: endTimeStamp,
-      range: !(startTimeStamp || endTimeStamp) ? statsPeriod : undefined,
-    });
-  }, [queryParams, traceSlug]);
+  const params = useParams<{traceSlug?: string}>();
+  const traceSlug = useMemo(() => decodeTraceSlug(params.traceSlug), [params.traceSlug]);
+  const queryParams = useTraceQueryParams();
+  const traceEventView = useTraceEventView(traceSlug, queryParams);
+  const hasTraceNewUi = useHasTraceNewUi();
 
   const preferences = useMemo(
     () =>
@@ -194,12 +58,11 @@ export function TraceView() {
   const rootEvent = useTraceRootEvent(trace.data ?? null);
   const tree = useTraceTree({traceSlug, trace, meta, replay: null});
 
-  const title = useMemo(() => {
-    return `${t('Trace Details')} - ${traceSlug}`;
-  }, [traceSlug]);
-
   return (
-    <SentryDocumentTitle title={title} orgSlug={organization.slug}>
+    <SentryDocumentTitle
+      title={`${t('Trace Details')} - ${traceSlug}`}
+      orgSlug={organization.slug}
+    >
       <TraceStateProvider
         initialPreferences={preferences}
         preferencesStorageKey="trace-view-preferences"
@@ -215,18 +78,18 @@ export function TraceView() {
               traceEventView={traceEventView}
             />
             <TraceInnerLayout>
-              <TraceViewWaterfall
+              <TraceWaterfall
                 tree={tree}
                 trace={trace}
                 meta={meta}
                 replay={null}
+                source="performance"
                 rootEvent={rootEvent}
                 traceSlug={traceSlug}
                 traceEventView={traceEventView}
                 organization={organization}
-                source="performance"
-                isEmbedded={false}
               />
+              {hasTraceNewUi && <TraceContextPanel tree={tree} rootEvent={rootEvent} />}
             </TraceInnerLayout>
           </TraceExternalLayout>
         </NoProjectMessage>
@@ -235,863 +98,6 @@ export function TraceView() {
   );
 }
 
-const TRACE_TAB: TraceReducerState['tabs']['tabs'][0] = {
-  node: 'trace',
-  label: t('Trace'),
-};
-
-const VITALS_TAB: TraceReducerState['tabs']['tabs'][0] = {
-  node: 'vitals',
-  label: t('Vitals'),
-};
-
-type TraceViewWaterfallProps = {
-  isEmbedded: boolean;
-  meta: TraceMetaQueryResults;
-  organization: Organization;
-  replay: ReplayRecord | null;
-  rootEvent: UseApiQueryResult<EventTransaction, RequestError>;
-  source: string;
-  trace: UseApiQueryResult<TraceSplitResults<TraceTree.Transaction>, RequestError>;
-  traceEventView: EventView;
-  traceSlug: string | undefined;
-  tree: TraceTree;
-  replayTraces?: ReplayTrace[];
-  /**
-   * Ignore eventId or path query parameters and use the provided node.
-   * Must be set at component mount, no reactivity
-   */
-  scrollToNode?: {eventId?: string; path?: TraceTree.NodePath[]};
-};
-
-export function TraceViewWaterfall(props: TraceViewWaterfallProps) {
-  const api = useApi();
-  const filters = usePageFilters();
-  const {projects} = useProjects();
-  const organization = useOrganization();
-
-  const traceState = useTraceState();
-  const traceDispatch = useTraceStateDispatch();
-  const traceStateEmitter = useTraceStateEmitter();
-
-  const [forceRender, rerender] = useReducer(x => (x + 1) % Number.MAX_SAFE_INTEGER, 0);
-
-  const traceView = useMemo(() => new TraceViewModel(), []);
-  const traceScheduler = useMemo(() => new TraceScheduler(), []);
-
-  const projectsRef = useRef<Project[]>(projects);
-  projectsRef.current = projects;
-
-  const scrollQueueRef = useTraceScrollToPath(props.scrollToNode);
-  const forceRerender = useCallback(() => {
-    flushSync(rerender);
-  }, []);
-
-  useEffect(() => {
-    trackAnalytics('performance_views.trace_view_v1_page_load', {
-      organization: props.organization,
-      source: props.source,
-    });
-  }, [props.organization, props.source]);
-
-  const previouslyFocusedNodeRef = useRef<TraceTreeNode<TraceTree.NodeValue> | null>(
-    null
-  );
-  const previouslyScrolledToNodeRef = useRef<TraceTreeNode<TraceTree.NodeValue> | null>(
-    null
-  );
-
-  useEffect(() => {
-    if (!props.replayTraces?.length || props.tree?.type !== 'trace') {
-      return undefined;
-    }
-
-    const cleanup = props.tree.fetchAdditionalTraces({
-      api,
-      filters,
-      replayTraces: props.replayTraces,
-      organization: props.organization,
-      urlParams: qs.parse(location.search),
-      rerender: forceRerender,
-      meta: props.meta,
-    });
-
-    return () => cleanup();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [props.tree, props.replayTraces]);
-
-  // Assign the trace state to a ref so we can access it without re-rendering
-  const traceStateRef = useRef<TraceReducerState>(traceState);
-  traceStateRef.current = traceState;
-
-  const traceStatePreferencesRef = useRef<
-    Pick<TraceReducerState['preferences'], 'autogroup' | 'missing_instrumentation'>
-  >(traceState.preferences);
-  traceStatePreferencesRef.current = traceState.preferences;
-
-  // Initialize the view manager right after the state reducer
-  const viewManager = useMemo(() => {
-    return new VirtualizedViewManager(
-      {
-        list: {width: traceState.preferences.list.width},
-        span_list: {width: 1 - traceState.preferences.list.width},
-      },
-      traceScheduler,
-      traceView
-    );
-    // We only care about initial state when we initialize the view manager
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  useLayoutEffect(() => {
-    const onTraceViewChange: TraceEvents['set trace view'] = view => {
-      traceView.setTraceView(view);
-      viewManager.enqueueFOVQueryParamSync(traceView);
-    };
-
-    const onPhysicalSpaceChange: TraceEvents['set container physical space'] =
-      container => {
-        traceView.setTracePhysicalSpace(container, [
-          0,
-          0,
-          container[2] * viewManager.columns.span_list.width,
-          container[3],
-        ]);
-      };
-
-    const onTraceSpaceChange: TraceEvents['initialize trace space'] = view => {
-      traceView.setTraceSpace(view);
-    };
-
-    // These handlers have high priority because they are responsible for
-    // updating the view coordinates. If we update them first, then any components downstream
-    // that rely on the view coordinates will be in sync with the view.
-    traceScheduler.on('set trace view', onTraceViewChange, TraceEventPriority.HIGH);
-    traceScheduler.on('set trace space', onTraceSpaceChange, TraceEventPriority.HIGH);
-    traceScheduler.on(
-      'set container physical space',
-      onPhysicalSpaceChange,
-      TraceEventPriority.HIGH
-    );
-    traceScheduler.on(
-      'initialize trace space',
-      onTraceSpaceChange,
-      TraceEventPriority.HIGH
-    );
-
-    return () => {
-      traceScheduler.off('set trace view', onTraceViewChange);
-      traceScheduler.off('set trace space', onTraceSpaceChange);
-      traceScheduler.off('set container physical space', onPhysicalSpaceChange);
-      traceScheduler.off('initialize trace space', onTraceSpaceChange);
-    };
-  }, [traceScheduler, traceView, viewManager]);
-
-  // Initialize the tabs reducer when the tree initializes
-  useLayoutEffect(() => {
-    return traceDispatch({
-      type: 'set roving count',
-      items: props.tree.list.length - 1,
-    });
-  }, [props.tree.list.length, traceDispatch]);
-
-  // Initialize the tabs reducer when the tree initializes
-  useLayoutEffect(() => {
-    if (props.tree.type !== 'trace') {
-      return;
-    }
-
-    const newTabs = [TRACE_TAB];
-
-    if (props.tree.vitals.size > 0) {
-      const types = Array.from(props.tree.vital_types.values());
-      const label = types.length > 1 ? t('Vitals') : capitalize(types[0]) + ' Vitals';
-
-      newTabs.push({
-        ...VITALS_TAB,
-        label,
-      });
-    }
-
-    if (props.tree.profiled_events.size > 0) {
-      newTabs.push({
-        node: 'profiles',
-        label: 'Profiles',
-      });
-    }
-
-    traceDispatch({
-      type: 'initialize tabs reducer',
-      payload: {
-        current_tab: traceStateRef?.current?.tabs?.tabs?.[0],
-        tabs: newTabs,
-        last_clicked_tab: null,
-      },
-    });
-    // We only want to update the tabs when the tree changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [props.tree]);
-
-  const searchingRaf = useRef<{id: number | null} | null>(null);
-  const onTraceSearch = useCallback(
-    (
-      query: string,
-      activeNode: TraceTreeNode<TraceTree.NodeValue> | null,
-      behavior: 'track result' | 'persist'
-    ) => {
-      if (searchingRaf.current?.id) {
-        window.cancelAnimationFrame(searchingRaf.current.id);
-        searchingRaf.current = null;
-      }
-
-      function done([matches, lookup, activeNodeSearchResult]) {
-        // If the previous node is still in the results set, we want to keep it
-        if (activeNodeSearchResult) {
-          traceDispatch({
-            type: 'set results',
-            results: matches,
-            resultsLookup: lookup,
-            resultIteratorIndex: activeNodeSearchResult?.resultIteratorIndex,
-            resultIndex: activeNodeSearchResult?.resultIndex,
-            previousNode: activeNodeSearchResult,
-            node: activeNode,
-          });
-          return;
-        }
-
-        if (activeNode && behavior === 'persist') {
-          traceDispatch({
-            type: 'set results',
-            results: matches,
-            resultsLookup: lookup,
-            resultIteratorIndex: undefined,
-            resultIndex: undefined,
-            previousNode: null,
-            node: activeNode,
-          });
-          return;
-        }
-
-        const resultIndex: number | undefined = matches?.[0]?.index;
-        const resultIteratorIndex: number | undefined = matches?.[0] ? 0 : undefined;
-        const node: TraceTreeNode<TraceTree.NodeValue> | null = matches?.[0]?.value;
-
-        traceDispatch({
-          type: 'set results',
-          results: matches,
-          resultsLookup: lookup,
-          resultIteratorIndex: resultIteratorIndex,
-          resultIndex: resultIndex,
-          previousNode: activeNodeSearchResult,
-          node,
-        });
-      }
-
-      const tokens = parseTraceSearch(query);
-
-      if (tokens) {
-        searchingRaf.current = searchInTraceTreeTokens(
-          props.tree,
-          tokens,
-          activeNode,
-          done
-        );
-      } else {
-        searchingRaf.current = searchInTraceTreeText(props.tree, query, activeNode, done);
-      }
-    },
-    [traceDispatch, props.tree]
-  );
-
-  // We need to heavily debounce query string updates because the rest of the app is so slow
-  // to rerender that it causes the search to drop frames on every keystroke...
-  const QUERY_STRING_STATE_DEBOUNCE = 300;
-  const queryStringAnimationTimeoutRef = useRef<{id: number} | null>(null);
-  const setRowAsFocused = useCallback(
-    (
-      node: TraceTreeNode<TraceTree.NodeValue> | null,
-      event: React.MouseEvent<HTMLElement> | null,
-      resultsLookup: Map<TraceTreeNode<TraceTree.NodeValue>, number>,
-      index: number | null,
-      debounce: number = QUERY_STRING_STATE_DEBOUNCE
-    ) => {
-      // sync query string with the clicked node
-      if (node) {
-        if (queryStringAnimationTimeoutRef.current) {
-          cancelAnimationTimeout(queryStringAnimationTimeoutRef.current);
-        }
-        queryStringAnimationTimeoutRef.current = requestAnimationTimeout(() => {
-          const currentQueryStringPath = qs.parse(location.search).node;
-          const nextNodePath = TraceTree.PathToNode(node);
-          // Updating the query string with the same path is problematic because it causes
-          // the entire sentry app to rerender, which is enough to cause jank and drop frames
-          if (JSON.stringify(currentQueryStringPath) === JSON.stringify(nextNodePath)) {
-            return;
-          }
-          const {eventId: _eventId, ...query} = qs.parse(location.search);
-          browserHistory.replace({
-            pathname: location.pathname,
-            query: {
-              ...query,
-              node: nextNodePath,
-            },
-          });
-          queryStringAnimationTimeoutRef.current = null;
-        }, debounce);
-
-        if (resultsLookup.has(node) && typeof index === 'number') {
-          traceDispatch({
-            type: 'set search iterator index',
-            resultIndex: index,
-            resultIteratorIndex: resultsLookup.get(node)!,
-          });
-        }
-
-        if (isTraceNode(node)) {
-          traceDispatch({type: 'activate tab', payload: TRACE_TAB.node});
-          return;
-        }
-
-        traceDispatch({
-          type: 'activate tab',
-          payload: node,
-          pin_previous: event?.metaKey,
-        });
-      }
-    },
-    [traceDispatch]
-  );
-
-  const onRowClick = useCallback(
-    (
-      node: TraceTreeNode<TraceTree.NodeValue>,
-      event: React.MouseEvent<HTMLElement>,
-      index: number
-    ) => {
-      trackAnalytics('trace.trace_layout.span_row_click', {
-        organization,
-        num_children: node.children.length,
-        type: traceNodeAnalyticsName(node),
-        project_platform:
-          projects.find(p => p.slug === node.metadata.project_slug)?.platform || 'other',
-        ...traceNodeAdjacentAnalyticsProperties(node),
-      });
-
-      if (traceStateRef.current.preferences.drawer.minimized) {
-        traceDispatch({type: 'minimize drawer', payload: false});
-      }
-      setRowAsFocused(node, event, traceStateRef.current.search.resultsLookup, null, 0);
-
-      if (traceStateRef.current.search.resultsLookup.has(node)) {
-        const idx = traceStateRef.current.search.resultsLookup.get(node)!;
-        traceDispatch({
-          type: 'set search iterator index',
-          resultIndex: index,
-          resultIteratorIndex: idx,
-        });
-      } else if (traceStateRef.current.search.resultIteratorIndex !== null) {
-        traceDispatch({type: 'clear search iterator index'});
-      }
-
-      traceDispatch({
-        type: 'set roving index',
-        action_source: 'click',
-        index,
-        node,
-      });
-    },
-    [setRowAsFocused, traceDispatch, organization, projects]
-  );
-
-  const scrollRowIntoView = useCallback(
-    (
-      node: TraceTreeNode<TraceTree.NodeValue>,
-      index: number,
-      anchor?: ViewManagerScrollAnchor,
-      force?: boolean
-    ) => {
-      // Last node we scrolled to is the same as the node we want to scroll to
-      if (previouslyScrolledToNodeRef.current === node && !force) {
-        return;
-      }
-
-      // Always scroll to the row vertically
-      viewManager.scrollToRow(index, anchor);
-      if (viewManager.isOutsideOfView(node)) {
-        viewManager.scrollRowIntoViewHorizontally(node, 0, 48, 'measured');
-      }
-      previouslyScrolledToNodeRef.current = node;
-    },
-    [viewManager]
-  );
-
-  const onScrollToNode = useCallback(
-    (
-      node: TraceTreeNode<TraceTree.NodeValue>
-    ): Promise<TraceTreeNode<TraceTree.NodeValue> | null> => {
-      return TraceTree.ExpandToPath(props.tree, TraceTree.PathToNode(node), {
-        api,
-        organization: props.organization,
-        preferences: traceStatePreferencesRef.current,
-      }).then(() => {
-        const maybeNode = TraceTree.Find(props.tree.root, n => n === node);
-
-        if (!maybeNode) {
-          return null;
-        }
-
-        const index = TraceTree.EnforceVisibility(props.tree, maybeNode);
-        if (index === -1) {
-          return null;
-        }
-
-        scrollRowIntoView(maybeNode, index, 'center if outside', true);
-        traceDispatch({
-          type: 'set roving index',
-          node: maybeNode,
-          index: index,
-          action_source: 'click',
-        });
-
-        if (traceStateRef.current.search.resultsLookup.has(maybeNode)) {
-          traceDispatch({
-            type: 'set search iterator index',
-            resultIndex: index,
-            resultIteratorIndex:
-              traceStateRef.current.search.resultsLookup.get(maybeNode)!,
-          });
-        } else if (traceStateRef.current.search.resultIteratorIndex !== null) {
-          traceDispatch({type: 'clear search iterator index'});
-        }
-
-        return maybeNode;
-      });
-    },
-    [api, props.organization, scrollRowIntoView, props.tree, traceDispatch]
-  );
-
-  const onTabScrollToNode = useCallback(
-    (
-      node: TraceTreeNode<TraceTree.NodeValue>
-    ): Promise<TraceTreeNode<TraceTree.NodeValue> | null> => {
-      return onScrollToNode(node).then(maybeNode => {
-        if (maybeNode) {
-          setRowAsFocused(
-            maybeNode,
-            null,
-            traceStateRef.current.search.resultsLookup,
-            null,
-            0
-          );
-        }
-
-        return maybeNode;
-      });
-    },
-    [onScrollToNode, setRowAsFocused]
-  );
-
-  // Callback that is invoked when the trace loads and reaches its initialied state,
-  // that is when the trace tree data and any data that the trace depends on is loaded,
-  // but the trace is not yet rendered in the view.
-  const onTraceLoad = useCallback(() => {
-    logTraceMetadata(props.tree, projectsRef.current, props.organization);
-    // The tree has the data fetched, but does not yet respect the user preferences.
-    // We will autogroup and inject missing instrumentation if the preferences are set.
-    // and then we will perform a search to find the node the user is interested in.
-
-    const query = qs.parse(location.search);
-    if (query.fov && typeof query.fov === 'string') {
-      viewManager.maybeInitializeTraceViewFromQS(query.fov);
-    }
-    if (traceStateRef.current.preferences.missing_instrumentation) {
-      TraceTree.DetectMissingInstrumentation(props.tree.root);
-    }
-    if (traceStateRef.current.preferences.autogroup.sibling) {
-      TraceTree.AutogroupSiblingSpanNodes(props.tree.root);
-    }
-    if (traceStateRef.current.preferences.autogroup.parent) {
-      TraceTree.AutogroupDirectChildrenSpanNodes(props.tree.root);
-    }
-
-    // Construct the visual representation of the tree
-    props.tree.build();
-
-    const eventId = scrollQueueRef.current?.eventId;
-    const [type, path] = scrollQueueRef.current?.path?.[0]?.split('-') ?? [];
-    scrollQueueRef.current = null;
-
-    let node =
-      (path === 'root' && props.tree.root.children[0]) ||
-      (path && TraceTree.FindByID(props.tree.root, path)) ||
-      (eventId && TraceTree.FindByID(props.tree.root, eventId)) ||
-      null;
-
-    // If the node points to a span, but we found an autogrouped node, then
-    // perform another search inside the autogrouped node to find the more detailed
-    // location of the span. This is necessary because the id of the autogrouped node
-    // is in some cases inferred from the spans it contains and searching by the span id
-    // just gives us the first match which may not be the one the user is looking for.
-    if (node) {
-      if (isAutogroupedNode(node) && type !== 'ag') {
-        if (isParentAutogroupedNode(node)) {
-          node = TraceTree.FindByID(node.head, eventId ?? path) ?? node;
-        } else if (isSiblingAutogroupedNode(node)) {
-          node = node.children.find(n => TraceTree.FindByID(n, eventId ?? path)) ?? node;
-        }
-      }
-    }
-
-    const index = node ? TraceTree.EnforceVisibility(props.tree, node) : -1;
-
-    if (traceStateRef.current.search.query) {
-      onTraceSearch(traceStateRef.current.search.query, node, 'persist');
-    }
-
-    if (index === -1 || !node) {
-      const hasScrollComponent = !!(path || eventId);
-      if (hasScrollComponent) {
-        Sentry.withScope(scope => {
-          scope.setFingerprint(['trace-view-scroll-to-node-error']);
-          scope.captureMessage('Failed to scroll to node in trace tree');
-        });
-      }
-
-      return;
-    }
-
-    // At load time, we want to scroll the row into view, but we need to wait for the view
-    // to initialize before we can do that. We listen for the 'initialize virtualized list' and scroll
-    // to the row in the view if it is not in view yet. If its in the view, then scroll to it immediately.
-    traceScheduler.once('initialize virtualized list', () => {
-      function onTargetRowMeasure() {
-        if (!node || !viewManager.row_measurer.cache.has(node)) {
-          return;
-        }
-        viewManager.row_measurer.off('row measure end', onTargetRowMeasure);
-        if (viewManager.isOutsideOfView(node)) {
-          viewManager.scrollRowIntoViewHorizontally(node!, 0, 48, 'measured');
-        }
-      }
-      viewManager.scrollToRow(index, 'center');
-      viewManager.row_measurer.on('row measure end', onTargetRowMeasure);
-      previouslyScrolledToNodeRef.current = node;
-
-      setRowAsFocused(node, null, traceStateRef.current.search.resultsLookup, index);
-      traceDispatch({
-        type: 'set roving index',
-        node: node,
-        index: index,
-        action_source: 'load',
-      });
-    });
-  }, [
-    setRowAsFocused,
-    traceDispatch,
-    onTraceSearch,
-    viewManager,
-    traceScheduler,
-    scrollQueueRef,
-    props.tree,
-    props.organization,
-  ]);
-
-  // Setup the middleware for the trace reducer
-  useLayoutEffect(() => {
-    const beforeTraceNextStateDispatch: DispatchingReducerMiddleware<
-      typeof TraceReducer
-    >['before next state'] = (prevState, nextState, action) => {
-      // This effect is responsible fo syncing the keyboard interactions with the search results,
-      // we observe the changes to the roving tab index and search results and react by syncing the state.
-      const {node: nextRovingNode, index: nextRovingTabIndex} = nextState.rovingTabIndex;
-      const {resultIndex: nextSearchResultIndex} = nextState.search;
-      if (
-        nextRovingNode &&
-        action.type === 'set roving index' &&
-        action.action_source !== 'click' &&
-        typeof nextRovingTabIndex === 'number' &&
-        prevState.rovingTabIndex.node !== nextRovingNode
-      ) {
-        // When the roving tabIndex updates mark the node as focused and sync search results
-        setRowAsFocused(
-          nextRovingNode,
-          null,
-          nextState.search.resultsLookup,
-          nextRovingTabIndex
-        );
-        if (action.type === 'set roving index' && action.action_source === 'keyboard') {
-          scrollRowIntoView(nextRovingNode, nextRovingTabIndex, undefined);
-        }
-
-        if (nextState.search.resultsLookup.has(nextRovingNode)) {
-          const idx = nextState.search.resultsLookup.get(nextRovingNode)!;
-          traceDispatch({
-            type: 'set search iterator index',
-            resultIndex: nextRovingTabIndex,
-            resultIteratorIndex: idx,
-          });
-        } else if (nextState.search.resultIteratorIndex !== null) {
-          traceDispatch({type: 'clear search iterator index'});
-        }
-      } else if (
-        typeof nextSearchResultIndex === 'number' &&
-        prevState.search.resultIndex !== nextSearchResultIndex &&
-        action.type !== 'set search iterator index'
-      ) {
-        // If the search result index changes, mark the node as focused and scroll it into view
-        const nextNode = props.tree.list[nextSearchResultIndex];
-        setRowAsFocused(
-          nextNode,
-          null,
-          nextState.search.resultsLookup,
-          nextSearchResultIndex
-        );
-        scrollRowIntoView(nextNode, nextSearchResultIndex, 'center if outside');
-      }
-    };
-
-    traceStateEmitter.on('before next state', beforeTraceNextStateDispatch);
-
-    return () => {
-      traceStateEmitter.off('before next state', beforeTraceNextStateDispatch);
-    };
-  }, [
-    props.tree,
-    onTraceSearch,
-    traceStateEmitter,
-    traceDispatch,
-    setRowAsFocused,
-    scrollRowIntoView,
-  ]);
-
-  // Setup the middleware for the view manager and store the list width as a preference
-  useLayoutEffect(() => {
-    function onDividerResizeEnd(list_width: number) {
-      traceDispatch({
-        type: 'set list width',
-        payload: list_width,
-      });
-    }
-    traceScheduler.on('divider resize end', onDividerResizeEnd);
-    return () => {
-      traceScheduler.off('divider resize end', onDividerResizeEnd);
-    };
-  }, [traceScheduler, traceDispatch]);
-
-  const [traceGridRef, setTraceGridRef] = useState<HTMLElement | null>(null);
-
-  // Memoized because it requires tree traversal
-  const shape = useMemo(() => props.tree.shape, [props.tree]);
-
-  useLayoutEffect(() => {
-    if (props.tree.type !== 'trace') {
-      return undefined;
-    }
-
-    traceScheduler.dispatch('initialize trace space', [
-      props.tree.root.space[0],
-      0,
-      props.tree.root.space[1],
-      1,
-    ]);
-
-    // Whenever the timeline changes, update the trace space and trigger a redraw
-    const onTraceTimelineChange = (s: [number, number]) => {
-      traceScheduler.dispatch('set trace space', [s[0], 0, s[1], 1]);
-    };
-
-    props.tree.on('trace timeline change', onTraceTimelineChange);
-
-    return () => {
-      props.tree.off('trace timeline change', onTraceTimelineChange);
-    };
-  }, [viewManager, traceScheduler, props.tree]);
-
-  const onLoadScrollStatus = useTraceOnLoad({
-    onTraceLoad,
-    pathToNodeOrEventId: scrollQueueRef.current,
-    tree: props.tree,
-  });
-
-  // Sync part of the state with the URL
-  const traceQueryStateSync = useMemo(() => {
-    return {search: traceState.search.query};
-  }, [traceState.search.query]);
-  useTraceQueryParamStateSync(traceQueryStateSync);
-
-  const onAutogroupChange = useCallback(() => {
-    const value = !traceState.preferences.autogroup.parent;
-
-    if (!value) {
-      let removeCount = 0;
-      removeCount += TraceTree.RemoveSiblingAutogroupNodes(props.tree.root);
-      removeCount += TraceTree.RemoveDirectChildrenAutogroupNodes(props.tree.root);
-
-      addSuccessMessage(
-        removeCount > 0
-          ? tct('Autogrouping disabled, removed [count] autogroup spans', {
-              count: removeCount,
-            })
-          : t('Autogrouping disabled')
-      );
-    } else {
-      let autogroupCount = 0;
-      autogroupCount += TraceTree.AutogroupSiblingSpanNodes(props.tree.root);
-      autogroupCount += TraceTree.AutogroupDirectChildrenSpanNodes(props.tree.root);
-      addSuccessMessage(
-        autogroupCount > 0
-          ? tct('Autogrouping enabled, detected [count] autogrouping spans', {
-              count: autogroupCount,
-            })
-          : t('Autogrouping enabled')
-      );
-    }
-
-    traceAnalytics.trackAutogroupingPreferenceChange(props.organization, value);
-    props.tree.rebuild();
-    traceDispatch({
-      type: 'set autogrouping',
-      payload: value,
-    });
-  }, [traceDispatch, traceState.preferences.autogroup, props.tree, props.organization]);
-
-  const onMissingInstrumentationChange = useCallback(() => {
-    const value = !traceState.preferences.missing_instrumentation;
-    if (!value) {
-      const removeCount = TraceTree.RemoveMissingInstrumentationNodes(props.tree.root);
-      addSuccessMessage(
-        removeCount > 0
-          ? tct(
-              'Missing instrumentation disabled, removed [count] missing instrumentation spans',
-              {
-                count: removeCount,
-              }
-            )
-          : t('Missing instrumentation disabled')
-      );
-    } else {
-      const missingInstrumentationCount = TraceTree.DetectMissingInstrumentation(
-        props.tree.root
-      );
-      addSuccessMessage(
-        missingInstrumentationCount > 0
-          ? tct(
-              'Missing instrumentation enabled, found [count] missing instrumentation spans',
-              {
-                count: missingInstrumentationCount,
-              }
-            )
-          : t('Missing instrumentation enabled')
-      );
-    }
-
-    traceAnalytics.trackMissingInstrumentationPreferenceChange(props.organization, value);
-    props.tree.rebuild();
-    traceDispatch({
-      type: 'set missing instrumentation',
-      payload: value,
-    });
-  }, [
-    traceDispatch,
-    traceState.preferences.missing_instrumentation,
-    props.tree,
-    props.organization,
-  ]);
-
-  return (
-    <Fragment>
-      <TraceTypeWarnings
-        tree={props.tree}
-        traceSlug={props.traceSlug}
-        organization={organization}
-      />
-      <TraceToolbar>
-        <TraceSearchInput onTraceSearch={onTraceSearch} organization={organization} />
-        <TraceResetZoomButton
-          viewManager={viewManager}
-          organization={props.organization}
-        />
-        <TraceShortcuts />
-        <TracePreferencesDropdown
-          autogroup={
-            traceState.preferences.autogroup.parent &&
-            traceState.preferences.autogroup.sibling
-          }
-          missingInstrumentation={traceState.preferences.missing_instrumentation}
-          onAutogroupChange={onAutogroupChange}
-          onMissingInstrumentationChange={onMissingInstrumentationChange}
-        />
-      </TraceToolbar>
-      <TraceGrid layout={traceState.preferences.layout} ref={setTraceGridRef}>
-        <Trace
-          trace={props.tree}
-          rerender={rerender}
-          trace_id={props.traceSlug}
-          onRowClick={onRowClick}
-          onTraceSearch={onTraceSearch}
-          previouslyFocusedNodeRef={previouslyFocusedNodeRef}
-          manager={viewManager}
-          scheduler={traceScheduler}
-          forceRerender={forceRender}
-          isEmbedded={props.isEmbedded}
-          isLoading={props.tree.type === 'loading' || onLoadScrollStatus === 'pending'}
-        />
-
-        {props.tree.type === 'loading' || onLoadScrollStatus === 'pending' ? (
-          <TraceLoading />
-        ) : props.tree.type === 'error' ? (
-          <TraceError />
-        ) : props.tree.type === 'empty' ? (
-          <TraceEmpty />
-        ) : null}
-
-        <TraceDrawer
-          replay={props.replay}
-          meta={props.meta}
-          traceType={shape}
-          trace={props.tree}
-          traceGridRef={traceGridRef}
-          manager={viewManager}
-          scheduler={traceScheduler}
-          onTabScrollToNode={onTabScrollToNode}
-          onScrollToNode={onScrollToNode}
-          rootEventResults={props.rootEvent}
-          traceEventView={props.traceEventView}
-        />
-      </TraceGrid>
-    </Fragment>
-  );
-}
-
-function TraceResetZoomButton(props: {
-  organization: Organization;
-  viewManager: VirtualizedViewManager;
-}) {
-  const onResetZoom = useCallback(() => {
-    traceAnalytics.trackResetZoom(props.organization);
-    props.viewManager.resetZoom();
-  }, [props.viewManager, props.organization]);
-
-  return (
-    <ResetZoomButton
-      size="xs"
-      onClick={onResetZoom}
-      ref={props.viewManager.registerResetZoomRef}
-    >
-      {t('Reset Zoom')}
-    </ResetZoomButton>
-  );
-}
-
-const ResetZoomButton = styled(Button)`
-  transition: opacity 0.2s 0.5s ease-in-out;
-
-  &[disabled] {
-    cursor: not-allowed;
-    opacity: 0.65;
-  }
-`;
-
 const TraceExternalLayout = styled('div')`
   display: flex;
   flex-direction: column;
@@ -1108,160 +114,5 @@ const TraceInnerLayout = styled('div')`
   flex: 1 1 100%;
   padding: ${space(2)};
 
-  background-color: ${p => p.theme.background};
-`;
-
-const TraceToolbar = styled('div')`
-  flex-grow: 0;
-  display: grid;
-  grid-template-columns: 1fr min-content min-content min-content;
-  gap: ${space(1)};
-`;
-
-const TraceGrid = styled('div')<{
-  layout: 'drawer bottom' | 'drawer left' | 'drawer right';
-}>`
-  border: 1px solid ${p => p.theme.border};
-  flex: 1 1 100%;
-  display: grid;
-  border-radius: ${p => p.theme.borderRadius};
-  overflow: hidden;
-  position: relative;
-  /* false positive for grid layout */
-  /* stylelint-disable */
-  grid-template-areas: ${p =>
-    p.layout === 'drawer bottom'
-      ? `
-      'trace'
-      'drawer'
-      `
-      : p.layout === 'drawer left'
-        ? `'drawer trace'`
-        : `'trace drawer'`};
-  grid-template-columns: ${p =>
-    p.layout === 'drawer bottom'
-      ? '1fr'
-      : p.layout === 'drawer left'
-        ? 'min-content 1fr'
-        : '1fr min-content'};
-  grid-template-rows: 1fr auto;
-`;
-
-const LoadingContainer = styled('div')<{animate: boolean; error?: boolean}>`
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  left: 50%;
-  top: 50%;
-  position: absolute;
-  height: auto;
-  font-size: ${p => p.theme.fontSizeMedium};
-  color: ${p => p.theme.gray300};
-  z-index: 30;
-  padding: 24px;
-  background-color: ${p => p.theme.background};
-  border-radius: ${p => p.theme.borderRadius};
-  border: 1px solid ${p => p.theme.border};
-  transform-origin: 50% 50%;
-  transform: translate(-50%, -50%);
-  animation: ${p =>
-    p.animate
-      ? `${p.error ? 'showLoadingContainerShake' : 'showLoadingContainer'} 300ms cubic-bezier(0.61, 1, 0.88, 1) forwards`
-      : 'none'};
-
-  @keyframes showLoadingContainer {
-    from {
-      opacity: 0.6;
-      transform: scale(0.99) translate(-50%, -50%);
-    }
-    to {
-      opacity: 1;
-      transform: scale(1) translate(-50%, -50%);
-    }
-  }
-
-  @keyframes showLoadingContainerShake {
-    0% {
-      transform: translate(-50%, -50%);
-    }
-    25% {
-      transform: translate(-51%, -50%);
-    }
-    75% {
-      transform: translate(-49%, -50%);
-    }
-    100% {
-      transform: translate(-50%, -50%);
-    }
-  }
-`;
-
-function TraceLoading() {
-  return (
-    // Dont flash the animation on load because it's annoying
-    <LoadingContainer animate={false}>
-      <NoMarginIndicator size={24}>
-        <div>{t('Assembling the trace')}</div>
-      </NoMarginIndicator>
-    </LoadingContainer>
-  );
-}
-
-function TraceError() {
-  const linkref = useRef<HTMLAnchorElement>(null);
-  const feedback = useFeedbackWidget({buttonRef: linkref});
-
-  useEffect(() => {
-    traceAnalytics.trackFailedToFetchTraceState();
-  }, []);
-
-  return (
-    <LoadingContainer animate error>
-      <div>{t('Ughhhhh, we failed to load your trace...')}</div>
-      <div>
-        {t('Seeing this often? Send us ')}
-        {feedback ? (
-          <a href="#" ref={linkref}>
-            {t('feedback')}
-          </a>
-        ) : (
-          <a href="mailto:support@sentry.io?subject=Trace%20fails%20to%20load">
-            {t('feedback')}
-          </a>
-        )}
-      </div>
-    </LoadingContainer>
-  );
-}
-
-function TraceEmpty() {
-  const linkref = useRef<HTMLAnchorElement>(null);
-  const feedback = useFeedbackWidget({buttonRef: linkref});
-
-  useEffect(() => {
-    traceAnalytics.trackEmptyTraceState();
-  }, []);
-
-  return (
-    <LoadingContainer animate>
-      <div>{t('This trace does not contain any data?!')}</div>
-      <div>
-        {t('Seeing this often? Send us ')}
-        {feedback ? (
-          <a href="#" ref={linkref}>
-            {t('feedback')}
-          </a>
-        ) : (
-          <a href="mailto:support@sentry.io?subject=Trace%20does%20not%20contain%20data">
-            {t('feedback')}
-          </a>
-        )}
-      </div>
-    </LoadingContainer>
-  );
-}
-
-const NoMarginIndicator = styled(LoadingIndicator)`
-  margin: 0;
+  background-color: ${p => p.theme.surface100};
 `;
diff --git a/static/app/views/performance/newTraceDetails/issuesTraceWaterfall.tsx b/static/app/views/performance/newTraceDetails/issuesTraceWaterfall.tsx
new file mode 100644
index 00000000000000..af971915585d38
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/issuesTraceWaterfall.tsx
@@ -0,0 +1,327 @@
+import type React from 'react';
+import {
+  Fragment,
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useReducer,
+  useRef,
+} from 'react';
+import styled from '@emotion/styled';
+import * as Sentry from '@sentry/react';
+
+import type {Event} from 'sentry/types/event';
+import type {Project} from 'sentry/types/project';
+import {trackAnalytics} from 'sentry/utils/analytics';
+import useOrganization from 'sentry/utils/useOrganization';
+import useProjects from 'sentry/utils/useProjects';
+import {
+  isSpanNode,
+  isTraceErrorNode,
+  isTransactionNode,
+} from 'sentry/views/performance/newTraceDetails/traceGuards';
+import {IssuesTraceTree} from 'sentry/views/performance/newTraceDetails/traceModels/issuesTraceTree';
+import type {TraceTree} from 'sentry/views/performance/newTraceDetails/traceModels/traceTree';
+import {useDividerResizeSync} from 'sentry/views/performance/newTraceDetails/useDividerResizeSync';
+import {useTraceSpaceListeners} from 'sentry/views/performance/newTraceDetails/useTraceSpaceListeners';
+
+import type {TraceTreeNode} from './traceModels/traceTreeNode';
+import {TraceScheduler} from './traceRenderers/traceScheduler';
+import {TraceView as TraceViewModel} from './traceRenderers/traceView';
+import {VirtualizedViewManager} from './traceRenderers/virtualizedViewManager';
+import {useTraceState, useTraceStateDispatch} from './traceState/traceStateProvider';
+import {Trace} from './trace';
+import {traceAnalytics} from './traceAnalytics';
+import type {TraceReducerState} from './traceState';
+import {
+  traceNodeAdjacentAnalyticsProperties,
+  traceNodeAnalyticsName,
+} from './traceTreeAnalytics';
+import TraceTypeWarnings from './traceTypeWarnings';
+import type {TraceWaterfallProps} from './traceWaterfall';
+import {TraceGrid} from './traceWaterfall';
+import {TraceWaterfallState} from './traceWaterfallState';
+import {useTraceIssuesOnLoad} from './useTraceOnLoad';
+import {useTraceTimelineChangeSync} from './useTraceTimelineChangeSync';
+
+const noopTraceSearch = () => {};
+
+interface IssuesTraceWaterfallProps extends Omit<TraceWaterfallProps, 'tree'> {
+  event: Event;
+  tree: IssuesTraceTree;
+}
+
+export function IssuesTraceWaterfall(props: IssuesTraceWaterfallProps) {
+  const {projects} = useProjects();
+  const organization = useOrganization();
+  const traceState = useTraceState();
+  const traceDispatch = useTraceStateDispatch();
+
+  const [forceRender, rerender] = useReducer(x => (x + 1) % Number.MAX_SAFE_INTEGER, 0);
+
+  const traceView = useMemo(() => new TraceViewModel(), []);
+  const traceScheduler = useMemo(() => new TraceScheduler(), []);
+
+  const projectsRef = useRef<Project[]>(projects);
+  projectsRef.current = projects;
+
+  useEffect(() => {
+    trackAnalytics('performance_views.trace_view_v1_page_load', {
+      organization: props.organization,
+      source: props.source,
+    });
+  }, [props.organization, props.source]);
+
+  const previouslyFocusedNodeRef = useRef<TraceTreeNode<TraceTree.NodeValue> | null>(
+    null
+  );
+
+  // Assign the trace state to a ref so we can access it without re-rendering
+  const traceStateRef = useRef<TraceReducerState>(traceState);
+  traceStateRef.current = traceState;
+
+  const traceStatePreferencesRef = useRef<
+    Pick<TraceReducerState['preferences'], 'autogroup' | 'missing_instrumentation'>
+  >(traceState.preferences);
+  traceStatePreferencesRef.current = traceState.preferences;
+
+  // Initialize the view manager right after the state reducer
+  const viewManager = useMemo(() => {
+    return new VirtualizedViewManager(
+      {
+        list: {width: traceState.preferences.list.width},
+        span_list: {width: 1 - traceState.preferences.list.width},
+      },
+      traceScheduler,
+      traceView
+    );
+    // We only care about initial state when we initialize the view manager
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // Initialize the tabs reducer when the tree initializes
+  useLayoutEffect(() => {
+    return traceDispatch({
+      type: 'set roving count',
+      items: props.tree.list.length - 1,
+    });
+  }, [props.tree.list.length, traceDispatch]);
+
+  const onRowClick = useCallback(
+    (
+      node: TraceTreeNode<TraceTree.NodeValue>,
+      _event: React.MouseEvent<HTMLElement>,
+      index: number
+    ) => {
+      trackAnalytics('trace.trace_layout.span_row_click', {
+        organization,
+        num_children: node.children.length,
+        type: traceNodeAnalyticsName(node),
+        project_platform:
+          projects.find(p => p.slug === node.metadata.project_slug)?.platform || 'other',
+        ...traceNodeAdjacentAnalyticsProperties(node),
+      });
+
+      traceDispatch({
+        type: 'set roving index',
+        node,
+        index,
+        action_source: 'click',
+      });
+    },
+    [organization, projects, traceDispatch]
+  );
+
+  // Callback that is invoked when the trace loads and reaches its initialied state,
+  // that is when the trace tree data and any data that the trace depends on is loaded,
+  // but the trace is not yet rendered in the view.
+  const onTraceLoad = useCallback(() => {
+    traceAnalytics.trackTraceShape(props.tree, projectsRef.current, props.organization);
+    // Construct the visual representation of the tree
+    props.tree.build();
+
+    // Find all the nodes that match the event id from the error so that we can try and
+    // link the user to the most specific one.
+    const nodes = IssuesTraceTree.FindAll(props.tree.root, n => {
+      if (isTraceErrorNode(n)) {
+        return n.value.event_id === props.event.eventID;
+      }
+      if (isTransactionNode(n)) {
+        if (n.value.event_id === props.event.eventID) {
+          return true;
+        }
+
+        for (const e of n.errors) {
+          if (e.event_id === props.event.eventID) {
+            return true;
+          }
+        }
+
+        for (const p of n.performance_issues) {
+          if (p.event_id === props.event.eventID) {
+            return true;
+          }
+        }
+      }
+      if (isSpanNode(n)) {
+        if (n.value.span_id === props.event.eventID) {
+          return true;
+        }
+        for (const e of n.errors) {
+          if (e.event_id === props.event.eventID) {
+            return true;
+          }
+        }
+        for (const p of n.performance_issues) {
+          if (p.event_id === props.event.eventID) {
+            return true;
+          }
+        }
+      }
+      return false;
+    });
+
+    // By order of priority, we want to find the error node, then the span node, then the transaction node.
+    // This is because the error node as standalone is the most specific one, otherwise we look for the span that
+    // the error may have been attributed to, otherwise we look at the transaction.
+    const node =
+      nodes?.find(n => isTraceErrorNode(n)) ||
+      nodes?.find(n => isSpanNode(n)) ||
+      nodes?.find(n => isTransactionNode(n));
+
+    if (node) {
+      props.tree.collapseList([node]);
+    }
+
+    const index = node ? props.tree.list.indexOf(node) : -1;
+    if (index === -1 || !node) {
+      const hasScrollComponent = !!props.event.eventID;
+      if (hasScrollComponent) {
+        Sentry.withScope(scope => {
+          scope.setFingerprint(['trace-view-issesu-scroll-to-node-error']);
+          scope.captureMessage('Failed to scroll to node in issues trace tree');
+        });
+      }
+
+      return;
+    }
+
+    // We dont want to focus the row at load time, because it will cause the page to scroll down to
+    // the trace section. Mark is as scrolled on load so nothing will happen.
+    previouslyFocusedNodeRef.current = node;
+    traceScheduler.once('initialize virtualized list', () => {
+      function onTargetRowMeasure() {
+        if (!node || !viewManager.row_measurer.cache.has(node)) {
+          return;
+        }
+        viewManager.row_measurer.off('row measure end', onTargetRowMeasure);
+        if (viewManager.isOutsideOfView(node)) {
+          viewManager.scrollRowIntoViewHorizontally(node!, 0, 48, 'measured');
+        }
+      }
+      viewManager.scrollToRow(index, 'center');
+      viewManager.row_measurer.on('row measure end', onTargetRowMeasure);
+
+      // setRowAsFocused(node, null, traceStateRef.current.search.resultsLookup, index);
+      traceDispatch({
+        type: 'set roving index',
+        node,
+        index,
+        action_source: 'load',
+      });
+    });
+  }, [
+    traceDispatch,
+    viewManager,
+    traceScheduler,
+    props.tree,
+    props.organization,
+    props.event,
+  ]);
+
+  useTraceTimelineChangeSync({
+    tree: props.tree,
+    traceScheduler,
+  });
+
+  useTraceSpaceListeners({
+    view: traceView,
+    viewManager,
+    traceScheduler,
+  });
+
+  useDividerResizeSync(traceScheduler);
+
+  const onLoadScrollStatus = useTraceIssuesOnLoad({
+    onTraceLoad,
+    event: props.event,
+    tree: props.tree,
+  });
+
+  return (
+    <Fragment>
+      <TraceTypeWarnings
+        tree={props.tree}
+        traceSlug={props.traceSlug}
+        organization={organization}
+      />
+      <IssuesTraceGrid
+        layout={traceState.preferences.layout}
+        rowCount={
+          props.tree.type === 'trace' && onLoadScrollStatus === 'success'
+            ? props.tree.list.length
+            : 8
+        }
+      >
+        <IssuesPointerDisabled>
+          <Trace
+            trace={props.tree}
+            rerender={rerender}
+            trace_id={props.traceSlug}
+            onRowClick={onRowClick}
+            onTraceSearch={noopTraceSearch}
+            previouslyFocusedNodeRef={previouslyFocusedNodeRef}
+            manager={viewManager}
+            scheduler={traceScheduler}
+            forceRerender={forceRender}
+            isLoading={props.tree.type === 'loading' || onLoadScrollStatus === 'pending'}
+          />
+        </IssuesPointerDisabled>
+
+        {props.tree.type === 'loading' || onLoadScrollStatus === 'pending' ? (
+          <TraceWaterfallState.Loading />
+        ) : props.tree.type === 'error' ? (
+          <TraceWaterfallState.Error />
+        ) : props.tree.type === 'empty' ? (
+          <TraceWaterfallState.Empty />
+        ) : null}
+      </IssuesTraceGrid>
+    </Fragment>
+  );
+}
+
+const IssuesPointerDisabled = styled('div')`
+  pointer-events: none;
+  position: relative;
+  height: 100%;
+  width: 100%;
+`;
+
+const ROW_HEIGHT = 24;
+const MIN_ROW_COUNT = 1;
+const HEADER_HEIGHT = 28;
+const MAX_HEIGHT = 12 * ROW_HEIGHT + HEADER_HEIGHT;
+const MAX_ROW_COUNT = Math.floor(MAX_HEIGHT / ROW_HEIGHT);
+
+const IssuesTraceGrid = styled(TraceGrid)<{
+  layout: 'drawer bottom' | 'drawer left' | 'drawer right';
+  rowCount: number;
+}>`
+  display: block;
+  flex-grow: 1;
+  max-height: ${MAX_HEIGHT}px;
+  height: ${p =>
+    Math.min(Math.max(p.rowCount, MIN_ROW_COUNT), MAX_ROW_COUNT) * ROW_HEIGHT +
+    HEADER_HEIGHT}px;
+`;
diff --git a/static/app/views/performance/newTraceDetails/trace.tsx b/static/app/views/performance/newTraceDetails/trace.tsx
index be89f9dd9109b7..ea884b7fd45a52 100644
--- a/static/app/views/performance/newTraceDetails/trace.tsx
+++ b/static/app/views/performance/newTraceDetails/trace.tsx
@@ -31,6 +31,7 @@ import {
 } from './traceRenderers/traceVirtualizedList';
 import type {VirtualizedViewManager} from './traceRenderers/virtualizedViewManager';
 import {TraceAutogroupedRow} from './traceRow/traceAutogroupedRow';
+import {TraceCollapsedRow} from './traceRow/traceCollapsedRow';
 import {TraceErrorRow} from './traceRow/traceErrorRow';
 import {TraceLoadingRow} from './traceRow/traceLoadingRow';
 import {TraceMissingInstrumentationRow} from './traceRow/traceMissingInstrumentationRow';
@@ -51,6 +52,7 @@ import {
 import {useTraceState, useTraceStateDispatch} from './traceState/traceStateProvider';
 import {
   isAutogroupedNode,
+  isCollapsedNode,
   isMissingInstrumentationNode,
   isSpanNode,
   isTraceErrorNode,
@@ -86,7 +88,6 @@ function computeNextIndexFromAction(
 
 interface TraceProps {
   forceRerender: number;
-  isEmbedded: boolean;
   isLoading: boolean;
   manager: VirtualizedViewManager;
   onRowClick: (
@@ -116,7 +117,6 @@ export function Trace({
   scheduler,
   forceRerender,
   trace_id,
-  isEmbedded,
   isLoading,
 }: TraceProps) {
   const theme = useTheme();
@@ -333,7 +333,6 @@ export function Trace({
           onRowKeyDown={onRowKeyDown}
           tree={trace}
           trace_id={trace_id}
-          isEmbedded={isEmbedded}
         />
       );
     },
@@ -462,7 +461,6 @@ export function Trace({
 
 function RenderTraceRow(props: {
   index: number;
-  isEmbedded: boolean;
   isSearchResult: boolean;
   manager: VirtualizedViewManager;
   node: TraceTreeNode<TraceTree.NodeValue>;
@@ -591,7 +589,6 @@ function RenderTraceRow(props: {
     onRowClick,
     onRowKeyDown,
     previouslyFocusedNodeRef: props.previouslyFocusedNodeRef,
-    isEmbedded: props.isEmbedded,
     onSpanArrowClick: onSpanRowArrowClick,
     manager: props.manager,
     index: props.index,
@@ -637,6 +634,10 @@ function RenderTraceRow(props: {
     return <TraceRootRow {...rowProps} node={node} />;
   }
 
+  if (isCollapsedNode(node)) {
+    return <TraceCollapsedRow {...rowProps} node={node} />;
+  }
+
   return null;
 }
 
@@ -731,21 +732,11 @@ const TraceStylingWrapper = styled('div')`
   grid-area: trace;
   padding-top: 26px;
 
-  --info: ${p => p.theme.purple400};
-  --warning: ${p => p.theme.yellow300};
-  --debug: ${p => p.theme.blue300};
-  --error: ${p => p.theme.error};
-  --fatal: ${p => p.theme.error};
-  --default: ${p => p.theme.gray300};
-  --unknown: ${p => p.theme.gray300};
-  --profile: ${p => p.theme.purple300};
-  --autogrouped: ${p => p.theme.blue300};
-  --performance-issue: ${p => p.theme.blue300};
-
   &.WithIndicators {
     padding-top: 44px;
 
     &:before {
+      background-color: ${p => p.theme.background};
       height: 44px;
 
       .TraceScrollbarContainer {
@@ -1273,6 +1264,22 @@ const TraceStylingWrapper = styled('div')`
         }
       }
     }
+
+    &.Collapsed {
+      background-color: ${p => p.theme.backgroundSecondary};
+      border-bottom: 1px solid ${p => p.theme.border};
+      border-top: 1px solid ${p => p.theme.border};
+
+      .TraceLeftColumn {
+        padding-left: 14px;
+        width: 100%;
+        color: ${p => p.theme.subText};
+
+        .TraceLeftColumnInner {
+          padding-left: 0 !important;
+        }
+      }
+    }
   }
 
   .TraceLeftColumn {
diff --git a/static/app/views/performance/newTraceDetails/traceAnalytics.tsx b/static/app/views/performance/newTraceDetails/traceAnalytics.tsx
index a42637a77837a4..a64157282041b9 100644
--- a/static/app/views/performance/newTraceDetails/traceAnalytics.tsx
+++ b/static/app/views/performance/newTraceDetails/traceAnalytics.tsx
@@ -4,7 +4,7 @@ import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {trackAnalytics} from 'sentry/utils/analytics';
 
-import type {TraceShape, TraceTree} from './traceModels/traceTree';
+import {TraceShape, type TraceTree} from './traceModels/traceTree';
 
 const trackTraceMetadata = (
   tree: TraceTree,
@@ -166,9 +166,31 @@ const trackMissingInstrumentationPreferenceChange = (
     enabled,
   });
 
+function trackTraceShape(
+  tree: TraceTree,
+  projects: Project[],
+  organization: Organization
+) {
+  switch (tree.shape) {
+    case TraceShape.BROKEN_SUBTRACES:
+    case TraceShape.EMPTY_TRACE:
+    case TraceShape.MULTIPLE_ROOTS:
+    case TraceShape.ONE_ROOT:
+    case TraceShape.NO_ROOT:
+    case TraceShape.ONLY_ERRORS:
+    case TraceShape.BROWSER_MULTIPLE_ROOTS:
+      traceAnalytics.trackTraceMetadata(tree, projects, organization);
+      break;
+    default: {
+      Sentry.captureMessage('Unknown trace type');
+    }
+  }
+}
+
 const traceAnalytics = {
   // Trace shape
   trackTraceMetadata,
+  trackTraceShape,
   trackEmptyTraceState,
   trackFailedToFetchTraceState,
   // Drawer actions
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useIssuesTraceTree.tsx b/static/app/views/performance/newTraceDetails/traceApi/useIssuesTraceTree.tsx
new file mode 100644
index 00000000000000..949ad6da23899f
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceApi/useIssuesTraceTree.tsx
@@ -0,0 +1,107 @@
+import {useEffect, useState} from 'react';
+
+import type {TraceSplitResults} from 'sentry/utils/performance/quickTrace/types';
+import type {QueryStatus, UseApiQueryResult} from 'sentry/utils/queryClient';
+import useApi from 'sentry/utils/useApi';
+import useOrganization from 'sentry/utils/useOrganization';
+import useProjects from 'sentry/utils/useProjects';
+import {IssuesTraceTree} from 'sentry/views/performance/newTraceDetails/traceModels/issuesTraceTree';
+import type {ReplayRecord} from 'sentry/views/replays/types';
+
+import type {TraceTree} from '../traceModels/traceTree';
+
+import type {TraceMetaQueryResults} from './useTraceMeta';
+
+type UseTraceTreeParams = {
+  meta: TraceMetaQueryResults;
+  replay: ReplayRecord | null;
+  trace: UseApiQueryResult<TraceSplitResults<TraceTree.Transaction> | undefined, any>;
+  traceSlug?: string;
+};
+
+function getTraceViewQueryStatus(
+  traceQueryStatus: QueryStatus,
+  traceMetaQueryStatus: QueryStatus
+): QueryStatus {
+  if (traceQueryStatus === 'error' || traceMetaQueryStatus === 'error') {
+    return 'error';
+  }
+
+  if (traceQueryStatus === 'pending' || traceMetaQueryStatus === 'pending') {
+    return 'pending';
+  }
+
+  return 'success';
+}
+
+export function useIssuesTraceTree({
+  trace,
+  meta,
+  replay,
+  traceSlug,
+}: UseTraceTreeParams): IssuesTraceTree {
+  const api = useApi();
+  const {projects} = useProjects();
+  const organization = useOrganization();
+
+  const [tree, setTree] = useState<IssuesTraceTree>(IssuesTraceTree.Empty());
+
+  useEffect(() => {
+    const status = getTraceViewQueryStatus(trace.status, meta.status);
+
+    if (status === 'error') {
+      setTree(t =>
+        t.type === 'error'
+          ? t
+          : IssuesTraceTree.Error({
+              project_slug: projects?.[0]?.slug ?? '',
+              event_id: traceSlug,
+            })
+      );
+      return;
+    }
+
+    if (
+      trace?.data?.transactions.length === 0 &&
+      trace?.data?.orphan_errors.length === 0
+    ) {
+      setTree(t => (t.type === 'empty' ? t : IssuesTraceTree.Empty()));
+      return;
+    }
+
+    if (status === 'pending') {
+      setTree(t =>
+        t.type === 'loading'
+          ? t
+          : IssuesTraceTree.Loading({
+              project_slug: projects?.[0]?.slug ?? '',
+              event_id: traceSlug,
+            })
+      );
+      return;
+    }
+
+    if (trace.data && meta.data) {
+      const newTree = IssuesTraceTree.FromTrace(trace.data, {
+        meta: meta.data,
+        replay: replay,
+      });
+
+      setTree(newTree);
+      newTree.build();
+      return;
+    }
+  }, [
+    api,
+    organization,
+    projects,
+    replay,
+    meta.status,
+    trace.status,
+    trace.data,
+    meta.data,
+    traceSlug,
+  ]);
+
+  return tree;
+}
diff --git a/static/app/views/performance/newTraceDetails/traceContextPanel.tsx b/static/app/views/performance/newTraceDetails/traceContextPanel.tsx
new file mode 100644
index 00000000000000..e92b76ddf553ec
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceContextPanel.tsx
@@ -0,0 +1,162 @@
+import {useCallback, useRef, useState} from 'react';
+import styled from '@emotion/styled';
+
+import EventTagsTree from 'sentry/components/events/eventTags/eventTagsTree';
+import {IconGrabbable} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import type {EventTransaction} from 'sentry/types/event';
+import type {UseApiQueryResult} from 'sentry/utils/queryClient';
+import type RequestError from 'sentry/utils/requestError/requestError';
+import type {SectionKey} from 'sentry/views/issueDetails/streamline/context';
+import {FoldSection} from 'sentry/views/issueDetails/streamline/foldSection';
+import {TraceContextVitals} from 'sentry/views/performance/newTraceDetails/traceContextVitals';
+import type {TraceTree} from 'sentry/views/performance/newTraceDetails/traceModels/traceTree';
+
+const MIN_HEIGHT = 0;
+const DEFAULT_HEIGHT = 150;
+const MAX_HEIGHT = 700;
+
+type Props = {
+  rootEvent: UseApiQueryResult<EventTransaction, RequestError>;
+  tree: TraceTree;
+};
+
+export function TraceContextPanel({tree, rootEvent}: Props) {
+  const [height, setHeight] = useState(DEFAULT_HEIGHT);
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const handleMouseDown = useCallback(
+    (event: React.MouseEvent) => {
+      event.preventDefault();
+
+      if (!containerRef.current) {
+        return;
+      }
+
+      const startY = event.clientY;
+      const startHeight = height;
+
+      function handleMouseMove(moveEvent: MouseEvent) {
+        if (!containerRef.current) {
+          return;
+        }
+
+        const deltaY = moveEvent.clientY - startY;
+        const newHeight = Math.max(
+          MIN_HEIGHT,
+          Math.min(startHeight - deltaY, MAX_HEIGHT)
+        );
+
+        containerRef.current.style.setProperty('--panel-height', `${newHeight}px`);
+      }
+
+      function handleMouseUp() {
+        if (!containerRef.current) {
+          return;
+        }
+
+        const finalHeight = parseInt(
+          getComputedStyle(containerRef.current).getPropertyValue('--panel-height'),
+          10
+        );
+
+        setHeight(finalHeight);
+
+        window.removeEventListener('mousemove', handleMouseMove);
+        window.removeEventListener('mouseup', handleMouseUp);
+      }
+
+      window.addEventListener('mousemove', handleMouseMove);
+      window.addEventListener('mouseup', handleMouseUp);
+    },
+    [height]
+  );
+
+  const renderTags = useCallback(() => {
+    if (!rootEvent.data) {
+      return null;
+    }
+
+    return (
+      <EventTagsTree
+        event={rootEvent.data}
+        meta={rootEvent.data._meta}
+        projectSlug={rootEvent.data.projectSlug ?? ''}
+        tags={rootEvent.data.tags ?? []}
+      />
+    );
+  }, [rootEvent.data]);
+
+  return (
+    <Container>
+      <GrabberContainer onMouseDown={handleMouseDown}>
+        <IconGrabbable color="gray500" />
+      </GrabberContainer>
+
+      <TraceContextContainer ref={containerRef}>
+        <VitalMetersContainer>
+          <TraceContextVitals tree={tree} />
+        </VitalMetersContainer>
+        <TraceTagsContainer>
+          <FoldSection sectionKey={'trace_tags' as SectionKey} title={t('Trace Tags')}>
+            {renderTags()}
+          </FoldSection>
+        </TraceTagsContainer>
+      </TraceContextContainer>
+    </Container>
+  );
+}
+
+const Container = styled('div')`
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+`;
+
+const TraceContextContainer = styled('div')`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  margin-top: ${space(1)};
+  --panel-height: ${DEFAULT_HEIGHT}px;
+  height: var(--panel-height);
+
+  &[style*='--panel-height: 0px'] {
+    display: none;
+  }
+`;
+
+const GrabberContainer = styled(Container)`
+  align-items: center;
+  background: ${p => p.theme.background};
+  border: 1px solid ${p => p.theme.border};
+  border-radius: 0 0 ${p => p.theme.borderRadius} ${p => p.theme.borderRadius};
+  display: flex;
+
+  width: 100%;
+  cursor: row-resize;
+  padding: ${space(0.5)};
+
+  & > svg {
+    transform: rotate(90deg);
+  }
+`;
+
+const VitalMetersContainer = styled('div')`
+  justify-content: center;
+  display: flex;
+  flex-direction: row;
+  gap: ${space(1)};
+  width: 100%;
+  margin-bottom: ${space(1)};
+`;
+
+const TraceTagsContainer = styled('div')`
+  width: 100%;
+  border: 1px solid ${p => p.theme.border};
+  border-radius: ${p => p.theme.borderRadius};
+  padding: 0 ${space(0.5)};
+`;
diff --git a/static/app/views/performance/newTraceDetails/traceContextVitals.tsx b/static/app/views/performance/newTraceDetails/traceContextVitals.tsx
new file mode 100644
index 00000000000000..4f0589a6f07698
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceContextVitals.tsx
@@ -0,0 +1,59 @@
+import {useTheme} from '@emotion/react';
+
+import {VitalMeter} from 'sentry/views/insights/browser/webVitals/components/webVitalMeters';
+import type {WebVitals} from 'sentry/views/insights/browser/webVitals/types';
+import type {TraceTree} from 'sentry/views/performance/newTraceDetails/traceModels/traceTree';
+
+type Props = {
+  tree: TraceTree;
+};
+
+const ALLOWED_VITALS = ['lcp', 'fcp', 'cls', 'ttfb', 'inp'];
+
+export function TraceContextVitals({tree}: Props) {
+  const theme = useTheme();
+
+  const hasWebVitals = tree.vital_types.has('web');
+  const hasValidWebVitals = Array.from(tree.vitals.values()).some(vitalGroup =>
+    vitalGroup.some(vital => ALLOWED_VITALS.includes(vital.key))
+  );
+
+  if (!hasWebVitals || !hasValidWebVitals) {
+    return null;
+  }
+
+  return ALLOWED_VITALS.map((webVital, index) => {
+    let vital: TraceTree.CollectedVital | undefined;
+    tree.vitals.forEach(entry => (vital = entry.find(v => v.key === webVital)));
+
+    // Render empty state
+    if (!vital || !vital.score) {
+      return (
+        <VitalMeter
+          key={webVital}
+          webVital={webVital as WebVitals}
+          score={undefined}
+          meterValue={undefined}
+          color={theme.charts.getColorPalette(3)[index]}
+          showTooltip
+          isAggregateMode={false}
+        />
+      );
+    }
+
+    const colors = theme.charts.getColorPalette(3);
+    const score = Math.round(vital.score * 100);
+
+    return (
+      <VitalMeter
+        key={vital.key}
+        webVital={vital.key as WebVitals}
+        score={score}
+        meterValue={vital.measurement.value}
+        showTooltip
+        color={colors[index]}
+        isAggregateMode={false}
+      />
+    );
+  });
+}
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/index.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/index.tsx
new file mode 100644
index 00000000000000..4f40da23ba8827
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/index.tsx
@@ -0,0 +1,89 @@
+import styled from '@emotion/styled';
+
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+
+import {isSiblingAutogroupedNode} from '../../../traceGuards';
+import type {ParentAutogroupNode} from '../../../traceModels/parentAutogroupNode';
+import type {SiblingAutogroupNode} from '../../../traceModels/siblingAutogroupNode';
+import {useHasTraceNewUi} from '../../../useHasTraceNewUi';
+import type {TraceTreeNodeDetailsProps} from '../../tabs/traceTreeNodeDetails';
+import {TraceDrawerComponents} from '../styles';
+
+import {ParentAutogroupNodeDetails} from './parentAutogroup';
+import {SiblingAutogroupNodeDetails} from './siblingAutogroup';
+
+export function AutogroupNodeDetails(
+  props: TraceTreeNodeDetailsProps<ParentAutogroupNode | SiblingAutogroupNode>
+) {
+  const hasTraceNewUi = useHasTraceNewUi();
+  const {node, organization, onTabScrollToNode} = props;
+
+  if (!hasTraceNewUi) {
+    if (isSiblingAutogroupedNode(node)) {
+      return (
+        <SiblingAutogroupNodeDetails
+          {...(props as TraceTreeNodeDetailsProps<SiblingAutogroupNode>)}
+        />
+      );
+    }
+
+    return (
+      <ParentAutogroupNodeDetails
+        {...(props as TraceTreeNodeDetailsProps<ParentAutogroupNode>)}
+      />
+    );
+  }
+
+  return (
+    <TraceDrawerComponents.DetailContainer hasNewTraceUi={hasTraceNewUi}>
+      <TraceDrawerComponents.HeaderContainer>
+        <TraceDrawerComponents.Title>
+          <TraceDrawerComponents.LegacyTitleText>
+            <TraceDrawerComponents.TitleText>
+              {t('Autogroup')}
+            </TraceDrawerComponents.TitleText>
+            <TraceDrawerComponents.SubtitleWithCopyButton
+              text={`ID: ${node.value.span_id}`}
+            />
+          </TraceDrawerComponents.LegacyTitleText>
+        </TraceDrawerComponents.Title>
+        <TraceDrawerComponents.NodeActions
+          node={node}
+          organization={organization}
+          onTabScrollToNode={onTabScrollToNode}
+        />
+      </TraceDrawerComponents.HeaderContainer>
+      <TextBlock>
+        {t(
+          'This block represents autogrouped spans. We do this to reduce noise whenever it fits one of the following criteria:'
+        )}
+      </TextBlock>
+      <BulletList>
+        <li>{t('5 or more siblings with the same operation and description')}</li>
+        <li>{t('2 or more descendants with the same operation')}</li>
+      </BulletList>
+      <TextBlock>
+        {t(
+          'You can either open this autogroup using the chevron on the span or turn this functionality off using the settings dropdown above.'
+        )}
+      </TextBlock>
+    </TraceDrawerComponents.DetailContainer>
+  );
+}
+
+const TextBlock = styled('div')`
+  font-size: ${p => p.theme.fontSizeLarge};
+  line-height: 1.5;
+  margin-bottom: ${space(2)};
+`;
+
+const BulletList = styled('ul')`
+  list-style-type: disc;
+  padding-left: 20px;
+  margin-bottom: ${space(2)};
+
+  li {
+    margin-bottom: ${space(1)};
+  }
+`;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/parentAutogroup.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/parentAutogroup.tsx
similarity index 80%
rename from static/app/views/performance/newTraceDetails/traceDrawer/details/parentAutogroup.tsx
rename to static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/parentAutogroup.tsx
index 442cb32b4e51a9..89fbc4e222de00 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/parentAutogroup.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/parentAutogroup.tsx
@@ -4,14 +4,13 @@ import {useTheme} from '@emotion/react';
 import {IconGroup} from 'sentry/icons';
 import {t} from 'sentry/locale';
 
-import type {TraceTreeNodeDetailsProps} from '../../traceDrawer/tabs/traceTreeNodeDetails';
-import type {ParentAutogroupNode} from '../../traceModels/parentAutogroupNode';
-import {TraceTree} from '../../traceModels/traceTree';
-import {makeTraceNodeBarColor} from '../../traceRow/traceBar';
-import {getTraceTabTitle} from '../../traceState/traceTabs';
-
-import {IssueList} from './issues/issues';
-import {type SectionCardKeyValueList, TraceDrawerComponents} from './styles';
+import type {TraceTreeNodeDetailsProps} from '../../../traceDrawer/tabs/traceTreeNodeDetails';
+import type {ParentAutogroupNode} from '../../../traceModels/parentAutogroupNode';
+import {TraceTree} from '../../../traceModels/traceTree';
+import {makeTraceNodeBarColor} from '../../../traceRow/traceBar';
+import {getTraceTabTitle} from '../../../traceState/traceTabs';
+import {IssueList} from '.././issues/issues';
+import {type SectionCardKeyValueList, TraceDrawerComponents} from '.././styles';
 
 export function ParentAutogroupNodeDetails({
   node,
@@ -60,7 +59,7 @@ export function ParentAutogroupNodeDetails({
 
   return (
     <TraceDrawerComponents.DetailContainer>
-      <TraceDrawerComponents.HeaderContainer>
+      <TraceDrawerComponents.LegacyHeaderContainer>
         <TraceDrawerComponents.Title>
           <TraceDrawerComponents.IconTitleWrapper>
             <TraceDrawerComponents.IconBorder
@@ -76,7 +75,7 @@ export function ParentAutogroupNodeDetails({
           node={node}
           onTabScrollToNode={onTabScrollToNode}
         />
-      </TraceDrawerComponents.HeaderContainer>
+      </TraceDrawerComponents.LegacyHeaderContainer>
 
       <IssueList issues={issues} node={node} organization={organization} />
 
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/siblingAutogroup.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/siblingAutogroup.tsx
similarity index 81%
rename from static/app/views/performance/newTraceDetails/traceDrawer/details/siblingAutogroup.tsx
rename to static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/siblingAutogroup.tsx
index 79f842ec246c65..b4fee0fbd8fceb 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/siblingAutogroup.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/autogroup/siblingAutogroup.tsx
@@ -4,14 +4,13 @@ import {useTheme} from '@emotion/react';
 import {IconGroup} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 
-import type {TraceTreeNodeDetailsProps} from '../../traceDrawer/tabs/traceTreeNodeDetails';
-import type {SiblingAutogroupNode} from '../../traceModels/siblingAutogroupNode';
-import {TraceTree} from '../../traceModels/traceTree';
-import {makeTraceNodeBarColor} from '../../traceRow/traceBar';
-import {getTraceTabTitle} from '../../traceState/traceTabs';
-
-import {IssueList} from './issues/issues';
-import {type SectionCardKeyValueList, TraceDrawerComponents} from './styles';
+import type {TraceTreeNodeDetailsProps} from '../../../traceDrawer/tabs/traceTreeNodeDetails';
+import type {SiblingAutogroupNode} from '../../../traceModels/siblingAutogroupNode';
+import {TraceTree} from '../../../traceModels/traceTree';
+import {makeTraceNodeBarColor} from '../../../traceRow/traceBar';
+import {getTraceTabTitle} from '../../../traceState/traceTabs';
+import {IssueList} from '.././issues/issues';
+import {type SectionCardKeyValueList, TraceDrawerComponents} from '.././styles';
 
 export function SiblingAutogroupNodeDetails({
   node,
@@ -61,7 +60,7 @@ export function SiblingAutogroupNodeDetails({
 
   return (
     <TraceDrawerComponents.DetailContainer>
-      <TraceDrawerComponents.HeaderContainer>
+      <TraceDrawerComponents.LegacyHeaderContainer>
         <TraceDrawerComponents.Title>
           <TraceDrawerComponents.IconTitleWrapper>
             <TraceDrawerComponents.IconBorder
@@ -77,7 +76,7 @@ export function SiblingAutogroupNodeDetails({
           node={node}
           onTabScrollToNode={onTabScrollToNode}
         />
-      </TraceDrawerComponents.HeaderContainer>
+      </TraceDrawerComponents.LegacyHeaderContainer>
 
       <IssueList issues={issues} node={node} organization={organization} />
 
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/error.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/error.tsx
index b6355f86df9812..4fdb2a6c7945a1 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/error.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/error.tsx
@@ -10,6 +10,7 @@ import {
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {generateIssueEventTarget} from 'sentry/components/quickTrace/utils';
 import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
 import type {EventError} from 'sentry/types/event';
 import {useApiQuery} from 'sentry/utils/queryClient';
 
@@ -19,11 +20,61 @@ import {TraceTree} from '../../traceModels/traceTree';
 import type {TraceTreeNode} from '../../traceModels/traceTreeNode';
 import {makeTraceNodeBarColor} from '../../traceRow/traceBar';
 import {getTraceTabTitle} from '../../traceState/traceTabs';
+import {useHasTraceNewUi} from '../../useHasTraceNewUi';
 
 import {IssueList} from './issues/issues';
 import {type SectionCardKeyValueList, TraceDrawerComponents} from './styles';
 
-export function ErrorNodeDetails({
+export function ErrorNodeDetails(
+  props: TraceTreeNodeDetailsProps<TraceTreeNode<TraceTree.TraceError>>
+) {
+  const hasTraceNewUi = useHasTraceNewUi();
+  const {node, organization, onTabScrollToNode} = props;
+  const issues = useMemo(() => {
+    return [...node.errors];
+  }, [node.errors]);
+
+  if (!hasTraceNewUi) {
+    return <LegacyErrorNodeDetails {...props} />;
+  }
+
+  return (
+    <TraceDrawerComponents.DetailContainer hasNewTraceUi={hasTraceNewUi}>
+      <TraceDrawerComponents.HeaderContainer>
+        <TraceDrawerComponents.Title>
+          <TraceDrawerComponents.LegacyTitleText>
+            <TraceDrawerComponents.TitleText>
+              {t('Error')}
+            </TraceDrawerComponents.TitleText>
+            <TraceDrawerComponents.SubtitleWithCopyButton
+              text={`ID: ${props.node.value.event_id}`}
+            />
+          </TraceDrawerComponents.LegacyTitleText>
+        </TraceDrawerComponents.Title>
+        <TraceDrawerComponents.NodeActions
+          node={node}
+          organization={organization}
+          onTabScrollToNode={onTabScrollToNode}
+        />
+      </TraceDrawerComponents.HeaderContainer>
+      <Description>
+        {t(
+          'This error is related to an ongoing issue. For details about how many users this affects and more, go to the issue below.'
+        )}
+      </Description>
+      <IssueList issues={issues} node={node} organization={organization} />
+    </TraceDrawerComponents.DetailContainer>
+  );
+}
+
+const Description = styled('div')`
+  margin-bottom: ${space(2)};
+  font-size: ${p => p.theme.fontSizeLarge};
+  line-height: 1.5;
+  text-align: left;
+`;
+
+function LegacyErrorNodeDetails({
   node,
   organization,
   onTabScrollToNode,
@@ -77,19 +128,19 @@ export function ErrorNodeDetails({
     <LoadingIndicator />
   ) : data ? (
     <TraceDrawerComponents.DetailContainer>
-      <TraceDrawerComponents.HeaderContainer>
+      <TraceDrawerComponents.LegacyHeaderContainer>
         <TraceDrawerComponents.Title>
           <TraceDrawerComponents.IconBorder
             backgroundColor={makeTraceNodeBarColor(theme, node)}
           >
             <TraceIcons.Icon event={node.value} />
           </TraceDrawerComponents.IconBorder>
-          <TraceDrawerComponents.TitleText>
+          <TraceDrawerComponents.LegacyTitleText>
             <div>{node.value.level ?? t('error')}</div>
             <TraceDrawerComponents.TitleOp
               text={node.value.message ?? node.value.title ?? 'Error'}
             />
-          </TraceDrawerComponents.TitleText>
+          </TraceDrawerComponents.LegacyTitleText>
         </TraceDrawerComponents.Title>
         <TraceDrawerComponents.Actions>
           <TraceDrawerComponents.NodeActions
@@ -101,7 +152,7 @@ export function ErrorNodeDetails({
             {t('Go to Issue')}
           </LinkButton>
         </TraceDrawerComponents.Actions>
-      </TraceDrawerComponents.HeaderContainer>
+      </TraceDrawerComponents.LegacyHeaderContainer>
 
       <IssueList issues={issues} node={node} organization={organization} />
 
@@ -133,7 +184,6 @@ export function ErrorNodeDetails({
     </TraceDrawerComponents.DetailContainer>
   ) : null;
 }
-
 const StackTraceWrapper = styled('div')`
   .traceback {
     margin-bottom: 0;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx
index ea6fbdd7e9b708..159b039a881a67 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx
@@ -153,11 +153,11 @@ const IconWrapper = styled('span')`
 `;
 
 const TitleWithLink = styled(GlobalSelectionLink)`
-  display: inline-flex;
   align-items: center;
+  ${p => p.theme.overflowEllipsis}
 `;
 const TitleWithoutLink = styled('span')`
-  display: inline-flex;
+  ${p => p.theme.overflowEllipsis}
 `;
 
 const StyledEventOrGroupTitle = styled(EventOrGroupTitle)<{
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issues.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issues.tsx
index fb3917af0d94b7..7519c0022cdd7c 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issues.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issues.tsx
@@ -14,6 +14,7 @@ import Panel from 'sentry/components/panels/panel';
 import PanelHeader from 'sentry/components/panels/panelHeader';
 import PanelItem from 'sentry/components/panels/panelItem';
 import {PrimaryCount} from 'sentry/components/stream/group';
+import {IconOpen} from 'sentry/icons';
 import {t, tct, tn} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Group} from 'sentry/types/group';
@@ -24,12 +25,16 @@ import type {
   TracePerformanceIssue,
 } from 'sentry/utils/performance/quickTrace/types';
 import {useApiQuery} from 'sentry/utils/queryClient';
+import type RequestError from 'sentry/utils/requestError/requestError';
 import useOrganization from 'sentry/utils/useOrganization';
 import {HeaderDivider} from 'sentry/views/issueList/actions';
 import {NarrowAssigneeLabel} from 'sentry/views/issueList/actions/headers';
 
+import {isTracePerformanceIssue} from '../../../traceGuards';
+import {TraceIcons} from '../../../traceIcons';
 import type {TraceTree} from '../../../traceModels/traceTree';
 import type {TraceTreeNode} from '../../../traceModels/traceTreeNode';
+import {useHasTraceNewUi} from '../../../useHasTraceNewUi';
 import {TraceDrawerComponents} from '../styles';
 
 import {IssueSummary} from './issueSummary';
@@ -68,6 +73,7 @@ function sortIssuesByLevel(a: TraceError, b: TraceError): number {
 
 function Issue(props: IssueProps) {
   const {organization} = props;
+  const hasTraceNewUi = useHasTraceNewUi();
   const {
     isPending,
     data: fetchedIssue,
@@ -91,37 +97,196 @@ function Issue(props: IssueProps) {
 
   const hasNewLayout = organization.features.includes('issue-stream-table-layout');
 
+  if (!hasTraceNewUi) {
+    return (
+      <LegacyIssue
+        {...props}
+        isError={isError}
+        fetchedIssue={fetchedIssue}
+        error={error}
+        isPending={isPending}
+      />
+    );
+  }
+
+  const isPerformanceIssue: boolean = isTracePerformanceIssue(props.issue);
+  const iconClassName: string = isPerformanceIssue
+    ? 'performance_issue'
+    : props.issue.level;
+
   return isPending ? (
     <StyledLoadingIndicatorWrapper>
       <LoadingIndicator size={24} mini />
     </StyledLoadingIndicatorWrapper>
   ) : fetchedIssue ? (
     <StyledPanelItem hasNewLayout={hasNewLayout}>
+      <IconWrapper className={iconClassName}>
+        <IconBackground className={iconClassName}>
+          <TraceIcons.Icon event={props.issue} />
+        </IconBackground>
+      </IconWrapper>
       {hasNewLayout ? (
-        <NarrowIssueSummaryWrapper>
-          <EventOrGroupHeader data={fetchedIssue} organization={organization} />
+        <NarrowSummaryWrapper>
+          <EventOrGroupHeader
+            data={fetchedIssue}
+            organization={organization}
+            eventId={props.issue.event_id}
+          />
           <EventOrGroupExtraDetails data={fetchedIssue} />
-        </NarrowIssueSummaryWrapper>
+        </NarrowSummaryWrapper>
       ) : (
-        <IssueSummaryWrapper>
+        <SummaryWrapper>
           <IssueSummary
             data={fetchedIssue}
             organization={props.organization}
             event_id={props.issue.event_id}
           />
           <EventOrGroupExtraDetails data={fetchedIssue} />
+        </SummaryWrapper>
+      )}
+    </StyledPanelItem>
+  ) : isError ? (
+    <LoadingError
+      message={
+        error.status === 404 ? t('This issue was deleted') : t('Failed to fetch issue')
+      }
+    />
+  ) : null;
+}
+
+const IconBackground = styled('div')`
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  padding: 3px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  svg {
+    width: 16px;
+    height: 16px;
+    fill: ${p => p.theme.white};
+  }
+`;
+
+const IconWrapper = styled('div')`
+  border-radius: 50%;
+  padding: ${space(0.25)};
+
+  &.info {
+    border: 1px solid var(--info);
+    ${IconBackground} {
+      background-color: var(--info);
+    }
+  }
+  &.warning {
+    border: 1px solid var(--warning);
+    ${IconBackground} {
+      background-color: var(--warning);
+    }
+  }
+  &.debug {
+    border: 1px solid var(--debug);
+    ${IconBackground} {
+      background-color: var(--debug);
+    }
+  }
+  &.error,
+  &.fatal {
+    border: 1px solid var(--error);
+    ${IconBackground} {
+      background-color: var(--error);
+    }
+  }
+  &.performance_issue {
+    border: 1px solid var(--performance-issue);
+    ${IconBackground} {
+      background-color: var(--performance-issue);
+    }
+  }
+  &.default {
+    border: 1px solid var(--default);
+    ${IconBackground} {
+      background-color: var(--default);
+    }
+  }
+  &.unknown {
+    border: 1px solid var(--unknown);
+    ${IconBackground} {
+      background-color: var(--unknown);
+    }
+  }
+
+  &.info,
+  &.warning,
+  &.performance_issue,
+  &.default,
+  &.unknown {
+    svg {
+      transform: translateY(-1px);
+    }
+  }
+`;
+
+const NarrowSummaryWrapper = styled('div')`
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  width: 100%;
+  justify-content: left;
+`;
+
+const SummaryWrapper = styled('div')`
+  overflow: hidden;
+  flex: 1;
+`;
+
+function LegacyIssue(
+  props: IssueProps & {
+    error: RequestError | null;
+    fetchedIssue: Group | undefined;
+    isError: boolean;
+    isPending: boolean;
+  }
+) {
+  const {organization} = props;
+  const hasNewLayout = organization.features.includes('issue-stream-table-layout');
+
+  return props.isPending ? (
+    <StyledLoadingIndicatorWrapper>
+      <LoadingIndicator size={24} mini />
+    </StyledLoadingIndicatorWrapper>
+  ) : props.fetchedIssue ? (
+    <StyledLegacyPanelItem hasNewLayout={hasNewLayout}>
+      {hasNewLayout ? (
+        <NarrowIssueSummaryWrapper>
+          <EventOrGroupHeader data={props.fetchedIssue} organization={organization} />
+          <EventOrGroupExtraDetails data={props.fetchedIssue} />
+        </NarrowIssueSummaryWrapper>
+      ) : (
+        <IssueSummaryWrapper>
+          <IssueSummary
+            data={props.fetchedIssue}
+            organization={props.organization}
+            event_id={props.issue.event_id}
+          />
+          <EventOrGroupExtraDetails data={props.fetchedIssue} />
         </IssueSummaryWrapper>
       )}
       <ChartWrapper>
         <GroupStatusChart
           stats={
-            fetchedIssue.filtered
-              ? fetchedIssue.filtered.stats?.['24h']
-              : fetchedIssue.stats?.['24h']
+            props.fetchedIssue.filtered
+              ? props.fetchedIssue.filtered.stats?.['24h']
+              : props.fetchedIssue.stats?.['24h']
+          }
+          secondaryStats={
+            props.fetchedIssue.filtered ? props.fetchedIssue.stats?.['24h'] : []
           }
-          secondaryStats={fetchedIssue.filtered ? fetchedIssue.stats?.['24h'] : []}
           groupStatus={
-            getBadgeProperties(fetchedIssue.status, fetchedIssue.substatus)?.status
+            getBadgeProperties(props.fetchedIssue.status, props.fetchedIssue.substatus)
+              ?.status
           }
           hideZeros
           showSecondaryPoints
@@ -133,14 +298,18 @@ function Issue(props: IssueProps) {
           <NarrowEventsOrUsersWrapper>
             <PrimaryCount
               value={
-                fetchedIssue.filtered ? fetchedIssue.filtered.count : fetchedIssue.count
+                props.fetchedIssue.filtered
+                  ? props.fetchedIssue.filtered.count
+                  : props.fetchedIssue.count
               }
             />
           </NarrowEventsOrUsersWrapper>
         ) : (
           <PrimaryCount
             value={
-              fetchedIssue.filtered ? fetchedIssue.filtered.count : fetchedIssue.count
+              props.fetchedIssue.filtered
+                ? props.fetchedIssue.filtered.count
+                : props.fetchedIssue.count
             }
           />
         )}
@@ -149,9 +318,9 @@ function Issue(props: IssueProps) {
         <NarrowEventsOrUsersWrapper>
           <PrimaryCount
             value={
-              fetchedIssue.filtered
-                ? fetchedIssue.filtered.userCount
-                : fetchedIssue.userCount
+              props.fetchedIssue.filtered
+                ? props.fetchedIssue.filtered.userCount
+                : props.fetchedIssue.userCount
             }
           />
         </NarrowEventsOrUsersWrapper>
@@ -159,32 +328,33 @@ function Issue(props: IssueProps) {
         <UserCountWrapper>
           <PrimaryCount
             value={
-              fetchedIssue.filtered
-                ? fetchedIssue.filtered.userCount
-                : fetchedIssue.userCount
+              props.fetchedIssue.filtered
+                ? props.fetchedIssue.filtered.userCount
+                : props.fetchedIssue.userCount
             }
           />
         </UserCountWrapper>
       )}
       {hasNewLayout ? (
         <NarrowAssigneeWrapper>
-          <AssigneeBadge assignedTo={fetchedIssue.assignedTo ?? undefined} />
+          <AssigneeBadge assignedTo={props.fetchedIssue.assignedTo ?? undefined} />
         </NarrowAssigneeWrapper>
       ) : (
         <AssigneeWrapper>
-          <AssigneeBadge assignedTo={fetchedIssue.assignedTo ?? undefined} />
+          <AssigneeBadge assignedTo={props.fetchedIssue.assignedTo ?? undefined} />
         </AssigneeWrapper>
       )}
-    </StyledPanelItem>
-  ) : isError ? (
+    </StyledLegacyPanelItem>
+  ) : props.isError ? (
     <LoadingError
       message={
-        error.status === 404 ? t('This issue was deleted') : t('Failed to fetch issue')
+        props.error?.status === 404
+          ? t('This issue was deleted')
+          : t('Failed to fetch issue')
       }
     />
   ) : null;
 }
-
 type IssueListProps = {
   issues: TraceErrorOrIssue[];
   node: TraceTreeNode<TraceTree.NodeValue>;
@@ -192,6 +362,7 @@ type IssueListProps = {
 };
 
 export function IssueList({issues, node, organization}: IssueListProps) {
+  const hasTraceNewUi = useHasTraceNewUi();
   const uniqueErrorIssues = useMemo(() => {
     const unique: TraceError[] = [];
 
@@ -235,20 +406,50 @@ export function IssueList({issues, node, organization}: IssueListProps) {
     return null;
   }
 
+  if (!hasTraceNewUi) {
+    return (
+      <StyledPanel>
+        <IssueListHeader
+          node={node}
+          errorIssues={uniqueErrorIssues}
+          performanceIssues={uniquePerformanceIssues}
+        />
+        {uniqueIssues.slice(0, MAX_DISPLAYED_ISSUES_COUNT).map((issue, index) => (
+          <Issue key={index} issue={issue} organization={organization} />
+        ))}
+      </StyledPanel>
+    );
+  }
+
   return (
-    <StyledPanel>
-      <IssueListHeader
-        node={node}
-        errorIssues={uniqueErrorIssues}
-        performanceIssues={uniquePerformanceIssues}
-      />
-      {uniqueIssues.slice(0, MAX_DISPLAYED_ISSUES_COUNT).map((issue, index) => (
-        <Issue key={index} issue={issue} organization={organization} />
-      ))}
-    </StyledPanel>
+    <IssuesWrapper>
+      <StyledPanel>
+        {uniqueIssues.slice(0, MAX_DISPLAYED_ISSUES_COUNT).map((issue, index) => (
+          <Issue key={index} issue={issue} organization={organization} />
+        ))}
+      </StyledPanel>
+      {uniqueIssues.length > MAX_DISPLAYED_ISSUES_COUNT ? (
+        <TraceDrawerComponents.IssuesLink node={node}>
+          <IssueLinkWrapper>
+            <IconOpen />
+            {t(
+              `Open %s more in Issues`,
+              uniqueIssues.length - MAX_DISPLAYED_ISSUES_COUNT
+            )}
+          </IssueLinkWrapper>
+        </TraceDrawerComponents.IssuesLink>
+      ) : null}
+    </IssuesWrapper>
   );
 }
 
+const IssueLinkWrapper = styled('div')`
+  display: flex;
+  align-items: center;
+  gap: ${space(0.5)};
+  margin-left: ${space(0.25)};
+`;
+
 function IssueListHeader({
   node,
   errorIssues,
@@ -424,6 +625,18 @@ const StyledPanel = styled(Panel)`
   container-type: inline-size;
 `;
 
+const IssuesWrapper = styled('div')`
+  display: flex;
+  flex-direction: column;
+  gap: ${space(0.75)};
+  justify-content: left;
+  margin-bottom: ${space(2)};
+
+  ${StyledPanel} {
+    margin-bottom: 0;
+  }
+`;
+
 const StyledPanelHeader = styled(PanelHeader)<{hasNewLayout: boolean}>`
   padding-top: ${space(1)};
   padding-bottom: ${space(1)};
@@ -436,6 +649,7 @@ const StyledPanelHeader = styled(PanelHeader)<{hasNewLayout: boolean}>`
 
 const StyledLoadingIndicatorWrapper = styled('div')`
   display: flex;
+  align-items: center;
   justify-content: center;
   width: 100%;
   padding: ${space(2)} 0;
@@ -488,11 +702,12 @@ const AssigneeWrapper = styled(ColumnWrapper)`
   }
 `;
 
-const NarrowAssigneeWrapper = styled(AssigneeWrapper)`
-  margin-left: 0;
+const NarrowAssigneeWrapper = styled(ColumnWrapper)`
+  margin-right: ${space(2)};
 `;
 
 const ChartWrapper = styled('div')`
+  margin-left: ${space(4)};
   width: 200px;
   align-self: center;
 
@@ -501,7 +716,9 @@ const ChartWrapper = styled('div')`
   }
 `;
 
-const StyledPanelItem = styled(PanelItem)<{hasNewLayout: boolean}>`
+const StyledLegacyPanelItem = styled(PanelItem)<{hasNewLayout: boolean}>`
+  justify-content: space-between;
+  align-items: center;
   padding-top: ${p => (p.hasNewLayout ? '0px' : space(1))};
   padding-bottom: ${p => (p.hasNewLayout ? '0px' : space(1))};
   ${p =>
@@ -516,6 +733,14 @@ const StyledPanelItem = styled(PanelItem)<{hasNewLayout: boolean}>`
         `}
 `;
 
+const StyledPanelItem = styled(StyledLegacyPanelItem)`
+  justify-content: left;
+  align-items: center;
+  gap: ${space(1.5)};
+  height: fit-content;
+  padding: ${space(1)} ${space(2)};
+`;
+
 const StyledIssueStreamHeaderLabel = styled(IssueStreamHeaderLabel)`
   display: flex;
   margin-left: ${space(2)};
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/missingInstrumentation.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/missingInstrumentation.tsx
index 4fbf2b6b26557f..a44c9c64e914ce 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/missingInstrumentation.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/missingInstrumentation.tsx
@@ -1,23 +1,110 @@
 import {useTheme} from '@emotion/react';
+import styled from '@emotion/styled';
 
+import ExternalLink from 'sentry/components/links/externalLink';
 import {IconSpan} from 'sentry/icons';
-import {t} from 'sentry/locale';
+import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
 import getDuration from 'sentry/utils/duration/getDuration';
 import {generateProfileFlamechartRouteWithQuery} from 'sentry/utils/profiling/routes';
 import useProjects from 'sentry/utils/useProjects';
 import {ProfileGroupProvider} from 'sentry/views/profiling/profileGroupProvider';
 import {ProfileContext, ProfilesProvider} from 'sentry/views/profiling/profilesProvider';
 
+import {getCustomInstrumentationLink} from '../../traceConfigurations';
 import {ProfilePreview} from '../../traceDrawer/details/profiling/profilePreview';
 import type {TraceTreeNodeDetailsProps} from '../../traceDrawer/tabs/traceTreeNodeDetails';
 import type {MissingInstrumentationNode} from '../../traceModels/missingInstrumentationNode';
 import {TraceTree} from '../../traceModels/traceTree';
 import {makeTraceNodeBarColor} from '../../traceRow/traceBar';
 import {getTraceTabTitle} from '../../traceState/traceTabs';
+import {useHasTraceNewUi} from '../../useHasTraceNewUi';
 
 import {type SectionCardKeyValueList, TraceDrawerComponents} from './styles';
 
-export function MissingInstrumentationNodeDetails({
+export function MissingInstrumentationNodeDetails(
+  props: TraceTreeNodeDetailsProps<MissingInstrumentationNode>
+) {
+  const {projects} = useProjects();
+  const hasTraceNewUi = useHasTraceNewUi();
+
+  if (!hasTraceNewUi) {
+    return <LegacyMissingInstrumentationNodeDetails {...props} />;
+  }
+
+  const {node, organization, onTabScrollToNode} = props;
+  const event = node.previous.event ?? node.next.event ?? null;
+  const project = projects.find(proj => proj.slug === event?.projectSlug);
+  const profileId = event?.contexts?.profile?.profile_id ?? null;
+
+  return (
+    <TraceDrawerComponents.DetailContainer hasNewTraceUi={hasTraceNewUi}>
+      <TraceDrawerComponents.HeaderContainer>
+        <TraceDrawerComponents.Title>
+          <TraceDrawerComponents.LegacyTitleText>
+            <TraceDrawerComponents.TitleText>
+              {t('No Instrumentation')}
+            </TraceDrawerComponents.TitleText>
+            <TraceDrawerComponents.SubtitleWithCopyButton
+              hideCopyButton
+              text={t('How Awkward')}
+            />
+          </TraceDrawerComponents.LegacyTitleText>
+        </TraceDrawerComponents.Title>
+        <TraceDrawerComponents.NodeActions
+          node={node}
+          organization={organization}
+          onTabScrollToNode={onTabScrollToNode}
+        />
+      </TraceDrawerComponents.HeaderContainer>
+
+      <TextBlock>
+        {tct(
+          'It looks like there’s more than 100ms unaccounted for. This might be a missing service or just idle time. If you know there’s something going on, you can [customInstrumentationLink: add more spans using custom instrumentation].',
+          {
+            customInstrumentationLink: (
+              <ExternalLink href={getCustomInstrumentationLink(project)} />
+            ),
+          }
+        )}
+      </TextBlock>
+
+      {event?.projectSlug ? (
+        <ProfilesProvider
+          orgSlug={organization.slug}
+          projectSlug={node.event?.projectSlug ?? ''}
+          profileId={profileId || ''}
+        >
+          <ProfileContext.Consumer>
+            {profiles => (
+              <ProfileGroupProvider
+                type="flamechart"
+                input={profiles?.type === 'resolved' ? profiles.data : null}
+                traceID={profileId || ''}
+              >
+                <ProfilePreview event={event!} node={node} />
+              </ProfileGroupProvider>
+            )}
+          </ProfileContext.Consumer>
+        </ProfilesProvider>
+      ) : null}
+
+      <TextBlock>
+        {t(
+          "You can turn off the 'No Instrumentation' feature using the settings dropdown above."
+        )}
+      </TextBlock>
+    </TraceDrawerComponents.DetailContainer>
+  );
+}
+
+const TextBlock = styled('div')`
+  font-size: ${p => p.theme.fontSizeLarge};
+  line-height: 1.5;
+  margin-bottom: ${space(2)};
+`;
+
+function LegacyMissingInstrumentationNodeDetails({
   node,
   onParentClick,
   onTabScrollToNode,
@@ -81,7 +168,7 @@ export function MissingInstrumentationNodeDetails({
 
   return (
     <TraceDrawerComponents.DetailContainer>
-      <TraceDrawerComponents.HeaderContainer>
+      <TraceDrawerComponents.LegacyHeaderContainer>
         <TraceDrawerComponents.Title>
           <TraceDrawerComponents.IconTitleWrapper>
             <TraceDrawerComponents.IconBorder
@@ -97,7 +184,7 @@ export function MissingInstrumentationNodeDetails({
           node={node}
           onTabScrollToNode={onTabScrollToNode}
         />
-      </TraceDrawerComponents.HeaderContainer>
+      </TraceDrawerComponents.LegacyHeaderContainer>
 
       {node.event?.projectSlug ? (
         <ProfilesProvider
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/profiling/profilePreview.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/profiling/profilePreview.tsx
index 34f230c6429f1e..d1951b3a8e639e 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/profiling/profilePreview.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/profiling/profilePreview.tsx
@@ -1,4 +1,4 @@
-import {useMemo, useState} from 'react';
+import {Fragment, useMemo, useState} from 'react';
 import styled from '@emotion/styled';
 
 import emptyStateImg from 'sentry-images/spot/profiling-empty-state.svg';
@@ -8,6 +8,8 @@ import {SectionHeading} from 'sentry/components/charts/styles';
 import InlineDocs from 'sentry/components/events/interfaces/spans/inlineDocs';
 import ExternalLink from 'sentry/components/links/externalLink';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
+import Panel from 'sentry/components/panels/panel';
+import PanelBody from 'sentry/components/panels/panelBody';
 import {FlamegraphPreview} from 'sentry/components/profiling/flamegraph/flamegraphPreview';
 import QuestionTooltip from 'sentry/components/questionTooltip';
 import {t, tct} from 'sentry/locale';
@@ -26,12 +28,15 @@ import {generateProfileFlamechartRouteWithQuery} from 'sentry/utils/profiling/ro
 import {Rect} from 'sentry/utils/profiling/speedscope';
 import useOrganization from 'sentry/utils/useOrganization';
 import useProjects from 'sentry/utils/useProjects';
+import {SectionDivider} from 'sentry/views/issueDetails/streamline/foldSection';
+import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
 import {useProfileGroup} from 'sentry/views/profiling/profileGroupProvider';
 import {useProfiles} from 'sentry/views/profiling/profilesProvider';
 
 import type {MissingInstrumentationNode} from '../../../traceModels/missingInstrumentationNode';
 import {TraceTree} from '../../../traceModels/traceTree';
 import type {TraceTreeNode} from '../../../traceModels/traceTreeNode';
+import {useHasTraceNewUi} from '../../../useHasTraceNewUi';
 
 interface SpanProfileProps {
   event: Readonly<EventTransaction>;
@@ -39,6 +44,157 @@ interface SpanProfileProps {
 }
 
 export function ProfilePreview({event, node}: SpanProfileProps) {
+  const {projects} = useProjects();
+  const hasNewTraceUi = useHasTraceNewUi();
+  const profiles = useProfiles();
+  const profileGroup = useProfileGroup();
+  const project = useMemo(
+    () => projects.find(p => p.id === event.projectID),
+    [projects, event]
+  );
+
+  const organization = useOrganization();
+  const [canvasView, setCanvasView] = useState<CanvasView<FlamegraphModel> | null>(null);
+
+  const profile = useMemo(() => {
+    const threadId = profileGroup.profiles[profileGroup.activeProfileIndex]?.threadId;
+    if (!defined(threadId)) {
+      return null;
+    }
+    return profileGroup.profiles.find(p => p.threadId === threadId) ?? null;
+  }, [profileGroup.profiles, profileGroup.activeProfileIndex]);
+
+  const transactionHasProfile = useMemo(() => {
+    return (TraceTree.ParentTransaction(node)?.profiles?.length ?? 0) > 0;
+  }, [node]);
+
+  const flamegraph = useMemo(() => {
+    if (!transactionHasProfile || !profile) {
+      return FlamegraphModel.Example();
+    }
+
+    return new FlamegraphModel(profile, {});
+  }, [transactionHasProfile, profile]);
+
+  if (!hasNewTraceUi) {
+    return (
+      <LegacyProfilePreview event={event} node={node as MissingInstrumentationNode} />
+    );
+  }
+
+  // The most recent profile formats should contain a timestamp indicating
+  // the beginning of the profile. This timestamp can be after the start
+  // timestamp on the transaction, so we need to account for the gap and
+  // make sure the relative start timestamps we compute for the span is
+  // relative to the start of the profile.
+  //
+  // If the profile does not contain a timestamp, we fall back to using the
+  // start timestamp on the transaction. This won't be as accurate but it's
+  // the next best thing.
+  const startTimestamp = profile?.timestamp ?? event.startTimestamp;
+  const relativeStartTimestamp = transactionHasProfile
+    ? node.value.start_timestamp - startTimestamp
+    : 0;
+  const relativeStopTimestamp = transactionHasProfile
+    ? node.value.timestamp - startTimestamp
+    : flamegraph.configSpace.width;
+
+  const profileId = event.contexts.profile?.profile_id || '';
+  // we want to try to go straight to the same config view as the preview
+  const query = canvasView?.configView
+    ? {
+        // TODO: this assumes that profile start timestamp == transaction timestamp
+        fov: Rect.encode(canvasView.configView),
+        // the flamechart persists some preferences to local storage,
+        // force these settings so the view is the same as the preview
+        view: 'top down',
+        type: 'flamechart',
+      }
+    : undefined;
+
+  const target = generateProfileFlamechartRouteWithQuery({
+    orgSlug: organization.slug,
+    projectSlug: event?.projectSlug ?? '',
+    profileId,
+    query,
+  });
+
+  function handleGoToProfile() {
+    trackAnalytics('profiling_views.go_to_flamegraph', {
+      organization,
+      source: 'performance.missing_instrumentation',
+    });
+  }
+
+  const message = (
+    <TextBlock>{t('Or, see if profiling can provide more context on this:')}</TextBlock>
+  );
+
+  if (transactionHasProfile) {
+    return (
+      <FlamegraphThemeProvider>
+        {message}
+        <SectionDivider />
+        <InterimSection
+          title={t('Related Profile')}
+          type="no_instrumentation_profile"
+          initialCollapse={false}
+          actions={
+            <LinkButton size="xs" onClick={handleGoToProfile} to={target}>
+              {t('Open in Profiling')}
+            </LinkButton>
+          }
+        >
+          {/* If you remove this div, padding between elements will break */}
+          <div>
+            <ProfilePreviewLegend />
+            <FlamegraphContainer>
+              {profiles.type === 'loading' ? (
+                <LoadingIndicator />
+              ) : (
+                <FlamegraphPreview
+                  flamegraph={flamegraph}
+                  updateFlamegraphView={setCanvasView}
+                  relativeStartTimestamp={relativeStartTimestamp}
+                  relativeStopTimestamp={relativeStopTimestamp}
+                />
+              )}
+            </FlamegraphContainer>
+          </div>
+        </InterimSection>
+      </FlamegraphThemeProvider>
+    );
+  }
+
+  // The event's platform is more accurate than the project
+  // so use that first and fall back to the project's platform
+  const docsLink =
+    getProfilingDocsForPlatform(event.platform) ??
+    (project && getProfilingDocsForPlatform(project.platform));
+
+  // This project has received a profile before so they've already
+  // set up profiling. No point showing the profiling setup again.
+  if (!docsLink || project?.hasProfiles) {
+    return null;
+  }
+
+  // At this point we must have a project on a supported
+  // platform that has not setup profiling yet
+  return (
+    <Fragment>
+      {message}
+      <SetupProfiling link={docsLink} />
+    </Fragment>
+  );
+}
+
+const TextBlock = styled('div')`
+  font-size: ${p => p.theme.fontSizeLarge};
+  line-height: 1.5;
+  margin-bottom: ${space(2)};
+`;
+
+function LegacyProfilePreview({event, node}: SpanProfileProps) {
   const {projects} = useProjects();
   const profiles = useProfiles();
   const profileGroup = useProfileGroup();
@@ -130,7 +286,7 @@ export function ProfilePreview({event, node}: SpanProfileProps) {
 
   // At this point we must have a project on a supported
   // platform that has not setup profiling yet
-  return <SetupProfiling link={docsLink} />;
+  return <LegacySetupProfiling link={docsLink} />;
 }
 
 interface ProfilePreviewProps {
@@ -210,9 +366,56 @@ function ProfilePreviewLegend() {
 }
 
 function SetupProfiling({link}: {link: string}) {
+  return (
+    <Panel>
+      <StyledPanelBody>
+        <span>
+          <h5>{t('Profiling for a Better Picture')}</h5>
+          <TextBlock>
+            {t(
+              'Profiles can also give you additional context on which functions are getting sampled at the time of these spans.'
+            )}
+          </TextBlock>
+          <LinkButton size="sm" priority="primary" href={link} external>
+            {t('Get Started')}
+          </LinkButton>
+        </span>
+        <ImageContainer>
+          <Image src={emptyStateImg} />
+        </ImageContainer>
+      </StyledPanelBody>
+    </Panel>
+  );
+}
+
+const Image = styled('img')`
+  user-select: none;
+  width: 250px;
+  align-self: center;
+`;
+
+const StyledPanelBody = styled(PanelBody)`
+  display: flex;
+  gap: ${space(2)};
+  justify-content: space-between;
+  padding: ${space(2)};
+  container-type: inline-size;
+`;
+
+const ImageContainer = styled('div')`
+  display: flex;
+  min-width: 200px;
+  justify-content: center;
+
+  @container (max-width: 600px) {
+    display: none;
+  }
+`;
+
+function LegacySetupProfiling({link}: {link: string}) {
   return (
     <Container>
-      <Image src={emptyStateImg} />
+      <LegacyImage src={emptyStateImg} />
       <InstructionsContainer>
         <h5>{t('With Profiling, we could paint a better picture')}</h5>
         <p>
@@ -270,9 +473,9 @@ const InstructionsContainer = styled('div')`
   align-items: start;
 `;
 
-const Image = styled('img')`
+const LegacyImage = styled('img')`
   user-select: none;
-  width: 420px;
+  width: 200px;
   align-self: center;
 
   @media (min-width: ${p => p.theme.breakpoints.medium}) {
@@ -289,7 +492,7 @@ const Image = styled('img')`
 `;
 
 const FlamegraphContainer = styled('div')`
-  height: 310px;
+  height: 200px;
   margin-top: ${space(1)};
   margin-bottom: ${space(1)};
   position: relative;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/components/spanSummaryLink.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/components/spanSummaryLink.tsx
new file mode 100644
index 00000000000000..aa8b5e30052ddd
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/components/spanSummaryLink.tsx
@@ -0,0 +1,102 @@
+import styled from '@emotion/styled';
+
+import type {SpanType} from 'sentry/components/events/interfaces/spans/types';
+import Link from 'sentry/components/links/link';
+import {IconStats} from 'sentry/icons';
+import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import type {EventTransaction} from 'sentry/types/event';
+import type {Organization} from 'sentry/types/organization';
+import {trackAnalytics} from 'sentry/utils/analytics';
+import {useLocation} from 'sentry/utils/useLocation';
+import {DATA_TYPE} from 'sentry/views/insights/browser/resources/settings';
+import {resolveSpanModule} from 'sentry/views/insights/common/utils/resolveSpanModule';
+import {useModuleURL} from 'sentry/views/insights/common/utils/useModuleURL';
+import {ModuleName} from 'sentry/views/insights/types';
+import {
+  querySummaryRouteWithQuery,
+  resourceSummaryRouteWithQuery,
+} from 'sentry/views/performance/transactionSummary/transactionSpans/spanDetails/utils';
+
+interface Props {
+  event: Readonly<EventTransaction>;
+  organization: Organization;
+  span: SpanType;
+}
+
+function SpanSummaryLink(props: Props) {
+  const location = useLocation();
+  const resourceBaseUrl = useModuleURL(ModuleName.RESOURCE);
+  const queryBaseUrl = useModuleURL(ModuleName.DB);
+
+  const {event, organization, span} = props;
+
+  const sentryTags = span.sentry_tags;
+  if (!sentryTags || !sentryTags.group) {
+    return null;
+  }
+
+  const resolvedModule = resolveSpanModule(sentryTags.op, sentryTags.category);
+
+  if (
+    organization.features.includes('insights-initial-modules') &&
+    resolvedModule === ModuleName.DB
+  ) {
+    return (
+      <Link
+        to={querySummaryRouteWithQuery({
+          base: queryBaseUrl,
+          query: location.query,
+          group: sentryTags.group,
+          projectID: event.projectID,
+        })}
+        onClick={() => {
+          trackAnalytics('trace.trace_layout.view_in_insight_module', {
+            organization,
+            module: ModuleName.DB,
+          });
+        }}
+      >
+        <StyledIconStats size="xs" />
+        {t('View Query Summary')}
+      </Link>
+    );
+  }
+
+  if (
+    organization.features.includes('insights-initial-modules') &&
+    resolvedModule === ModuleName.RESOURCE &&
+    resourceSummaryAvailable(sentryTags.op)
+  ) {
+    return (
+      <Link
+        to={resourceSummaryRouteWithQuery({
+          baseUrl: resourceBaseUrl,
+          query: location.query,
+          group: sentryTags.group,
+          projectID: event.projectID,
+        })}
+        onClick={() => {
+          trackAnalytics('trace.trace_layout.view_in_insight_module', {
+            organization,
+            module: ModuleName.RESOURCE,
+          });
+        }}
+      >
+        <StyledIconStats size="xs" />
+        {tct('View [dataType] Summary', {dataType: DATA_TYPE})}
+      </Link>
+    );
+  }
+
+  return null;
+}
+
+const StyledIconStats = styled(IconStats)`
+  margin-right: ${space(0.5)};
+`;
+
+const resourceSummaryAvailable = (op: string = '') =>
+  ['resource.script', 'resource.css'].includes(op);
+
+export default SpanSummaryLink;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/index.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/index.tsx
index 7a60403f056769..bcd947ffdcac82 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/index.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/index.tsx
@@ -1,7 +1,12 @@
-import {useMemo} from 'react';
+import {Fragment, useMemo} from 'react';
+import styled from '@emotion/styled';
+import type {Location} from 'history';
 
-import {EventContexts} from 'sentry/components/events/contexts';
-import {SpanProfileDetails} from 'sentry/components/events/interfaces/spans/spanProfileDetails';
+import {
+  SpanProfileDetails,
+  useSpanProfileDetails,
+} from 'sentry/components/events/interfaces/spans/spanProfileDetails';
+import type {SpanType} from 'sentry/components/events/interfaces/spans/types';
 import {getSpanOperation} from 'sentry/components/events/interfaces/spans/utils';
 import ProjectBadge from 'sentry/components/idBadge/projectBadge';
 import {
@@ -10,16 +15,21 @@ import {
 } from 'sentry/components/metrics/customMetricsEventData';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import type {EventTransaction} from 'sentry/types/event';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
+import {defined} from 'sentry/utils';
 import {useLocation} from 'sentry/utils/useLocation';
 import useProjects from 'sentry/utils/useProjects';
+import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
 import {ProfileGroupProvider} from 'sentry/views/profiling/profileGroupProvider';
 import {ProfileContext, ProfilesProvider} from 'sentry/views/profiling/profilesProvider';
 
 import type {TraceTreeNodeDetailsProps} from '../../../traceDrawer/tabs/traceTreeNodeDetails';
 import type {TraceTree} from '../../../traceModels/traceTree';
 import type {TraceTreeNode} from '../../../traceModels/traceTreeNode';
+import {useHasTraceNewUi} from '../../../useHasTraceNewUi';
 import {TraceDrawerComponents} from '.././styles';
 import {IssueList} from '../issues/issues';
 
@@ -41,10 +51,53 @@ function SpanNodeDetailHeader({
   organization: Organization;
   project: Project | undefined;
 }) {
-  const span = node.value;
+  const hasNewTraceUi = useHasTraceNewUi();
+
+  if (!hasNewTraceUi) {
+    return (
+      <LegacySpanNodeDetailHeader
+        node={node}
+        organization={organization}
+        onTabScrollToNode={onTabScrollToNode}
+        project={project}
+      />
+    );
+  }
 
   return (
     <TraceDrawerComponents.HeaderContainer>
+      <TraceDrawerComponents.Title>
+        <TraceDrawerComponents.LegacyTitleText>
+          <TraceDrawerComponents.TitleText>{t('Span')}</TraceDrawerComponents.TitleText>
+          <TraceDrawerComponents.SubtitleWithCopyButton
+            text={`ID: ${node.value.span_id}`}
+          />
+        </TraceDrawerComponents.LegacyTitleText>
+      </TraceDrawerComponents.Title>
+      <TraceDrawerComponents.NodeActions
+        node={node}
+        organization={organization}
+        onTabScrollToNode={onTabScrollToNode}
+      />
+    </TraceDrawerComponents.HeaderContainer>
+  );
+}
+
+function LegacySpanNodeDetailHeader({
+  node,
+  organization,
+  onTabScrollToNode,
+  project,
+}: {
+  node: TraceTreeNode<TraceTree.Span>;
+  onTabScrollToNode: (node: TraceTreeNode<any>) => void;
+  organization: Organization;
+  project: Project | undefined;
+}) {
+  const span = node.value;
+
+  return (
+    <TraceDrawerComponents.LegacyHeaderContainer>
       <TraceDrawerComponents.Title>
         <Tooltip title={node.event?.projectSlug}>
           <ProjectBadge
@@ -53,22 +106,157 @@ function SpanNodeDetailHeader({
             hideName
           />
         </Tooltip>
-        <TraceDrawerComponents.TitleText>
+        <TraceDrawerComponents.LegacyTitleText>
           <div>{t('span')}</div>
           <TraceDrawerComponents.TitleOp
             text={getSpanOperation(span) + ' - ' + (span.description ?? span.span_id)}
           />
-        </TraceDrawerComponents.TitleText>
+        </TraceDrawerComponents.LegacyTitleText>
       </TraceDrawerComponents.Title>
       <TraceDrawerComponents.NodeActions
         node={node}
         organization={organization}
         onTabScrollToNode={onTabScrollToNode}
       />
-    </TraceDrawerComponents.HeaderContainer>
+    </TraceDrawerComponents.LegacyHeaderContainer>
+  );
+}
+
+function SpanSections({
+  node,
+  project,
+  organization,
+  location,
+  onParentClick,
+}: {
+  location: Location;
+  node: TraceTreeNode<TraceTree.Span>;
+  onParentClick: (node: TraceTreeNode<TraceTree.NodeValue>) => void;
+  organization: Organization;
+  project: Project | undefined;
+}) {
+  const hasTraceNewUi = useHasTraceNewUi();
+
+  if (!hasTraceNewUi) {
+    return (
+      <LegacySpanSections
+        node={node}
+        project={project}
+        organization={organization}
+        location={location}
+        onParentClick={onParentClick}
+      />
+    );
+  }
+
+  const hasSpanSpecificData =
+    hasSpanHTTPInfo(node.value) ||
+    hasSpanKeys(node) ||
+    hasSpanTags(node.value) ||
+    eventHasCustomMetrics(organization, node.value._metrics_summary);
+
+  return (
+    <Fragment>
+      <GeneralInfo
+        node={node}
+        organization={organization}
+        location={location}
+        onParentClick={onParentClick}
+      />
+      {hasSpanSpecificData ? (
+        <InterimSection title={t('Span Specific')} type="span_specifc" initialCollapse>
+          <TraceDrawerComponents.SectionCardGroup>
+            {hasSpanKeys(node) ? <SpanKeys node={node} /> : null}
+            {hasSpanHTTPInfo(node.value) ? <SpanHTTPInfo span={node.value} /> : null}
+            {hasSpanTags(node.value) ? <Tags span={node.value} /> : null}
+            {eventHasCustomMetrics(organization, node.value._metrics_summary) ? (
+              <CustomMetricsEventData
+                projectId={project?.id || ''}
+                metricsSummary={node.value._metrics_summary}
+                startTimestamp={node.value.start_timestamp}
+              />
+            ) : null}
+          </TraceDrawerComponents.SectionCardGroup>
+        </InterimSection>
+      ) : null}
+    </Fragment>
   );
 }
 
+function LegacySpanSections({
+  node,
+  project,
+  organization,
+  location,
+  onParentClick,
+}: {
+  location: Location;
+  node: TraceTreeNode<TraceTree.Span>;
+  onParentClick: (node: TraceTreeNode<TraceTree.NodeValue>) => void;
+  organization: Organization;
+  project: Project | undefined;
+}) {
+  return (
+    <TraceDrawerComponents.SectionCardGroup>
+      {hasFormattedSpanDescription(node) ? (
+        <SpanDescription
+          node={node}
+          project={project}
+          organization={organization}
+          location={location}
+        />
+      ) : null}
+      <GeneralInfo
+        node={node}
+        organization={organization}
+        location={location}
+        onParentClick={onParentClick}
+      />
+      {hasSpanHTTPInfo(node.value) ? <SpanHTTPInfo span={node.value} /> : null}
+      {hasSpanTags(node.value) ? <Tags span={node.value} /> : null}
+      {hasSpanKeys(node) ? <SpanKeys node={node} /> : null}
+      {eventHasCustomMetrics(organization, node.value._metrics_summary) ? (
+        <CustomMetricsEventData
+          projectId={project?.id || ''}
+          metricsSummary={node.value._metrics_summary}
+          startTimestamp={node.value.start_timestamp}
+        />
+      ) : null}
+    </TraceDrawerComponents.SectionCardGroup>
+  );
+}
+
+function ProfileDetails({
+  event,
+  span,
+}: {
+  event: Readonly<EventTransaction>;
+  span: Readonly<SpanType>;
+}) {
+  const hasNewTraceUi = useHasTraceNewUi();
+  const {profile, frames} = useSpanProfileDetails(event, span);
+
+  if (!hasNewTraceUi) {
+    return <SpanProfileDetails span={span} event={event} />;
+  }
+
+  if (!defined(profile) || frames.length === 0) {
+    return null;
+  }
+
+  return (
+    <InterimSection title={t('Profile')} type="span_profile_details" initialCollapse>
+      <EmbededContentWrapper>
+        <SpanProfileDetails span={span} event={event} />
+      </EmbededContentWrapper>
+    </InterimSection>
+  );
+}
+
+const EmbededContentWrapper = styled('div')`
+  margin-top: ${space(0.5)};
+`;
+
 export function SpanNodeDetails({
   node,
   organization,
@@ -76,6 +264,7 @@ export function SpanNodeDetails({
   onParentClick,
 }: TraceTreeNodeDetailsProps<TraceTreeNode<TraceTree.Span>>) {
   const location = useLocation();
+  const hasNewTraceUi = useHasTraceNewUi();
   const {projects} = useProjects();
   const issues = useMemo(() => {
     return [...node.errors, ...node.performance_issues];
@@ -85,7 +274,7 @@ export function SpanNodeDetails({
   const profileId = node.event?.contexts?.profile?.profile_id ?? null;
 
   return (
-    <TraceDrawerComponents.DetailContainer>
+    <TraceDrawerComponents.DetailContainer hasNewTraceUi={hasNewTraceUi}>
       <SpanNodeDetailHeader
         node={node}
         organization={organization}
@@ -109,36 +298,21 @@ export function SpanNodeDetails({
                 {issues.length > 0 ? (
                   <IssueList organization={organization} issues={issues} node={node} />
                 ) : null}
-                <TraceDrawerComponents.SectionCardGroup>
-                  {hasFormattedSpanDescription(node) ? (
-                    <SpanDescription
-                      node={node}
-                      organization={organization}
-                      location={location}
-                    />
-                  ) : null}
-                  <GeneralInfo
-                    node={node}
-                    organization={organization}
-                    location={location}
-                    onParentClick={onParentClick}
-                  />
-                  {hasSpanHTTPInfo(node.value) ? (
-                    <SpanHTTPInfo span={node.value} />
-                  ) : null}
-                  {hasSpanTags(node.value) ? <Tags span={node.value} /> : null}
-                  {hasSpanKeys(node) ? <SpanKeys node={node} /> : null}
-                  {eventHasCustomMetrics(organization, node.value._metrics_summary) ? (
-                    <CustomMetricsEventData
-                      projectId={project?.id || ''}
-                      metricsSummary={node.value._metrics_summary}
-                      startTimestamp={node.value.start_timestamp}
-                    />
-                  ) : null}
-                </TraceDrawerComponents.SectionCardGroup>
-                <EventContexts event={node.event!} />
+                <SpanDescription
+                  node={node}
+                  project={project}
+                  organization={organization}
+                  location={location}
+                />
+                <SpanSections
+                  node={node}
+                  project={project}
+                  organization={organization}
+                  location={location}
+                  onParentClick={onParentClick}
+                />
                 {organization.features.includes('profiling') ? (
-                  <SpanProfileDetails span={node.value} event={node.event!} />
+                  <ProfileDetails event={node.event!} span={node.value} />
                 ) : null}
               </ProfileGroupProvider>
             )}
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/ancestry.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/ancestry.tsx
index 6355089670e7e5..bc26cae8f72ca9 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/ancestry.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/ancestry.tsx
@@ -21,6 +21,7 @@ import EventView from 'sentry/utils/discover/eventView';
 import {SavedQueryDatasets} from 'sentry/utils/discover/types';
 import {generateEventSlug} from 'sentry/utils/discover/urls';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
+import {useHasTraceNewUi} from 'sentry/views/performance/newTraceDetails/useHasTraceNewUi';
 import {transactionSummaryRouteWithQuery} from 'sentry/views/performance/transactionSummary/utils';
 
 import {isTransactionNode} from '../../../../traceGuards';
@@ -166,6 +167,7 @@ export function useSpanAncestryAndGroupingItems({
   onParentClick: (node: TraceTreeNode<TraceTree.NodeValue>) => void;
   organization: Organization;
 }): SectionCardKeyValueList {
+  const hasTraceNewUi = useHasTraceNewUi();
   const parentTransaction = useMemo(() => TraceTree.ParentTransaction(node), [node]);
   const childTransactions = useMemo(() => {
     const transactions: TraceTreeNode<TraceTree.Transaction>[] = [];
@@ -191,24 +193,31 @@ export function useSpanAncestryAndGroupingItems({
     });
   }
 
-  items.push({
-    key: 'span_id',
-    value: (
-      <Fragment>
-        {span.span_id}
-        <CopyToClipboardButton borderless size="zero" iconSize="xs" text={span.span_id} />
-      </Fragment>
-    ),
-    subject: 'Span ID',
-    subjectNode: (
-      <TraceDrawerComponents.FlexBox style={{gap: '5px'}}>
-        <span onClick={scrollToSpan(span.span_id, () => {}, location, organization)}>
-          Span ID
-        </span>
-        <SpanChildrenTraversalButton node={node} organization={organization} />
-      </TraceDrawerComponents.FlexBox>
-    ),
-  });
+  if (!hasTraceNewUi) {
+    items.push({
+      key: 'span_id',
+      value: (
+        <Fragment>
+          {span.span_id}
+          <CopyToClipboardButton
+            borderless
+            size="zero"
+            iconSize="xs"
+            text={span.span_id}
+          />
+        </Fragment>
+      ),
+      subject: 'Span ID',
+      subjectNode: (
+        <TraceDrawerComponents.FlexBox style={{gap: '5px'}}>
+          <span onClick={scrollToSpan(span.span_id, () => {}, location, organization)}>
+            Span ID
+          </span>
+          <SpanChildrenTraversalButton node={node} organization={organization} />
+        </TraceDrawerComponents.FlexBox>
+      ),
+    });
+  }
 
   items.push({
     key: 'origin',
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/description.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/description.tsx
index eaf874db5b6e60..9b7bfece01ec73 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/description.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/description.tsx
@@ -4,10 +4,15 @@ import type {Location} from 'history';
 
 import {LinkButton} from 'sentry/components/button';
 import {CodeSnippet} from 'sentry/components/codeSnippet';
+import {CopyToClipboardButton} from 'sentry/components/copyToClipboardButton';
 import SpanSummaryButton from 'sentry/components/events/interfaces/spans/spanSummaryButton';
+import Link from 'sentry/components/links/link';
+import LinkHint from 'sentry/components/structuredEventData/linkHint';
+import {IconGraph} from 'sentry/icons/iconGraph';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
 import {resolveSpanModule} from 'sentry/views/insights/common/utils/resolveSpanModule';
@@ -15,12 +20,19 @@ import {
   MissingFrame,
   StackTraceMiniFrame,
 } from 'sentry/views/insights/database/components/stackTraceMiniFrame';
+import {SupportedDatabaseSystem} from 'sentry/views/insights/database/utils/constants';
+import {
+  isValidJson,
+  prettyPrintJsonString,
+} from 'sentry/views/insights/database/utils/jsonUtils';
 import {ModuleName} from 'sentry/views/insights/types';
+import {useHasTraceNewUi} from 'sentry/views/performance/newTraceDetails/useHasTraceNewUi';
 import {spanDetailsRouteWithQuery} from 'sentry/views/performance/transactionSummary/transactionSpans/spanDetails/utils';
 
 import type {TraceTree} from '../../../../traceModels/traceTree';
 import type {TraceTreeNode} from '../../../../traceModels/traceTreeNode';
 import {TraceDrawerComponents} from '../../styles';
+import SpanSummaryLink from '../components/spanSummaryLink';
 
 const formatter = new SQLishFormatter();
 
@@ -46,6 +58,163 @@ export function SpanDescription({
   node,
   organization,
   location,
+  project,
+}: {
+  location: Location;
+  node: TraceTreeNode<TraceTree.Span>;
+  organization: Organization;
+  project: Project | undefined;
+}) {
+  const hasTraceNewUi = useHasTraceNewUi();
+  const span = node.value;
+
+  const resolvedModule: ModuleName = resolveSpanModule(
+    span.sentry_tags?.op,
+    span.sentry_tags?.category
+  );
+
+  const system = span?.data?.['db.system'];
+  const formattedDescription = useMemo(() => {
+    if (resolvedModule !== ModuleName.DB) {
+      return span.description ?? '';
+    }
+
+    if (
+      system === SupportedDatabaseSystem.MONGODB &&
+      span?.sentry_tags?.description &&
+      isValidJson(span.sentry_tags.description)
+    ) {
+      return prettyPrintJsonString(span.sentry_tags.description).prettifiedQuery;
+    }
+
+    return formatter.toString(span.description ?? '');
+  }, [span.description, resolvedModule, span.sentry_tags?.description, system]);
+
+  if (!hasTraceNewUi) {
+    return (
+      <LegacySpanDescription
+        node={node}
+        organization={organization}
+        location={location}
+      />
+    );
+  }
+
+  const hasNewSpansUIFlag =
+    organization.features.includes('performance-spans-new-ui') &&
+    organization.features.includes('insights-initial-modules');
+
+  // The new spans UI relies on the group hash assigned by Relay, which is different from the hash available on the span itself
+  const groupHash = hasNewSpansUIFlag ? span.sentry_tags?.group ?? '' : span.hash ?? '';
+  const averageSpanDuration: number | undefined =
+    span['span.averageResults']?.['avg(span.duration)'];
+
+  const actions =
+    !span.op || !span.hash ? null : (
+      <BodyContentWrapper
+        padding={
+          resolvedModule === ModuleName.DB ? `${space(1)} ${space(2)}` : `${space(1)}`
+        }
+      >
+        <SpanSummaryLink event={node.event!} organization={organization} span={span} />
+        <Link
+          to={spanDetailsRouteWithQuery({
+            orgSlug: organization.slug,
+            transaction: node.event?.title ?? '',
+            query: location.query,
+            spanSlug: {op: span.op, group: groupHash},
+            projectID: node.event?.projectID,
+          })}
+          onClick={() => {
+            hasNewSpansUIFlag
+              ? trackAnalytics('trace.trace_layout.view_span_summary', {
+                  organization,
+                  module: resolvedModule,
+                })
+              : trackAnalytics('trace.trace_layout.view_similar_spans', {
+                  organization,
+                  module: resolvedModule,
+                  source: 'span_description',
+                });
+          }}
+        >
+          <StyledIconGraph type="area" size="xs" />
+          {hasNewSpansUIFlag ? t('View Span Summary') : t('View Similar Spans')}
+        </Link>
+      </BodyContentWrapper>
+    );
+
+  const value =
+    resolvedModule === ModuleName.DB ? (
+      <CodeSnippetWrapper>
+        <StyledCodeSnippet
+          language={system === 'mongodb' ? 'json' : 'sql'}
+          isRounded={false}
+        >
+          {formattedDescription}
+        </StyledCodeSnippet>
+        {span?.data?.['code.filepath'] ? (
+          <StackTraceMiniFrame
+            projectId={node.event?.projectID}
+            eventId={node.event?.eventID}
+            frame={{
+              filename: span?.data?.['code.filepath'],
+              lineNo: span?.data?.['code.lineno'],
+              function: span?.data?.['code.function'],
+            }}
+          />
+        ) : (
+          <MissingFrame />
+        )}
+      </CodeSnippetWrapper>
+    ) : (
+      <DescriptionWrapper>
+        {formattedDescription ? (
+          <Fragment>
+            <span>
+              {formattedDescription}
+              <LinkHint value={formattedDescription} />
+            </span>
+            <CopyToClipboardButton
+              borderless
+              size="zero"
+              iconSize="xs"
+              text={formattedDescription}
+              tooltipProps={{disabled: true}}
+            />
+          </Fragment>
+        ) : (
+          t('This span has no description')
+        )}
+      </DescriptionWrapper>
+    );
+
+  return (
+    <TraceDrawerComponents.Highlights
+      node={node}
+      transaction={undefined}
+      project={project}
+      avgDuration={averageSpanDuration ? averageSpanDuration / 1000 : undefined}
+      headerContent={value}
+      bodyContent={actions}
+    />
+  );
+}
+
+const CodeSnippetWrapper = styled('div')`
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+`;
+
+const StyledIconGraph = styled(IconGraph)`
+  margin-right: ${space(0.5)};
+`;
+
+function LegacySpanDescription({
+  node,
+  organization,
+  location,
 }: {
   location: Location;
   node: TraceTreeNode<TraceTree.Span>;
@@ -135,7 +304,7 @@ export function SpanDescription({
   const title =
     resolvedModule === ModuleName.DB && span.op?.startsWith('db')
       ? t('Database Query')
-      : t('Resource');
+      : t('Asset');
 
   return (
     <TraceDrawerComponents.SectionCard
@@ -171,8 +340,26 @@ const ButtonGroup = styled('div')`
   justify-content: flex-end;
 `;
 
+const BodyContentWrapper = styled('div')<{padding: string}>`
+  display: flex;
+  gap: ${space(1)};
+  padding: ${p => p.padding};
+`;
+
 const StyledCodeSnippet = styled(CodeSnippet)`
   code {
     text-wrap: wrap;
   }
 `;
+
+const DescriptionWrapper = styled('div')`
+  display: flex;
+  align-items: baseline;
+  font-size: ${p => p.theme.fontSizeMedium};
+  width: 100%;
+  justify-content: space-between;
+  flex-direction: row;
+  gap: ${space(0.5)};
+  word-break: break-word;
+  padding: ${space(1)};
+`;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx
index 4b306cde97b26b..9447e1eecf3855 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx
@@ -1,11 +1,21 @@
+import {Fragment} from 'react';
+import styled from '@emotion/styled';
 import type {Location} from 'history';
 
+import {DateTime} from 'sentry/components/dateTime';
+import {getFormattedTimeRangeWithLeadingAndTrailingZero} from 'sentry/components/events/interfaces/spans/utils';
+import {Content} from 'sentry/components/keyValueData';
 import QuestionTooltip from 'sentry/components/questionTooltip';
 import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
+import getDuration from 'sentry/utils/duration/getDuration';
+import getDynamicText from 'sentry/utils/getDynamicText';
 import {resolveSpanModule} from 'sentry/views/insights/common/utils/resolveSpanModule';
 import {ModuleName} from 'sentry/views/insights/types';
+import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
+import {useHasTraceNewUi} from 'sentry/views/performance/newTraceDetails/useHasTraceNewUi';
 import {spanDetailsRouteWithQuery} from 'sentry/views/performance/transactionSummary/transactionSpans/spanDetails/utils';
 
 import type {TraceTree} from '../../../../traceModels/traceTree';
@@ -22,17 +32,20 @@ type GeneralnfoProps = {
 };
 
 function SpanDuration({node}: {node: TraceTreeNode<TraceTree.Span>}) {
+  const hasNewTraceUi = useHasTraceNewUi();
   const span = node.value;
   const startTimestamp: number = span.start_timestamp;
   const endTimestamp: number = span.timestamp;
   const duration = endTimestamp - startTimestamp;
   const averageSpanDuration: number | undefined =
     span['span.averageResults']?.['avg(span.duration)'];
+  const baseline =
+    !hasNewTraceUi && averageSpanDuration ? averageSpanDuration / 1000 : undefined;
 
   return (
     <TraceDrawerComponents.Duration
       duration={duration}
-      baseline={averageSpanDuration ? averageSpanDuration / 1000 : undefined}
+      baseline={baseline}
       baseDescription={t(
         'Average total time for this span group across the project associated with its parent transaction, over the last 24 hours'
       )}
@@ -42,18 +55,33 @@ function SpanDuration({node}: {node: TraceTreeNode<TraceTree.Span>}) {
 }
 
 function SpanSelfTime({node}: {node: TraceTreeNode<TraceTree.Span>}) {
+  const hasNewTraceUi = useHasTraceNewUi();
   const span = node.value;
   const startTimestamp: number = span.start_timestamp;
   const endTimestamp: number = span.timestamp;
   const duration = endTimestamp - startTimestamp;
+
   const averageSpanSelfTime: number | undefined =
     span['span.averageResults']?.['avg(span.self_time)'];
+  const baseline = hasNewTraceUi
+    ? undefined
+    : averageSpanSelfTime
+      ? averageSpanSelfTime / 1000
+      : undefined;
+
+  if (
+    duration &&
+    span.exclusive_time &&
+    getDuration(duration, 2, true) === getDuration(span.exclusive_time / 1000, 2, true)
+  ) {
+    return t('Same as duration');
+  }
 
   return span.exclusive_time ? (
     <TraceDrawerComponents.Duration
       ratio={span.exclusive_time / 1000 / duration}
       duration={span.exclusive_time / 1000}
-      baseline={averageSpanSelfTime ? averageSpanSelfTime / 1000 : undefined}
+      baseline={baseline}
       baseDescription={t(
         'Average self time for this span group across the project associated with its parent transaction, over the last 24 hours'
       )}
@@ -63,6 +91,99 @@ function SpanSelfTime({node}: {node: TraceTreeNode<TraceTree.Span>}) {
 }
 
 export function GeneralInfo(props: GeneralnfoProps) {
+  const hasTraceNewUi = useHasTraceNewUi();
+
+  const ancestryAndGroupingItems = useSpanAncestryAndGroupingItems({
+    node: props.node,
+    onParentClick: props.onParentClick,
+    location: props.location,
+    organization: props.organization,
+  });
+
+  if (!hasTraceNewUi) {
+    return <LegacyGeneralInfo {...props} />;
+  }
+
+  const startTimestamp = props.node.space[0];
+  const endTimestamp = props.node.space[0] + props.node.space[1];
+  const {start: startTimeWithLeadingZero, end: endTimeWithLeadingZero} =
+    getFormattedTimeRangeWithLeadingAndTrailingZero(
+      startTimestamp / 1e3,
+      endTimestamp / 1e3
+    );
+
+  let items: SectionCardKeyValueList = [
+    {
+      key: 'duration',
+      subject: t('Duration'),
+      value: <SpanDuration node={props.node} />,
+    },
+    {
+      key: 'start_timestamp',
+      subject: t('Start Timestamp'),
+      value: getDynamicText({
+        fixed: 'Mar 19, 2021 11:06:27 AM UTC',
+        value: (
+          <Fragment>
+            <DateTime date={startTimestamp} />
+            {` (${startTimeWithLeadingZero})`}
+          </Fragment>
+        ),
+      }),
+    },
+    {
+      key: 'end_timestamp',
+      subject: t('End Timestamp'),
+      value: getDynamicText({
+        fixed: 'Mar 19, 2021 11:06:28 AM UTC',
+        value: (
+          <Fragment>
+            <DateTime date={endTimestamp} />
+            {` (${endTimeWithLeadingZero})`}
+          </Fragment>
+        ),
+      }),
+    },
+  ];
+
+  if (props.node.value.exclusive_time) {
+    items.push({
+      key: 'self_time',
+      subject: t('Self Time'),
+      subjectNode: (
+        <TraceDrawerComponents.FlexBox style={{gap: '5px'}}>
+          {t('Self Time')}
+          <QuestionTooltip
+            title={t('Applicable to the children of this event only')}
+            size="xs"
+          />
+        </TraceDrawerComponents.FlexBox>
+      ),
+      value: <SpanSelfTime node={props.node} />,
+    });
+  }
+
+  items = [...items, ...ancestryAndGroupingItems];
+
+  return (
+    <InterimSection title={t('General')} initialCollapse type="trace_transaction_general">
+      <ContentWrapper>
+        {items.map(item => (
+          <Content key={item.key} item={item} />
+        ))}
+      </ContentWrapper>
+    </InterimSection>
+  );
+}
+
+const ContentWrapper = styled('div')`
+  display: grid;
+  column-gap: ${space(1.5)};
+  grid-template-columns: fit-content(50%) 1fr;
+  font-size: ${p => p.theme.fontSizeSmall};
+`;
+
+function LegacyGeneralInfo(props: GeneralnfoProps) {
   let items: SectionCardKeyValueList = [];
 
   const span = props.node.value;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/keys.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/keys.tsx
index 76cd095f63fd4c..302b327fc08533 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/keys.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/keys.tsx
@@ -103,7 +103,7 @@ export function hasSpanKeys(node: TraceTreeNode<TraceTree.Span>) {
     getSpanAggregateMeasurements(node);
 
   return (
-    !allZeroSizes ||
+    allZeroSizes ||
     unknownKeys.length > 0 ||
     timingKeys.length > 0 ||
     aggregateMeasurements.length > 0 ||
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
index 1dde2f39c1931f..cc8420116eb106 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
@@ -10,8 +10,10 @@ import {
   type MenuItemProps,
 } from 'sentry/components/dropdownMenu';
 import EventTagsDataSection from 'sentry/components/events/eventTagsAndScreenshot/tags';
+import {generateStats} from 'sentry/components/events/opsBreakdown';
 import {DataSection} from 'sentry/components/events/styles';
 import FileSize from 'sentry/components/fileSize';
+import ProjectBadge from 'sentry/components/idBadge/projectBadge';
 import KeyValueData, {
   CardPanel,
   type KeyValueDataContentProps,
@@ -19,17 +21,30 @@ import KeyValueData, {
 } from 'sentry/components/keyValueData';
 import {LazyRender, type LazyRenderProps} from 'sentry/components/lazyRender';
 import Link from 'sentry/components/links/link';
+import Panel from 'sentry/components/panels/panel';
+import PanelBody from 'sentry/components/panels/panelBody';
+import PanelHeader from 'sentry/components/panels/panelHeader';
+import {pickBarColor} from 'sentry/components/performance/waterfall/utils';
 import QuestionTooltip from 'sentry/components/questionTooltip';
 import {Tooltip} from 'sentry/components/tooltip';
-import {IconChevron, IconOpen} from 'sentry/icons';
+import {
+  IconChevron,
+  IconCircleFill,
+  IconFocus,
+  IconJson,
+  IconOpen,
+  IconPanel,
+  IconProfiling,
+} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Event, EventTransaction} from 'sentry/types/event';
 import type {KeyValueListData} from 'sentry/types/group';
 import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
 import {formatBytesBase10} from 'sentry/utils/bytes/formatBytesBase10';
 import getDuration from 'sentry/utils/duration/getDuration';
-import type {ColorOrAlias} from 'sentry/utils/theme';
+import type {Color, ColorOrAlias} from 'sentry/utils/theme';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
@@ -51,12 +66,14 @@ import type {ParentAutogroupNode} from '../../traceModels/parentAutogroupNode';
 import type {SiblingAutogroupNode} from '../../traceModels/siblingAutogroupNode';
 import {TraceTree} from '../../traceModels/traceTree';
 import type {TraceTreeNode} from '../../traceModels/traceTreeNode';
+import {useTraceState, useTraceStateDispatch} from '../../traceState/traceStateProvider';
+import {useHasTraceNewUi} from '../../useHasTraceNewUi';
 
-const DetailContainer = styled('div')`
+const DetailContainer = styled('div')<{hasNewTraceUi?: boolean}>`
   display: flex;
   flex-direction: column;
-  gap: ${space(2)};
-  padding: ${space(1)};
+  gap: ${p => (p.hasNewTraceUi ? 0 : space(2))};
+  padding: ${p => (p.hasNewTraceUi ? `${space(1)} ${space(2)}` : space(1))};
 
   ${DataSection} {
     padding: 0;
@@ -83,14 +100,51 @@ const Title = styled(FlexBox)`
   }
 `;
 
-const TitleText = styled('div')`
+const LegacyTitleText = styled('div')`
   ${p => p.theme.overflowEllipsis}
 `;
 
+const TitleText = styled('div')`
+  font-size: ${p => p.theme.fontSizeExtraLarge};
+  font-weight: bold;
+`;
+
 function TitleWithTestId(props: PropsWithChildren<{}>) {
   return <Title data-test-id="trace-drawer-title">{props.children}</Title>;
 }
 
+function SubtitleWithCopyButton({
+  text,
+  hideCopyButton = false,
+}: {
+  text: string;
+  hideCopyButton?: boolean;
+}) {
+  return (
+    <SubTitleWrapper>
+      <StyledSubTitleText>{text}</StyledSubTitleText>
+      {!hideCopyButton ? (
+        <CopyToClipboardButton
+          borderless
+          size="zero"
+          iconSize="xs"
+          text={text}
+          tooltipProps={{disabled: true}}
+        />
+      ) : null}
+    </SubTitleWrapper>
+  );
+}
+
+const SubTitleWrapper = styled(FlexBox)`
+  ${p => p.theme.overflowEllipsis}
+`;
+
+const StyledSubTitleText = styled('span')`
+  font-size: ${p => p.theme.fontSizeMedium};
+  color: ${p => p.theme.subText};
+`;
+
 function TitleOp({text}: {text: string}) {
   return (
     <Tooltip
@@ -155,7 +209,7 @@ const IconBorder = styled('div')<{backgroundColor: string; errored?: boolean}>`
   }
 `;
 
-const HeaderContainer = styled(FlexBox)`
+const LegacyHeaderContainer = styled(FlexBox)`
   justify-content: space-between;
   gap: ${space(3)};
   container-type: inline-size;
@@ -176,6 +230,13 @@ const HeaderContainer = styled(FlexBox)`
   }
 `;
 
+const HeaderContainer = styled(FlexBox)`
+  align-items: baseline;
+  justify-content: space-between;
+  gap: ${space(3)};
+  margin-bottom: ${space(1.5)};
+`;
+
 const DURATION_COMPARISON_STATUS_COLORS: {
   equal: {light: ColorOrAlias; normal: ColorOrAlias};
   faster: {light: ColorOrAlias; normal: ColorOrAlias};
@@ -197,6 +258,53 @@ const DURATION_COMPARISON_STATUS_COLORS: {
 
 const MIN_PCT_DURATION_DIFFERENCE = 10;
 
+type DurationComparison = {
+  deltaPct: number;
+  deltaText: JSX.Element;
+  status: 'faster' | 'slower' | 'equal';
+} | null;
+
+const getDurationComparison = (
+  baseline: number | undefined,
+  duration: number,
+  baseDescription?: string
+): DurationComparison => {
+  if (!baseline) {
+    return null;
+  }
+
+  const delta = duration - baseline;
+  const deltaPct = Math.round(Math.abs((delta / baseline) * 100));
+  const status = delta > 0 ? 'slower' : delta < 0 ? 'faster' : 'equal';
+
+  const formattedBaseDuration = (
+    <Tooltip
+      title={baseDescription}
+      showUnderline
+      underlineColor={DURATION_COMPARISON_STATUS_COLORS[status].normal}
+    >
+      {getDuration(baseline, 2, true)}
+    </Tooltip>
+  );
+
+  const deltaText =
+    status === 'equal'
+      ? tct(`equal to avg [formattedBaseDuration]`, {
+          formattedBaseDuration,
+        })
+      : status === 'faster'
+        ? tct(`[deltaPct] faster than avg [formattedBaseDuration]`, {
+            formattedBaseDuration,
+            deltaPct: `${deltaPct}%`,
+          })
+        : tct(`[deltaPct] slower than avg [formattedBaseDuration]`, {
+            formattedBaseDuration,
+            deltaPct: `${deltaPct}%`,
+          });
+
+  return {deltaPct, status, deltaText};
+};
+
 type DurationProps = {
   baseline: number | undefined;
   duration: number;
@@ -220,43 +328,20 @@ function Duration(props: DurationProps) {
     );
   }
 
-  const delta = props.duration - props.baseline;
-  const deltaPct = Math.round(Math.abs((delta / props.baseline) * 100));
-  const status = delta > 0 ? 'slower' : delta < 0 ? 'faster' : 'equal';
-
-  const formattedBaseDuration = (
-    <Tooltip
-      title={props.baseDescription}
-      showUnderline
-      underlineColor={DURATION_COMPARISON_STATUS_COLORS[status].normal}
-    >
-      {getDuration(props.baseline, 2, true)}
-    </Tooltip>
+  const comparison = getDurationComparison(
+    props.baseline,
+    props.duration,
+    props.baseDescription
   );
 
-  const deltaText =
-    status === 'equal'
-      ? tct(`equal to the avg of [formattedBaseDuration]`, {
-          formattedBaseDuration,
-        })
-      : status === 'faster'
-        ? tct(`[deltaPct] faster than the avg of [formattedBaseDuration]`, {
-            formattedBaseDuration,
-            deltaPct: `${deltaPct}%`,
-          })
-        : tct(`[deltaPct] slower than the avg of [formattedBaseDuration]`, {
-            formattedBaseDuration,
-            deltaPct: `${deltaPct}%`,
-          });
-
   return (
     <Fragment>
       <DurationContainer>
         {getDuration(props.duration, precision, true)}{' '}
         {props.ratio ? `(${(props.ratio * 100).toFixed()}%)` : null}
       </DurationContainer>
-      {deltaPct >= MIN_PCT_DURATION_DIFFERENCE ? (
-        <Comparison status={status}>{deltaText}</Comparison>
+      {comparison && comparison.deltaPct >= MIN_PCT_DURATION_DIFFERENCE ? (
+        <Comparison status={comparison.status}>{comparison.deltaText}</Comparison>
       ) : null}
     </Fragment>
   );
@@ -302,6 +387,215 @@ function TableRow({
   );
 }
 
+type HighlightProps = {
+  avgDuration: number | undefined;
+  bodyContent: React.ReactNode;
+  headerContent: React.ReactNode;
+  node: TraceTreeNode<TraceTree.NodeValue>;
+  project: Project | undefined;
+  transaction: EventTransaction | undefined;
+};
+
+function Highlights({
+  node,
+  transaction: event,
+  avgDuration,
+  project,
+  headerContent,
+  bodyContent,
+}: HighlightProps) {
+  if (!isTransactionNode(node) && !isSpanNode(node)) {
+    return null;
+  }
+
+  const startTimestamp = node.space[0];
+  const endTimestamp = node.space[0] + node.space[1];
+  const durationInSeconds = (endTimestamp - startTimestamp) / 1e3;
+
+  const comparison = getDurationComparison(
+    avgDuration,
+    durationInSeconds,
+    t('Average duration for this transaction over the last 24 hours')
+  );
+
+  return (
+    <Fragment>
+      <HighlightsWrapper>
+        <HighlightsLeftColumn>
+          <Tooltip title={node.value?.project_slug}>
+            <ProjectBadge
+              project={project ? project : {slug: node.value?.project_slug ?? ''}}
+              avatarSize={18}
+              hideName
+            />
+          </Tooltip>
+          <VerticalLine />
+        </HighlightsLeftColumn>
+        <HighlightsRightColumn>
+          <HighlightOp>
+            {isTransactionNode(node) ? node.value?.['transaction.op'] : node.value?.op}
+          </HighlightOp>
+          <HighlightsDurationWrapper>
+            <HighlightDuration>
+              {getDuration(durationInSeconds, 2, true)}
+            </HighlightDuration>
+            {comparison && comparison.deltaPct >= MIN_PCT_DURATION_DIFFERENCE ? (
+              <HiglightsDurationComparison status={comparison.status}>
+                {comparison.deltaText}
+              </HiglightsDurationComparison>
+            ) : null}
+          </HighlightsDurationWrapper>
+          <StyledPanel>
+            <StyledPanelHeader>{headerContent}</StyledPanelHeader>
+            <PanelBody>{bodyContent}</PanelBody>
+          </StyledPanel>
+          {event ? <HighLightsOpsBreakdown event={event} /> : null}
+        </HighlightsRightColumn>
+      </HighlightsWrapper>
+      <SectionDivider />
+    </Fragment>
+  );
+}
+
+const StyledPanel = styled(Panel)`
+  margin-bottom: 0;
+`;
+
+function HighLightsOpsBreakdown({event}: {event: EventTransaction}) {
+  const breakdown = generateStats(event, {type: 'no_filter'});
+  const spansCount =
+    event.entries?.find(entry => entry.type === 'spans')?.data?.length ?? 0;
+
+  return (
+    <HighlightsOpsBreakdownWrapper>
+      <HighlightsSpanCount>
+        {tct('This transaction contains [spansCount] spans', {
+          spansCount,
+        })}
+      </HighlightsSpanCount>
+      {breakdown.slice(0, 5).map(currOp => {
+        const {name, percentage} = currOp;
+
+        const operationName = typeof name === 'string' ? name : t('Other');
+        const color = pickBarColor(operationName);
+        const pctLabel = isFinite(percentage) ? Math.round(percentage * 100) : '∞';
+
+        return (
+          <HighlightsOpRow key={operationName}>
+            <IconCircleFill size="xs" color={color as Color} />
+            {operationName}
+            <HighlightsOpPct>{pctLabel}%</HighlightsOpPct>
+          </HighlightsOpRow>
+        );
+      })}
+      {breakdown.length > 5 ? (
+        <HighlightsOpsBreakdownMoreCount>
+          {tct('+ [moreCount] more', {moreCount: breakdown.length - 5})}
+        </HighlightsOpsBreakdownMoreCount>
+      ) : null}
+    </HighlightsOpsBreakdownWrapper>
+  );
+}
+
+const HighlightsOpsBreakdownMoreCount = styled('div')`
+  font-size: 12px;
+  color: ${p => p.theme.subText};
+`;
+
+const HighlightsOpPct = styled('div')`
+  color: ${p => p.theme.subText};
+  font-size: 14px;
+`;
+
+const HighlightsSpanCount = styled('div')`
+  margin-bottom: ${space(0.25)};
+`;
+
+const HighlightsOpRow = styled(FlexBox)`
+  font-size: 13px;
+  gap: ${space(0.5)};
+`;
+
+const HighlightsOpsBreakdownWrapper = styled(FlexBox)`
+  align-items: flex-start;
+  flex-direction: column;
+  gap: ${space(0.25)};
+  margin-top: ${space(1.5)};
+`;
+
+const HiglightsDurationComparison = styled('div')<{status: string}>`
+  white-space: nowrap;
+  border-radius: 12px;
+  color: ${p => p.theme[DURATION_COMPARISON_STATUS_COLORS[p.status].normal]};
+  background-color: ${p => p.theme[DURATION_COMPARISON_STATUS_COLORS[p.status].light]};
+  border: solid 1px ${p => p.theme[DURATION_COMPARISON_STATUS_COLORS[p.status].light]};
+  font-size: ${p => p.theme.fontSizeExtraSmall};
+  padding: ${space(0.25)} ${space(1)};
+  display: inline-block;
+  height: 21px;
+`;
+
+const HighlightsDurationWrapper = styled(FlexBox)`
+  gap: ${space(1)};
+  margin-bottom: ${space(1)};
+`;
+
+const HighlightDuration = styled('div')`
+  font-size: ${p => p.theme.headerFontSize};
+  font-weight: 400;
+`;
+
+const HighlightOp = styled('div')`
+  font-weight: bold;
+  font-size: ${p => p.theme.fontSizeMedium};
+  line-height: normal;
+`;
+
+const StyledPanelHeader = styled(PanelHeader)`
+  font-weight: normal;
+  padding: 0;
+  line-height: normal;
+  text-transform: none;
+  overflow: hidden;
+`;
+
+const SectionDivider = styled('hr')`
+  border-color: ${p => p.theme.translucentBorder};
+  margin: ${space(3)} 0 ${space(1.5)} 0;
+`;
+
+const VerticalLine = styled('div')`
+  width: 1px;
+  height: 100%;
+  background-color: ${p => p.theme.border};
+  margin-top: ${space(0.5)};
+`;
+
+const HighlightsWrapper = styled('div')`
+  display: flex;
+  align-items: stretch;
+  gap: ${space(1)};
+  width: 100%;
+  overflow: hidden;
+  margin: ${space(1)} 0;
+`;
+
+const HighlightsLeftColumn = styled('div')`
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+`;
+
+const HighlightsRightColumn = styled('div')`
+  display: flex;
+  flex-direction: column;
+  justify-content: left;
+  height: 100%;
+  flex: 1;
+  overflow: hidden;
+`;
+
 function IssuesLink({
   node,
   children,
@@ -414,6 +708,71 @@ function TypeSafeBoolean<T>(value: T | null | undefined): value is NonNullable<T
   return value !== null && value !== undefined;
 }
 
+function PanelPositionDropDown({organization}: {organization: Organization}) {
+  const traceState = useTraceState();
+  const traceDispatch = useTraceStateDispatch();
+
+  const options: MenuItemProps[] = [];
+
+  const layoutOptions = traceState.preferences.drawer.layoutOptions;
+  if (layoutOptions.includes('drawer left')) {
+    options.push({
+      key: 'drawer-left',
+      onAction: () => {
+        traceAnalytics.trackLayoutChange('drawer left', organization);
+        traceDispatch({type: 'set layout', payload: 'drawer left'});
+      },
+      leadingItems: <IconPanel direction="left" size="xs" />,
+      label: t('Left'),
+      disabled: traceState.preferences.layout === 'drawer left',
+    });
+  }
+
+  if (layoutOptions.includes('drawer right')) {
+    options.push({
+      key: 'drawer-right',
+      onAction: () => {
+        traceAnalytics.trackLayoutChange('drawer right', organization);
+        traceDispatch({type: 'set layout', payload: 'drawer right'});
+      },
+      leadingItems: <IconPanel direction="right" size="xs" />,
+      label: t('Right'),
+      disabled: traceState.preferences.layout === 'drawer right',
+    });
+  }
+
+  if (layoutOptions.includes('drawer bottom')) {
+    options.push({
+      key: 'drawer-bottom',
+      onAction: () => {
+        traceAnalytics.trackLayoutChange('drawer bottom', organization);
+        traceDispatch({type: 'set layout', payload: 'drawer bottom'});
+      },
+      leadingItems: <IconPanel direction="down" size="xs" />,
+      label: t('Bottom'),
+      disabled: traceState.preferences.layout === 'drawer bottom',
+    });
+  }
+
+  return (
+    <DropdownMenu
+      size="sm"
+      items={options}
+      menuTitle={<div>{t('Panel Position')}</div>}
+      trigger={triggerProps => (
+        <Tooltip title={t('Panel Position')}>
+          <ActionButton
+            {...triggerProps}
+            size="xs"
+            aria-label={t('Panel position')}
+            icon={<IconPanel direction="right" size="xs" />}
+          />
+        </Tooltip>
+      )}
+    />
+  );
+}
+
 function NodeActions(props: {
   node: TraceTreeNode<any>;
   onTabScrollToNode: (
@@ -426,7 +785,7 @@ function NodeActions(props: {
   organization: Organization;
   eventSize?: number | undefined;
 }) {
-  const navigate = useNavigate();
+  const hasNewTraceUi = useHasTraceNewUi();
   const organization = useOrganization();
   const params = useParams<{traceSlug?: string}>();
 
@@ -435,7 +794,7 @@ function NodeActions(props: {
     organization,
   });
 
-  const profilerId = useMemo(() => {
+  const profilerId: string = useMemo(() => {
     if (isTransactionNode(props.node)) {
       return props.node.value.profiler_id;
     }
@@ -452,12 +811,101 @@ function NodeActions(props: {
     threadId: getThreadIdFromNode(props.node, transaction),
   });
 
+  if (!hasNewTraceUi) {
+    return (
+      <LegacyNodeActions
+        {...props}
+        profileLink={profileLink}
+        profilerId={profilerId}
+        transaction={transaction}
+      />
+    );
+  }
+
+  return (
+    <ActionWrapper>
+      <Tooltip title={t('Show in view')}>
+        <ActionButton
+          onClick={_e => {
+            traceAnalytics.trackShowInView(props.organization);
+            props.onTabScrollToNode(props.node);
+          }}
+          size="xs"
+          aria-label={t('Show in view')}
+          icon={<IconFocus size="xs" />}
+        />
+      </Tooltip>
+      {isTransactionNode(props.node) ? (
+        <Tooltip title={t('JSON')}>
+          <ActionButton
+            onClick={() => traceAnalytics.trackViewEventJSON(props.organization)}
+            href={`/api/0/projects/${props.organization.slug}/${props.node.value.project_slug}/events/${props.node.value.event_id}/json/`}
+            size="xs"
+            aria-label={t('JSON')}
+            icon={<IconJson size="xs" />}
+          />
+        </Tooltip>
+      ) : null}
+      {profileLink ? (
+        <Tooltip title={t('Continuous Profile')}>
+          <ActionButton
+            size="xs"
+            aria-label={t('Continuous Profile')}
+            icon={<IconProfiling size="xs" />}
+          />
+        </Tooltip>
+      ) : null}
+      <PanelPositionDropDown organization={organization} />
+    </ActionWrapper>
+  );
+}
+
+const ActionButton = styled(Button)`
+  border: none;
+  background-color: transparent;
+  box-shadow: none;
+  transition: none !important;
+  opacity: 0.8;
+  height: 24px;
+  max-height: 24px;
+
+  &:hover {
+    border: none;
+    background-color: transparent;
+    box-shadow: none;
+    opacity: 1;
+  }
+`;
+
+const ActionWrapper = styled('div')`
+  display: flex;
+  align-items: center;
+  gap: ${space(0.25)};
+`;
+
+function LegacyNodeActions(props: {
+  node: TraceTreeNode<any>;
+  onTabScrollToNode: (
+    node:
+      | TraceTreeNode<any>
+      | ParentAutogroupNode
+      | SiblingAutogroupNode
+      | MissingInstrumentationNode
+  ) => void;
+  profileLink: LocationDescriptor | null;
+  profilerId: string;
+  transaction: EventTransaction | undefined;
+  eventSize?: number | undefined;
+}) {
+  const navigate = useNavigate();
+  const organization = useOrganization();
+
   const items = useMemo((): MenuItemProps[] => {
     const showInView: MenuItemProps = {
       key: 'show-in-view',
       label: t('Show in View'),
       onAction: () => {
-        traceAnalytics.trackShowInView(props.organization);
+        traceAnalytics.trackShowInView(organization);
         props.onTabScrollToNode(props.node);
       },
     };
@@ -473,9 +921,9 @@ function NodeActions(props: {
     const jsonDetails: MenuItemProps = {
       key: 'json-details',
       onAction: () => {
-        traceAnalytics.trackViewEventJSON(props.organization);
+        traceAnalytics.trackViewEventJSON(organization);
         window.open(
-          `/api/0/projects/${props.organization.slug}/${projectSlug}/events/${eventId}/json/`,
+          `/api/0/projects/${organization.slug}/${projectSlug}/events/${eventId}/json/`,
           '_blank'
         );
       },
@@ -484,17 +932,16 @@ function NodeActions(props: {
         (typeof eventSize === 'number' ? ` (${formatBytesBase10(eventSize, 0)})` : ''),
     };
 
-    const continuousProfileLink: MenuItemProps | null =
-      organization.features.includes('continuous-profiling-ui') && !!profileLink
-        ? {
-            key: 'continuous-profile',
-            onAction: () => {
-              traceAnalytics.trackViewContinuousProfile(props.organization);
-              navigate(profileLink!);
-            },
-            label: t('Continuous Profile'),
-          }
-        : null;
+    const continuousProfileLink: MenuItemProps | null = props.profileLink
+      ? {
+          key: 'continuous-profile',
+          onAction: () => {
+            traceAnalytics.trackViewContinuousProfile(organization);
+            navigate(props.profileLink!);
+          },
+          label: t('Continuous Profile'),
+        }
+      : null;
 
     if (isTransactionNode(props.node)) {
       return [showInView, jsonDetails, continuousProfileLink].filter(TypeSafeBoolean);
@@ -516,20 +963,20 @@ function NodeActions(props: {
     }
 
     return [showInView];
-  }, [props, profileLink, navigate, organization.features]);
+  }, [props, navigate, organization]);
 
   return (
     <ActionsContainer>
       <Actions className="Actions">
-        {organization.features.includes('continuous-profiling-ui') && !!profileLink ? (
-          <LinkButton size="xs" to={profileLink}>
+        {props.profileLink ? (
+          <LinkButton size="xs" to={props.profileLink}>
             {t('Continuous Profile')}
           </LinkButton>
         ) : null}
         <Button
           size="xs"
           onClick={_e => {
-            traceAnalytics.trackShowInView(props.organization);
+            traceAnalytics.trackShowInView(organization);
             props.onTabScrollToNode(props.node);
           }}
         >
@@ -540,8 +987,8 @@ function NodeActions(props: {
           <LinkButton
             size="xs"
             icon={<IconOpen />}
-            onClick={() => traceAnalytics.trackViewEventJSON(props.organization)}
-            href={`/api/0/projects/${props.organization.slug}/${props.node.value.project_slug}/events/${props.node.value.event_id}/json/`}
+            onClick={() => traceAnalytics.trackViewEventJSON(organization)}
+            href={`/api/0/projects/${organization.slug}/${props.node.value.project_slug}/events/${props.node.value.event_id}/json/`}
             external
           >
             {t('JSON')} (<FileSize bytes={props.eventSize ?? 0} />)
@@ -579,6 +1026,16 @@ const ActionsContainer = styled('div')`
 `;
 
 function EventTags({projectSlug, event}: {event: Event; projectSlug: string}) {
+  const hasNewTraceUi = useHasTraceNewUi();
+
+  if (!hasNewTraceUi) {
+    return <LegacyEventTags event={event} projectSlug={projectSlug} />;
+  }
+
+  return <EventTagsDataSection event={event} projectSlug={projectSlug} />;
+}
+
+function LegacyEventTags({projectSlug, event}: {event: Event; projectSlug: string}) {
   return (
     <LazyRender {...TraceDrawerComponents.LAZY_RENDER_PROPS} containerHeight={200}>
       <TagsWrapper>
@@ -721,12 +1178,15 @@ const TraceDrawerComponents = {
   Type,
   TitleOp,
   HeaderContainer,
+  LegacyHeaderContainer,
+  Highlights,
   Actions,
   NodeActions,
   Table,
   IconTitleWrapper,
   IconBorder,
   TitleText,
+  LegacyTitleText,
   Duration,
   TableRow,
   LAZY_RENDER_PROPS,
@@ -736,6 +1196,7 @@ const TraceDrawerComponents = {
   SectionCard,
   CopyableCardValueWithLink,
   EventTags,
+  SubtitleWithCopyButton,
   TraceDataSection,
   SectionCardGroup,
   DropdownMenuWithPortal,
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/index.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/index.tsx
index b49fe7d8cdb858..7f6d96d0a6658e 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/index.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/index.tsx
@@ -1,4 +1,4 @@
-import {useMemo} from 'react';
+import {Fragment, useMemo} from 'react';
 import styled from '@emotion/styled';
 
 import Alert from 'sentry/components/alert';
@@ -18,6 +18,7 @@ import {
 } from 'sentry/components/metrics/customMetricsEventData';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
 import type {EventTransaction} from 'sentry/types/event';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
@@ -25,7 +26,11 @@ import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
 import useProjects from 'sentry/utils/useProjects';
 import {useSpanMetrics} from 'sentry/views/insights/common/queries/useDiscover';
-import type {SpanMetricsQueryFilters} from 'sentry/views/insights/types';
+import type {
+  SpanMetricsQueryFilters,
+  SpanMetricsResponse,
+} from 'sentry/views/insights/types';
+import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
 
 import {Referrer} from '../../../referrers';
 import {traceAnalytics} from '../../../traceAnalytics';
@@ -35,13 +40,16 @@ import {CacheMetrics} from '../../../traceDrawer/details/transaction/sections/ca
 import type {TraceTreeNodeDetailsProps} from '../../../traceDrawer/tabs/traceTreeNodeDetails';
 import type {TraceTree} from '../../../traceModels/traceTree';
 import type {TraceTreeNode} from '../../../traceModels/traceTreeNode';
+import {useHasTraceNewUi} from '../../../useHasTraceNewUi';
 import {IssueList} from '../issues/issues';
 import {TraceDrawerComponents} from '../styles';
 
 import {AdditionalData, hasAdditionalData} from './sections/additionalData';
 import {BreadCrumbs} from './sections/breadCrumbs';
+import {BuiltIn} from './sections/builtIn';
 import {Entries} from './sections/entries';
 import GeneralInfo from './sections/generalInfo';
+import {TransactionHighlights} from './sections/highlights';
 import {hasMeasurements, Measurements} from './sections/measurements';
 import ReplayPreview from './sections/replayPreview';
 import {Request} from './sections/request';
@@ -66,8 +74,51 @@ function TransactionNodeDetailHeader({
   onTabScrollToNode,
   event,
 }: TransactionNodeDetailHeaderProps) {
+  const hasNewTraceUi = useHasTraceNewUi();
+
+  if (!hasNewTraceUi) {
+    return (
+      <LegacyTransactionNodeDetailHeader
+        node={node}
+        organization={organization}
+        project={project}
+        onTabScrollToNode={onTabScrollToNode}
+        event={event}
+      />
+    );
+  }
+
   return (
     <TraceDrawerComponents.HeaderContainer>
+      <TraceDrawerComponents.Title>
+        <TraceDrawerComponents.LegacyTitleText>
+          <TraceDrawerComponents.TitleText>
+            {t('Transaction')}
+          </TraceDrawerComponents.TitleText>
+          <TraceDrawerComponents.SubtitleWithCopyButton
+            text={`ID: ${node.value.event_id}`}
+          />
+        </TraceDrawerComponents.LegacyTitleText>
+      </TraceDrawerComponents.Title>
+      <TraceDrawerComponents.NodeActions
+        node={node}
+        organization={organization}
+        onTabScrollToNode={onTabScrollToNode}
+        eventSize={event?.size}
+      />
+    </TraceDrawerComponents.HeaderContainer>
+  );
+}
+
+function LegacyTransactionNodeDetailHeader({
+  node,
+  organization,
+  project,
+  onTabScrollToNode,
+  event,
+}: TransactionNodeDetailHeaderProps) {
+  return (
+    <TraceDrawerComponents.LegacyHeaderContainer>
       <TraceDrawerComponents.Title>
         <Tooltip title={node.value.project_slug}>
           <ProjectBadge
@@ -76,12 +127,12 @@ function TransactionNodeDetailHeader({
             hideName
           />
         </Tooltip>
-        <TraceDrawerComponents.TitleText>
+        <TraceDrawerComponents.LegacyTitleText>
           <div>{t('transaction')}</div>
           <TraceDrawerComponents.TitleOp
             text={node.value['transaction.op'] + ' - ' + node.value.transaction}
           />
-        </TraceDrawerComponents.TitleText>
+        </TraceDrawerComponents.LegacyTitleText>
       </TraceDrawerComponents.Title>
       <TraceDrawerComponents.NodeActions
         node={node}
@@ -89,7 +140,7 @@ function TransactionNodeDetailHeader({
         onTabScrollToNode={onTabScrollToNode}
         eventSize={event?.size}
       />
-    </TraceDrawerComponents.HeaderContainer>
+    </TraceDrawerComponents.LegacyHeaderContainer>
   );
 }
 
@@ -100,12 +151,10 @@ export function TransactionNodeDetails({
   onParentClick,
   replay,
 }: TraceTreeNodeDetailsProps<TraceTreeNode<TraceTree.Transaction>>) {
-  const location = useLocation();
   const {projects} = useProjects();
   const issues = useMemo(() => {
     return [...node.errors, ...node.performance_issues];
   }, [node.errors, node.performance_issues]);
-
   const {
     data: event,
     isError,
@@ -114,7 +163,7 @@ export function TransactionNodeDetails({
     node,
     organization,
   });
-
+  const hasNewTraceUi = useHasTraceNewUi();
   const {data: cacheMetrics} = useSpanMetrics(
     {
       search: MutableSearch.fromQueryObject({
@@ -136,7 +185,7 @@ export function TransactionNodeDetails({
   const project = projects.find(proj => proj.slug === event?.projectSlug);
 
   return (
-    <TraceDrawerComponents.DetailContainer>
+    <TraceDrawerComponents.DetailContainer hasNewTraceUi={hasNewTraceUi}>
       {!node.canFetch ? (
         <StyledAlert type="info" showIcon>
           {tct(
@@ -165,33 +214,22 @@ export function TransactionNodeDetails({
 
       <IssueList node={node} organization={organization} issues={issues} />
 
-      <TraceDrawerComponents.SectionCardGroup>
-        <GeneralInfo
+      {hasNewTraceUi ? (
+        <TransactionHighlights
+          event={event}
           node={node}
-          onParentClick={onParentClick}
+          project={project}
           organization={organization}
-          event={event}
-          location={location}
         />
-        {hasAdditionalData(event) ? <AdditionalData event={event} /> : null}
-        {hasMeasurements(event) ? (
-          <Measurements event={event} location={location} organization={organization} />
-        ) : null}
-        {cacheMetrics.length > 0 ? <CacheMetrics cacheMetrics={cacheMetrics} /> : null}
-        {hasSDKContext(event) ? <Sdk event={event} /> : null}
-        {eventHasCustomMetrics(organization, event._metrics_summary) ? (
-          <CustomMetricsEventData
-            metricsSummary={event._metrics_summary}
-            startTimestamp={event.startTimestamp}
-            projectId={event.projectID}
-          />
-        ) : null}
-        {event.contexts.trace?.data ? (
-          <TraceDrawerComponents.TraceDataSection event={event} />
-        ) : null}
-      </TraceDrawerComponents.SectionCardGroup>
+      ) : null}
 
-      <Request event={event} />
+      <TransactionSpecificSections
+        event={event}
+        node={node}
+        onParentClick={onParentClick}
+        organization={organization}
+        cacheMetrics={cacheMetrics}
+      />
 
       {event.projectSlug ? (
         <Entries
@@ -232,6 +270,106 @@ export function TransactionNodeDetails({
   );
 }
 
+type TransactionSpecificSectionsProps = {
+  cacheMetrics: Pick<SpanMetricsResponse, 'avg(cache.item_size)' | 'cache_miss_rate()'>[];
+  event: EventTransaction;
+  node: TraceTreeNode<TraceTree.Transaction>;
+  onParentClick: (node: TraceTreeNode<TraceTree.NodeValue>) => void;
+  organization: Organization;
+};
+
+function TransactionSpecificSections(props: TransactionSpecificSectionsProps) {
+  const location = useLocation();
+  const hasNewTraceUi = useHasTraceNewUi();
+  const {event, node, onParentClick, organization, cacheMetrics} = props;
+
+  if (!hasNewTraceUi) {
+    return <LegacyTransactionSpecificSections {...props} />;
+  }
+
+  return (
+    <Fragment>
+      <GeneralInfo
+        node={node}
+        onParentClick={onParentClick}
+        organization={organization}
+        event={event}
+        location={location}
+        cacheMetrics={cacheMetrics}
+      />
+      <InterimSection
+        title={t('Transaction Specific')}
+        type="transaction_specifc"
+        initialCollapse
+      >
+        <TraceDrawerComponents.SectionCardGroup>
+          {hasSDKContext(event) || cacheMetrics.length > 0 ? (
+            <BuiltIn event={event} cacheMetrics={cacheMetrics} />
+          ) : null}
+          {hasAdditionalData(event) ? <AdditionalData event={event} /> : null}
+          {hasMeasurements(event) ? (
+            <Measurements event={event} location={location} organization={organization} />
+          ) : null}
+          {eventHasCustomMetrics(organization, event._metrics_summary) ? (
+            <CustomMetricsEventData
+              metricsSummary={event._metrics_summary}
+              startTimestamp={event.startTimestamp}
+              projectId={event.projectID}
+            />
+          ) : null}
+          {event.contexts.trace?.data ? (
+            <TraceDrawerComponents.TraceDataSection event={event} />
+          ) : null}
+        </TraceDrawerComponents.SectionCardGroup>
+        <Request event={event} />
+      </InterimSection>
+    </Fragment>
+  );
+}
+
+function LegacyTransactionSpecificSections({
+  event,
+  node,
+  onParentClick,
+  organization,
+  cacheMetrics,
+}: TransactionSpecificSectionsProps) {
+  const location = useLocation();
+
+  return (
+    <Fragment>
+      <TraceDrawerComponents.SectionCardGroup>
+        <GeneralInfo
+          node={node}
+          onParentClick={onParentClick}
+          organization={organization}
+          event={event}
+          location={location}
+          cacheMetrics={cacheMetrics}
+        />
+        {hasAdditionalData(event) ? <AdditionalData event={event} /> : null}
+        {hasMeasurements(event) ? (
+          <Measurements event={event} location={location} organization={organization} />
+        ) : null}
+        {cacheMetrics.length > 0 ? <CacheMetrics cacheMetrics={cacheMetrics} /> : null}
+        {hasSDKContext(event) ? <Sdk event={event} /> : null}
+        {eventHasCustomMetrics(organization, event._metrics_summary) ? (
+          <CustomMetricsEventData
+            metricsSummary={event._metrics_summary}
+            startTimestamp={event.startTimestamp}
+            projectId={event.projectID}
+          />
+        ) : null}
+        {event.contexts.trace?.data ? (
+          <TraceDrawerComponents.TraceDataSection event={event} />
+        ) : null}
+      </TraceDrawerComponents.SectionCardGroup>
+
+      <Request event={event} />
+    </Fragment>
+  );
+}
+
 const StyledAlert = styled(Alert)`
-  margin: 0;
+  margin-bottom: ${space(2)};
 `;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/additionalData.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/additionalData.tsx
index 6cb22d2ab2fad6..86ed387dc72e5d 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/additionalData.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/additionalData.tsx
@@ -40,7 +40,7 @@ function getEventExtraDataKnownDataDetails({
     default:
       return {
         subject: type,
-        value: data[type],
+        value: [type],
       };
   }
 }
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/breadCrumbs.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/breadCrumbs.tsx
index 095ee203664011..d9da2a461c4d86 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/breadCrumbs.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/breadCrumbs.tsx
@@ -19,6 +19,7 @@ import {
   type EventTransaction,
 } from 'sentry/types/event';
 import type {Organization} from 'sentry/types/organization';
+import {useHasTraceNewUi} from 'sentry/views/performance/newTraceDetails/useHasTraceNewUi';
 
 import {TraceDrawerComponents} from '../../styles';
 
@@ -28,6 +29,33 @@ export function BreadCrumbs({
 }: {
   event: EventTransaction;
   organization: Organization;
+}) {
+  const hasNewTraceUi = useHasTraceNewUi();
+  const matchingEntry: EntryBreadcrumbs | undefined = event?.entries?.find(
+    (entry): entry is EntryBreadcrumbs => entry.type === EntryType.BREADCRUMBS
+  );
+
+  if (!matchingEntry) {
+    return null;
+  }
+
+  if (!hasNewTraceUi) {
+    return <LegacyBreadCrumbs event={event} organization={organization} />;
+  }
+
+  return (
+    <ResponsiveBreadcrumbWrapper>
+      <Breadcrumbs data={matchingEntry.data} event={event} organization={organization} />
+    </ResponsiveBreadcrumbWrapper>
+  );
+}
+
+function LegacyBreadCrumbs({
+  event,
+  organization,
+}: {
+  event: EventTransaction;
+  organization: Organization;
 }) {
   const matchingEntry: EntryBreadcrumbs | undefined = event?.entries?.find(
     (entry): entry is EntryBreadcrumbs => entry.type === EntryType.BREADCRUMBS
@@ -74,6 +102,10 @@ const ResponsiveBreadcrumbWrapper = styled('div')`
   container: breadcrumbs / inline-size;
 
   ${SearchAndSortWrapper} {
+    @container breadcrumbs (width < 600px) {
+      display: none;
+    }
+
     > div {
       width: auto !important;
     }
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/builtIn.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/builtIn.tsx
new file mode 100644
index 00000000000000..9c7ca9742c4a80
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/builtIn.tsx
@@ -0,0 +1,65 @@
+import {AnnotatedText} from 'sentry/components/events/meta/annotatedText';
+import {t} from 'sentry/locale';
+import type {EventTransaction} from 'sentry/types/event';
+import {formatBytesBase2} from 'sentry/utils/bytes/formatBytesBase2';
+import {formatPercentage} from 'sentry/utils/number/formatPercentage';
+import type {SpanMetricsResponse} from 'sentry/views/insights/types';
+
+import {type SectionCardKeyValueList, TraceDrawerComponents} from '../../styles';
+
+import {hasSDKContext} from './sdk';
+
+type Props = {
+  cacheMetrics: Pick<SpanMetricsResponse, 'avg(cache.item_size)' | 'cache_miss_rate()'>[];
+  event: EventTransaction;
+};
+
+export function BuiltIn({event, cacheMetrics}: Props) {
+  const items: SectionCardKeyValueList = [];
+
+  // SDK info
+  const meta = event._meta?.sdk;
+  if (hasSDKContext(event)) {
+    items.push({
+      key: 'sdk_name',
+      subject: 'SDK Name',
+      value: meta?.name?.[''] ? (
+        <AnnotatedText value={event?.sdk?.name} meta={meta?.name?.['']} />
+      ) : (
+        event?.sdk?.name
+      ),
+    });
+
+    items.push({
+      key: 'version',
+      subject: 'SDK Version',
+      value: meta?.version?.[''] ? (
+        <AnnotatedText value={event?.sdk?.version} meta={meta?.version?.['']} />
+      ) : (
+        event?.sdk?.version
+      ),
+    });
+  }
+
+  // Cache metrics
+  const cacheMetric = cacheMetrics[0];
+  if (cacheMetric) {
+    if (cacheMetric['avg(cache.item_size)'] !== null) {
+      items.push({
+        key: 'avg(cache.item_size)',
+        subject: t('Cache Avg Value Size'),
+        value: formatBytesBase2(cacheMetric['avg(cache.item_size)']),
+      });
+    }
+
+    if (cacheMetric['cache_miss_rate()'] !== null) {
+      items.push({
+        key: 'cache_miss_rate()',
+        subject: t('Cache Miss Rate'),
+        value: formatPercentage(cacheMetric['cache_miss_rate()']),
+      });
+    }
+  }
+
+  return <TraceDrawerComponents.SectionCard items={items} title={t('Built-in')} />;
+}
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/generalInfo.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/generalInfo.tsx
index e8d103a5a9d03a..b218cda728edbc 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/generalInfo.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/generalInfo.tsx
@@ -1,4 +1,5 @@
 import {Fragment, useMemo} from 'react';
+import styled from '@emotion/styled';
 import type {Location} from 'history';
 import omit from 'lodash/omit';
 
@@ -6,12 +7,17 @@ import {CopyToClipboardButton} from 'sentry/components/copyToClipboardButton';
 import {DateTime} from 'sentry/components/dateTime';
 import {getFormattedTimeRangeWithLeadingAndTrailingZero} from 'sentry/components/events/interfaces/spans/utils';
 import {generateStats} from 'sentry/components/events/opsBreakdown';
+import {Content} from 'sentry/components/keyValueData';
 import QuestionTooltip from 'sentry/components/questionTooltip';
 import {PAGE_URL_PARAM} from 'sentry/constants/pageFilters';
 import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
 import type {EventTransaction} from 'sentry/types/event';
 import type {Organization} from 'sentry/types/organization';
 import getDynamicText from 'sentry/utils/getDynamicText';
+import type {SpanMetricsResponse} from 'sentry/views/insights/types';
+import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
+import {useHasTraceNewUi} from 'sentry/views/performance/newTraceDetails/useHasTraceNewUi';
 import {transactionSummaryRouteWithQuery} from 'sentry/views/performance/transactionSummary/utils';
 
 import {useTraceAverageTransactionDuration} from '../../../../traceApi/useTraceAverageTransactionDuration';
@@ -23,6 +29,7 @@ import {type SectionCardKeyValueList, TraceDrawerComponents} from '../../styles'
 import {OpsBreakdown} from './opsBreakDown';
 
 type GeneralInfoProps = {
+  cacheMetrics: Pick<SpanMetricsResponse, 'avg(cache.item_size)' | 'cache_miss_rate()'>[];
   event: EventTransaction;
   location: Location;
   node: TraceTreeNode<TraceTree.Transaction>;
@@ -30,7 +37,97 @@ type GeneralInfoProps = {
   organization: Organization;
 };
 
-function GeneralInfo({
+function GeneralInfo(props: GeneralInfoProps) {
+  const hasNewTraceUi = useHasTraceNewUi();
+  const {node, onParentClick} = props;
+
+  if (!hasNewTraceUi) {
+    return <LegacyGeneralInfo {...props} />;
+  }
+
+  const startTimestamp = node.space[0];
+  const endTimestamp = node.space[0] + node.space[1];
+
+  const durationInSeconds = (endTimestamp - startTimestamp) / 1e3;
+  const {start: startTimeWithLeadingZero, end: endTimeWithLeadingZero} =
+    getFormattedTimeRangeWithLeadingAndTrailingZero(
+      startTimestamp / 1e3,
+      endTimestamp / 1e3
+    );
+
+  const parentTransaction = TraceTree.ParentTransaction(node);
+
+  const items: SectionCardKeyValueList = [
+    {
+      key: 'duration',
+      subject: t('Duration'),
+      value: (
+        <TraceDrawerComponents.Duration
+          node={node}
+          duration={durationInSeconds}
+          baseline={undefined}
+        />
+      ),
+    },
+    {
+      key: 'start_timestamp',
+      subject: t('Start Timestamp'),
+      value: getDynamicText({
+        fixed: 'Mar 19, 2021 11:06:27 AM UTC',
+        value: (
+          <Fragment>
+            <DateTime date={startTimestamp} />
+            {` (${startTimeWithLeadingZero})`}
+          </Fragment>
+        ),
+      }),
+    },
+    {
+      key: 'end_timestamp',
+      subject: t('End Timestamp'),
+      value: getDynamicText({
+        fixed: 'Mar 19, 2021 11:06:28 AM UTC',
+        value: (
+          <Fragment>
+            <DateTime date={endTimestamp} />
+            {` (${endTimeWithLeadingZero})`}
+          </Fragment>
+        ),
+      }),
+    },
+  ];
+
+  if (parentTransaction) {
+    items.push({
+      key: 'parent_transaction',
+      subject: t('Parent Transaction'),
+      value: (
+        <a onClick={() => onParentClick(parentTransaction)}>
+          {getTraceTabTitle(parentTransaction)}
+        </a>
+      ),
+    });
+  }
+
+  return (
+    <InterimSection title={t('General')} initialCollapse type="trace_transaction_general">
+      <ContentWrapper>
+        {items.map(item => (
+          <Content key={item.key} item={item} />
+        ))}
+      </ContentWrapper>
+    </InterimSection>
+  );
+}
+
+const ContentWrapper = styled('div')`
+  display: grid;
+  column-gap: ${space(1.5)};
+  grid-template-columns: fit-content(50%) 1fr;
+  font-size: ${p => p.theme.fontSizeSmall};
+`;
+
+function LegacyGeneralInfo({
   node,
   location,
   organization,
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/highlights.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/highlights.tsx
new file mode 100644
index 00000000000000..6915bb316d2bac
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/highlights.tsx
@@ -0,0 +1,112 @@
+import {useMemo} from 'react';
+import styled from '@emotion/styled';
+import omit from 'lodash/omit';
+
+import {CopyToClipboardButton} from 'sentry/components/copyToClipboardButton';
+import Link from 'sentry/components/links/link';
+import {PAGE_URL_PARAM} from 'sentry/constants/pageFilters';
+import {IconGraph} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import type {EventTransaction} from 'sentry/types/event';
+import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useTraceAverageTransactionDuration} from 'sentry/views/performance/newTraceDetails/traceApi/useTraceAverageTransactionDuration';
+import {isTransactionNode} from 'sentry/views/performance/newTraceDetails/traceGuards';
+import type {TraceTree} from 'sentry/views/performance/newTraceDetails/traceModels/traceTree';
+import type {TraceTreeNode} from 'sentry/views/performance/newTraceDetails/traceModels/traceTreeNode';
+import {transactionSummaryRouteWithQuery} from 'sentry/views/performance/transactionSummary/utils';
+
+import {TraceDrawerComponents} from '../../styles';
+
+type HighlightProps = {
+  event: EventTransaction;
+  node: TraceTreeNode<TraceTree.Transaction>;
+  organization: Organization;
+  project: Project | undefined;
+};
+
+export function TransactionHighlights(props: HighlightProps) {
+  const location = useLocation();
+
+  const {data: averageDurationQueryResult} = useTraceAverageTransactionDuration({
+    node: props.node,
+    location,
+    organization: props.organization,
+  });
+
+  const avgDurationInSeconds: number = useMemo(() => {
+    return (
+      Number(averageDurationQueryResult?.data?.[0]?.['avg(transaction.duration)']) / 1000
+    );
+  }, [averageDurationQueryResult]);
+
+  if (!isTransactionNode(props.node)) {
+    return null;
+  }
+
+  const headerContent = (
+    <HeaderContentWrapper>
+      <TextWrapper>{props.node.value.transaction}</TextWrapper>
+      <CopyToClipboardButton
+        borderless
+        size="zero"
+        iconSize="xs"
+        text={props.node.value.transaction}
+        tooltipProps={{disabled: true}}
+      />
+    </HeaderContentWrapper>
+  );
+
+  const bodyContent = (
+    <BodyContentWrapper>
+      <Link
+        to={transactionSummaryRouteWithQuery({
+          orgSlug: props.organization.slug,
+          transaction: props.node.value.transaction,
+          // Omit the query from the target url, as we dont know where it may have came from
+          // and if its syntax is supported on the target page. In this example, txn search does
+          // not support is:filter type expressions (and possibly other expressions we dont know about)
+          query: omit(location.query, Object.values(PAGE_URL_PARAM).concat('query')),
+          projectID: String(props.node.value.project_id),
+        })}
+      >
+        <StyledIconGraph type="area" size="xs" />
+        {t('View transaction summary')}
+      </Link>
+    </BodyContentWrapper>
+  );
+
+  return (
+    <TraceDrawerComponents.Highlights
+      node={props.node}
+      transaction={props.event}
+      project={props.project}
+      avgDuration={avgDurationInSeconds}
+      headerContent={headerContent}
+      bodyContent={bodyContent}
+    />
+  );
+}
+
+const StyledIconGraph = styled(IconGraph)`
+  margin-right: ${space(1)};
+`;
+
+const HeaderContentWrapper = styled('div')`
+  padding: ${space(1)};
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-between;
+`;
+
+const BodyContentWrapper = styled('div')`
+  padding: ${space(1)};
+`;
+
+const TextWrapper = styled('span')`
+  font-size: ${p => p.theme.fontSizeMedium};
+  ${p => p.theme.overflowEllipsis};
+`;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/replayPreview.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/replayPreview.tsx
index 4d5cde86162bdd..7d9aaa4077a13d 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/replayPreview.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/transaction/sections/replayPreview.tsx
@@ -8,6 +8,8 @@ import type {EventTransaction} from 'sentry/types/event';
 import type {Organization} from 'sentry/types/organization';
 import {getAnalyticsDataForEvent} from 'sentry/utils/events';
 import {getReplayIdFromEvent} from 'sentry/utils/replays/getReplayIdFromEvent';
+import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
+import {useHasTraceNewUi} from 'sentry/views/performance/newTraceDetails/useHasTraceNewUi';
 
 import {TraceDrawerComponents} from '../../styles';
 
@@ -19,9 +21,11 @@ const REPLAY_CLIP_OFFSETS = {
 function ReplaySection({
   event,
   organization,
+  showTitle = false,
 }: {
   event: EventTransaction;
   organization: Organization;
+  showTitle?: boolean;
 }) {
   const replayId = getReplayIdFromEvent(event);
   const startTimestampMS =
@@ -31,7 +35,7 @@ function ReplaySection({
 
   return replayId ? (
     <ReplaySectionContainer>
-      <ReplaySectionTitle>{t('Session Replay')}</ReplaySectionTitle>
+      {showTitle ? <ReplaySectionTitle>{t('Session Replay')}</ReplaySectionTitle> : null}
       <ReplayClipPreview
         analyticsContext="trace-view"
         replaySlug={replayId}
@@ -58,15 +62,44 @@ function ReplayPreview({
   event: EventTransaction;
   organization: Organization;
 }) {
+  const hasNewTraceUi = useHasTraceNewUi();
   const replayId = getReplayIdFromEvent(event);
 
+  if (!hasNewTraceUi) {
+    return <LegacyReplayPreview event={event} organization={organization} />;
+  }
+
   if (!replayId) {
     return null;
   }
 
   return (
-    <LazyRender {...TraceDrawerComponents.LAZY_RENDER_PROPS} containerHeight={480}>
+    <InterimSection
+      title={t('Session Replay')}
+      type="trace_session_replay"
+      initialCollapse
+    >
       <ReplaySection event={event} organization={organization} />
+    </InterimSection>
+  );
+}
+
+function LegacyReplayPreview({
+  event,
+  organization,
+}: {
+  event: EventTransaction;
+  organization: Organization;
+}) {
+  const replayId = getReplayIdFromEvent(event);
+
+  if (!replayId) {
+    return null;
+  }
+
+  return (
+    <LazyRender {...TraceDrawerComponents.LAZY_RENDER_PROPS} containerHeight={480}>
+      <ReplaySection showTitle event={event} organization={organization} />
     </LazyRender>
   );
 }
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceTreeNodeDetails.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceTreeNodeDetails.tsx
index 8c681620f5e1dc..d4b58abf5ac662 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceTreeNodeDetails.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceTreeNodeDetails.tsx
@@ -2,9 +2,8 @@ import type {Organization} from 'sentry/types/organization';
 import type {ReplayRecord} from 'sentry/views/replays/types';
 
 import {
+  isAutogroupedNode,
   isMissingInstrumentationNode,
-  isParentAutogroupedNode,
-  isSiblingAutogroupedNode,
   isSpanNode,
   isTraceErrorNode,
   isTransactionNode,
@@ -12,10 +11,9 @@ import {
 import type {TraceTree} from '../../traceModels/traceTree';
 import type {TraceTreeNode} from '../../traceModels/traceTreeNode';
 import type {VirtualizedViewManager} from '../../traceRenderers/virtualizedViewManager';
+import {AutogroupNodeDetails} from '../details/autogroup';
 import {ErrorNodeDetails} from '../details/error';
 import {MissingInstrumentationNodeDetails} from '../details/missingInstrumentation';
-import {ParentAutogroupNodeDetails} from '../details/parentAutogroup';
-import {SiblingAutogroupNodeDetails} from '../details/siblingAutogroup';
 import {SpanNodeDetails} from '../details/span/index';
 import {TransactionNodeDetails} from '../details/transaction/index';
 
@@ -41,12 +39,8 @@ export function TraceTreeNodeDetails(props: TraceTreeNodeDetailsProps<any>) {
     return <ErrorNodeDetails {...props} />;
   }
 
-  if (isParentAutogroupedNode(props.node)) {
-    return <ParentAutogroupNodeDetails {...props} />;
-  }
-
-  if (isSiblingAutogroupedNode(props.node)) {
-    return <SiblingAutogroupNodeDetails {...props} />;
+  if (isAutogroupedNode(props.node)) {
+    return <AutogroupNodeDetails {...props} />;
   }
 
   if (isMissingInstrumentationNode(props.node)) {
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceVitals.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceVitals.tsx
index f4d59ff4c3efd4..4d8b0915446046 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceVitals.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/tabs/traceVitals.tsx
@@ -34,7 +34,7 @@ export function TraceVitals(props: TraceVitalsProps) {
 
         return (
           <div key="">
-            <TraceDrawerComponents.HeaderContainer>
+            <TraceDrawerComponents.LegacyHeaderContainer>
               <TraceDrawerComponents.Title>
                 <Tooltip title={node.metadata.project_slug}>
                   <ProjectBadge
@@ -56,7 +56,7 @@ export function TraceVitals(props: TraceVitalsProps) {
                   />
                 </div>
               </TraceDrawerComponents.Title>
-            </TraceDrawerComponents.HeaderContainer>
+            </TraceDrawerComponents.LegacyHeaderContainer>
 
             <VitalsContainer>
               {vital.map((v, i) => {
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
index 1d63234e5d9481..c0e3f88ffa60f8 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
@@ -41,6 +41,7 @@ import type {TraceReducerAction, TraceReducerState} from '../traceState';
 import {TRACE_DRAWER_DEFAULT_SIZES} from '../traceState/tracePreferences';
 import {useTraceState, useTraceStateDispatch} from '../traceState/traceStateProvider';
 import {getTraceTabTitle, type TraceTabsReducerState} from '../traceState/traceTabs';
+import {useHasTraceNewUi} from '../useHasTraceNewUi';
 
 import {TraceDetails} from './tabs/trace';
 import {TraceTreeNodeDetails} from './tabs/traceTreeNodeDetails';
@@ -66,6 +67,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
   const traceState = useTraceState();
   const traceDispatch = useTraceStateDispatch();
   const contentContainerRef = useRef<HTMLDivElement>(null);
+  const hasNewTraceUi = useHasTraceNewUi();
 
   // The /events-facets/ endpoint used to fetch tags for the trace tab is slow. Therefore,
   // we try to prefetch the tags as soon as the drawer loads, hoping that the tags will be loaded
@@ -410,7 +412,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
               />
             ) : null}
           </TabsContainer>
-          {traceState.preferences.drawer.layoutOptions.length > 0 ? (
+          {traceState.preferences.drawer.layoutOptions.length > 0 && !hasNewTraceUi ? (
             <TraceLayoutButtons traceDispatch={traceDispatch} trace_state={traceState} />
           ) : null}
         </TabsLayout>
@@ -666,7 +668,7 @@ const TabsHeightContainer = styled('div')<{
   layout: 'drawer bottom' | 'drawer left' | 'drawer right';
   absolute?: boolean;
 }>`
-  background: ${p => p.theme.backgroundSecondary};
+  background: ${p => p.theme.background};
   left: ${p => (p.layout === 'drawer left' ? '0' : 'initial')};
   right: ${p => (p.layout === 'drawer right' ? '0' : 'initial')};
   position: ${p => (p.absolute ? 'absolute' : 'relative')};
@@ -724,7 +726,7 @@ const TabLayoutControlItem = styled('li')`
   margin: 0;
   position: relative;
   z-index: 10;
-  background-color: ${p => p.theme.backgroundSecondary};
+  background-color: ${p => p.theme.background};
 `;
 
 const Tab = styled('li')`
diff --git a/static/app/views/performance/newTraceDetails/traceGuards.tsx b/static/app/views/performance/newTraceDetails/traceGuards.tsx
index 0ac84eb6289705..e3f9970834e453 100644
--- a/static/app/views/performance/newTraceDetails/traceGuards.tsx
+++ b/static/app/views/performance/newTraceDetails/traceGuards.tsx
@@ -1,6 +1,7 @@
 import {MissingInstrumentationNode} from './traceModels/missingInstrumentationNode';
 import {ParentAutogroupNode} from './traceModels/parentAutogroupNode';
 import {SiblingAutogroupNode} from './traceModels/siblingAutogroupNode';
+import {CollapsedNode} from './traceModels/traceCollapsedNode';
 import type {TraceTree} from './traceModels/traceTree';
 import type {TraceTreeNode} from './traceModels/traceTreeNode';
 
@@ -44,6 +45,12 @@ export function isAutogroupedNode(
   return node instanceof ParentAutogroupNode || node instanceof SiblingAutogroupNode;
 }
 
+export function isCollapsedNode(
+  node: TraceTreeNode<TraceTree.NodeValue>
+): node is CollapsedNode {
+  return node instanceof CollapsedNode;
+}
+
 export function isTraceErrorNode(
   node: TraceTreeNode<TraceTree.NodeValue>
 ): node is TraceTreeNode<TraceTree.TraceError> {
@@ -82,6 +89,7 @@ export function shouldAddMissingInstrumentationSpan(sdk: string | undefined): bo
     case 'sentry.javascript.angular':
     case 'sentry.javascript.angular-ivy':
     case 'sentry.javascript.nextjs':
+    case 'sentry.javascript.nuxt':
     case 'sentry.javascript.electron':
     case 'sentry.javascript.remix':
     case 'sentry.javascript.svelte':
@@ -136,3 +144,9 @@ export function getPageloadTransactionChildCount(
   }
   return count;
 }
+
+export function isTracePerformanceIssue(
+  issue: TraceTree.TraceError | TraceTree.TracePerformanceIssue
+): issue is TraceTree.TracePerformanceIssue {
+  return 'suspect_spans' in issue;
+}
diff --git a/static/app/views/performance/newTraceDetails/traceHeader/breadcrumbs.tsx b/static/app/views/performance/newTraceDetails/traceHeader/breadcrumbs.tsx
index 32cc6ebd4609ff..b7e1750b1c5b4b 100644
--- a/static/app/views/performance/newTraceDetails/traceHeader/breadcrumbs.tsx
+++ b/static/app/views/performance/newTraceDetails/traceHeader/breadcrumbs.tsx
@@ -229,7 +229,11 @@ function getInsightsModuleBreadcrumbs(
     moduleName = TRACE_SOURCE_TO_MODULE[location.query.source] as RoutableModuleNames;
     crumbs.push({
       label: MODULE_TITLES[moduleName],
-      to: moduleURLBuilder(moduleName),
+      to: getBreadCrumbTarget(
+        `${moduleURLBuilder(moduleName, view)}/`,
+        location.query,
+        organization
+      ),
     });
   }
 
diff --git a/static/app/views/performance/newTraceDetails/traceHeader/index.tsx b/static/app/views/performance/newTraceDetails/traceHeader/index.tsx
index 059061561670e2..fb87a80d6bfca8 100644
--- a/static/app/views/performance/newTraceDetails/traceHeader/index.tsx
+++ b/static/app/views/performance/newTraceDetails/traceHeader/index.tsx
@@ -165,8 +165,8 @@ export function TraceMetaDataHeader(props: TraceMetadataHeaderProps) {
   );
 
   const projectSlugs = useMemo(() => {
-    return Array.from(props.tree.projects).map(p => p.slug);
-  }, [props.tree]);
+    return Array.from(props.tree.projects.values()).map(project => project.slug);
+  }, [props.tree.projects]);
 
   if (!hasNewTraceViewUi) {
     return <LegacyTraceMetadataHeader {...props} />;
@@ -233,7 +233,8 @@ const ProjectsRendererWrapper = styled('div')`
 `;
 
 const HeaderLayout = styled(Layout.Header)`
-  padding: ${space(2)} ${space(2)} !important;
+  background-color: ${p => p.theme.background};
+  padding: ${space(2)} ${space(2)} 0 !important;
 `;
 
 const HeaderRow = styled('div')`
diff --git a/static/app/views/performance/newTraceDetails/traceModels/__snapshots__/issuesTraceTree.spec.tsx.snap b/static/app/views/performance/newTraceDetails/traceModels/__snapshots__/issuesTraceTree.spec.tsx.snap
new file mode 100644
index 00000000000000..d4aeaf91abe184
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceModels/__snapshots__/issuesTraceTree.spec.tsx.snap
@@ -0,0 +1,52 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`IssuesTraceTree FromSpans collapses spans 1`] = `
+"
+collapsed
+      http - GET /
+      db - SELECT
+      cache - GET
+      http - GET /
+      db - SELECT
+"
+`;
+
+exports[`IssuesTraceTree collapsed nodes without errors 1`] = `
+"
+trace root
+  transaction 1 - transaction.op
+  transaction 2 - transaction.op
+  transaction 3 - transaction.op
+  transaction 4 - transaction.op
+  transaction 5 - transaction.op
+"
+`;
+
+exports[`IssuesTraceTree errors only 1`] = `
+"
+trace root
+  error
+  error
+  error
+  error
+  error
+  error
+  error
+  error
+  error
+  error
+  error
+  error
+  collapsed
+"
+`;
+
+exports[`IssuesTraceTree preserves path to child error 1`] = `
+"
+trace root
+  transaction 1 - transaction.op
+  transaction 2 - transaction.op
+    transaction - transaction.op
+  transaction 4 - transaction.op
+"
+`;
diff --git a/static/app/views/performance/newTraceDetails/traceModels/issuesTraceTree.spec.tsx b/static/app/views/performance/newTraceDetails/traceModels/issuesTraceTree.spec.tsx
new file mode 100644
index 00000000000000..1132c6bc5255f2
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceModels/issuesTraceTree.spec.tsx
@@ -0,0 +1,170 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
+
+import {EntryType} from 'sentry/types/event';
+import {
+  isSpanNode,
+  isTraceErrorNode,
+  isTraceNode,
+  isTransactionNode,
+} from 'sentry/views/performance/newTraceDetails/traceGuards';
+import {TraceTree} from 'sentry/views/performance/newTraceDetails/traceModels/traceTree';
+import type {TraceTreeNode} from 'sentry/views/performance/newTraceDetails/traceModels/traceTreeNode';
+import {DEFAULT_TRACE_VIEW_PREFERENCES} from 'sentry/views/performance/newTraceDetails/traceState/tracePreferences';
+
+import {IssuesTraceTree} from './issuesTraceTree';
+import {
+  makeEventTransaction,
+  makeSpan,
+  makeTrace,
+  makeTraceError,
+  makeTransaction,
+} from './traceTreeTestUtils';
+
+const traceWithErrorInMiddle = makeTrace({
+  transactions: [
+    makeTransaction({transaction: 'transaction 1'}),
+    makeTransaction({transaction: 'transaction 2'}),
+    makeTransaction({transaction: 'transaction 3', errors: [makeTraceError({})]}),
+    makeTransaction({transaction: 'transaction 4'}),
+    makeTransaction({transaction: 'transaction 5'}),
+  ],
+});
+
+const traceWithChildError = makeTrace({
+  transactions: [
+    makeTransaction({transaction: 'transaction 1'}),
+    makeTransaction({
+      transaction: 'transaction 2',
+      children: [makeTransaction({errors: [makeTraceError({})]})],
+    }),
+    makeTransaction({transaction: 'transaction 4'}),
+  ],
+});
+
+const errorsOnlyTrace = makeTrace({
+  transactions: [],
+  orphan_errors: new Array(20).fill(null).map(() => makeTraceError({})),
+});
+
+function mockSpansResponse(
+  spans: TraceTree.Span[],
+  project_slug: string,
+  event_id: string
+): jest.Mock<any, any> {
+  return MockApiClient.addMockResponse({
+    url: `/organizations/org-slug/events/${project_slug}:${event_id}/?averageColumn=span.self_time&averageColumn=span.duration`,
+    method: 'GET',
+    body: makeEventTransaction({
+      entries: [{type: EntryType.SPANS, data: spans}],
+    }),
+  });
+}
+
+function hasErrors(n: TraceTreeNode<any>): boolean {
+  return (
+    (isTraceErrorNode(n) || n.errors.size > 0 || n.performance_issues.size > 0) &&
+    !isTraceNode(n)
+  );
+}
+
+describe('IssuesTraceTree', () => {
+  it('collapsed nodes without errors', () => {
+    const tree = IssuesTraceTree.FromTrace(traceWithErrorInMiddle, {
+      meta: null,
+      replay: null,
+    });
+
+    const issues = IssuesTraceTree.FindAll(tree.root, hasErrors);
+    expect(tree.build().collapseList(issues).serialize()).toMatchSnapshot();
+  });
+
+  it('preserves path to child error', () => {
+    const tree = IssuesTraceTree.FromTrace(traceWithChildError, {
+      meta: null,
+      replay: null,
+    });
+
+    const error = IssuesTraceTree.Find(tree.root, hasErrors);
+
+    let node = error;
+    const nodes: TraceTreeNode<any>[] = [];
+    while (node && !isTraceNode(node)) {
+      nodes.push(node);
+      node = node.parent;
+    }
+
+    expect(tree.build().collapseList(nodes).serialize()).toMatchSnapshot();
+  });
+
+  it('errors only', () => {
+    // has +100 issues at the end
+    const tree = IssuesTraceTree.FromTrace(errorsOnlyTrace, {
+      meta: null,
+      replay: null,
+    });
+
+    const errors = IssuesTraceTree.FindAll(tree.root, hasErrors).slice(0, 10);
+    expect(tree.build().collapseList(errors).serialize()).toMatchSnapshot();
+  });
+
+  describe('FromSpans', () => {
+    const traceWithSpans = makeTrace({
+      transactions: [
+        makeTransaction({transaction: 'transaction 0'}),
+        makeTransaction({transaction: 'transaction 0'}),
+        makeTransaction({
+          transaction: 'transaction 1',
+          children: [
+            makeTransaction({
+              transaction: 'transaction 2',
+              event_id: 'event-id',
+              project_slug: 'project',
+              errors: [
+                makeTraceError({
+                  span: 'error-span-id',
+                }),
+              ],
+            }),
+          ],
+        }),
+      ],
+    });
+
+    it('collapses spans', async () => {
+      const tree = IssuesTraceTree.FromTrace(traceWithSpans, {
+        meta: null,
+        replay: null,
+      });
+
+      mockSpansResponse(
+        [
+          makeSpan({op: 'cache', description: 'GET'}),
+          makeSpan({op: 'http', description: 'GET /'}),
+          makeSpan({op: 'db', description: 'SELECT'}),
+          makeSpan({op: 'cache', description: 'GET'}),
+          makeSpan({op: 'http', description: 'GET /', span_id: 'error-span-id'}),
+          makeSpan({op: 'db', description: 'SELECT'}),
+        ],
+        'project',
+        'event-id'
+      );
+
+      const txn = TraceTree.Find(
+        tree.root,
+        node => isTransactionNode(node) && node.value.transaction === 'transaction 2'
+      )!;
+
+      await tree.zoom(txn, true, {
+        api: new MockApiClient(),
+        organization: OrganizationFixture(),
+        preferences: DEFAULT_TRACE_VIEW_PREFERENCES,
+      });
+
+      const span = TraceTree.Find(
+        tree.root,
+        node => isSpanNode(node) && node.value.span_id === 'error-span-id'
+      )!;
+      expect(tree.build().collapseList([span]).serialize()).toMatchSnapshot();
+    });
+  });
+});
diff --git a/static/app/views/performance/newTraceDetails/traceModels/issuesTraceTree.tsx b/static/app/views/performance/newTraceDetails/traceModels/issuesTraceTree.tsx
new file mode 100644
index 00000000000000..8817604608f4aa
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceModels/issuesTraceTree.tsx
@@ -0,0 +1,154 @@
+import type {Client} from 'sentry/api';
+import type {Organization} from 'sentry/types/organization';
+import {
+  isTraceErrorNode,
+  isTransactionNode,
+} from 'sentry/views/performance/newTraceDetails/traceGuards';
+import {TraceTree} from 'sentry/views/performance/newTraceDetails/traceModels/traceTree';
+import type {TracePreferencesState} from 'sentry/views/performance/newTraceDetails/traceState/tracePreferences';
+import type {ReplayRecord} from 'sentry/views/replays/types';
+
+import type {TraceMetaQueryResults} from '../traceApi/useTraceMeta';
+import {CollapsedNode} from '../traceModels/traceCollapsedNode';
+
+import {makeExampleTrace} from './makeExampleTrace';
+import type {TraceTreeNode} from './traceTreeNode';
+
+export class IssuesTraceTree extends TraceTree {
+  static Empty() {
+    const tree = new IssuesTraceTree().build();
+    tree.type = 'empty';
+    return tree;
+  }
+
+  static Loading(metadata: TraceTree.Metadata): IssuesTraceTree {
+    const t = makeExampleTrace(metadata);
+    const tree = new IssuesTraceTree();
+    tree.root = t.root;
+    tree.type = 'loading';
+    tree.build();
+    return tree;
+  }
+
+  static Error(metadata: TraceTree.Metadata): IssuesTraceTree {
+    const t = makeExampleTrace(metadata);
+    const tree = new IssuesTraceTree();
+    tree.root = t.root;
+    tree.type = 'error';
+    tree.build();
+    return tree;
+  }
+
+  static FromTrace(
+    trace: TraceTree.Trace,
+    options: {
+      meta: TraceMetaQueryResults['data'] | null;
+      replay: ReplayRecord | null;
+    }
+  ): IssuesTraceTree {
+    const tree = super.FromTrace(trace, options);
+    const issuesTree = new IssuesTraceTree();
+    issuesTree.root = tree.root;
+    return issuesTree;
+  }
+
+  static ExpandToEvent(
+    tree: IssuesTraceTree,
+    eventId: string,
+    options: {
+      api: Client;
+      organization: Organization;
+      preferences: Pick<TracePreferencesState, 'autogroup' | 'missing_instrumentation'>;
+    }
+  ): Promise<void> {
+    const node = TraceTree.Find(tree.root, n => {
+      if (isTraceErrorNode(n)) {
+        return n.value.event_id === eventId;
+      }
+      if (isTransactionNode(n)) {
+        if (n.value.event_id === eventId) {
+          return true;
+        }
+
+        for (const e of n.errors) {
+          if (e.event_id === eventId) {
+            return true;
+          }
+        }
+
+        for (const p of n.performance_issues) {
+          if (p.event_id === eventId) {
+            return true;
+          }
+        }
+      }
+      return false;
+    });
+
+    if (node && isTransactionNode(node)) {
+      return tree.zoom(node, true, options).then(() => {});
+    }
+
+    return Promise.resolve();
+  }
+
+  collapseList(preserveLeafNodes: TraceTreeNode[]) {
+    const preserveNodes = new Set(preserveLeafNodes);
+
+    for (const node of preserveLeafNodes) {
+      const index = this.list.indexOf(node);
+      if (index === -1) {
+        continue;
+      }
+
+      // Preserve the previous 3 nodes
+      let i = Math.max(index - 1, 0);
+      while (i > index - 4) {
+        if (this.list[i]) {
+          preserveNodes.add(this.list[i]);
+        }
+        i--;
+      }
+
+      // Preserve the next 2 nodes
+      let j = Math.min(index + 1, this.list.length - 1);
+      while (j < index + 3) {
+        if (this.list[j]) {
+          preserveNodes.add(this.list[j]);
+        }
+        j++;
+      }
+    }
+
+    let i = 0;
+    while (i < this.list.length) {
+      const start = i;
+      while (this.list[i] && !preserveNodes.has(this.list[i])) {
+        i++;
+      }
+
+      if (i - start > 0) {
+        const collapsedNode = new CollapsedNode(
+          this.list[start].parent!,
+          {type: 'collapsed'},
+          this.list[start].metadata
+        );
+
+        const removed = this.list.splice(start, i - start, collapsedNode);
+        collapsedNode.children = removed;
+
+        i = start + 1;
+        continue;
+      }
+
+      i++;
+    }
+
+    return this;
+  }
+
+  build() {
+    super.build();
+    return this;
+  }
+}
diff --git a/static/app/views/performance/newTraceDetails/traceModels/parentAutogroupNode.tsx b/static/app/views/performance/newTraceDetails/traceModels/parentAutogroupNode.tsx
index 13cbe227e7cd28..03943526ce7795 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/parentAutogroupNode.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/parentAutogroupNode.tsx
@@ -1,5 +1,3 @@
-import {isSpanNode} from '../traceGuards';
-
 import type {TraceTree} from './traceTree';
 import {TraceTreeNode} from './traceTreeNode';
 
@@ -57,10 +55,6 @@ export function computeCollapsedBarSpace(
 
   const first = nodes[0];
 
-  if (!isSpanNode(first)) {
-    throw new Error('Autogrouped node must have span children');
-  }
-
   const segments: [number, number][] = [];
 
   let start = first.space[0];
@@ -70,10 +64,6 @@ export function computeCollapsedBarSpace(
   while (i < nodes.length) {
     const next = nodes[i];
 
-    if (!isSpanNode(next)) {
-      throw new Error('Autogrouped node must have span children');
-    }
-
     if (next.space[0] > end) {
       segments.push([start, end - start]);
       start = next.space[0];
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceCollapsedNode.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceCollapsedNode.tsx
new file mode 100644
index 00000000000000..197c092e3a0e97
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceCollapsedNode.tsx
@@ -0,0 +1,13 @@
+import type {TraceTree} from './traceTree';
+import {TraceTreeNode} from './traceTreeNode';
+
+export class CollapsedNode extends TraceTreeNode<TraceTree.CollapsedNode> {
+  constructor(
+    parent: TraceTreeNode<TraceTree.NodeValue>,
+    node: TraceTree.CollapsedNode,
+    metadata: TraceTree.Metadata
+  ) {
+    super(parent, node, metadata);
+    this.expanded = false;
+  }
+}
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTree.measurements.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTree.measurements.tsx
index 8c6ab3345d7d1a..835dfb8c8a169e 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTree.measurements.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTree.measurements.tsx
@@ -125,10 +125,13 @@ export function collectTraceMeasurements(
     WEB_VITALS_LOOKUP.has(measurement) && vital_types.add('web');
     MOBILE_VITALS_LOOKUP.has(measurement) && vital_types.add('mobile');
 
+    const score = measurements[`score.${measurement}`]?.value;
+
     const vital = vitals.get(node)!;
     vital.push({
       key: measurement,
       measurement: value,
+      score,
     });
 
     if (!RENDERABLE_MEASUREMENTS[measurement]) {
@@ -141,7 +144,7 @@ export function collectTraceMeasurements(
       value.unit ?? 'millisecond'
     );
 
-    indicators.push({
+    const indicator: TraceTree.Indicator = {
       start: timestamp,
       duration: 0,
       measurement: value,
@@ -150,7 +153,9 @@ export function collectTraceMeasurements(
         : false,
       type: measurement as TraceTree.Indicator['type'],
       label: (MEASUREMENT_ACRONYM_MAPPING[measurement] ?? measurement).toUpperCase(),
-    });
+    };
+
+    indicators.push(indicator);
   }
 
   return indicators;
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTree.spec.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTree.spec.tsx
index 496f493a9c1707..82f4cab10a6ea4 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTree.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTree.spec.tsx
@@ -15,6 +15,7 @@ import {
 import type {ParentAutogroupNode} from './parentAutogroupNode';
 import {TraceTree} from './traceTree';
 import {
+  assertTransactionNode,
   makeEventTransaction,
   makeSpan,
   makeTrace,
@@ -993,6 +994,38 @@ describe('TraceTree', () => {
     });
   });
 
+  describe('FindByID', () => {
+    it('finds transaction by event_id', () => {
+      const traceWithError = makeTrace({
+        transactions: [
+          makeTransaction({transaction: 'first', event_id: 'first-event-id'}),
+        ],
+      });
+      const tree = TraceTree.FromTrace(traceWithError, traceMetadata);
+      const node = TraceTree.FindByID(tree.root, 'first-event-id');
+
+      assertTransactionNode(node);
+      expect(node.value.transaction).toBe('first');
+    });
+
+    it('matches by error event_id', () => {
+      const traceWithError = makeTrace({
+        transactions: [
+          makeTransaction({
+            transaction: 'first',
+            event_id: 'txn-event-id',
+            errors: [makeTraceError({event_id: 'error-event-id'})],
+          }),
+        ],
+      });
+      const tree = TraceTree.FromTrace(traceWithError, traceMetadata);
+      const node = TraceTree.FindByID(tree.root, 'error-event-id');
+
+      assertTransactionNode(node);
+      expect(node.value.transaction).toBe('first');
+    });
+  });
+
   describe('FindAll', () => {
     it('finds all nodes by predicate', () => {
       const tree = TraceTree.FromTrace(trace, traceMetadata);
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTree.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTree.tsx
index 03670797ac580d..d1300c4c30ac8c 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTree.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTree.tsx
@@ -24,6 +24,7 @@ import {
   getPageloadTransactionChildCount,
   isAutogroupedNode,
   isBrowserRequestSpan,
+  isCollapsedNode,
   isJavascriptSDKTransaction,
   isMissingInstrumentationNode,
   isPageloadTransactionNode,
@@ -132,7 +133,6 @@ export declare namespace TraceTree {
   type TracePerformanceIssue = TracePerformanceIssueType;
   type Profile = {profile_id: string} | {profiler_id: string};
   type Project = {
-    id: number;
     slug: string;
   };
   type Root = null;
@@ -146,8 +146,13 @@ export declare namespace TraceTree {
     | MissingInstrumentationSpan
     | SiblingAutogroup
     | ChildrenAutogroup
+    | CollapsedNode
     | Root;
 
+  interface CollapsedNode {
+    type: 'collapsed';
+  }
+
   // Node types
   interface MissingInstrumentationSpan {
     start_timestamp: number;
@@ -192,7 +197,7 @@ export declare namespace TraceTree {
     type: 'cls' | 'fcp' | 'fp' | 'lcp' | 'ttfb';
   };
 
-  type CollectedVital = {key: string; measurement: Measurement};
+  type CollectedVital = {key: string; measurement: Measurement; score?: number};
 }
 
 export enum TraceShape {
@@ -231,7 +236,7 @@ function fetchTrace(
 
 export class TraceTree extends TraceTreeEventDispatcher {
   eventsCount = 0;
-  projects = new Set<TraceTree.Project>();
+  projects = new Map<number, TraceTree.Project>();
 
   type: 'loading' | 'empty' | 'error' | 'trace' = 'trace';
   root: TraceTreeNode<null> = TraceTreeNode.Root();
@@ -289,8 +294,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
       value: TraceTree.Transaction | TraceTree.TraceError
     ) {
       tree.eventsCount++;
-      tree.projects.add({
-        id: value.project_id,
+      tree.projects.set(value.project_id, {
         slug: value.project_slug,
       });
 
@@ -1014,7 +1018,8 @@ export class TraceTree extends TraceTreeEventDispatcher {
       const node = queue.pop()!;
 
       visibleChildren.push(node);
-      // iterate in reverseto ensure nodes are processed in order
+
+      // iterate in reverse to ensure nodes are processed in order
       if (node.expanded || isParentAutogroupedNode(node)) {
         const children = TraceTree.DirectVisibleChildren(node);
 
@@ -1142,8 +1147,8 @@ export class TraceTree extends TraceTreeEventDispatcher {
       if (isParentAutogroupedNode(next)) {
         queue.push(next.head);
       } else {
-        for (const child of next.children) {
-          queue.push(child);
+        for (let i = next.children.length - 1; i >= 0; i--) {
+          queue.push(next.children[i]);
         }
       }
     }
@@ -1215,10 +1220,38 @@ export class TraceTree extends TraceTreeEventDispatcher {
       if (isTransactionNode(n)) {
         // A transaction itself is a span and we are starting to treat it as such.
         // Hence we check for both event_id and span_id.
-        return n.value.event_id === eventId || n.value.span_id === eventId;
+        if (n.value.event_id === eventId || n.value.span_id === eventId) {
+          return true;
+        }
+
+        // If we dont have an exact match, then look for an event_id in the errors or performance issues
+        for (const e of n.errors) {
+          if (e.event_id === eventId) {
+            return true;
+          }
+        }
+        for (const p of n.performance_issues) {
+          if (p.event_id === eventId) {
+            return true;
+          }
+        }
       }
       if (isSpanNode(n)) {
-        return n.value.span_id === eventId;
+        if (n.value.span_id === eventId) {
+          return true;
+        }
+
+        // If we dont have an exact match, then look for an event_id in the errors or performance issues
+        for (const e of n.errors) {
+          if (e.event_id === eventId) {
+            return true;
+          }
+        }
+        for (const p of n.performance_issues) {
+          if (p.event_id === eventId) {
+            return true;
+          }
+        }
       }
       if (isTraceErrorNode(n)) {
         return n.value.event_id === eventId;
@@ -1248,18 +1281,6 @@ export class TraceTree extends TraceTreeEventDispatcher {
         return true;
       }
 
-      // If we dont have an exact match, then look for an event_id in the errors or performance issues
-      for (const e of n.errors) {
-        if (e.event_id === eventId) {
-          return true;
-        }
-      }
-      for (const p of n.performance_issues) {
-        if (p.event_id === eventId) {
-          return true;
-        }
-      }
-
       return false;
     });
   }
@@ -1511,7 +1532,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
         // This is very wasteful as it performs O(n^2) search each time we expand a node...
         // In most cases though, we should be operating on a tree with sub 10k elements and hopefully
         // a low autogrouped node count.
-        index = node ? tree.list.findIndex(n => n === node) : -1;
+        index = node ? tree.list.indexOf(node) : -1;
         if (index !== -1) {
           break;
         }
@@ -1961,6 +1982,10 @@ function printTraceTreeNode(
     return padding + (t.value.event_id || t.value.level) || 'unknown trace error';
   }
 
+  if (isCollapsedNode(t)) {
+    return padding + 'collapsed';
+  }
+
   return 'unknown node';
 }
 
diff --git a/static/app/views/performance/newTraceDetails/traceResetZoomButton.tsx b/static/app/views/performance/newTraceDetails/traceResetZoomButton.tsx
new file mode 100644
index 00000000000000..dbd72fe130d384
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceResetZoomButton.tsx
@@ -0,0 +1,37 @@
+import {useCallback} from 'react';
+import styled from '@emotion/styled';
+
+import {Button} from 'sentry/components/button';
+import {t} from 'sentry/locale';
+import type {Organization} from 'sentry/types/organization';
+import {traceAnalytics} from 'sentry/views/performance/newTraceDetails/traceAnalytics';
+import type {VirtualizedViewManager} from 'sentry/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager';
+
+export function TraceResetZoomButton(props: {
+  organization: Organization;
+  viewManager: VirtualizedViewManager;
+}) {
+  const onResetZoom = useCallback(() => {
+    traceAnalytics.trackResetZoom(props.organization);
+    props.viewManager.resetZoom();
+  }, [props.viewManager, props.organization]);
+
+  return (
+    <ResetZoomButton
+      size="xs"
+      onClick={onResetZoom}
+      ref={props.viewManager.registerResetZoomRef}
+    >
+      {t('Reset Zoom')}
+    </ResetZoomButton>
+  );
+}
+
+const ResetZoomButton = styled(Button)`
+  transition: opacity 0.2s 0.5s ease-in-out;
+
+  &[disabled] {
+    cursor: not-allowed;
+    opacity: 0.65;
+  }
+`;
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceAutogroupedRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceAutogroupedRow.tsx
index f5f46b612b0397..45138e2c4e3b83 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceAutogroupedRow.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceAutogroupedRow.tsx
@@ -19,13 +19,13 @@ export function TraceAutogroupedRow(
     <div
       key={props.index}
       ref={r =>
-        props.tabIndex === 0 && !props.isEmbedded
+        props.tabIndex === 0
           ? maybeFocusTraceRow(r, props.node, props.previouslyFocusedNodeRef)
           : null
       }
       tabIndex={props.tabIndex}
       className={`Autogrouped TraceRow ${props.rowSearchClassName} ${props.node.hasErrors ? props.node.maxIssueSeverity : ''}`}
-      onClick={props.onRowClick}
+      onPointerDown={props.onRowClick}
       onKeyDown={props.onRowKeyDown}
       style={props.style}
     >
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceCollapsedRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceCollapsedRow.tsx
new file mode 100644
index 00000000000000..957a958177fb0e
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceCollapsedRow.tsx
@@ -0,0 +1,67 @@
+import {useMemo} from 'react';
+
+import {t} from 'sentry/locale';
+import {
+  isCollapsedNode,
+  isTraceErrorNode,
+} from 'sentry/views/performance/newTraceDetails/traceGuards';
+import type {TraceTreeNode} from 'sentry/views/performance/newTraceDetails/traceModels/traceTreeNode';
+
+import type {CollapsedNode} from '../traceModels/traceCollapsedNode';
+import {TraceTree} from '../traceModels/traceTree';
+import type {TraceRowProps} from '../traceRow/traceRow';
+
+export function TraceCollapsedRow(props: TraceRowProps<CollapsedNode>) {
+  const stats = useMemo(() => {
+    const childStatistics = {issues: 0, events: 0};
+
+    const seen = new Set<TraceTreeNode<any>>();
+
+    TraceTree.ForEachChild(props.node, c => {
+      // Dont count collapsed nodes and track what we've seen because
+      // the collapsed nodes may contain duplicate children due to vertical
+      // collapsing.
+      if (isCollapsedNode(c) || seen.has(c)) {
+        return;
+      }
+
+      seen.add(c);
+
+      if (!isTraceErrorNode(c)) {
+        childStatistics.events++;
+      } else {
+        childStatistics.issues++;
+      }
+    });
+    return childStatistics;
+  }, [props.node]);
+
+  return (
+    <div
+      key={props.index}
+      tabIndex={props.tabIndex}
+      className={`Collapsed TraceRow`}
+      onPointerDown={props.onRowClick}
+      onKeyDown={props.onRowKeyDown}
+      style={props.style}
+    >
+      <div className="TraceLeftColumn" ref={props.registerListColumnRef}>
+        <div className="TraceLeftColumnInner" style={props.listColumnStyle}>
+          {stats.events > 0 ? stats.events : null}{' '}
+          {stats.events > 0
+            ? stats.events === 1
+              ? t('hidden span')
+              : t('hidden spans')
+            : null}
+          {stats.events > 0 && ', '}
+          {stats.issues > 0 ? stats.issues : null}{' '}
+          {stats.issues > 0
+            ? stats.issues === 1
+              ? t('hidden issue')
+              : t('hidden issues')
+            : null}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceErrorRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceErrorRow.tsx
index 8adcf4328d167e..ae97e241518004 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceErrorRow.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceErrorRow.tsx
@@ -31,13 +31,13 @@ export function TraceErrorRow(props: TraceRowProps<TraceTreeNode<TraceTree.Trace
     <div
       key={props.index}
       ref={r =>
-        props.tabIndex === 0 && !props.isEmbedded
+        props.tabIndex === 0
           ? maybeFocusTraceRow(r, props.node, props.previouslyFocusedNodeRef)
           : null
       }
       tabIndex={props.tabIndex}
       className={`TraceRow ${props.rowSearchClassName} ${props.node.maxIssueSeverity}`}
-      onClick={props.onRowClick}
+      onPointerDown={props.onRowClick}
       onKeyDown={props.onRowKeyDown}
       style={props.style}
     >
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceMissingInstrumentationRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceMissingInstrumentationRow.tsx
index a652e6c22c4b0b..d1bab9b439f055 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceMissingInstrumentationRow.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceMissingInstrumentationRow.tsx
@@ -20,13 +20,13 @@ export function TraceMissingInstrumentationRow(
     <div
       key={props.index}
       ref={r =>
-        props.tabIndex === 0 && !props.isEmbedded
+        props.tabIndex === 0
           ? maybeFocusTraceRow(r, props.node, props.previouslyFocusedNodeRef)
           : null
       }
       tabIndex={props.tabIndex}
       className={`TraceRow ${props.rowSearchClassName}`}
-      onClick={props.onRowClick}
+      onPointerDown={props.onRowClick}
       onKeyDown={props.onRowKeyDown}
       style={props.style}
     >
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceRootNode.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceRootNode.tsx
index fc93717fb15c15..61a51c4c8e28d5 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceRootNode.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceRootNode.tsx
@@ -28,13 +28,13 @@ export function TraceRootRow(props: TraceRowProps<TraceTreeNode<TraceTree.Trace>
     <div
       key={props.index}
       ref={r =>
-        props.tabIndex === 0 && !props.isEmbedded
+        props.tabIndex === 0
           ? maybeFocusTraceRow(r, props.node, props.previouslyFocusedNodeRef)
           : null
       }
       tabIndex={props.tabIndex}
       className={`TraceRow ${props.rowSearchClassName} ${props.node.hasErrors ? props.node.maxIssueSeverity : ''}`}
-      onClick={props.onRowClick}
+      onPointerDown={props.onRowClick}
       onKeyDown={props.onRowKeyDown}
       style={props.style}
     >
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceRow.tsx
index 259c19d6f0c1d8..78f7823112d860 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceRow.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceRow.tsx
@@ -23,7 +23,6 @@ export const TRACE_CHILDREN_COUNT_WRAPPER_ORPHANED_CLASSNAME = [
 
 export interface TraceRowProps<T extends TraceTree.Node> {
   index: number;
-  isEmbedded: boolean;
   listColumnClassName: string;
   listColumnStyle: React.CSSProperties;
   manager: VirtualizedViewManager;
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceSpanRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceSpanRow.tsx
index 38939678b4ae55..ffbd5f1ad7e9b2 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceSpanRow.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceSpanRow.tsx
@@ -17,13 +17,13 @@ export function TraceSpanRow(props: TraceRowProps<TraceTreeNode<TraceTree.Span>>
     <div
       key={props.index}
       ref={r =>
-        props.tabIndex === 0 && !props.isEmbedded
+        props.tabIndex === 0
           ? maybeFocusTraceRow(r, props.node, props.previouslyFocusedNodeRef)
           : null
       }
       tabIndex={props.tabIndex}
       className={`TraceRow ${props.rowSearchClassName} ${props.node.hasErrors ? props.node.maxIssueSeverity : ''}`}
-      onClick={props.onRowClick}
+      onPointerDown={props.onRowClick}
       onKeyDown={props.onRowKeyDown}
       style={props.style}
     >
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceTransactionRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceTransactionRow.tsx
index b1aa6275cf52a4..747093a5a015f9 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceTransactionRow.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceTransactionRow.tsx
@@ -19,14 +19,14 @@ export function TraceTransactionRow(
     <div
       key={props.index}
       ref={r =>
-        props.tabIndex === 0 && !props.isEmbedded
+        props.tabIndex === 0
           ? maybeFocusTraceRow(r, props.node, props.previouslyFocusedNodeRef)
           : null
       }
       tabIndex={props.tabIndex}
       className={`TraceRow ${props.rowSearchClassName} ${props.node.hasErrors ? props.node.maxIssueSeverity : ''}`}
       onKeyDown={props.onRowKeyDown}
-      onClick={props.onRowClick}
+      onPointerDown={props.onRowClick}
       style={props.style}
     >
       <div
diff --git a/static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx b/static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx
index 5d4cbe9408bf94..74f47314fd6ab2 100644
--- a/static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx
+++ b/static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx
@@ -34,7 +34,8 @@ function filterProjects(projects: Project[], tree: TraceTree) {
   const projectsWithOnboardingChecklist: Project[] = [];
 
   for (const project of projects) {
-    if (Array.from(tree.projects).some(p => Number(project.id) === p.id)) {
+    const hasProject = tree.projects.has(Number(project.id));
+    if (hasProject) {
       if (!project.firstTransactionEvent) {
         projectsWithNoPerformance.push(project);
         if (project.platform && withPerformanceOnboarding.has(project.platform)) {
diff --git a/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx b/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx
index 0ea40b3d0054be..73432ddd5326c4 100644
--- a/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx
+++ b/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx
@@ -48,7 +48,7 @@ export function usePerformanceUsageStats({
       field: 'sum(quantity)',
       utc: true,
       category: 'transaction_indexed',
-      project: Array.from(tree.projects).map(project => project.id),
+      project: Array.from(tree.projects.keys()),
       referrer: 'trace-view-warnings',
     },
   };
diff --git a/static/app/views/performance/newTraceDetails/traceWaterfall.tsx b/static/app/views/performance/newTraceDetails/traceWaterfall.tsx
new file mode 100644
index 00000000000000..b3e83e3c5ceaa4
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceWaterfall.tsx
@@ -0,0 +1,898 @@
+import type React from 'react';
+import {
+  Fragment,
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useReducer,
+  useRef,
+  useState,
+} from 'react';
+import {flushSync} from 'react-dom';
+import styled from '@emotion/styled';
+import * as Sentry from '@sentry/react';
+import * as qs from 'query-string';
+
+import {addSuccessMessage} from 'sentry/actionCreators/indicator';
+import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import type {EventTransaction} from 'sentry/types/event';
+import type {Organization} from 'sentry/types/organization';
+import type {Project} from 'sentry/types/project';
+import {trackAnalytics} from 'sentry/utils/analytics';
+import {browserHistory} from 'sentry/utils/browserHistory';
+import type EventView from 'sentry/utils/discover/eventView';
+import type {TraceSplitResults} from 'sentry/utils/performance/quickTrace/types';
+import {
+  cancelAnimationTimeout,
+  requestAnimationTimeout,
+} from 'sentry/utils/profiling/hooks/useVirtualizedTree/virtualizedTreeUtils';
+import type {UseApiQueryResult} from 'sentry/utils/queryClient';
+import type RequestError from 'sentry/utils/requestError/requestError';
+import {capitalize} from 'sentry/utils/string/capitalize';
+import useApi from 'sentry/utils/useApi';
+import type {DispatchingReducerMiddleware} from 'sentry/utils/useDispatchingReducer';
+import useOrganization from 'sentry/utils/useOrganization';
+import usePageFilters from 'sentry/utils/usePageFilters';
+import useProjects from 'sentry/utils/useProjects';
+import {TraceTree} from 'sentry/views/performance/newTraceDetails/traceModels/traceTree';
+import {useDividerResizeSync} from 'sentry/views/performance/newTraceDetails/useDividerResizeSync';
+import {useHasTraceNewUi} from 'sentry/views/performance/newTraceDetails/useHasTraceNewUi';
+import {useTraceSpaceListeners} from 'sentry/views/performance/newTraceDetails/useTraceSpaceListeners';
+import type {ReplayTrace} from 'sentry/views/replays/detail/trace/useReplayTraces';
+import type {ReplayRecord} from 'sentry/views/replays/types';
+
+import type {TraceMetaQueryResults} from './traceApi/useTraceMeta';
+import {TraceDrawer} from './traceDrawer/traceDrawer';
+import type {TraceTreeNode} from './traceModels/traceTreeNode';
+import {TraceScheduler} from './traceRenderers/traceScheduler';
+import {TraceView as TraceViewModel} from './traceRenderers/traceView';
+import {
+  type ViewManagerScrollAnchor,
+  VirtualizedViewManager,
+} from './traceRenderers/virtualizedViewManager';
+import {
+  searchInTraceTreeText,
+  searchInTraceTreeTokens,
+} from './traceSearch/traceSearchEvaluator';
+import {TraceSearchInput} from './traceSearch/traceSearchInput';
+import {parseTraceSearch} from './traceSearch/traceTokenConverter';
+import {
+  useTraceState,
+  useTraceStateDispatch,
+  useTraceStateEmitter,
+} from './traceState/traceStateProvider';
+import {Trace} from './trace';
+import {traceAnalytics} from './traceAnalytics';
+import {
+  isAutogroupedNode,
+  isParentAutogroupedNode,
+  isSiblingAutogroupedNode,
+  isTraceNode,
+} from './traceGuards';
+import {TracePreferencesDropdown} from './tracePreferencesDropdown';
+import {TraceResetZoomButton} from './traceResetZoomButton';
+import {TraceShortcuts} from './traceShortcutsModal';
+import type {TraceReducer, TraceReducerState} from './traceState';
+import {
+  traceNodeAdjacentAnalyticsProperties,
+  traceNodeAnalyticsName,
+} from './traceTreeAnalytics';
+import TraceTypeWarnings from './traceTypeWarnings';
+import {TraceWaterfallState} from './traceWaterfallState';
+import {useTraceOnLoad} from './useTraceOnLoad';
+import {useTraceQueryParamStateSync} from './useTraceQueryParamStateSync';
+import {useTraceScrollToPath} from './useTraceScrollToPath';
+import {useTraceTimelineChangeSync} from './useTraceTimelineChangeSync';
+
+const TRACE_TAB: TraceReducerState['tabs']['tabs'][0] = {
+  node: 'trace',
+  label: t('Trace'),
+};
+
+const VITALS_TAB: TraceReducerState['tabs']['tabs'][0] = {
+  node: 'vitals',
+  label: t('Vitals'),
+};
+
+export interface TraceWaterfallProps {
+  meta: TraceMetaQueryResults;
+  organization: Organization;
+  replay: ReplayRecord | null;
+  rootEvent: UseApiQueryResult<EventTransaction, RequestError>;
+  source: string;
+  trace: UseApiQueryResult<TraceSplitResults<TraceTree.Transaction>, RequestError>;
+  traceEventView: EventView;
+  traceSlug: string | undefined;
+  tree: TraceTree;
+  replayTraces?: ReplayTrace[];
+}
+
+export function TraceWaterfall(props: TraceWaterfallProps) {
+  const api = useApi();
+  const filters = usePageFilters();
+  const {projects} = useProjects();
+  const organization = useOrganization();
+
+  const traceState = useTraceState();
+  const traceDispatch = useTraceStateDispatch();
+  const traceStateEmitter = useTraceStateEmitter();
+  const hasTraceNewUi = useHasTraceNewUi();
+
+  const [forceRender, rerender] = useReducer(x => (x + 1) % Number.MAX_SAFE_INTEGER, 0);
+
+  const traceView = useMemo(() => new TraceViewModel(), []);
+  const traceScheduler = useMemo(() => new TraceScheduler(), []);
+
+  const projectsRef = useRef<Project[]>(projects);
+  projectsRef.current = projects;
+
+  const scrollQueueRef = useTraceScrollToPath(undefined);
+  const forceRerender = useCallback(() => {
+    flushSync(rerender);
+  }, []);
+
+  useEffect(() => {
+    trackAnalytics('performance_views.trace_view_v1_page_load', {
+      organization: props.organization,
+      source: props.source,
+    });
+  }, [props.organization, props.source]);
+
+  const previouslyFocusedNodeRef = useRef<TraceTreeNode<TraceTree.NodeValue> | null>(
+    null
+  );
+  const previouslyScrolledToNodeRef = useRef<TraceTreeNode<TraceTree.NodeValue> | null>(
+    null
+  );
+
+  useEffect(() => {
+    if (!props.replayTraces?.length || props.tree?.type !== 'trace') {
+      return undefined;
+    }
+
+    const cleanup = props.tree.fetchAdditionalTraces({
+      api,
+      filters,
+      replayTraces: props.replayTraces,
+      organization: props.organization,
+      urlParams: qs.parse(location.search),
+      rerender: forceRerender,
+      meta: props.meta,
+    });
+
+    return () => cleanup();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [props.tree, props.replayTraces]);
+
+  // Assign the trace state to a ref so we can access it without re-rendering
+  const traceStateRef = useRef<TraceReducerState>(traceState);
+  traceStateRef.current = traceState;
+
+  const traceStatePreferencesRef = useRef<
+    Pick<TraceReducerState['preferences'], 'autogroup' | 'missing_instrumentation'>
+  >(traceState.preferences);
+  traceStatePreferencesRef.current = traceState.preferences;
+
+  // Initialize the view manager right after the state reducer
+  const viewManager = useMemo(() => {
+    return new VirtualizedViewManager(
+      {
+        list: {width: traceState.preferences.list.width},
+        span_list: {width: 1 - traceState.preferences.list.width},
+      },
+      traceScheduler,
+      traceView
+    );
+    // We only care about initial state when we initialize the view manager
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // Initialize the tabs reducer when the tree initializes
+  useLayoutEffect(() => {
+    return traceDispatch({
+      type: 'set roving count',
+      items: props.tree.list.length - 1,
+    });
+  }, [props.tree.list.length, traceDispatch]);
+
+  // Initialize the tabs reducer when the tree initializes
+  useLayoutEffect(() => {
+    if (props.tree.type !== 'trace') {
+      return;
+    }
+
+    const newTabs = [TRACE_TAB];
+
+    if (props.tree.vitals.size > 0) {
+      const types = Array.from(props.tree.vital_types.values());
+      const label = types.length > 1 ? t('Vitals') : capitalize(types[0]) + ' Vitals';
+
+      newTabs.push({
+        ...VITALS_TAB,
+        label,
+      });
+    }
+
+    if (props.tree.profiled_events.size > 0) {
+      newTabs.push({
+        node: 'profiles',
+        label: 'Profiles',
+      });
+    }
+
+    traceDispatch({
+      type: 'initialize tabs reducer',
+      payload: {
+        current_tab: traceStateRef?.current?.tabs?.tabs?.[0],
+        tabs: newTabs,
+        last_clicked_tab: null,
+      },
+    });
+    // We only want to update the tabs when the tree changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [props.tree]);
+
+  const searchingRaf = useRef<{id: number | null} | null>(null);
+  const onTraceSearch = useCallback(
+    (
+      query: string,
+      activeNode: TraceTreeNode<TraceTree.NodeValue> | null,
+      behavior: 'track result' | 'persist'
+    ) => {
+      if (searchingRaf.current?.id) {
+        window.cancelAnimationFrame(searchingRaf.current.id);
+        searchingRaf.current = null;
+      }
+
+      function done([matches, lookup, activeNodeSearchResult]) {
+        // If the previous node is still in the results set, we want to keep it
+        if (activeNodeSearchResult) {
+          traceDispatch({
+            type: 'set results',
+            results: matches,
+            resultsLookup: lookup,
+            resultIteratorIndex: activeNodeSearchResult?.resultIteratorIndex,
+            resultIndex: activeNodeSearchResult?.resultIndex,
+            previousNode: activeNodeSearchResult,
+            node: activeNode,
+          });
+          return;
+        }
+
+        if (activeNode && behavior === 'persist') {
+          traceDispatch({
+            type: 'set results',
+            results: matches,
+            resultsLookup: lookup,
+            resultIteratorIndex: undefined,
+            resultIndex: undefined,
+            previousNode: null,
+            node: activeNode,
+          });
+          return;
+        }
+
+        const resultIndex: number | undefined = matches?.[0]?.index;
+        const resultIteratorIndex: number | undefined = matches?.[0] ? 0 : undefined;
+        const node: TraceTreeNode<TraceTree.NodeValue> | null = matches?.[0]?.value;
+
+        traceDispatch({
+          type: 'set results',
+          results: matches,
+          resultsLookup: lookup,
+          resultIteratorIndex: resultIteratorIndex,
+          resultIndex: resultIndex,
+          previousNode: activeNodeSearchResult,
+          node,
+        });
+      }
+
+      const tokens = parseTraceSearch(query);
+
+      if (tokens) {
+        searchingRaf.current = searchInTraceTreeTokens(
+          props.tree,
+          tokens,
+          activeNode,
+          done
+        );
+      } else {
+        searchingRaf.current = searchInTraceTreeText(props.tree, query, activeNode, done);
+      }
+    },
+    [traceDispatch, props.tree]
+  );
+
+  // We need to heavily debounce query string updates because the rest of the app is so slow
+  // to rerender that it causes the search to drop frames on every keystroke...
+  const QUERY_STRING_STATE_DEBOUNCE = 300;
+  const queryStringAnimationTimeoutRef = useRef<{id: number} | null>(null);
+  const setRowAsFocused = useCallback(
+    (
+      node: TraceTreeNode<TraceTree.NodeValue> | null,
+      event: React.MouseEvent<HTMLElement> | null,
+      resultsLookup: Map<TraceTreeNode<TraceTree.NodeValue>, number>,
+      index: number | null,
+      debounce: number = QUERY_STRING_STATE_DEBOUNCE
+    ) => {
+      // sync query string with the clicked node
+      if (node) {
+        if (queryStringAnimationTimeoutRef.current) {
+          cancelAnimationTimeout(queryStringAnimationTimeoutRef.current);
+        }
+        queryStringAnimationTimeoutRef.current = requestAnimationTimeout(() => {
+          const currentQueryStringPath = qs.parse(location.search).node;
+          const nextNodePath = TraceTree.PathToNode(node);
+          // Updating the query string with the same path is problematic because it causes
+          // the entire sentry app to rerender, which is enough to cause jank and drop frames
+          if (JSON.stringify(currentQueryStringPath) === JSON.stringify(nextNodePath)) {
+            return;
+          }
+          const {eventId: _eventId, ...query} = qs.parse(location.search);
+          browserHistory.replace({
+            pathname: location.pathname,
+            query: {
+              ...query,
+              node: nextNodePath,
+            },
+          });
+          queryStringAnimationTimeoutRef.current = null;
+        }, debounce);
+
+        if (resultsLookup.has(node) && typeof index === 'number') {
+          traceDispatch({
+            type: 'set search iterator index',
+            resultIndex: index,
+            resultIteratorIndex: resultsLookup.get(node)!,
+          });
+        }
+
+        if (isTraceNode(node)) {
+          traceDispatch({type: 'activate tab', payload: TRACE_TAB.node});
+          return;
+        }
+
+        traceDispatch({
+          type: 'activate tab',
+          payload: node,
+          pin_previous: event?.metaKey,
+        });
+      }
+    },
+    [traceDispatch]
+  );
+
+  const onRowClick = useCallback(
+    (
+      node: TraceTreeNode<TraceTree.NodeValue>,
+      event: React.MouseEvent<HTMLElement>,
+      index: number
+    ) => {
+      trackAnalytics('trace.trace_layout.span_row_click', {
+        organization,
+        num_children: node.children.length,
+        type: traceNodeAnalyticsName(node),
+        project_platform:
+          projects.find(p => p.slug === node.metadata.project_slug)?.platform || 'other',
+        ...traceNodeAdjacentAnalyticsProperties(node),
+      });
+
+      if (traceStateRef.current.preferences.drawer.minimized) {
+        traceDispatch({type: 'minimize drawer', payload: false});
+      }
+      setRowAsFocused(node, event, traceStateRef.current.search.resultsLookup, null, 0);
+
+      if (traceStateRef.current.search.resultsLookup.has(node)) {
+        const idx = traceStateRef.current.search.resultsLookup.get(node)!;
+        traceDispatch({
+          type: 'set search iterator index',
+          resultIndex: index,
+          resultIteratorIndex: idx,
+        });
+      } else if (traceStateRef.current.search.resultIteratorIndex !== null) {
+        traceDispatch({type: 'clear search iterator index'});
+      }
+
+      traceDispatch({
+        type: 'set roving index',
+        action_source: 'click',
+        index,
+        node,
+      });
+    },
+    [setRowAsFocused, traceDispatch, organization, projects]
+  );
+
+  const scrollRowIntoView = useCallback(
+    (
+      node: TraceTreeNode<TraceTree.NodeValue>,
+      index: number,
+      anchor?: ViewManagerScrollAnchor,
+      force?: boolean
+    ) => {
+      // Last node we scrolled to is the same as the node we want to scroll to
+      if (previouslyScrolledToNodeRef.current === node && !force) {
+        return;
+      }
+
+      // Always scroll to the row vertically
+      viewManager.scrollToRow(index, anchor);
+      if (viewManager.isOutsideOfView(node)) {
+        viewManager.scrollRowIntoViewHorizontally(node, 0, 48, 'measured');
+      }
+      previouslyScrolledToNodeRef.current = node;
+    },
+    [viewManager]
+  );
+
+  const onScrollToNode = useCallback(
+    (
+      node: TraceTreeNode<TraceTree.NodeValue>
+    ): Promise<TraceTreeNode<TraceTree.NodeValue> | null> => {
+      return TraceTree.ExpandToPath(props.tree, TraceTree.PathToNode(node), {
+        api,
+        organization: props.organization,
+        preferences: traceStatePreferencesRef.current,
+      }).then(() => {
+        const maybeNode = TraceTree.Find(props.tree.root, n => n === node);
+
+        if (!maybeNode) {
+          return null;
+        }
+
+        const index = TraceTree.EnforceVisibility(props.tree, maybeNode);
+        if (index === -1) {
+          return null;
+        }
+
+        scrollRowIntoView(maybeNode, index, 'center if outside', true);
+        traceDispatch({
+          type: 'set roving index',
+          node: maybeNode,
+          index: index,
+          action_source: 'click',
+        });
+
+        if (traceStateRef.current.search.resultsLookup.has(maybeNode)) {
+          traceDispatch({
+            type: 'set search iterator index',
+            resultIndex: index,
+            resultIteratorIndex:
+              traceStateRef.current.search.resultsLookup.get(maybeNode)!,
+          });
+        } else if (traceStateRef.current.search.resultIteratorIndex !== null) {
+          traceDispatch({type: 'clear search iterator index'});
+        }
+
+        return maybeNode;
+      });
+    },
+    [api, props.organization, scrollRowIntoView, props.tree, traceDispatch]
+  );
+
+  const onTabScrollToNode = useCallback(
+    (
+      node: TraceTreeNode<TraceTree.NodeValue>
+    ): Promise<TraceTreeNode<TraceTree.NodeValue> | null> => {
+      return onScrollToNode(node).then(maybeNode => {
+        if (maybeNode) {
+          setRowAsFocused(
+            maybeNode,
+            null,
+            traceStateRef.current.search.resultsLookup,
+            null,
+            0
+          );
+        }
+
+        return maybeNode;
+      });
+    },
+    [onScrollToNode, setRowAsFocused]
+  );
+
+  // Callback that is invoked when the trace loads and reaches its initialied state,
+  // that is when the trace tree data and any data that the trace depends on is loaded,
+  // but the trace is not yet rendered in the view.
+  const onTraceLoad = useCallback(() => {
+    traceAnalytics.trackTraceShape(props.tree, projectsRef.current, props.organization);
+    // The tree has the data fetched, but does not yet respect the user preferences.
+    // We will autogroup and inject missing instrumentation if the preferences are set.
+    // and then we will perform a search to find the node the user is interested in.
+
+    const query = qs.parse(location.search);
+    if (query.fov && typeof query.fov === 'string') {
+      viewManager.maybeInitializeTraceViewFromQS(query.fov);
+    }
+    if (traceStateRef.current.preferences.missing_instrumentation) {
+      TraceTree.DetectMissingInstrumentation(props.tree.root);
+    }
+    if (traceStateRef.current.preferences.autogroup.sibling) {
+      TraceTree.AutogroupSiblingSpanNodes(props.tree.root);
+    }
+    if (traceStateRef.current.preferences.autogroup.parent) {
+      TraceTree.AutogroupDirectChildrenSpanNodes(props.tree.root);
+    }
+
+    // Construct the visual representation of the tree
+    props.tree.build();
+
+    const eventId = scrollQueueRef.current?.eventId;
+    const [type, path] = scrollQueueRef.current?.path?.[0]?.split('-') ?? [];
+    scrollQueueRef.current = null;
+
+    let node =
+      (path === 'root' && props.tree.root.children[0]) ||
+      (path && TraceTree.FindByID(props.tree.root, path)) ||
+      (eventId && TraceTree.FindByID(props.tree.root, eventId)) ||
+      null;
+
+    // If the node points to a span, but we found an autogrouped node, then
+    // perform another search inside the autogrouped node to find the more detailed
+    // location of the span. This is necessary because the id of the autogrouped node
+    // is in some cases inferred from the spans it contains and searching by the span id
+    // just gives us the first match which may not be the one the user is looking for.
+    if (node) {
+      if (isAutogroupedNode(node) && type !== 'ag') {
+        if (isParentAutogroupedNode(node)) {
+          node = TraceTree.FindByID(node.head, eventId ?? path) ?? node;
+        } else if (isSiblingAutogroupedNode(node)) {
+          node = node.children.find(n => TraceTree.FindByID(n, eventId ?? path)) ?? node;
+        }
+      }
+    }
+
+    const index = node ? TraceTree.EnforceVisibility(props.tree, node) : -1;
+
+    if (traceStateRef.current.search.query) {
+      onTraceSearch(traceStateRef.current.search.query, node, 'persist');
+    }
+
+    if (index === -1 || !node) {
+      const hasScrollComponent = !!(path || eventId);
+      if (hasScrollComponent) {
+        Sentry.withScope(scope => {
+          scope.setFingerprint(['trace-view-scroll-to-node-error']);
+          scope.captureMessage('Failed to scroll to node in trace tree');
+        });
+      }
+
+      return;
+    }
+
+    // At load time, we want to scroll the row into view, but we need to wait for the view
+    // to initialize before we can do that. We listen for the 'initialize virtualized list' and scroll
+    // to the row in the view if it is not in view yet. If its in the view, then scroll to it immediately.
+    traceScheduler.once('initialize virtualized list', () => {
+      function onTargetRowMeasure() {
+        if (!node || !viewManager.row_measurer.cache.has(node)) {
+          return;
+        }
+        viewManager.row_measurer.off('row measure end', onTargetRowMeasure);
+        if (viewManager.isOutsideOfView(node)) {
+          viewManager.scrollRowIntoViewHorizontally(node!, 0, 48, 'measured');
+        }
+      }
+      viewManager.scrollToRow(index, 'center');
+      viewManager.row_measurer.on('row measure end', onTargetRowMeasure);
+      previouslyScrolledToNodeRef.current = node;
+
+      setRowAsFocused(node, null, traceStateRef.current.search.resultsLookup, index);
+      traceDispatch({
+        type: 'set roving index',
+        node: node,
+        index: index,
+        action_source: 'load',
+      });
+    });
+  }, [
+    setRowAsFocused,
+    traceDispatch,
+    onTraceSearch,
+    viewManager,
+    traceScheduler,
+    scrollQueueRef,
+    props.tree,
+    props.organization,
+  ]);
+
+  // Setup the middleware for the trace reducer
+  useLayoutEffect(() => {
+    const beforeTraceNextStateDispatch: DispatchingReducerMiddleware<
+      typeof TraceReducer
+    >['before next state'] = (prevState, nextState, action) => {
+      // This effect is responsible fo syncing the keyboard interactions with the search results,
+      // we observe the changes to the roving tab index and search results and react by syncing the state.
+      const {node: nextRovingNode, index: nextRovingTabIndex} = nextState.rovingTabIndex;
+      const {resultIndex: nextSearchResultIndex} = nextState.search;
+      if (
+        nextRovingNode &&
+        action.type === 'set roving index' &&
+        action.action_source !== 'click' &&
+        typeof nextRovingTabIndex === 'number' &&
+        prevState.rovingTabIndex.node !== nextRovingNode
+      ) {
+        // When the roving tabIndex updates mark the node as focused and sync search results
+        setRowAsFocused(
+          nextRovingNode,
+          null,
+          nextState.search.resultsLookup,
+          nextRovingTabIndex
+        );
+        if (action.type === 'set roving index' && action.action_source === 'keyboard') {
+          scrollRowIntoView(nextRovingNode, nextRovingTabIndex, undefined);
+        }
+
+        if (nextState.search.resultsLookup.has(nextRovingNode)) {
+          const idx = nextState.search.resultsLookup.get(nextRovingNode)!;
+          traceDispatch({
+            type: 'set search iterator index',
+            resultIndex: nextRovingTabIndex,
+            resultIteratorIndex: idx,
+          });
+        } else if (nextState.search.resultIteratorIndex !== null) {
+          traceDispatch({type: 'clear search iterator index'});
+        }
+      } else if (
+        typeof nextSearchResultIndex === 'number' &&
+        prevState.search.resultIndex !== nextSearchResultIndex &&
+        action.type !== 'set search iterator index'
+      ) {
+        // If the search result index changes, mark the node as focused and scroll it into view
+        const nextNode = props.tree.list[nextSearchResultIndex];
+        setRowAsFocused(
+          nextNode,
+          null,
+          nextState.search.resultsLookup,
+          nextSearchResultIndex
+        );
+        scrollRowIntoView(nextNode, nextSearchResultIndex, 'center if outside');
+      }
+    };
+
+    traceStateEmitter.on('before next state', beforeTraceNextStateDispatch);
+
+    return () => {
+      traceStateEmitter.off('before next state', beforeTraceNextStateDispatch);
+    };
+  }, [
+    props.tree,
+    onTraceSearch,
+    traceStateEmitter,
+    traceDispatch,
+    setRowAsFocused,
+    scrollRowIntoView,
+  ]);
+
+  const [traceGridRef, setTraceGridRef] = useState<HTMLElement | null>(null);
+
+  // Memoized because it requires tree traversal
+  const shape = useMemo(() => props.tree.shape, [props.tree]);
+
+  useTraceTimelineChangeSync({
+    tree: props.tree,
+    traceScheduler,
+  });
+
+  useTraceSpaceListeners({
+    view: traceView,
+    viewManager,
+    traceScheduler,
+  });
+
+  useDividerResizeSync(traceScheduler);
+
+  const onLoadScrollStatus = useTraceOnLoad({
+    onTraceLoad,
+    pathToNodeOrEventId: scrollQueueRef.current,
+    tree: props.tree,
+  });
+
+  // Sync part of the state with the URL
+  const traceQueryStateSync = useMemo(() => {
+    return {search: traceState.search.query};
+  }, [traceState.search.query]);
+  useTraceQueryParamStateSync(traceQueryStateSync);
+
+  const onAutogroupChange = useCallback(() => {
+    const value = !traceState.preferences.autogroup.parent;
+
+    if (!value) {
+      let removeCount = 0;
+      removeCount += TraceTree.RemoveSiblingAutogroupNodes(props.tree.root);
+      removeCount += TraceTree.RemoveDirectChildrenAutogroupNodes(props.tree.root);
+
+      addSuccessMessage(
+        removeCount > 0
+          ? tct('Autogrouping disabled, removed [count] autogroup spans', {
+              count: removeCount,
+            })
+          : t('Autogrouping disabled')
+      );
+    } else {
+      let autogroupCount = 0;
+      autogroupCount += TraceTree.AutogroupSiblingSpanNodes(props.tree.root);
+      autogroupCount += TraceTree.AutogroupDirectChildrenSpanNodes(props.tree.root);
+      addSuccessMessage(
+        autogroupCount > 0
+          ? tct('Autogrouping enabled, detected [count] autogrouping spans', {
+              count: autogroupCount,
+            })
+          : t('Autogrouping enabled')
+      );
+    }
+
+    traceAnalytics.trackAutogroupingPreferenceChange(props.organization, value);
+    props.tree.rebuild();
+    traceDispatch({
+      type: 'set autogrouping',
+      payload: value,
+    });
+  }, [traceDispatch, traceState.preferences.autogroup, props.tree, props.organization]);
+
+  const onMissingInstrumentationChange = useCallback(() => {
+    const value = !traceState.preferences.missing_instrumentation;
+    if (!value) {
+      const removeCount = TraceTree.RemoveMissingInstrumentationNodes(props.tree.root);
+      addSuccessMessage(
+        removeCount > 0
+          ? tct(
+              'Missing instrumentation disabled, removed [count] missing instrumentation spans',
+              {
+                count: removeCount,
+              }
+            )
+          : t('Missing instrumentation disabled')
+      );
+    } else {
+      const missingInstrumentationCount = TraceTree.DetectMissingInstrumentation(
+        props.tree.root
+      );
+      addSuccessMessage(
+        missingInstrumentationCount > 0
+          ? tct(
+              'Missing instrumentation enabled, found [count] missing instrumentation spans',
+              {
+                count: missingInstrumentationCount,
+              }
+            )
+          : t('Missing instrumentation enabled')
+      );
+    }
+
+    traceAnalytics.trackMissingInstrumentationPreferenceChange(props.organization, value);
+    props.tree.rebuild();
+    traceDispatch({
+      type: 'set missing instrumentation',
+      payload: value,
+    });
+  }, [
+    traceDispatch,
+    traceState.preferences.missing_instrumentation,
+    props.tree,
+    props.organization,
+  ]);
+
+  return (
+    <Fragment>
+      <TraceTypeWarnings
+        tree={props.tree}
+        traceSlug={props.traceSlug}
+        organization={organization}
+      />
+      <TraceToolbar>
+        <TraceSearchInput onTraceSearch={onTraceSearch} organization={organization} />
+        <TraceResetZoomButton
+          viewManager={viewManager}
+          organization={props.organization}
+        />
+        <TraceShortcuts />
+        <TracePreferencesDropdown
+          autogroup={
+            traceState.preferences.autogroup.parent &&
+            traceState.preferences.autogroup.sibling
+          }
+          missingInstrumentation={traceState.preferences.missing_instrumentation}
+          onAutogroupChange={onAutogroupChange}
+          onMissingInstrumentationChange={onMissingInstrumentationChange}
+        />
+      </TraceToolbar>
+      <TraceGrid
+        layout={traceState.preferences.layout}
+        ref={setTraceGridRef}
+        hideBottomBorder={hasTraceNewUi}
+      >
+        <Trace
+          trace={props.tree}
+          rerender={rerender}
+          trace_id={props.traceSlug}
+          onRowClick={onRowClick}
+          onTraceSearch={onTraceSearch}
+          previouslyFocusedNodeRef={previouslyFocusedNodeRef}
+          manager={viewManager}
+          scheduler={traceScheduler}
+          forceRerender={forceRender}
+          isLoading={props.tree.type === 'loading' || onLoadScrollStatus === 'pending'}
+        />
+
+        {props.tree.type === 'loading' || onLoadScrollStatus === 'pending' ? (
+          <TraceWaterfallState.Loading />
+        ) : props.tree.type === 'error' ? (
+          <TraceWaterfallState.Error />
+        ) : props.tree.type === 'empty' ? (
+          <TraceWaterfallState.Empty />
+        ) : null}
+
+        <TraceDrawer
+          replay={props.replay}
+          meta={props.meta}
+          traceType={shape}
+          trace={props.tree}
+          traceGridRef={traceGridRef}
+          manager={viewManager}
+          scheduler={traceScheduler}
+          onTabScrollToNode={onTabScrollToNode}
+          onScrollToNode={onScrollToNode}
+          rootEventResults={props.rootEvent}
+          traceEventView={props.traceEventView}
+        />
+      </TraceGrid>
+    </Fragment>
+  );
+}
+
+const TraceToolbar = styled('div')`
+  flex-grow: 0;
+  display: grid;
+  grid-template-columns: 1fr min-content min-content min-content;
+  gap: ${space(1)};
+`;
+
+export const TraceGrid = styled('div')<{
+  layout: 'drawer bottom' | 'drawer left' | 'drawer right';
+  hideBottomBorder?: boolean;
+}>`
+  --info: ${p => p.theme.purple400};
+  --warning: ${p => p.theme.yellow300};
+  --debug: ${p => p.theme.blue300};
+  --error: ${p => p.theme.error};
+  --fatal: ${p => p.theme.error};
+  --default: ${p => p.theme.gray300};
+  --unknown: ${p => p.theme.gray300};
+  --profile: ${p => p.theme.purple300};
+  --autogrouped: ${p => p.theme.blue300};
+  --performance-issue: ${p => p.theme.blue300};
+
+  background-color: ${p => p.theme.background};
+  border: 1px solid ${p => p.theme.border};
+  flex: 1 1 100%;
+  display: grid;
+  overflow: hidden;
+  position: relative;
+  /* false positive for grid layout */
+  /* stylelint-disable */
+  grid-template-areas: ${p =>
+    p.layout === 'drawer bottom'
+      ? `
+      'trace'
+      'drawer'
+      `
+      : p.layout === 'drawer left'
+        ? `'drawer trace'`
+        : `'trace drawer'`};
+  grid-template-columns: ${p =>
+    p.layout === 'drawer bottom'
+      ? '1fr'
+      : p.layout === 'drawer left'
+        ? 'min-content 1fr'
+        : '1fr min-content'};
+  grid-template-rows: 1fr auto;
+
+  ${p =>
+    p.hideBottomBorder
+      ? `border-radius: ${p.theme.borderRadius} ${p.theme.borderRadius} 0 0;`
+      : `border-radius: ${p.theme.borderRadius};`}
+  ${p => (p.hideBottomBorder ? 'border-bottom: none;' : '')}
+`;
diff --git a/static/app/views/performance/newTraceDetails/traceWaterfallState.tsx b/static/app/views/performance/newTraceDetails/traceWaterfallState.tsx
new file mode 100644
index 00000000000000..d4698343ef8f31
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/traceWaterfallState.tsx
@@ -0,0 +1,132 @@
+import {useEffect, useRef} from 'react';
+import styled from '@emotion/styled';
+
+import useFeedbackWidget from 'sentry/components/feedback/widget/useFeedbackWidget';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
+import {t} from 'sentry/locale';
+import {traceAnalytics} from 'sentry/views/performance/newTraceDetails/traceAnalytics';
+
+function TraceLoading() {
+  return (
+    // Dont flash the animation on load because it's annoying
+    <LoadingContainer animate={false}>
+      <NoMarginIndicator size={24}>
+        <div>{t('Assembling the trace')}</div>
+      </NoMarginIndicator>
+    </LoadingContainer>
+  );
+}
+
+function TraceError() {
+  const linkref = useRef<HTMLAnchorElement>(null);
+  const feedback = useFeedbackWidget({buttonRef: linkref});
+
+  useEffect(() => {
+    traceAnalytics.trackFailedToFetchTraceState();
+  }, []);
+
+  return (
+    <LoadingContainer animate error>
+      <div>{t('Ughhhhh, we failed to load your trace...')}</div>
+      <div>
+        {t('Seeing this often? Send us ')}
+        {feedback ? (
+          <a href="#" ref={linkref}>
+            {t('feedback')}
+          </a>
+        ) : (
+          <a href="mailto:support@sentry.io?subject=Trace%20fails%20to%20load">
+            {t('feedback')}
+          </a>
+        )}
+      </div>
+    </LoadingContainer>
+  );
+}
+
+function TraceEmpty() {
+  const linkref = useRef<HTMLAnchorElement>(null);
+  const feedback = useFeedbackWidget({buttonRef: linkref});
+
+  useEffect(() => {
+    traceAnalytics.trackEmptyTraceState();
+  }, []);
+
+  return (
+    <LoadingContainer animate>
+      <div>{t('This trace does not contain any data?!')}</div>
+      <div>
+        {t('Seeing this often? Send us ')}
+        {feedback ? (
+          <a href="#" ref={linkref}>
+            {t('feedback')}
+          </a>
+        ) : (
+          <a href="mailto:support@sentry.io?subject=Trace%20does%20not%20contain%20data">
+            {t('feedback')}
+          </a>
+        )}
+      </div>
+    </LoadingContainer>
+  );
+}
+
+const LoadingContainer = styled('div')<{animate: boolean; error?: boolean}>`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  left: 50%;
+  top: 50%;
+  position: absolute;
+  height: auto;
+  font-size: ${p => p.theme.fontSizeMedium};
+  color: ${p => p.theme.gray300};
+  z-index: 30;
+  padding: 24px;
+  background-color: ${p => p.theme.background};
+  border-radius: ${p => p.theme.borderRadius};
+  border: 1px solid ${p => p.theme.border};
+  transform-origin: 50% 50%;
+  transform: translate(-50%, -50%);
+  animation: ${p =>
+    p.animate
+      ? `${p.error ? 'showLoadingContainerShake' : 'showLoadingContainer'} 300ms cubic-bezier(0.61, 1, 0.88, 1) forwards`
+      : 'none'};
+
+  @keyframes showLoadingContainer {
+    from {
+      opacity: 0.6;
+      transform: scale(0.99) translate(-50%, -50%);
+    }
+    to {
+      opacity: 1;
+      transform: scale(1) translate(-50%, -50%);
+    }
+  }
+
+  @keyframes showLoadingContainerShake {
+    0% {
+      transform: translate(-50%, -50%);
+    }
+    25% {
+      transform: translate(-51%, -50%);
+    }
+    75% {
+      transform: translate(-49%, -50%);
+    }
+    100% {
+      transform: translate(-50%, -50%);
+    }
+  }
+`;
+
+const NoMarginIndicator = styled(LoadingIndicator)`
+  margin: 0;
+`;
+
+export const TraceWaterfallState = {
+  Loading: TraceLoading,
+  Error: TraceError,
+  Empty: TraceEmpty,
+};
diff --git a/static/app/views/performance/newTraceDetails/useDividerResizeSync.tsx b/static/app/views/performance/newTraceDetails/useDividerResizeSync.tsx
new file mode 100644
index 00000000000000..b7142f7bc59964
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/useDividerResizeSync.tsx
@@ -0,0 +1,24 @@
+import {useLayoutEffect} from 'react';
+
+import type {TraceScheduler} from './traceRenderers/traceScheduler';
+import {useTraceStateDispatch} from './traceState/traceStateProvider';
+
+// Observer around the divider resize event. This exists because we dont want to
+// dispatch a trace action for every single divider resize event (mousemove), and
+// instead only want to dispatch it when the resizing is done.
+export function useDividerResizeSync(traceScheduler: TraceScheduler) {
+  const traceDispatch = useTraceStateDispatch();
+
+  useLayoutEffect(() => {
+    function onDividerResizeEnd(list_width: number) {
+      traceDispatch({
+        type: 'set list width',
+        payload: list_width,
+      });
+    }
+    traceScheduler.on('divider resize end', onDividerResizeEnd);
+    return () => {
+      traceScheduler.off('divider resize end', onDividerResizeEnd);
+    };
+  }, [traceScheduler, traceDispatch]);
+}
diff --git a/static/app/views/performance/newTraceDetails/useTraceEventView.tsx b/static/app/views/performance/newTraceDetails/useTraceEventView.tsx
new file mode 100644
index 00000000000000..eaf5c16852a515
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/useTraceEventView.tsx
@@ -0,0 +1,39 @@
+import {useMemo} from 'react';
+
+import {ALL_ACCESS_PROJECTS} from 'sentry/constants/pageFilters';
+import EventView from 'sentry/utils/discover/eventView';
+
+import type {TraceViewQueryParams} from './useTraceQueryParams';
+
+export function useTraceEventView(
+  traceSlug: string,
+  params: TraceViewQueryParams
+): EventView {
+  return useMemo(() => {
+    let startTimeStamp = params.start;
+    let endTimeStamp = params.end;
+
+    // If timestamp exists in the query params, we want to use it to set the start and end time
+    // with a buffer of 1.5 days, for retrieving events belonging to the trace.
+    if (typeof params.timestamp === 'number') {
+      const buffer = 36 * 60 * 60 * 1000; // 1.5 days in milliseconds
+      const dateFromTimestamp = new Date(params.timestamp * 1000);
+
+      startTimeStamp = new Date(dateFromTimestamp.getTime() - buffer).toISOString();
+      endTimeStamp = new Date(dateFromTimestamp.getTime() + buffer).toISOString();
+    }
+
+    return EventView.fromSavedQuery({
+      id: undefined,
+      name: `Events with Trace ID ${traceSlug}`,
+      fields: ['title', 'event.type', 'project', 'timestamp'],
+      orderby: '-timestamp',
+      query: `trace:${traceSlug}`,
+      projects: [ALL_ACCESS_PROJECTS],
+      version: 2,
+      start: startTimeStamp,
+      end: endTimeStamp,
+      range: !(startTimeStamp || endTimeStamp) ? params.statsPeriod : undefined,
+    });
+  }, [params, traceSlug]);
+}
diff --git a/static/app/views/performance/newTraceDetails/useTraceOnLoad.tsx b/static/app/views/performance/newTraceDetails/useTraceOnLoad.tsx
index 06f918bb133a1d..c533a87b1e1108 100644
--- a/static/app/views/performance/newTraceDetails/useTraceOnLoad.tsx
+++ b/static/app/views/performance/newTraceDetails/useTraceOnLoad.tsx
@@ -2,9 +2,11 @@ import {useLayoutEffect, useRef, useState} from 'react';
 import * as Sentry from '@sentry/react';
 
 import type {Client} from 'sentry/api';
+import type {Event} from 'sentry/types/event';
 import type {Organization} from 'sentry/types/organization';
 import useApi from 'sentry/utils/useApi';
 import useOrganization from 'sentry/utils/useOrganization';
+import {IssuesTraceTree} from 'sentry/views/performance/newTraceDetails/traceModels/issuesTraceTree';
 
 import {TraceTree} from './traceModels/traceTree';
 import type {TracePreferencesState} from './traceState/tracePreferences';
@@ -80,9 +82,6 @@ export function useTraceOnLoad(
     }
 
     let cancel = false;
-    function cleanup() {
-      cancel = true;
-    }
 
     setStatus('pending');
     initializedRef.current = true;
@@ -103,18 +102,95 @@ export function useTraceOnLoad(
 
     promise
       .then(() => {
+        if (cancel) {
+          return;
+        }
         setStatus('success');
-
+        onTraceLoad();
+      })
+      .catch(() => {
         if (cancel) {
           return;
         }
+        setStatus('error');
+      });
+
+    return () => {
+      cancel = true;
+    };
+  }, [tree, api, onTraceLoad, organization, pathToNodeOrEventId]);
+
+  return status;
+}
+
+type UseTraceIssuesOnLoadOptions = {
+  event: Event;
+  onTraceLoad: () => void;
+  tree: IssuesTraceTree;
+};
+
+export function useTraceIssuesOnLoad(
+  options: UseTraceIssuesOnLoadOptions
+): 'success' | 'error' | 'pending' | 'idle' {
+  const api = useApi();
+  const organization = useOrganization();
+  const initializedRef = useRef<boolean>(false);
+  const {tree, onTraceLoad} = options;
+
+  const [status, setStatus] = useState<'success' | 'error' | 'pending' | 'idle'>('idle');
+
+  const traceState = useTraceState();
+  const traceStateRef = useRef<TraceReducerState>(traceState);
+  traceStateRef.current = traceState;
+
+  const traceStatePreferencesRef = useRef<
+    Pick<TraceReducerState['preferences'], 'autogroup' | 'missing_instrumentation'>
+  >(traceState.preferences);
+  traceStatePreferencesRef.current = traceState.preferences;
 
+  useLayoutEffect(() => {
+    if (initializedRef.current) {
+      return undefined;
+    }
+
+    if (tree.type !== 'trace') {
+      return undefined;
+    }
+
+    let cancel = false;
+
+    setStatus('pending');
+    initializedRef.current = true;
+
+    const expandOptions = {
+      api,
+      organization,
+      preferences: traceStatePreferencesRef.current,
+    };
+
+    const promise = options.event
+      ? IssuesTraceTree.ExpandToEvent(tree, options.event.eventID, expandOptions)
+      : Promise.resolve();
+
+    promise
+      .then(() => {
+        if (cancel) {
+          return;
+        }
+        setStatus('success');
         onTraceLoad();
       })
-      .catch(() => setStatus('error'));
+      .catch(() => {
+        if (cancel) {
+          return;
+        }
+        setStatus('error');
+      });
 
-    return cleanup;
-  }, [tree, api, onTraceLoad, organization, pathToNodeOrEventId]);
+    return () => {
+      cancel = true;
+    };
+  }, [tree, api, onTraceLoad, organization, options.event]);
 
   return status;
 }
diff --git a/static/app/views/performance/newTraceDetails/useTraceQueryParams.tsx b/static/app/views/performance/newTraceDetails/useTraceQueryParams.tsx
new file mode 100644
index 00000000000000..fa93f2b7611a3c
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/useTraceQueryParams.tsx
@@ -0,0 +1,36 @@
+import {useMemo} from 'react';
+import * as qs from 'query-string';
+
+import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
+import {decodeScalar} from 'sentry/utils/queryString';
+
+export interface TraceViewQueryParams {
+  end: string | undefined;
+  start: string | undefined;
+  statsPeriod: string | undefined;
+  timestamp: number | undefined;
+  useSpans: number;
+}
+
+export function useTraceQueryParams(
+  params?: Partial<TraceViewQueryParams>
+): TraceViewQueryParams {
+  return useMemo(() => {
+    const normalizedParams = normalizeDateTimeParams(qs.parse(location.search), {
+      allowAbsolutePageDatetime: true,
+    });
+    const start = decodeScalar(normalizedParams.start);
+    const timestamp: string | undefined = decodeScalar(normalizedParams.timestamp);
+    const end = decodeScalar(normalizedParams.end);
+    const statsPeriod = decodeScalar(normalizedParams.statsPeriod);
+    const numberTimestamp = timestamp ? Number(timestamp) : undefined;
+
+    return {
+      start: start ?? params?.start,
+      end: end ?? params?.end,
+      statsPeriod: statsPeriod ?? params?.statsPeriod,
+      timestamp: numberTimestamp ?? params?.timestamp,
+      useSpans: 1,
+    };
+  }, [params]);
+}
diff --git a/static/app/views/performance/newTraceDetails/useTraceSpaceListeners.tsx b/static/app/views/performance/newTraceDetails/useTraceSpaceListeners.tsx
new file mode 100644
index 00000000000000..32b6774fa95de7
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/useTraceSpaceListeners.tsx
@@ -0,0 +1,66 @@
+import {useLayoutEffect} from 'react';
+
+import {
+  TraceEventPriority,
+  type TraceEvents,
+  type TraceScheduler,
+} from './traceRenderers/traceScheduler';
+import type {TraceView} from './traceRenderers/traceView';
+import type {VirtualizedViewManager} from './traceRenderers/virtualizedViewManager';
+
+// Wire up the trace view to listen for events that happen in the trace scheduler.
+// This is required because the user interface needs to communicate bidirectionally
+// with the trace scheduler and actions can be dispatched from either side.
+export function useTraceSpaceListeners(props: {
+  traceScheduler: TraceScheduler;
+  view: TraceView;
+  viewManager: VirtualizedViewManager;
+}) {
+  useLayoutEffect(() => {
+    const onTraceViewChange: TraceEvents['set trace view'] = view => {
+      props.view.setTraceView(view);
+      props.viewManager.enqueueFOVQueryParamSync(props.view);
+    };
+
+    const onPhysicalSpaceChange: TraceEvents['set container physical space'] =
+      container => {
+        props.view.setTracePhysicalSpace(container, [
+          0,
+          0,
+          container[2] * props.viewManager.columns.span_list.width,
+          container[3],
+        ]);
+      };
+
+    const onTraceSpaceChange: TraceEvents['initialize trace space'] = view => {
+      props.view.setTraceSpace(view);
+    };
+
+    // These handlers have high priority because they are responsible for
+    // updating the view coordinates. If we update them first, then any components downstream
+    // that rely on the view coordinates will be in sync with the view.
+    props.traceScheduler.on('set trace view', onTraceViewChange, TraceEventPriority.HIGH);
+    props.traceScheduler.on(
+      'set trace space',
+      onTraceSpaceChange,
+      TraceEventPriority.HIGH
+    );
+    props.traceScheduler.on(
+      'set container physical space',
+      onPhysicalSpaceChange,
+      TraceEventPriority.HIGH
+    );
+    props.traceScheduler.on(
+      'initialize trace space',
+      onTraceSpaceChange,
+      TraceEventPriority.HIGH
+    );
+
+    return () => {
+      props.traceScheduler.off('set trace view', onTraceViewChange);
+      props.traceScheduler.off('set trace space', onTraceSpaceChange);
+      props.traceScheduler.off('set container physical space', onPhysicalSpaceChange);
+      props.traceScheduler.off('initialize trace space', onTraceSpaceChange);
+    };
+  }, [props.traceScheduler, props.view, props.viewManager]);
+}
diff --git a/static/app/views/performance/newTraceDetails/useTraceTimelineChangeSync.tsx b/static/app/views/performance/newTraceDetails/useTraceTimelineChangeSync.tsx
new file mode 100644
index 00000000000000..22b038b4078e4d
--- /dev/null
+++ b/static/app/views/performance/newTraceDetails/useTraceTimelineChangeSync.tsx
@@ -0,0 +1,36 @@
+import {useLayoutEffect} from 'react';
+
+import type {TraceTree} from './traceModels/traceTree';
+import type {TraceScheduler} from './traceRenderers/traceScheduler';
+
+// Observer around the tree model that track trace space changes and dispatches
+// them to the trace scheduler. This exists because sometimes, the trace space
+// changes (tree gets new data, or the precision of events in the tree overflows the current trace duration)
+export function useTraceTimelineChangeSync(props: {
+  traceScheduler: TraceScheduler;
+  tree: TraceTree;
+}) {
+  useLayoutEffect(() => {
+    if (props.tree.type !== 'trace') {
+      return undefined;
+    }
+
+    props.traceScheduler.dispatch('initialize trace space', [
+      props.tree.root.space[0],
+      0,
+      props.tree.root.space[1],
+      1,
+    ]);
+
+    // Whenever the timeline changes, update the trace space and trigger a redraw
+    const onTraceTimelineChange = (s: [number, number]) => {
+      props.traceScheduler.dispatch('set trace space', [s[0], 0, s[1], 1]);
+    };
+
+    props.tree.on('trace timeline change', onTraceTimelineChange);
+
+    return () => {
+      props.tree.off('trace timeline change', onTraceTimelineChange);
+    };
+  }, [props.traceScheduler, props.tree]);
+}
diff --git a/static/app/views/performance/table.tsx b/static/app/views/performance/table.tsx
index 131ac5de829090..15fed2e06b431b 100644
--- a/static/app/views/performance/table.tsx
+++ b/static/app/views/performance/table.tsx
@@ -570,6 +570,7 @@ class _Table extends Component<Props, State> {
                           data={tableData ? tableData.data : []}
                           columnOrder={columnOrder}
                           columnSortBy={columnSortBy}
+                          bodyStyle={{overflow: 'visible'}}
                           grid={{
                             onResizeColumn: this.handleResizeColumn,
                             renderHeadCell: this.renderHeadCellWithMeta(
diff --git a/static/app/views/performance/traceDetails/newTraceDetailsTransactionBar.tsx b/static/app/views/performance/traceDetails/newTraceDetailsTransactionBar.tsx
index 4850c8e5c2ed25..8dc9a4e3507053 100644
--- a/static/app/views/performance/traceDetails/newTraceDetailsTransactionBar.tsx
+++ b/static/app/views/performance/traceDetails/newTraceDetailsTransactionBar.tsx
@@ -56,7 +56,6 @@ import {
   getDurationDisplay,
   getHumanDuration,
 } from 'sentry/components/performance/waterfall/utils';
-import {TransactionProfileIdProvider} from 'sentry/components/profiling/transactionProfileIdProvider';
 import {generateIssueEventTarget} from 'sentry/components/quickTrace/utils';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconZoom} from 'sentry/icons/iconZoom';
@@ -495,52 +494,44 @@ function NewTraceDetailsTransactionBar(props: Props) {
                     input={profiles?.type === 'resolved' ? profiles.data : null}
                     traceID={profileId || ''}
                   >
-                    <TransactionProfileIdProvider
-                      projectId={embeddedChildren.projectID}
-                      timestamp={embeddedChildren.dateReceived}
-                      transactionId={embeddedChildren.id}
-                    >
-                      <SpanContext.Provider>
-                        <SpanContext.Consumer>
-                          {spanContextProps => (
-                            <Observer>
-                              {() => (
-                                <NewTraceDetailsSpanTree
-                                  measurements={props.measurements}
-                                  quickTrace={results}
-                                  location={props.location}
-                                  onRowClick={props.onRowClick}
-                                  traceInfo={traceInfo}
-                                  traceViewHeaderRef={traceViewRef}
-                                  traceViewRef={traceViewRef}
-                                  parentContinuingDepths={props.continuingDepths}
-                                  traceHasMultipleRoots={props.continuingDepths.some(
-                                    c => c.depth === 0 && c.isOrphanDepth
-                                  )}
-                                  parentIsOrphan={props.isOrphan}
-                                  parentIsLast={isLast}
-                                  parentGeneration={transaction.generation ?? 0}
-                                  organization={organization}
-                                  waterfallModel={waterfallModel}
-                                  filterSpans={waterfallModel.filterSpans}
-                                  spans={waterfallModel
-                                    .getWaterfall({
-                                      viewStart: 0,
-                                      viewEnd: 1,
-                                    })
-                                    .slice(1)}
-                                  focusedSpanIds={waterfallModel.focusedSpanIds}
-                                  spanContextProps={spanContextProps}
-                                  operationNameFilters={
-                                    waterfallModel.operationNameFilters
-                                  }
-                                />
-                              )}
-                            </Observer>
-                          )}
-                        </SpanContext.Consumer>
-                      </SpanContext.Provider>
-                    </TransactionProfileIdProvider>
+                    <SpanContext.Provider>
+                      <SpanContext.Consumer>
+                        {spanContextProps => (
+                          <Observer>
+                            {() => (
+                              <NewTraceDetailsSpanTree
+                                measurements={props.measurements}
+                                quickTrace={results}
+                                location={props.location}
+                                onRowClick={props.onRowClick}
+                                traceInfo={traceInfo}
+                                traceViewHeaderRef={traceViewRef}
+                                traceViewRef={traceViewRef}
+                                parentContinuingDepths={props.continuingDepths}
+                                traceHasMultipleRoots={props.continuingDepths.some(
+                                  c => c.depth === 0 && c.isOrphanDepth
+                                )}
+                                parentIsOrphan={props.isOrphan}
+                                parentIsLast={isLast}
+                                parentGeneration={transaction.generation ?? 0}
+                                organization={organization}
+                                waterfallModel={waterfallModel}
+                                filterSpans={waterfallModel.filterSpans}
+                                spans={waterfallModel
+                                  .getWaterfall({
+                                    viewStart: 0,
+                                    viewEnd: 1,
+                                  })
+                                  .slice(1)}
+                                focusedSpanIds={waterfallModel.focusedSpanIds}
+                                spanContextProps={spanContextProps}
+                                operationNameFilters={waterfallModel.operationNameFilters}
+                              />
+                            )}
+                          </Observer>
+                        )}
+                      </SpanContext.Consumer>
+                    </SpanContext.Provider>
                   </ProfileGroupProvider>
                 )}
               </ProfileContext.Consumer>
diff --git a/static/app/views/performance/transactionDetails/content.tsx b/static/app/views/performance/transactionDetails/content.tsx
index 367020c7d2a7db..40c56c9d7e038e 100644
--- a/static/app/views/performance/transactionDetails/content.tsx
+++ b/static/app/views/performance/transactionDetails/content.tsx
@@ -18,7 +18,6 @@ import FileSize from 'sentry/components/fileSize';
 import * as Layout from 'sentry/components/layouts/thirds';
 import LoadingError from 'sentry/components/loadingError';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
-import {TransactionProfileIdProvider} from 'sentry/components/profiling/transactionProfileIdProvider';
 import {TransactionToProfileButton} from 'sentry/components/profiling/transactionToProfileButton';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {TagsTable} from 'sentry/components/tagsTable';
@@ -139,13 +138,7 @@ function EventDetailsContent(props: Props) {
             skipLight={false}
           >
             {results => (
-              <TransactionProfileIdProvider
-                projectId={transaction.projectID}
-                transactionId={
-                  transaction.type === 'transaction' ? transaction.id : undefined
-                }
-                timestamp={transaction.dateReceived}
-              >
+              <Fragment>
                 <Layout.Header>
                   <Layout.HeaderContent>
                     <Breadcrumb
@@ -299,7 +292,7 @@ function EventDetailsContent(props: Props) {
                     </Layout.Side>
                   )}
                 </Layout.Body>
-              </TransactionProfileIdProvider>
+              </Fragment>
             )}
           </QuickTraceQuery>
         )}
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx b/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx
index d15ed40f769352..f045e3aad0b43d 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx
@@ -142,6 +142,53 @@ describe('Transaction Summary Content', function () {
       url: '/organizations/org-slug/dynamic-sampling/custom-rules/',
       body: '',
     });
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/profiling/flamegraph/',
+      body: {
+        activeProfileIndex: 0,
+        metadata: {
+          deviceClassification: '',
+          deviceLocale: '',
+          deviceManufacturer: '',
+          deviceModel: '',
+          deviceOSName: '',
+          deviceOSVersion: '',
+          durationNS: 0,
+          organizationID: 0,
+          platform: '',
+          profileID: '',
+          projectID: 0,
+          received: '0001-01-01T00:00:00Z',
+          sampled: false,
+          timestamp: '0001-01-01T00:00:00Z',
+          traceID: '',
+          transactionID: '',
+          transactionName: '',
+          version: '',
+        },
+        platform: '',
+        profiles: [
+          {
+            endValue: 0,
+            isMainThread: true,
+            name: '',
+            samples: [],
+            startValue: 0,
+            threadID: 0,
+            type: 'sampled',
+            unit: 'count',
+            weights: [],
+            sample_durations_ns: null,
+          },
+        ],
+        projectID: 0,
+        shared: {
+          frames: [],
+        },
+        transactionName: '',
+        metrics: [],
+      },
+    });
   });
 
   afterEach(function () {
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/content.tsx b/static/app/views/performance/transactionSummary/transactionOverview/content.tsx
index fc8f5c17932834..ab46fa4342f19e 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/content.tsx
@@ -466,9 +466,9 @@ function SummaryContent({
         />
 
         <SuspectFunctionsTable
-          project={project}
-          transaction={transactionName}
+          eventView={eventView}
           analyticsPageSource="performance_transaction"
+          project={project}
         />
         <RelatedIssues
           organization={organization}
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx
index 1b0fc7f9785a25..1e48c4c8123daf 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx
@@ -4,6 +4,7 @@ import {TeamFixture} from 'sentry-fixture/team';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {
+  findByLabelText,
   render,
   renderGlobalModal,
   screen,
@@ -471,6 +472,55 @@ describe('Performance > TransactionSummary', function () {
       ],
     });
 
+    // Flamegraph mock
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/profiling/flamegraph/',
+      body: {
+        activeProfileIndex: 0,
+        metadata: {
+          deviceClassification: '',
+          deviceLocale: '',
+          deviceManufacturer: '',
+          deviceModel: '',
+          deviceOSName: '',
+          deviceOSVersion: '',
+          durationNS: 0,
+          organizationID: 0,
+          platform: '',
+          profileID: '',
+          projectID: 0,
+          received: '0001-01-01T00:00:00Z',
+          sampled: false,
+          timestamp: '0001-01-01T00:00:00Z',
+          traceID: '',
+          transactionID: '',
+          transactionName: '',
+          version: '',
+        },
+        platform: '',
+        profiles: [
+          {
+            endValue: 0,
+            isMainThread: true,
+            name: '',
+            samples: [],
+            startValue: 0,
+            threadID: 0,
+            type: 'sampled',
+            unit: 'count',
+            weights: [],
+            sample_durations_ns: null,
+          },
+        ],
+        projectID: 0,
+        shared: {
+          frames: [],
+        },
+        transactionName: '',
+        metrics: [],
+      },
+    });
+
     jest.spyOn(MEPSetting, 'get').mockImplementation(() => MEPState.AUTO);
   });
 
@@ -877,10 +927,12 @@ describe('Performance > TransactionSummary', function () {
 
       await screen.findByText('Transaction Summary');
 
-      expect(await screen.findByLabelText('Previous')).toBeInTheDocument();
+      const pagination = await screen.findByTestId('pagination');
+      expect(await findByLabelText(pagination, 'Previous')).toBeInTheDocument();
+      expect(await findByLabelText(pagination, 'Next')).toBeInTheDocument();
 
       // Click the 'next' button
-      await userEvent.click(screen.getByLabelText('Next'));
+      await userEvent.click(await findByLabelText(pagination, 'Next'));
 
       // Check the navigation.
       expect(browserHistory.push).toHaveBeenCalledWith({
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/userStats.tsx b/static/app/views/performance/transactionSummary/transactionOverview/userStats.tsx
index bb77dc21218843..5e92553ecf1d25 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/userStats.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/userStats.tsx
@@ -52,7 +52,6 @@ function UserStats({
   const webVitalsUrl = useModuleURL(ModuleName.VITAL, false, 'frontend');
 
   const hasWebVitalsFlag = organization.features.includes('insights-initial-modules');
-  const hasDomainViewFlag = organization.features.includes('insights-domain-view');
 
   let userMisery = error !== null ? <div>{'\u2014'}</div> : <Placeholder height="34px" />;
 
@@ -84,7 +83,7 @@ function UserStats({
     query: location.query,
   });
 
-  if (hasWebVitalsFlag && hasDomainViewFlag) {
+  if (hasWebVitalsFlag) {
     webVitalsTarget = {
       pathname: `${webVitalsUrl}/overview/`,
       query: {
@@ -93,7 +92,7 @@ function UserStats({
     };
   }
 
-  const showLink = !hasDomainViewFlag || (hasDomainViewFlag && hasWebVitalsFlag);
+  const showLink = hasWebVitalsFlag;
 
   const mepSetting = useMEPSettingContext();
   const mepCardinalityContext = useMetricsCardinalityContext();
diff --git a/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx b/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
index 937216ce8f758a..1e9c061a58b20b 100644
--- a/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
@@ -287,16 +287,11 @@ const ALL_DIGESTS = [
 ] satisfies ProfilingFieldType[];
 
 function ProfileDigest({query}: TransactionProfilesContentProps) {
-  const organization = useOrganization();
-
   const profilesSummary = useProfileEvents<ProfilingFieldType>({
     fields: ALL_DIGESTS,
     query,
     sort: {key: 'last_seen()', order: 'desc'},
     referrer: 'api.profiling.profile-summary-table',
-    continuousProfilingCompat: organization.features.includes(
-      'continuous-profiling-compat'
-    ),
   });
 
   const digestData = profilesSummary.data?.data?.[0];
@@ -419,9 +414,6 @@ function ProfileList({query: userQuery, transaction}: TransactionProfilesContent
     referrer: 'api.profiling.profile-summary-table',
     cursor,
     limit: 10,
-    continuousProfilingCompat: organization.features.includes(
-      'continuous-profiling-compat'
-    ),
   });
 
   const handleSort = useCallback(
@@ -538,11 +530,10 @@ const TransactionProfilesContentContainer = styled('div')`
   /* false positive for grid layout */
   /* stylelint-disable */
   grid-template-areas: 'visualization digest';
-  grid-template-columns: 1fr 250px;
+  grid-template-columns: 1fr min-content;
   flex: 1;
   border: 1px solid ${p => p.theme.border};
   border-radius: ${p => p.theme.borderRadius};
-  overflow: hidden;
 `;
 
 const ProfileVisualizationContainer = styled('div')`
@@ -554,7 +545,6 @@ const ProfileVisualizationContainer = styled('div')`
 `;
 
 const FlamegraphContainer = styled('div')`
-  overflow: hidden;
   display: flex;
 `;
 
diff --git a/static/app/views/performance/transactionSummary/transactionProfiles/index.tsx b/static/app/views/performance/transactionSummary/transactionProfiles/index.tsx
index c98ddcfb8b8a87..014b917c354a1a 100644
--- a/static/app/views/performance/transactionSummary/transactionProfiles/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionProfiles/index.tsx
@@ -7,7 +7,6 @@ import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
 import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
 import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {TransactionSearchQueryBuilder} from 'sentry/components/performance/transactionSearchQueryBuilder';
-import {ProfileEventsTable} from 'sentry/components/profiling/profileEventsTable';
 import type {SmartSearchBarProps} from 'sentry/components/smartSearchBar';
 import {MAX_QUERY_LENGTH} from 'sentry/constants';
 import {t} from 'sentry/locale';
@@ -16,12 +15,6 @@ import type {Organization} from 'sentry/types/organization';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import EventView from 'sentry/utils/discover/eventView';
 import {isAggregateField} from 'sentry/utils/discover/fields';
-import type {ProfilingFieldType} from 'sentry/utils/profiling/hooks/useProfileEvents';
-import {
-  getProfilesTableFields,
-  useProfileEvents,
-} from 'sentry/utils/profiling/hooks/useProfileEvents';
-import {formatSort} from 'sentry/utils/profiling/hooks/utils';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
@@ -38,120 +31,6 @@ interface ProfilesProps {
   transaction: string;
 }
 
-function ProfilesLegacy({organization, transaction}: ProfilesProps) {
-  const location = useLocation();
-  const {projects} = useProjects();
-
-  const profilesCursor = useMemo(
-    () => decodeScalar(location.query.cursor),
-    [location.query.cursor]
-  );
-
-  const project = projects.find(p => p.id === location.query.project);
-  const fields = getProfilesTableFields(project?.platform);
-  const sortableFields = useMemo(() => new Set(fields), [fields]);
-
-  const sort = formatSort<ProfilingFieldType>(decodeScalar(location.query.sort), fields, {
-    key: 'timestamp',
-    order: 'desc',
-  });
-
-  const rawQuery = useMemo(
-    () => decodeScalar(location.query.query, ''),
-    [location.query.query]
-  );
-
-  const query = useMemo(() => {
-    const conditions = new MutableSearch(rawQuery);
-    conditions.setFilterValues('event.type', ['transaction']);
-    conditions.setFilterValues('transaction', [transaction]);
-
-    Object.keys(conditions.filters).forEach(field => {
-      if (isAggregateField(field)) {
-        conditions.removeFilter(field);
-      }
-    });
-
-    return conditions.formatString();
-  }, [transaction, rawQuery]);
-
-  const profiles = useProfileEvents<ProfilingFieldType>({
-    cursor: profilesCursor,
-    fields,
-    query,
-    sort,
-    limit: 30,
-    referrer: 'api.profiling.transactions-profiles-table',
-  });
-
-  const handleSearch: SmartSearchBarProps['onSearch'] = useCallback(
-    (searchQuery: string) => {
-      browserHistory.push({
-        ...location,
-        query: {
-          ...location.query,
-          cursor: undefined,
-          query: searchQuery || undefined,
-        },
-      });
-    },
-    [location]
-  );
-
-  const projectIds = useMemo(
-    () => (project ? [parseInt(project?.id, 10)] : undefined),
-    [project]
-  );
-
-  return (
-    <PageLayout
-      location={location}
-      organization={organization}
-      projects={projects}
-      tab={Tab.PROFILING}
-      generateEventView={() => EventView.fromLocation(location)}
-      getDocumentTitle={() => t(`Profile: %s`, transaction)}
-      childComponent={() => {
-        return (
-          <Layout.Main fullWidth>
-            <FilterActions>
-              <PageFilterBar condensed>
-                <EnvironmentPageFilter />
-                <DatePageFilter />
-              </PageFilterBar>
-              {organization.features.includes('search-query-builder-performance') ? (
-                <TransactionSearchQueryBuilder
-                  projects={projectIds}
-                  initialQuery={rawQuery}
-                  onSearch={handleSearch}
-                  searchSource="transaction_profiles"
-                />
-              ) : (
-                <SearchBar
-                  searchSource="transaction_profiles"
-                  organization={organization}
-                  projectIds={projects.map(p => parseInt(p.id, 10))}
-                  query={rawQuery}
-                  onSearch={handleSearch}
-                  maxQueryLength={MAX_QUERY_LENGTH}
-                />
-              )}
-            </FilterActions>
-            <ProfileEventsTable
-              columns={fields}
-              data={profiles.status === 'success' ? profiles.data : null}
-              error={profiles.status === 'error' ? t('Unable to load profiles') : null}
-              isLoading={profiles.status === 'pending'}
-              sort={sort}
-              sortableColumns={sortableFields}
-            />
-          </Layout.Main>
-        );
-      }}
-    />
-  );
-}
-
 function Profiles({organization, transaction}: ProfilesProps) {
   const location = useLocation();
   const {projects} = useProjects();
@@ -262,11 +141,7 @@ function ProfilesIndex() {
     return null;
   }
 
-  if (organization.features.includes('continuous-profiling-compat')) {
-    return <Profiles organization={organization} transaction={transaction} />;
-  }
-
-  return <ProfilesLegacy organization={organization} transaction={transaction} />;
+  return <Profiles organization={organization} transaction={transaction} />;
 }
 
 export default ProfilesIndex;
diff --git a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/utils.tsx b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/utils.tsx
index 90c52b96b534ae..80d20e909f4f52 100644
--- a/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/utils.tsx
+++ b/static/app/views/performance/transactionSummary/transactionSpans/spanDetails/utils.tsx
@@ -53,28 +53,28 @@ export function spanDetailsRouteWithQuery({
 }
 
 export function generateQuerySummaryRoute({
-  orgSlug,
+  base,
   group,
 }: {
+  base: string;
   group: string;
-  orgSlug: string;
 }): string {
-  return `/organizations/${orgSlug}/insights/database/spans/span/${group}/`;
+  return `${base}/spans/span/${group}/`;
 }
 
 export function querySummaryRouteWithQuery({
-  orgSlug,
+  base,
   query,
   group,
   projectID,
 }: {
+  base: string;
   group: string;
-  orgSlug: string;
   query: Query;
   projectID?: string | string[];
 }) {
   const pathname = generateQuerySummaryRoute({
-    orgSlug,
+    base,
     group,
   });
 
diff --git a/static/app/views/performance/trends/changeExplorer.spec.tsx b/static/app/views/performance/trends/changeExplorer.spec.tsx
deleted file mode 100644
index 43b29a1a4ac8d5..00000000000000
--- a/static/app/views/performance/trends/changeExplorer.spec.tsx
+++ /dev/null
@@ -1,682 +0,0 @@
-import {Fragment} from 'react';
-import moment from 'moment-timezone';
-
-import {initializeData} from 'sentry-test/performance/initializePerformanceData';
-import {act, render, screen, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import ProjectsStore from 'sentry/stores/projectsStore';
-import type {SuspectSpans} from 'sentry/utils/performance/suspectSpans/types';
-import type {EventsResultsDataRow} from 'sentry/utils/profiling/hooks/types';
-import {PerformanceChangeExplorer} from 'sentry/views/performance/trends/changeExplorer';
-import type {FunctionsField} from 'sentry/views/performance/trends/changeExplorerUtils/functionsList';
-import {FunctionsList} from 'sentry/views/performance/trends/changeExplorerUtils/functionsList';
-import {
-  COLUMNS,
-  MetricsTable,
-  renderBodyCell,
-} from 'sentry/views/performance/trends/changeExplorerUtils/metricsTable';
-import {SpansList} from 'sentry/views/performance/trends/changeExplorerUtils/spansList';
-import type {NormalizedTrendsTransaction} from 'sentry/views/performance/trends/types';
-import {TrendChangeType, TrendFunctionField} from 'sentry/views/performance/trends/types';
-import {TRENDS_PARAMETERS} from 'sentry/views/performance/trends/utils';
-
-async function waitForMockCall(mock: jest.Mock) {
-  await waitFor(() => {
-    expect(mock).toHaveBeenCalled();
-  });
-}
-
-const transaction: NormalizedTrendsTransaction = {
-  aggregate_range_1: 78.2757131147541,
-  aggregate_range_2: 110.50465131578949,
-  breakpoint: 1687262400,
-  project: 'sentry',
-  transaction: 'sentry.tasks.store.save_event',
-  trend_difference: 32.22893820103539,
-  trend_percentage: 1.411736117354651,
-  count: 3459,
-  received_at: moment(1601251200000),
-};
-
-const spanResults: SuspectSpans = [
-  {
-    op: 'db',
-    group: '1',
-    description: 'span1',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-  {
-    op: 'db',
-    group: '2',
-    description: 'span2',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-  {
-    op: 'db',
-    group: '3',
-    description: 'span3',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-  {
-    op: 'db',
-    group: '4',
-    description: 'span4',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-  {
-    op: 'db',
-    group: '5',
-    description: 'span5',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-  {
-    op: 'db',
-    group: '6',
-    description: 'span6',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-  {
-    op: 'db',
-    group: '7',
-    description: 'span7',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-  {
-    op: 'db',
-    group: '8',
-    description: 'span8',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-  {
-    op: 'db',
-    group: '9',
-    description: 'span9',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-  {
-    op: 'db',
-    group: '10',
-    description: 'span10',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-  {
-    op: 'db',
-    group: '11',
-    description: 'span11',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-  },
-];
-
-const functionResults: EventsResultsDataRow<FunctionsField>[] = [
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f1',
-    'p75()': 4239847,
-    package: 'p1',
-    'sum()': 2304823908,
-  },
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f2',
-    'p75()': 4239847,
-    package: 'p2',
-    'sum()': 2304823908,
-  },
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f3',
-    'p75()': 4239847,
-    package: 'p3',
-    'sum()': 2304823908,
-  },
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f4',
-    'p75()': 4239847,
-    package: 'p4',
-    'sum()': 2304823908,
-  },
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f5',
-    'p75()': 4239847,
-    package: 'p5',
-    'sum()': 2304823908,
-  },
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f5',
-    'p75()': 4239847,
-    package: 'p5',
-    'sum()': 2304823908,
-  },
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f7',
-    'p75()': 4239847,
-    package: 'p7',
-    'sum()': 2304823908,
-  },
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f8',
-    'p75()': 4239847,
-    package: 'p8',
-    'sum()': 2304823908,
-  },
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f9',
-    'p75()': 4239847,
-    package: 'p9',
-    'sum()': 2304823908,
-  },
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f10',
-    'p75()': 4239847,
-    package: 'p10',
-    'sum()': 2304823908,
-  },
-  {
-    'count()': 234,
-    'examples()': ['serw8r9s', 'aeo4i2u38'],
-    function: 'f11',
-    'p75()': 4239847,
-    package: 'p11',
-    'sum()': 2304823908,
-  },
-];
-
-describe('Performance > Trends > Performance Change Explorer', function () {
-  let eventsMockBefore: jest.Mock;
-  let spansMock: jest.Mock;
-  beforeEach(function () {
-    eventsMockBefore = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
-      body: {
-        data: [
-          {
-            'p95()': 1010.9232499999998,
-            'p50()': 47.34580982348902,
-            'tps()': 3.7226926286168966,
-            'count()': 345,
-            'failure_rate()': 0.23498234,
-            'examples()': ['dkwj4w8sdjk', 'asdi389a8'],
-          },
-        ],
-        meta: {
-          fields: {
-            'p95()': 'duration',
-            '950()': 'duration',
-            'tps()': 'number',
-            'count()': 'number',
-            'failure_rate()': 'number',
-            'examples()': 'Array',
-          },
-          units: {
-            'p95()': 'millisecond',
-            'p50()': 'millisecond',
-            'tps()': null,
-            'count()': null,
-            'failure_rate()': null,
-            'examples()': null,
-          },
-          isMetricsData: true,
-          tips: {},
-          dataset: 'metrics',
-        },
-      },
-    });
-
-    spansMock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events-spans-performance/',
-      body: [],
-    });
-  });
-
-  afterEach(function () {
-    MockApiClient.clearMockResponses();
-    act(() => ProjectsStore.reset());
-  });
-
-  it('renders basic UI elements', async function () {
-    const data = initializeData();
-    const statsData = {
-      ['/organizations/:orgId/performance/']: {
-        data: [],
-        order: 0,
-      },
-    };
-
-    render(
-      <PerformanceChangeExplorer
-        collapsed={false}
-        transaction={transaction}
-        onClose={() => {}}
-        trendChangeType={TrendChangeType.REGRESSION}
-        trendFunction={TrendFunctionField.P50}
-        trendParameter={TRENDS_PARAMETERS[0]}
-        trendView={data.eventView}
-        statsData={statsData}
-        isLoading={false}
-        organization={data.organization}
-        projects={data.projects}
-        location={data.location}
-      />,
-      {
-        router: data.router,
-        organization: data.organization,
-      }
-    );
-
-    await waitForMockCall(eventsMockBefore);
-    await waitForMockCall(spansMock);
-
-    await waitFor(() => {
-      expect(screen.getByTestId('pce-header')).toBeInTheDocument();
-      expect(screen.getByTestId('pce-graph')).toBeInTheDocument();
-      expect(screen.getByTestId('grid-editable')).toBeInTheDocument();
-      expect(screen.getAllByTestId('pce-metrics-chart-row-metric')).toHaveLength(4);
-      expect(screen.getAllByTestId('pce-metrics-chart-row-before')).toHaveLength(4);
-      expect(screen.getAllByTestId('pce-metrics-chart-row-after')).toHaveLength(4);
-      expect(screen.getAllByTestId('pce-metrics-chart-row-change')).toHaveLength(4);
-      expect(screen.getByTestId('list-item')).toBeInTheDocument();
-    });
-  });
-
-  it('shows correct change notation for no change', async () => {
-    const data = initializeData();
-
-    render(
-      <MetricsTable
-        isLoading={false}
-        location={data.location}
-        trendFunction={TrendFunctionField.P50}
-        transaction={transaction}
-        trendView={data.eventView}
-        organization={data.organization}
-      />
-    );
-
-    await waitForMockCall(eventsMockBefore);
-
-    await waitFor(() => {
-      expect(screen.getAllByText('3.7 ps')).toHaveLength(2);
-      expect(screen.getAllByTestId('pce-metrics-text-change')[0]).toHaveTextContent('-');
-    });
-  });
-
-  it('shows correct change notation for positive change', async () => {
-    const data = initializeData();
-
-    render(
-      <MetricsTable
-        isLoading={false}
-        location={data.location}
-        trendFunction={TrendFunctionField.P50}
-        transaction={transaction}
-        trendView={data.eventView}
-        organization={data.organization}
-      />
-    );
-
-    await waitForMockCall(eventsMockBefore);
-
-    await waitFor(() => {
-      expect(screen.getAllByTestId('pce-metrics-text-before')[1]).toHaveTextContent(
-        '78.3 ms'
-      );
-      expect(screen.getAllByTestId('pce-metrics-text-after')[1]).toHaveTextContent(
-        '110.5 ms'
-      );
-      expect(screen.getAllByTestId('pce-metrics-text-change')[1]).toHaveTextContent(
-        '+41.2%'
-      );
-    });
-  });
-
-  it('shows correct change notation for negative change', async () => {
-    const data = initializeData();
-    const negativeTransaction = {
-      ...transaction,
-      aggregate_range_1: 110.50465131578949,
-      aggregate_range_2: 78.2757131147541,
-      trend_percentage: 0.588263882645349,
-    };
-
-    render(
-      <MetricsTable
-        isLoading={false}
-        location={data.location}
-        trendFunction={TrendFunctionField.P50}
-        transaction={negativeTransaction}
-        trendView={data.eventView}
-        organization={data.organization}
-      />
-    );
-
-    await waitForMockCall(eventsMockBefore);
-
-    await waitFor(() => {
-      expect(screen.getAllByTestId('pce-metrics-text-after')[1]).toHaveTextContent(
-        '78.3 ms'
-      );
-      expect(screen.getAllByTestId('pce-metrics-text-before')[1]).toHaveTextContent(
-        '110.5 ms'
-      );
-      expect(screen.getAllByTestId('pce-metrics-text-change')[1]).toHaveTextContent(
-        '-41.2%'
-      );
-    });
-  });
-
-  it('shows correct change notation for no results', async () => {
-    const data = initializeData();
-
-    const nullEventsMock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
-      body: {
-        data: [
-          {
-            'p95()': 1010.9232499999998,
-            'p50()': 47.34580982348902,
-            'count()': 345,
-          },
-        ],
-        meta: {
-          fields: {
-            'p95()': 'duration',
-            '950()': 'duration',
-            'count()': 'number',
-          },
-          units: {
-            'p95()': 'millisecond',
-            'p50()': 'millisecond',
-            'count()': null,
-          },
-          isMetricsData: true,
-          tips: {},
-          dataset: 'metrics',
-        },
-      },
-    });
-
-    render(
-      <MetricsTable
-        isLoading={false}
-        location={data.location}
-        trendFunction={TrendFunctionField.P50}
-        transaction={transaction}
-        trendView={data.eventView}
-        organization={data.organization}
-      />
-    );
-
-    await waitForMockCall(nullEventsMock);
-
-    await waitFor(() => {
-      expect(screen.getAllByTestId('pce-metrics-text-after')[0]).toHaveTextContent('-');
-      expect(screen.getAllByTestId('pce-metrics-text-before')[0]).toHaveTextContent('-');
-      expect(screen.getAllByTestId('pce-metrics-text-change')[0]).toHaveTextContent('-');
-    });
-  });
-
-  it('returns correct null formatting for change column', () => {
-    render(
-      <Fragment>
-        {renderBodyCell(COLUMNS.change, {
-          metric: null,
-          before: null,
-          after: null,
-          change: '0%',
-        })}
-        {renderBodyCell(COLUMNS.change, {
-          metric: null,
-          before: null,
-          after: null,
-          change: '+NaN%',
-        })}
-        {renderBodyCell(COLUMNS.change, {
-          metric: null,
-          before: null,
-          after: null,
-          change: '-',
-        })}
-      </Fragment>
-    );
-
-    expect(screen.getAllByTestId('pce-metrics-text-change')[0]).toHaveTextContent('-');
-    expect(screen.getAllByTestId('pce-metrics-text-change')[1]).toHaveTextContent('-');
-    expect(screen.getAllByTestId('pce-metrics-text-change')[2]).toHaveTextContent('-');
-  });
-
-  it('returns correct positive formatting for change column', () => {
-    render(
-      renderBodyCell(COLUMNS.change, {
-        metric: null,
-        before: null,
-        after: null,
-        change: '40.3%',
-      })
-    );
-
-    expect(screen.getByText('+40.3%')).toBeInTheDocument();
-  });
-
-  it('renders spans list with no results', async () => {
-    const data = initializeData();
-    const emptyEventsMock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
-      body: {},
-    });
-
-    render(
-      <div>
-        <SpansList
-          location={data.location}
-          organization={data.organization}
-          trendView={data.eventView}
-          breakpoint={transaction.breakpoint!}
-          transaction={transaction}
-          trendChangeType={TrendChangeType.REGRESSION}
-        />
-        <FunctionsList
-          location={data.location}
-          organization={data.organization}
-          trendView={data.eventView}
-          breakpoint={transaction.breakpoint!}
-          transaction={transaction}
-          trendChangeType={TrendChangeType.REGRESSION}
-        />
-      </div>
-    );
-
-    await waitForMockCall(spansMock);
-    await waitForMockCall(emptyEventsMock);
-
-    await waitFor(() => {
-      expect(screen.getAllByTestId('empty-state')).toHaveLength(2);
-      expect(screen.getByTestId('spans-no-results')).toBeInTheDocument();
-      expect(screen.getByTestId('functions-no-results')).toBeInTheDocument();
-    });
-  });
-
-  it('renders spans list with error message', async () => {
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events-spans-performance/',
-      statusCode: 504,
-    });
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
-      statusCode: 504,
-    });
-    const data = initializeData();
-
-    render(
-      <div>
-        <SpansList
-          location={data.location}
-          organization={data.organization}
-          trendView={data.eventView}
-          breakpoint={transaction.breakpoint!}
-          transaction={transaction}
-          trendChangeType={TrendChangeType.REGRESSION}
-        />
-        <FunctionsList
-          location={data.location}
-          organization={data.organization}
-          trendView={data.eventView}
-          breakpoint={transaction.breakpoint!}
-          transaction={transaction}
-          trendChangeType={TrendChangeType.REGRESSION}
-        />
-      </div>
-    );
-
-    await waitFor(() => {
-      expect(screen.getByTestId('error-indicator-spans')).toBeInTheDocument();
-      expect(screen.getByTestId('error-indicator-functions')).toBeInTheDocument();
-    });
-  });
-
-  it('renders spans list with no changes message', async () => {
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events-spans-performance/',
-      body: spanResults,
-    });
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
-      body: {
-        data: functionResults,
-        meta: {},
-      },
-    });
-    const data = initializeData();
-
-    render(
-      <div>
-        <SpansList
-          location={data.location}
-          organization={data.organization}
-          trendView={data.eventView}
-          breakpoint={transaction.breakpoint!}
-          transaction={transaction}
-          trendChangeType={TrendChangeType.REGRESSION}
-        />
-        <FunctionsList
-          location={data.location}
-          organization={data.organization}
-          trendView={data.eventView}
-          breakpoint={transaction.breakpoint!}
-          transaction={transaction}
-          trendChangeType={TrendChangeType.REGRESSION}
-        />
-      </div>
-    );
-
-    await waitFor(() => {
-      expect(screen.getAllByTestId('empty-state')).toHaveLength(2);
-      expect(screen.getByTestId('spans-no-changes')).toBeInTheDocument();
-      expect(screen.getByTestId('functions-no-changes')).toBeInTheDocument();
-    });
-  });
-});
diff --git a/static/app/views/performance/trends/changeExplorer.tsx b/static/app/views/performance/trends/changeExplorer.tsx
deleted file mode 100644
index 1921fac42762cf..00000000000000
--- a/static/app/views/performance/trends/changeExplorer.tsx
+++ /dev/null
@@ -1,353 +0,0 @@
-import {Fragment} from 'react';
-import styled from '@emotion/styled';
-import type {Location} from 'history';
-import moment from 'moment-timezone';
-
-import {LinkButton} from 'sentry/components/button';
-import {getArbitraryRelativePeriod} from 'sentry/components/timeRangeSelector/utils';
-import {DEFAULT_RELATIVE_PERIODS} from 'sentry/constants';
-import {IconFire, IconOpen} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {Organization} from 'sentry/types/organization';
-import type {Project} from 'sentry/types/project';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import theme from 'sentry/utils/theme';
-import normalizeUrl from 'sentry/utils/url/normalizeUrl';
-import DetailPanel from 'sentry/views/insights/common/components/detailPanel';
-import {
-  DisplayModes,
-  transactionSummaryRouteWithQuery,
-} from 'sentry/views/performance/transactionSummary/utils';
-import {FunctionsList} from 'sentry/views/performance/trends/changeExplorerUtils/functionsList';
-import {MetricsTable} from 'sentry/views/performance/trends/changeExplorerUtils/metricsTable';
-import {SpansList} from 'sentry/views/performance/trends/changeExplorerUtils/spansList';
-import {Chart} from 'sentry/views/performance/trends/chart';
-import type {
-  NormalizedTrendsTransaction,
-  TrendParameter,
-  TrendsStats,
-  TrendView,
-} from 'sentry/views/performance/trends/types';
-import {TrendChangeType} from 'sentry/views/performance/trends/types';
-import {getTrendProjectId} from 'sentry/views/performance/trends/utils';
-
-type PerformanceChangeExplorerProps = {
-  collapsed: boolean;
-  isLoading: boolean;
-  location: Location;
-  onClose: () => void;
-  organization: Organization;
-  projects: Project[];
-  statsData: TrendsStats;
-  transaction: NormalizedTrendsTransaction;
-  trendChangeType: TrendChangeType;
-  trendFunction: string;
-  trendParameter: TrendParameter;
-  trendView: TrendView;
-};
-
-type ExplorerBodyProps = {
-  isLoading: boolean;
-  location: Location;
-  organization: Organization;
-  projects: Project[];
-  statsData: TrendsStats;
-  transaction: NormalizedTrendsTransaction;
-  trendChangeType: TrendChangeType;
-  trendFunction: string;
-  trendParameter: TrendParameter;
-  trendView: TrendView;
-};
-
-type HeaderProps = {
-  organization: Organization;
-  projects: Project[];
-  transaction: NormalizedTrendsTransaction;
-  trendChangeType: TrendChangeType;
-  trendFunction: string;
-  trendParameter: TrendParameter;
-  trendView: TrendView;
-};
-
-export function PerformanceChangeExplorer({
-  collapsed,
-  transaction,
-  onClose,
-  trendChangeType,
-  trendFunction,
-  trendView,
-  statsData,
-  isLoading,
-  organization,
-  projects,
-  trendParameter,
-  location,
-}: PerformanceChangeExplorerProps) {
-  return (
-    <DetailPanel detailKey={!collapsed ? transaction.transaction : ''} onClose={onClose}>
-      {!collapsed && (
-        <PanelBodyWrapper>
-          <ExplorerBody
-            transaction={transaction}
-            trendChangeType={trendChangeType}
-            trendFunction={trendFunction}
-            trendView={trendView}
-            statsData={statsData}
-            isLoading={isLoading}
-            organization={organization}
-            projects={projects}
-            trendParameter={trendParameter}
-            location={location}
-          />
-        </PanelBodyWrapper>
-      )}
-    </DetailPanel>
-  );
-}
-
-function ExplorerBody(props: ExplorerBodyProps) {
-  const {
-    transaction,
-    trendChangeType,
-    trendFunction,
-    trendView,
-    trendParameter,
-    isLoading,
-    location,
-    organization,
-    projects,
-  } = props;
-  const breakpointDate = transaction.breakpoint
-    ? moment(transaction.breakpoint * 1000).format('ddd, DD MMM YYYY HH:mm:ss z')
-    : '';
-
-  const start = moment(trendView.start).format('DD MMM YYYY HH:mm:ss z');
-  const end = moment(trendView.end).format('DD MMM YYYY HH:mm:ss z');
-  return (
-    <Fragment>
-      <Header
-        transaction={transaction}
-        trendChangeType={trendChangeType}
-        trendView={trendView}
-        projects={projects}
-        organization={organization}
-        trendFunction={trendFunction}
-        trendParameter={trendParameter}
-      />
-      <div style={{display: 'flex', gap: space(4)}}>
-        <InfoItem
-          label={
-            trendChangeType === TrendChangeType.REGRESSION
-              ? t('Regression Metric')
-              : t('Improvement Metric')
-          }
-          value={trendFunction}
-        />
-        <InfoItem label={t('Start Time')} value={breakpointDate} />
-      </div>
-      <GraphPanel data-test-id="pce-graph">
-        <strong>{`${trendParameter.label} (${trendFunction})`}</strong>
-        <ExplorerText color={theme.gray300} margin={`-${space(3)}`}>
-          {trendView.statsPeriod
-            ? DEFAULT_RELATIVE_PERIODS[trendView.statsPeriod] ||
-              getArbitraryRelativePeriod(trendView.statsPeriod)[trendView.statsPeriod]
-            : `${start} - ${end}`}
-        </ExplorerText>
-        <Chart
-          query={trendView.query}
-          project={trendView.project}
-          environment={trendView.environment}
-          start={trendView.start}
-          end={trendView.end}
-          statsPeriod={trendView.statsPeriod}
-          disableXAxis
-          disableLegend
-          neutralColor
-          {...props}
-        />
-      </GraphPanel>
-      <MetricsTable
-        isLoading={isLoading}
-        location={location}
-        transaction={transaction}
-        trendFunction={trendFunction}
-        trendView={trendView}
-        organization={organization}
-      />
-      <SpansList
-        location={location}
-        organization={organization}
-        trendView={trendView}
-        transaction={transaction}
-        breakpoint={transaction.breakpoint!}
-        trendChangeType={trendChangeType}
-      />
-      <FunctionsList
-        location={location}
-        organization={organization}
-        trendView={trendView}
-        transaction={transaction}
-        breakpoint={transaction.breakpoint!}
-        trendChangeType={trendChangeType}
-      />
-    </Fragment>
-  );
-}
-
-function InfoItem({label, value}: {label: string; value: string}) {
-  return (
-    <div>
-      <InfoLabel>{label}</InfoLabel>
-      <InfoText>{value}</InfoText>
-    </div>
-  );
-}
-
-function Header(props: HeaderProps) {
-  const {
-    transaction,
-    trendChangeType,
-    trendView,
-    projects,
-    organization,
-    trendFunction,
-    trendParameter,
-  } = props;
-
-  const regression = trendChangeType === TrendChangeType.REGRESSION;
-  const transactionSummaryLink = getTransactionSummaryLink(
-    trendView,
-    transaction,
-    projects,
-    organization,
-    trendFunction,
-    trendParameter
-  );
-
-  const handleClickAnalytics = () => {
-    trackAnalytics('performance_views.performance_change_explorer.summary_link_clicked', {
-      organization,
-      transaction: transaction.transaction,
-    });
-  };
-
-  return (
-    <HeaderWrapper data-test-id="pce-header">
-      <FireIcon regression={regression}>
-        <IconFire color="white" />
-      </FireIcon>
-      <HeaderTextWrapper>
-        <ChangeType regression={regression}>
-          {regression ? t('Ongoing Regression') : t('Ongoing Improvement')}
-        </ChangeType>
-        <TransactionNameWrapper>
-          <TransactionName>{transaction.transaction}</TransactionName>
-          <ViewTransactionButton
-            borderless
-            to={normalizeUrl(transactionSummaryLink)}
-            icon={<IconOpen />}
-            aria-label={t('View transaction summary')}
-            onClick={handleClickAnalytics}
-          />
-        </TransactionNameWrapper>
-      </HeaderTextWrapper>
-    </HeaderWrapper>
-  );
-}
-
-function getTransactionSummaryLink(
-  eventView: TrendView,
-  transaction: NormalizedTrendsTransaction,
-  projects: Project[],
-  organization: Organization,
-  currentTrendFunction: string,
-  trendParameter: TrendParameter
-) {
-  const summaryView = eventView.clone();
-  const projectID = getTrendProjectId(transaction, projects);
-  const target = transactionSummaryRouteWithQuery({
-    orgSlug: organization.slug,
-    transaction: String(transaction.transaction),
-    query: summaryView.generateQueryStringObject(),
-    projectID,
-    display: DisplayModes.TREND,
-    trendFunction: currentTrendFunction,
-    additionalQuery: {
-      trendParameter: trendParameter.column,
-    },
-  });
-  return target;
-}
-
-const PanelBodyWrapper = styled('div')`
-  padding: 0 ${space(2)};
-  margin-top: ${space(1)};
-`;
-
-const HeaderWrapper = styled('div')`
-  display: flex;
-  flex-wrap: nowrap;
-  margin-bottom: ${space(3)};
-`;
-const HeaderTextWrapper = styled('div')`
-  ${p => p.theme.overflowEllipsis};
-`;
-type ChangeTypeProps = {regression: boolean};
-
-const ChangeType = styled('p')<ChangeTypeProps>`
-  color: ${p => (p.regression ? p.theme.danger : p.theme.success)};
-  margin-bottom: 0;
-`;
-
-const FireIcon = styled('div')<ChangeTypeProps>`
-  padding: ${space(1.5)};
-  background-color: ${p => (p.regression ? p.theme.danger : p.theme.success)};
-  border-radius: ${space(0.5)};
-  margin-right: ${space(2)};
-  float: left;
-  height: 40px;
-`;
-
-const TransactionName = styled('h4')`
-  margin-right: ${space(1)};
-  margin-bottom: 0;
-  ${p => p.theme.overflowEllipsis};
-`;
-
-const TransactionNameWrapper = styled('div')`
-  display: flex;
-  align-items: center;
-  margin-bottom: ${space(3)};
-  max-width: fit-content;
-`;
-
-const ViewTransactionButton = styled(LinkButton)`
-  padding: 0;
-  height: min-content;
-  min-height: 0px;
-`;
-
-const InfoLabel = styled('strong')`
-  color: ${p => p.theme.gray300};
-`;
-const InfoText = styled('h3')`
-  font-weight: ${p => p.theme.fontWeightNormal};
-`;
-const GraphPanel = styled('div')`
-  border: 1px solid ${p => p.theme.border};
-  border-radius: ${p => p.theme.panelBorderRadius};
-  margin-bottom: ${space(2)};
-  padding: ${space(3)};
-  display: block;
-`;
-
-export const ExplorerText = styled('p')<{
-  align?: string;
-  color?: string;
-  margin?: string;
-}>`
-  margin-bottom: ${p => (p.margin ? p.margin : 0)};
-  color: ${p => p.color};
-  text-align: ${p => p.align};
-`;
diff --git a/static/app/views/performance/trends/changeExplorerUtils/functionsList.tsx b/static/app/views/performance/trends/changeExplorerUtils/functionsList.tsx
deleted file mode 100644
index 5ec089dde43f36..00000000000000
--- a/static/app/views/performance/trends/changeExplorerUtils/functionsList.tsx
+++ /dev/null
@@ -1,449 +0,0 @@
-import {Fragment, useMemo} from 'react';
-import type {Location} from 'history';
-import moment from 'moment-timezone';
-
-import EmptyStateWarning from 'sentry/components/emptyStateWarning';
-import LoadingIndicator from 'sentry/components/loadingIndicator';
-import {IconWarning} from 'sentry/icons';
-import {t, tct} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {Organization} from 'sentry/types/organization';
-import type {Project} from 'sentry/types/project';
-import {defined} from 'sentry/utils';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {useDiscoverQuery} from 'sentry/utils/discover/discoverQuery';
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
-import {parsePeriodToHours} from 'sentry/utils/duration/parsePeriodToHours';
-import type {EventsResultsDataRow, Sort} from 'sentry/utils/profiling/hooks/types';
-import {useProfileFunctions} from 'sentry/utils/profiling/hooks/useProfileFunctions';
-import {generateProfileFlamechartRouteWithQuery} from 'sentry/utils/profiling/routes';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-import useProjects from 'sentry/utils/useProjects';
-import {
-  getQueryParams,
-  relativeChange,
-} from 'sentry/views/performance/trends/changeExplorerUtils/metricsTable';
-import {
-  ErrorWrapper,
-  ListItemWrapper,
-  ListLink,
-  TimeDifference,
-} from 'sentry/views/performance/trends/changeExplorerUtils/spansList';
-import type {
-  NormalizedTrendsTransaction,
-  TrendView,
-} from 'sentry/views/performance/trends/types';
-import {TrendChangeType} from 'sentry/views/performance/trends/types';
-import {getTrendProjectId} from 'sentry/views/performance/trends/utils';
-
-type FunctionsListProps = {
-  breakpoint: number;
-  location: Location;
-  organization: Organization;
-  transaction: NormalizedTrendsTransaction;
-  trendChangeType: TrendChangeType;
-  trendView: TrendView;
-};
-
-type AveragedSuspectFunction = EventsResultsDataRow<FunctionsField> & {
-  avgSumExclusiveTime: number;
-};
-
-type ChangedSuspectFunction = AveragedSuspectFunction & {
-  avgTimeDifference: number;
-  changeType: string;
-  percentChange: number;
-};
-
-type NumberedFunctionsListProps = {
-  isError: boolean;
-  isLoading: boolean;
-  limit: number;
-  organization: Organization;
-  transactionName: string;
-  functions?: ChangedSuspectFunction[];
-  project?: Project;
-};
-
-const functionsFields = [
-  'package',
-  'function',
-  'count()',
-  'p75()',
-  'sum()',
-  'examples()',
-] as const;
-
-export type FunctionsField = (typeof functionsFields)[number];
-
-export const FunctionChangeType = {
-  added: t('Added'),
-  removed: t('Removed'),
-  regressed: t('Regressed'),
-  improved: t('Improved'),
-};
-
-export function FunctionsList(props: FunctionsListProps) {
-  const {trendView, location, organization, breakpoint, transaction, trendChangeType} =
-    props;
-
-  const hours = trendView.statsPeriod ? parsePeriodToHours(trendView.statsPeriod) : 0;
-  const startTime = useMemo(
-    () =>
-      trendView.start ? trendView.start : moment().subtract(hours, 'h').toISOString(),
-    [hours, trendView.start]
-  );
-  const breakpointTime = breakpoint ? new Date(breakpoint * 1000).toISOString() : '';
-  const endTime = useMemo(
-    () => (trendView.end ? trendView.end : moment().toISOString()),
-    [trendView.end]
-  );
-
-  const {projects} = useProjects();
-  const projectID = getTrendProjectId(transaction, projects);
-
-  const functionsSort: Sort<FunctionsField> = {key: 'sum()', order: 'desc'};
-
-  const query = useMemo(() => {
-    const conditions = new MutableSearch('');
-    conditions.setFilterValues('transaction', [transaction.transaction]);
-    return conditions.formatString();
-  }, [transaction.transaction]);
-
-  const {
-    data: totalTransactionsBefore,
-    isPending: transactionsLoadingBefore,
-    isError: transactionsErrorBefore,
-  } = useDiscoverQuery(
-    getQueryParams(
-      startTime,
-      breakpointTime,
-      ['count'],
-      'transaction',
-      DiscoverDatasets.METRICS,
-      organization,
-      trendView,
-      transaction.transaction,
-      location
-    )
-  );
-
-  const transactionCountBefore = totalTransactionsBefore?.data
-    ? (totalTransactionsBefore?.data[0]['count()'] as number)
-    : 0;
-
-  const {
-    data: totalTransactionsAfter,
-    isPending: transactionsLoadingAfter,
-    isError: transactionsErrorAfter,
-  } = useDiscoverQuery(
-    getQueryParams(
-      breakpointTime,
-      endTime,
-      ['count'],
-      'transaction',
-      DiscoverDatasets.METRICS,
-      organization,
-      trendView,
-      transaction.transaction,
-      location
-    )
-  );
-
-  const transactionCountAfter = totalTransactionsAfter?.data
-    ? (totalTransactionsAfter?.data[0]['count()'] as number)
-    : 0;
-
-  const beforeFunctionsQuery = useProfileFunctions<FunctionsField>({
-    fields: functionsFields,
-    referrer: 'api.performance.performance-change-explorer',
-    sort: functionsSort,
-    query,
-    limit: 50,
-    datetime: {
-      end: breakpointTime,
-      start: startTime,
-      period: null,
-      utc: null,
-    },
-  });
-
-  const afterFunctionsQuery = useProfileFunctions<FunctionsField>({
-    fields: functionsFields,
-    referrer: 'api.performance.performance-change-explorer',
-    sort: functionsSort,
-    query,
-    limit: 50,
-    datetime: {
-      end: endTime,
-      start: breakpointTime,
-      period: null,
-      utc: null,
-    },
-  });
-
-  // need these averaged fields because comparing total self times may be inaccurate depending on
-  // where the breakpoint is
-  const functionsAveragedAfter = addAvgSumOfFunctions(
-    afterFunctionsQuery.data?.data,
-    transactionCountAfter
-  );
-  const functionsAveragedBefore = addAvgSumOfFunctions(
-    beforeFunctionsQuery.data?.data,
-    transactionCountBefore
-  );
-
-  const addedFunctions = addFunctionChangeFields(
-    findFunctionsNotIn(functionsAveragedAfter, functionsAveragedBefore),
-    true
-  );
-  const removedFunctions = addFunctionChangeFields(
-    findFunctionsNotIn(functionsAveragedBefore, functionsAveragedAfter),
-    false
-  );
-
-  const remainingFunctionsBefore = findFunctionsIn(
-    functionsAveragedBefore,
-    functionsAveragedAfter
-  );
-  const remainingFunctionsAfter = findFunctionsIn(
-    functionsAveragedAfter,
-    functionsAveragedBefore
-  );
-
-  const remainingFunctionsWithChange = addPercentChangeInFunctions(
-    remainingFunctionsBefore,
-    remainingFunctionsAfter
-  );
-
-  const allFunctionsUpdated = remainingFunctionsWithChange
-    ?.concat(addedFunctions ? addedFunctions : [])
-    .concat(removedFunctions ? removedFunctions : []);
-
-  // sorts all functions in descending order of avgTimeDifference (change in avg total self time)
-  const functionList = allFunctionsUpdated?.sort(
-    (a, b) => b.avgTimeDifference - a.avgTimeDifference
-  );
-
-  return (
-    <div>
-      <h6>{t('Relevant Suspect Functions')}</h6>
-      <NumberedFunctionsList
-        functions={
-          trendChangeType === TrendChangeType.REGRESSION
-            ? functionList
-            : functionList?.reverse()
-        }
-        project={projects.find(project => project.id === projectID)}
-        organization={organization}
-        transactionName={transaction.transaction}
-        limit={4}
-        isLoading={
-          transactionsLoadingBefore ||
-          transactionsLoadingAfter ||
-          beforeFunctionsQuery.isPending ||
-          afterFunctionsQuery.isPending
-        }
-        isError={
-          transactionsErrorBefore ||
-          transactionsErrorAfter ||
-          beforeFunctionsQuery.isError ||
-          afterFunctionsQuery.isError
-        }
-      />
-    </div>
-  );
-}
-
-/**
- *
- * adds an average of the sum() time so it is more comparable when the breakpoint
- * is not close to the middle of the timeseries
- */
-function addAvgSumOfFunctions(
-  suspectFunctions: EventsResultsDataRow<FunctionsField>[] | undefined,
-  transactionCount: number
-) {
-  return suspectFunctions?.map(susFunc => {
-    return {
-      ...susFunc,
-      avgSumExclusiveTime: (susFunc['sum()'] as number)
-        ? (susFunc['sum()'] as number) / transactionCount
-        : 0,
-    };
-  });
-}
-
-function findFunctionsNotIn(
-  initialFunctions: AveragedSuspectFunction[] | undefined,
-  comparingFunctions: AveragedSuspectFunction[] | undefined
-) {
-  return initialFunctions?.filter(initialValue => {
-    const functionInComparingSet = comparingFunctions?.find(
-      comparingValue =>
-        comparingValue.function === initialValue.function &&
-        comparingValue.package === initialValue.package
-    );
-    return functionInComparingSet === undefined;
-  });
-}
-
-function findFunctionsIn(
-  initialFunctions: AveragedSuspectFunction[] | undefined,
-  comparingFunctions: AveragedSuspectFunction[] | undefined
-) {
-  return initialFunctions?.filter(initialValue => {
-    const functionInComparingSet = comparingFunctions?.find(
-      comparingValue =>
-        comparingValue.function === initialValue.function &&
-        comparingValue.package === initialValue.package
-    );
-    return functionInComparingSet !== undefined;
-  });
-}
-
-function addFunctionChangeFields(
-  functions: AveragedSuspectFunction[] | undefined,
-  added: boolean
-): ChangedSuspectFunction[] | undefined {
-  // percent change is hardcoded to pass the 1% change threshold,
-  // avoid infinite values and reflect correct change type
-  return functions?.map(func => {
-    if (added) {
-      return {
-        ...func,
-        percentChange: 100,
-        avgTimeDifference: func.avgSumExclusiveTime,
-        changeType: FunctionChangeType.added,
-      };
-    }
-    return {
-      ...func,
-      percentChange: -100,
-      avgTimeDifference: 0 - func.avgSumExclusiveTime,
-      changeType: FunctionChangeType.removed,
-    };
-  });
-}
-
-function addPercentChangeInFunctions(
-  before: AveragedSuspectFunction[] | undefined,
-  after: AveragedSuspectFunction[] | undefined
-) {
-  return after?.map(functionAfter => {
-    const functionBefore = before?.find(
-      beforeValue =>
-        functionAfter.function === beforeValue.function &&
-        functionAfter.package === beforeValue.package
-    );
-    const percentageChange =
-      relativeChange(
-        functionBefore?.avgSumExclusiveTime || 0,
-        functionAfter.avgSumExclusiveTime
-      ) * 100;
-    return {
-      ...functionAfter,
-      percentChange: percentageChange,
-      avgTimeDifference:
-        functionAfter.avgSumExclusiveTime - (functionBefore?.avgSumExclusiveTime || 0),
-      changeType:
-        percentageChange < 0 ? FunctionChangeType.improved : FunctionChangeType.regressed,
-    };
-  });
-}
-
-export function NumberedFunctionsList(props: NumberedFunctionsListProps) {
-  const {project, transactionName, organization, limit, isLoading, isError, functions} =
-    props;
-
-  if (isLoading) {
-    return <LoadingIndicator />;
-  }
-
-  if (isError) {
-    return (
-      <ErrorWrapper>
-        <IconWarning
-          data-test-id="error-indicator-functions"
-          color="gray200"
-          size="xxl"
-        />
-        <p>{t('There was an issue finding suspect functions for this transaction')}</p>
-      </ErrorWrapper>
-    );
-  }
-
-  if (functions?.length === 0 || !functions) {
-    return (
-      <EmptyStateWarning>
-        <p data-test-id="functions-no-results">
-          {t('No results found for suspect functions')}
-        </p>
-      </EmptyStateWarning>
-    );
-  }
-
-  // percent change of a function must be more than 1%
-  const formattedFunctions = functions
-    ?.filter(func => (functions.length > 10 ? Math.abs(func.percentChange) >= 1 : true))
-    .slice(0, limit)
-    .map((func, index) => {
-      const profiles = func['examples()'] as string[];
-
-      let rendered = <Fragment>{func.function}</Fragment>;
-      if (defined(profiles[0])) {
-        const functionSummaryView = generateProfileFlamechartRouteWithQuery({
-          orgSlug: organization.slug,
-          projectSlug: project?.slug || '',
-          profileId: profiles[0],
-          query: {
-            frameName: func.function as string,
-            framePackage: func.package as string,
-          },
-        });
-
-        const handleClickAnalytics = () => {
-          trackAnalytics(
-            'performance_views.performance_change_explorer.function_link_clicked',
-            {
-              organization,
-              transaction: transactionName,
-              package: func.package as string,
-              function: func.function as string,
-              profile_id: profiles[0],
-            }
-          );
-        };
-
-        rendered = (
-          <ListLink to={functionSummaryView} onClick={handleClickAnalytics}>
-            {rendered}
-          </ListLink>
-        );
-      }
-
-      return (
-        <li key={`list-item-${index}`}>
-          <ListItemWrapper data-test-id="list-item">
-            <p style={{marginLeft: space(2)}}>
-              {tct('[changeType] suspect function', {changeType: func.changeType})}
-            </p>
-            {rendered}
-            <TimeDifference difference={func.avgTimeDifference / 1000000} />
-          </ListItemWrapper>
-        </li>
-      );
-    });
-
-  if (formattedFunctions?.length === 0) {
-    return (
-      <EmptyStateWarning>
-        <p data-test-id="functions-no-changes">
-          {t('No sizable changes in suspect functions')}
-        </p>
-      </EmptyStateWarning>
-    );
-  }
-
-  return <ol>{formattedFunctions}</ol>;
-}
diff --git a/static/app/views/performance/trends/changeExplorerUtils/metricsTable.tsx b/static/app/views/performance/trends/changeExplorerUtils/metricsTable.tsx
deleted file mode 100644
index 17574b66fcc96f..00000000000000
--- a/static/app/views/performance/trends/changeExplorerUtils/metricsTable.tsx
+++ /dev/null
@@ -1,390 +0,0 @@
-import type {ReactNode} from 'react';
-import {useMemo} from 'react';
-import type {Location} from 'history';
-import moment from 'moment-timezone';
-
-import type {GridColumnOrder} from 'sentry/components/gridEditable';
-import GridEditable, {COL_WIDTH_UNDEFINED} from 'sentry/components/gridEditable';
-import SortLink from 'sentry/components/gridEditable/sortLink';
-import {t} from 'sentry/locale';
-import type {Organization} from 'sentry/types/organization';
-import type {TableData} from 'sentry/utils/discover/discoverQuery';
-import {useDiscoverQuery} from 'sentry/utils/discover/discoverQuery';
-import type EventView from 'sentry/utils/discover/eventView';
-import type {
-  AggregationKeyWithAlias,
-  ColumnType,
-  QueryFieldValue,
-} from 'sentry/utils/discover/fields';
-import {fieldAlignment} from 'sentry/utils/discover/fields';
-import {Container} from 'sentry/utils/discover/styles';
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
-import {parsePeriodToHours} from 'sentry/utils/duration/parsePeriodToHours';
-import {formatPercentage} from 'sentry/utils/number/formatPercentage';
-import theme from 'sentry/utils/theme';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-import {TransactionThresholdMetric} from 'sentry/views/performance/transactionSummary/transactionThresholdModal';
-import {ExplorerText} from 'sentry/views/performance/trends/changeExplorer';
-import type {
-  NormalizedTrendsTransaction,
-  TrendsTransaction,
-  TrendView,
-} from 'sentry/views/performance/trends/types';
-import {TrendFunctionField} from 'sentry/views/performance/trends/types';
-
-type MetricsTableProps = {
-  isLoading: boolean;
-  location: Location;
-  organization: Organization;
-  transaction: NormalizedTrendsTransaction;
-  trendFunction: string;
-  trendView: TrendView;
-};
-
-const fieldsNeeded: AggregationKeyWithAlias[] = ['tps', 'p50', 'p95', 'failure_rate'];
-
-type MetricColumnKey = 'metric' | 'before' | 'after' | 'change';
-
-type MetricColumn = GridColumnOrder<MetricColumnKey>;
-
-type TableDataRow = Record<MetricColumnKey, any>;
-
-const MetricColumnOrder = ['metric', 'before', 'after', 'change'];
-
-export const COLUMNS: Record<MetricColumnKey, MetricColumn> = {
-  metric: {
-    key: 'metric',
-    name: t('Metric'),
-    width: COL_WIDTH_UNDEFINED,
-  },
-  before: {
-    key: 'before',
-    name: t('Before'),
-    width: COL_WIDTH_UNDEFINED,
-  },
-  after: {
-    key: 'after',
-    name: t('After'),
-    width: COL_WIDTH_UNDEFINED,
-  },
-  change: {
-    key: 'change',
-    name: t('Change'),
-    width: COL_WIDTH_UNDEFINED,
-  },
-};
-
-const COLUMN_TYPE: Record<MetricColumnKey, ColumnType> = {
-  metric: 'string',
-  before: 'duration',
-  after: 'duration',
-  change: 'percentage',
-};
-
-export function MetricsTable(props: MetricsTableProps) {
-  const {trendFunction, transaction, trendView, organization, location, isLoading} =
-    props;
-  const p50 =
-    trendFunction === TrendFunctionField.P50
-      ? getTrendsRowData(transaction, TrendFunctionField.P50)
-      : undefined;
-  const p95 =
-    trendFunction === TrendFunctionField.P95
-      ? getTrendsRowData(transaction, TrendFunctionField.P95)
-      : undefined;
-
-  const breakpoint = transaction.breakpoint;
-
-  const hours = trendView.statsPeriod ? parsePeriodToHours(trendView.statsPeriod) : 0;
-  const startTime = useMemo(
-    () =>
-      trendView.start ? trendView.start : moment().subtract(hours, 'h').toISOString(),
-    [hours, trendView.start]
-  );
-  const breakpointTime = breakpoint ? new Date(breakpoint * 1000).toISOString() : '';
-  const endTime = useMemo(
-    () => (trendView.end ? trendView.end : moment().toISOString()),
-    [trendView.end]
-  );
-
-  const {data: beforeBreakpoint, isPending: isLoadingBefore} = useDiscoverQuery(
-    getQueryParams(
-      startTime,
-      breakpointTime,
-      fieldsNeeded,
-      'transaction',
-      DiscoverDatasets.METRICS,
-      organization,
-      trendView,
-      transaction.transaction,
-      location
-    )
-  );
-
-  const {data: afterBreakpoint, isPending: isLoadingAfter} = useDiscoverQuery(
-    getQueryParams(
-      breakpointTime,
-      endTime,
-      fieldsNeeded,
-      'transaction',
-      DiscoverDatasets.METRICS,
-      organization,
-      trendView,
-      transaction.transaction,
-      location
-    )
-  );
-
-  const throughput: TableDataRow = getEventsRowData(
-    'tps()',
-    'Throughput',
-    'ps',
-    '-',
-    false,
-    beforeBreakpoint,
-    afterBreakpoint
-  );
-
-  const p50Events = !p50
-    ? getEventsRowData(
-        'p50()',
-        'P50',
-        'ms',
-        '-',
-        false,
-        beforeBreakpoint,
-        afterBreakpoint
-      )
-    : p50;
-
-  const p95Events = !p95
-    ? getEventsRowData(
-        'p95()',
-        'P95',
-        'ms',
-        '-',
-        false,
-        beforeBreakpoint,
-        afterBreakpoint
-      )
-    : p95;
-
-  const failureRate: TableDataRow = getEventsRowData(
-    'failure_rate()',
-    'Failure Rate',
-    '%',
-    0,
-    true,
-    beforeBreakpoint,
-    afterBreakpoint
-  );
-
-  const columnOrder = MetricColumnOrder.map(column => COLUMNS[column]);
-
-  return (
-    <GridEditable
-      data={[throughput, p50Events, p95Events, failureRate]}
-      columnOrder={columnOrder}
-      columnSortBy={[]}
-      grid={{
-        renderHeadCell,
-        renderBodyCell,
-      }}
-      isLoading={isLoadingBefore || isLoadingAfter || isLoading}
-    />
-  );
-}
-
-function getEventsRowData(
-  field: string,
-  rowTitle: string,
-  suffix: string,
-  nullValue: string | number,
-  percentage: boolean,
-  beforeData?: TableData,
-  afterData?: TableData
-): TableDataRow {
-  if (
-    beforeData?.data[0][field] !== undefined &&
-    afterData?.data[0][field] !== undefined
-  ) {
-    return {
-      metric: rowTitle,
-      before: !percentage
-        ? toFormattedNumber(beforeData.data[0][field].toString(), 1) + ' ' + suffix
-        : formatPercentage(beforeData.data[0][field] as number, 1),
-      after: !percentage
-        ? toFormattedNumber(afterData.data[0][field].toString(), 1) + ' ' + suffix
-        : formatPercentage(afterData.data[0][field] as number, 1),
-      change:
-        beforeData.data[0][field] && afterData.data[0][field]
-          ? formatPercentage(
-              relativeChange(
-                beforeData.data[0][field] as number,
-                afterData.data[0][field] as number
-              ),
-              1
-            )
-          : '-',
-    };
-  }
-  return {
-    metric: rowTitle,
-    before: nullValue,
-    after: nullValue,
-    change: '-',
-  };
-}
-
-function getTrendsRowData(
-  aggregateData: TrendsTransaction | undefined,
-  metric: TrendFunctionField
-): TableDataRow | undefined {
-  if (aggregateData) {
-    return {
-      metric: metric.toString().toUpperCase(),
-      before: aggregateData?.aggregate_range_1.toFixed(1) + ' ms',
-      after: aggregateData?.aggregate_range_2.toFixed(1) + ' ms',
-      change:
-        aggregateData?.trend_percentage !== 1
-          ? formatPercentage(aggregateData?.trend_percentage! - 1, 1)
-          : '-',
-    };
-  }
-  return undefined;
-}
-
-function getEventViewWithFields(
-  _organization: Organization,
-  eventView: EventView,
-  start: string,
-  end: string,
-  fields: AggregationKeyWithAlias[],
-  eventType: string,
-  transactionName: string,
-  dataset: DiscoverDatasets
-): EventView {
-  const newEventView = eventView.clone();
-  newEventView.start = start;
-  newEventView.end = end;
-  newEventView.statsPeriod = undefined;
-  newEventView.dataset = dataset;
-  newEventView.query = 'event.type:' + eventType + ' transaction:' + transactionName;
-  newEventView.additionalConditions = new MutableSearch('');
-
-  const chartFields: QueryFieldValue[] = fields.map(field => {
-    return {
-      kind: 'function',
-      function: [field, '', undefined, undefined],
-    };
-  });
-
-  return newEventView.withColumns(chartFields);
-}
-
-function toFormattedNumber(numberString: string, decimal: number) {
-  return parseFloat(numberString).toFixed(decimal);
-}
-
-export function relativeChange(before: number, after: number) {
-  return (after - before) / before;
-}
-
-function renderHeadCell(column: MetricColumn, _index: number): ReactNode {
-  const align = fieldAlignment(column.key, COLUMN_TYPE[column.key]);
-  return (
-    <SortLink
-      title={column.name}
-      align={align}
-      direction={undefined}
-      canSort={false}
-      generateSortLink={() => undefined}
-    />
-  );
-}
-
-export function renderBodyCell(
-  column: GridColumnOrder<MetricColumnKey>,
-  dataRow: TableDataRow
-) {
-  let data = '';
-  let color = '';
-  if (column.key === 'change') {
-    if (
-      dataRow[column.key] === '0%' ||
-      dataRow[column.key] === '+NaN%' ||
-      dataRow[column.key] === '-'
-    ) {
-      data = '-';
-    } else if (dataRow[column.key].charAt(0) !== '-') {
-      color = theme.red300;
-      data = '+' + dataRow[column.key];
-    } else {
-      color = theme.green300;
-      data = dataRow[column.key];
-    }
-  } else {
-    data = dataRow[column.key];
-  }
-
-  return (
-    <Container data-test-id={'pce-metrics-chart-row-' + column.key}>
-      <ExplorerText
-        data-test-id={'pce-metrics-text-' + column.key}
-        align={column.key !== 'metric' ? 'right' : 'left'}
-        color={color}
-      >
-        {data}
-      </ExplorerText>
-    </Container>
-  );
-}
-
-export function getQueryParams(
-  startTime: string,
-  endTime: string,
-  fields: AggregationKeyWithAlias[],
-  query: string,
-  dataset: DiscoverDatasets,
-  organization: Organization,
-  eventView: EventView,
-  transactionName: string,
-  location: Location
-) {
-  const newLocation = {
-    ...location,
-    start: startTime,
-    end: endTime,
-    statsPeriod: undefined,
-    dataset,
-    sort: undefined,
-    query: {
-      query: `event.type: ${query} transaction: ${transactionName}`,
-      statsPeriod: undefined,
-      start: startTime,
-      end: endTime,
-    },
-  };
-
-  const newEventView = getEventViewWithFields(
-    organization,
-    eventView,
-    startTime,
-    endTime,
-    fields,
-    query,
-    transactionName,
-    dataset
-  );
-
-  return {
-    eventView: newEventView,
-    location: newLocation,
-    orgSlug: organization.slug,
-    transactionName,
-    transactionThresholdMetric: TransactionThresholdMetric.TRANSACTION_DURATION,
-    options: {
-      refetchOnWindowFocus: false,
-    },
-  };
-}
diff --git a/static/app/views/performance/trends/changeExplorerUtils/spansList.spec.tsx b/static/app/views/performance/trends/changeExplorerUtils/spansList.spec.tsx
deleted file mode 100644
index 62139f5af4fdca..00000000000000
--- a/static/app/views/performance/trends/changeExplorerUtils/spansList.spec.tsx
+++ /dev/null
@@ -1,394 +0,0 @@
-import moment from 'moment-timezone';
-
-import {initializeData} from 'sentry-test/performance/initializePerformanceData';
-import {render, screen, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import type {ChangedSuspectSpan} from 'sentry/views/performance/trends/changeExplorerUtils/spansList';
-import {
-  NumberedSpansList,
-  SpanChangeType,
-} from 'sentry/views/performance/trends/changeExplorerUtils/spansList';
-import type {NormalizedTrendsTransaction} from 'sentry/views/performance/trends/types';
-
-const transaction: NormalizedTrendsTransaction = {
-  aggregate_range_1: 78.2757131147541,
-  aggregate_range_2: 110.50465131578949,
-  breakpoint: 1687262400,
-  project: 'sentry',
-  transaction: 'sentry.tasks.store.save_event',
-  trend_difference: 32.22893820103539,
-  trend_percentage: 1.411736117354651,
-  count: 3459,
-  received_at: moment(1601251200000),
-};
-
-const longSpanList: ChangedSuspectSpan[] = [
-  {
-    op: 'db',
-    group: '1',
-    description: 'span1',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: 5,
-    avgTimeDifference: 20,
-    changeType: SpanChangeType.regressed,
-  },
-  {
-    op: 'db',
-    group: '2',
-    description: 'span2',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: 2,
-    avgTimeDifference: 19,
-    changeType: SpanChangeType.regressed,
-  },
-  {
-    op: 'db',
-    group: '3',
-    description: 'span3',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: 100,
-    avgTimeDifference: 18,
-    changeType: SpanChangeType.added,
-  },
-  {
-    op: 'db',
-    group: '4',
-    description: 'span4',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: 0.5,
-    avgTimeDifference: 17,
-    changeType: SpanChangeType.regressed,
-  },
-  {
-    op: 'db',
-    group: '5',
-    description: 'span5',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: 0.5,
-    avgTimeDifference: 16,
-    changeType: SpanChangeType.regressed,
-  },
-  {
-    op: 'db',
-    group: '6',
-    description: 'span6',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: -5,
-    avgTimeDifference: -1,
-    changeType: SpanChangeType.improved,
-  },
-  {
-    op: 'db',
-    group: '7',
-    description: 'span7',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: -0.5,
-    avgTimeDifference: -2,
-    changeType: SpanChangeType.improved,
-  },
-  {
-    op: 'db',
-    group: '8',
-    description: 'span8',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: -100,
-    avgTimeDifference: -3,
-    changeType: SpanChangeType.removed,
-  },
-  {
-    op: 'db',
-    group: '9',
-    description: 'span9',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: -100,
-    avgTimeDifference: -4,
-    changeType: SpanChangeType.removed,
-  },
-  {
-    op: 'db',
-    group: '10',
-    description: 'span10',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: -3,
-    avgTimeDifference: -5,
-    changeType: SpanChangeType.improved,
-  },
-  {
-    op: 'db',
-    group: '11',
-    description: 'span11',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: -0.5,
-    avgTimeDifference: -6,
-    changeType: SpanChangeType.improved,
-  },
-];
-
-const shortSpanList: ChangedSuspectSpan[] = [
-  {
-    op: 'db',
-    group: '1',
-    description: 'span1',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: 5,
-    avgTimeDifference: 20,
-    changeType: SpanChangeType.regressed,
-  },
-  {
-    op: 'db',
-    group: '2',
-    description: 'span2',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: 100,
-    avgTimeDifference: 19,
-    changeType: SpanChangeType.added,
-  },
-  {
-    op: 'db',
-    group: '3',
-    description: 'span3',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: -0.5,
-    avgTimeDifference: -3,
-    changeType: SpanChangeType.improved,
-  },
-  {
-    op: 'db',
-    group: '4',
-    description: 'span4',
-    frequency: 4,
-    count: 4,
-    avgOccurrences: undefined,
-    sumExclusiveTime: 345345,
-    p50ExclusiveTime: undefined,
-    p75ExclusiveTime: 25,
-    p95ExclusiveTime: undefined,
-    p99ExclusiveTime: undefined,
-    examples: [],
-    avgSumExclusiveTime: 34,
-    percentChange: -100,
-    avgTimeDifference: -17,
-    changeType: SpanChangeType.removed,
-  },
-];
-
-describe('Performance > Trends > Performance Change Explorer > Spans List', function () {
-  it('renders spans list for regression', async () => {
-    const data = initializeData();
-
-    render(
-      <NumberedSpansList
-        spans={longSpanList}
-        location={data.location}
-        organization={data.organization}
-        transactionName={transaction.transaction}
-        limit={6}
-        isLoading={false}
-        isError={false}
-      />
-    );
-
-    await waitFor(() => {
-      expect(screen.getAllByTestId('list-item')[0]).toHaveTextContent('span1');
-      expect(screen.getAllByTestId('list-item')[0]).toHaveTextContent('Regressed');
-      expect(screen.getAllByTestId('list-item')[1]).toHaveTextContent('span2');
-      expect(screen.getAllByTestId('list-item')[1]).toHaveTextContent('Regressed');
-      expect(screen.getAllByTestId('list-item')[2]).toHaveTextContent('span3');
-      expect(screen.getAllByTestId('list-item')[2]).toHaveTextContent('Added');
-      expect(screen.getAllByTestId('list-item')[3]).toHaveTextContent('span6');
-      expect(screen.getAllByTestId('list-item')[3]).toHaveTextContent('Improved');
-      expect(screen.getAllByTestId('list-item')[4]).toHaveTextContent('span8');
-      expect(screen.getAllByTestId('list-item')[4]).toHaveTextContent('Removed');
-      expect(screen.getAllByTestId('list-item')[5]).toHaveTextContent('span9');
-      expect(screen.getAllByTestId('list-item')[5]).toHaveTextContent('Removed');
-      expect(screen.getAllByTestId('list-delta')).toHaveLength(6);
-    });
-  });
-
-  it('renders spans list for improvement', async () => {
-    const data = initializeData();
-
-    render(
-      <NumberedSpansList
-        spans={longSpanList.reverse()}
-        location={data.location}
-        organization={data.organization}
-        transactionName={transaction.transaction}
-        limit={6}
-        isLoading={false}
-        isError={false}
-      />
-    );
-
-    await waitFor(() => {
-      expect(screen.getAllByTestId('list-item')[0]).toHaveTextContent('span10');
-      expect(screen.getAllByTestId('list-item')[0]).toHaveTextContent('Improved');
-      expect(screen.getAllByTestId('list-item')[1]).toHaveTextContent('span9');
-      expect(screen.getAllByTestId('list-item')[1]).toHaveTextContent('Removed');
-      expect(screen.getAllByTestId('list-item')[2]).toHaveTextContent('span8');
-      expect(screen.getAllByTestId('list-item')[2]).toHaveTextContent('Removed');
-      expect(screen.getAllByTestId('list-item')[3]).toHaveTextContent('span6');
-      expect(screen.getAllByTestId('list-item')[3]).toHaveTextContent('Improved');
-      expect(screen.getAllByTestId('list-item')[4]).toHaveTextContent('span3');
-      expect(screen.getAllByTestId('list-item')[4]).toHaveTextContent('Added');
-      expect(screen.getAllByTestId('list-item')[5]).toHaveTextContent('span2');
-      expect(screen.getAllByTestId('list-item')[5]).toHaveTextContent('Regressed');
-      expect(screen.getAllByTestId('list-delta')).toHaveLength(6);
-    });
-  });
-
-  it('renders spans list for smaller changed spans list', async () => {
-    const data = initializeData();
-
-    render(
-      <NumberedSpansList
-        spans={shortSpanList}
-        location={data.location}
-        organization={data.organization}
-        transactionName={transaction.transaction}
-        limit={6}
-        isLoading={false}
-        isError={false}
-      />
-    );
-
-    await waitFor(() => {
-      expect(screen.getAllByTestId('list-item')[0]).toHaveTextContent('span1');
-      expect(screen.getAllByTestId('list-item')[0]).toHaveTextContent('Regressed');
-      expect(screen.getAllByTestId('list-item')[1]).toHaveTextContent('span2');
-      expect(screen.getAllByTestId('list-item')[1]).toHaveTextContent('Added');
-      expect(screen.getAllByTestId('list-item')[2]).toHaveTextContent('span3');
-      expect(screen.getAllByTestId('list-item')[2]).toHaveTextContent('Improved');
-      expect(screen.getAllByTestId('list-item')[3]).toHaveTextContent('span4');
-      expect(screen.getAllByTestId('list-item')[3]).toHaveTextContent('Removed');
-      expect(screen.getAllByTestId('list-item')[4]).toBeUndefined();
-      expect(screen.getAllByTestId('list-delta')).toHaveLength(4);
-    });
-  });
-});
diff --git a/static/app/views/performance/trends/changeExplorerUtils/spansList.tsx b/static/app/views/performance/trends/changeExplorerUtils/spansList.tsx
deleted file mode 100644
index 079f15077cc62f..00000000000000
--- a/static/app/views/performance/trends/changeExplorerUtils/spansList.tsx
+++ /dev/null
@@ -1,559 +0,0 @@
-import {useMemo} from 'react';
-import styled from '@emotion/styled';
-import type {Location} from 'history';
-import moment from 'moment-timezone';
-
-import EmptyStateWarning from 'sentry/components/emptyStateWarning';
-import Link from 'sentry/components/links/link';
-import LoadingIndicator from 'sentry/components/loadingIndicator';
-import {IconWarning} from 'sentry/icons';
-import {t, tct} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {Organization} from 'sentry/types/organization';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {useDiscoverQuery} from 'sentry/utils/discover/discoverQuery';
-import {DiscoverDatasets} from 'sentry/utils/discover/types';
-import {parsePeriodToHours} from 'sentry/utils/duration/parsePeriodToHours';
-import SuspectSpansQuery from 'sentry/utils/performance/suspectSpans/suspectSpansQuery';
-import type {
-  SuspectSpan,
-  SuspectSpans,
-} from 'sentry/utils/performance/suspectSpans/types';
-import theme from 'sentry/utils/theme';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
-import useProjects from 'sentry/utils/useProjects';
-import {spanDetailsRouteWithQuery} from 'sentry/views/performance/transactionSummary/transactionSpans/spanDetails/utils';
-import type {SpanSortOption} from 'sentry/views/performance/transactionSummary/transactionSpans/types';
-import {
-  SpanSortOthers,
-  SpanSortPercentiles,
-} from 'sentry/views/performance/transactionSummary/transactionSpans/types';
-import {
-  getSuspectSpanSortFromLocation,
-  SPAN_SORT_TO_FIELDS,
-} from 'sentry/views/performance/transactionSummary/transactionSpans/utils';
-import {
-  getQueryParams,
-  relativeChange,
-} from 'sentry/views/performance/trends/changeExplorerUtils/metricsTable';
-import type {
-  NormalizedTrendsTransaction,
-  TrendView,
-} from 'sentry/views/performance/trends/types';
-import {TrendChangeType} from 'sentry/views/performance/trends/types';
-import {getTrendProjectId} from 'sentry/views/performance/trends/utils';
-
-type SpansListProps = {
-  breakpoint: number;
-  location: Location;
-  organization: Organization;
-  transaction: NormalizedTrendsTransaction;
-  trendChangeType: TrendChangeType;
-  trendView: TrendView;
-};
-
-type AveragedSuspectSpan = SuspectSpan & {
-  avgSumExclusiveTime: number;
-};
-
-export type ChangedSuspectSpan = AveragedSuspectSpan & {
-  avgTimeDifference: number;
-  changeType: string;
-  percentChange: number;
-};
-
-type NumberedSpansListProps = {
-  isError: boolean;
-  isLoading: boolean;
-  limit: number;
-  location: Location;
-  organization: Organization;
-  transactionName: string;
-  projectID?: string;
-  spans?: ChangedSuspectSpan[];
-};
-
-export const SpanChangeType = {
-  added: t('Added'),
-  removed: t('Removed'),
-  regressed: t('Regressed'),
-  improved: t('Improved'),
-};
-
-export function SpansList(props: SpansListProps) {
-  const {trendView, location, organization, breakpoint, transaction, trendChangeType} =
-    props;
-
-  const hours = trendView.statsPeriod ? parsePeriodToHours(trendView.statsPeriod) : 0;
-  const startTime = useMemo(
-    () =>
-      trendView.start ? trendView.start : moment().subtract(hours, 'h').toISOString(),
-    [hours, trendView.start]
-  );
-  const breakpointTime = breakpoint ? new Date(breakpoint * 1000).toISOString() : '';
-  const endTime = useMemo(
-    () => (trendView.end ? trendView.end : moment().toISOString()),
-    [trendView.end]
-  );
-
-  const {projects} = useProjects();
-  const projectID = getTrendProjectId(transaction, projects);
-
-  const beforeLocation = updateLocation(
-    location,
-    startTime,
-    breakpointTime,
-    transaction,
-    projectID
-  );
-
-  const beforeSort = getSuspectSpanSortFromLocation(beforeLocation, 'spanSort');
-
-  const beforeEventView = updateEventView(
-    trendView,
-    startTime,
-    breakpointTime,
-    transaction,
-    beforeSort,
-    projectID
-  );
-
-  const beforeFields = SPAN_SORT_TO_FIELDS[beforeSort.field];
-  beforeEventView.fields = beforeFields ? beforeFields.map(field => ({field})) : [];
-
-  const afterLocation = updateLocation(
-    location,
-    startTime,
-    breakpointTime,
-    transaction,
-    projectID
-  );
-
-  const afterSort = getSuspectSpanSortFromLocation(afterLocation, 'spanSort');
-
-  const afterEventView = updateEventView(
-    trendView,
-    breakpointTime,
-    endTime,
-    transaction,
-    afterSort,
-    projectID
-  );
-
-  const afterFields = SPAN_SORT_TO_FIELDS[afterSort.field];
-  afterEventView.fields = afterFields ? afterFields.map(field => ({field})) : [];
-
-  const {
-    data: totalTransactionsBefore,
-    isPending: transactionsLoadingBefore,
-    isError: transactionsErrorBefore,
-  } = useDiscoverQuery(
-    getQueryParams(
-      startTime,
-      breakpointTime,
-      ['count'],
-      'transaction',
-      DiscoverDatasets.METRICS,
-      organization,
-      trendView,
-      transaction.transaction,
-      location
-    )
-  );
-
-  const transactionCountBefore = totalTransactionsBefore?.data
-    ? (totalTransactionsBefore?.data[0]['count()'] as number)
-    : 0;
-
-  const {
-    data: totalTransactionsAfter,
-    isPending: transactionsLoadingAfter,
-    isError: transactionsErrorAfter,
-  } = useDiscoverQuery(
-    getQueryParams(
-      breakpointTime,
-      endTime,
-      ['count'],
-      'transaction',
-      DiscoverDatasets.METRICS,
-      organization,
-      trendView,
-      transaction.transaction,
-      location
-    )
-  );
-
-  const transactionCountAfter = totalTransactionsAfter?.data
-    ? (totalTransactionsAfter?.data[0]['count()'] as number)
-    : 0;
-
-  return (
-    <SuspectSpansQuery
-      location={beforeLocation}
-      orgSlug={organization.slug}
-      eventView={beforeEventView}
-      limit={50}
-      perSuspect={0}
-    >
-      {({
-        suspectSpans: suspectSpansBefore,
-        isLoading: spansLoadingBefore,
-        error: spansErrorBefore,
-      }) => {
-        const hasSpansErrorBefore = spansErrorBefore !== null;
-        return (
-          <SuspectSpansQuery
-            location={afterLocation}
-            orgSlug={organization.slug}
-            eventView={afterEventView}
-            limit={50}
-            perSuspect={0}
-          >
-            {({
-              suspectSpans: suspectSpansAfter,
-              isLoading: spansLoadingAfter,
-              error: spansErrorAfter,
-            }) => {
-              const hasSpansErrorAfter = spansErrorAfter !== null;
-
-              // need these averaged fields because comparing total self times may be inaccurate depending on
-              // where the breakpoint is
-              const spansAveragedAfter = addAvgSumExclusiveTime(
-                suspectSpansAfter,
-                transactionCountAfter
-              );
-              const spansAveragedBefore = addAvgSumExclusiveTime(
-                suspectSpansBefore,
-                transactionCountBefore
-              );
-
-              const addedSpans = addSpanChangeFields(
-                findSpansNotIn(spansAveragedAfter, spansAveragedBefore),
-                true
-              );
-              const removedSpans = addSpanChangeFields(
-                findSpansNotIn(spansAveragedBefore, spansAveragedAfter),
-                false
-              );
-
-              const remainingSpansBefore = findSpansIn(
-                spansAveragedBefore,
-                spansAveragedAfter
-              );
-              const remainingSpansAfter = findSpansIn(
-                spansAveragedAfter,
-                spansAveragedBefore
-              );
-
-              const remainingSpansWithChange = addPercentChangeInSpans(
-                remainingSpansBefore,
-                remainingSpansAfter
-              );
-
-              const allSpansUpdated = remainingSpansWithChange
-                ?.concat(addedSpans ? addedSpans : [])
-                .concat(removedSpans ? removedSpans : []);
-
-              // sorts all spans in descending order of avgTimeDifference (change in avg total self time)
-              const spanList = allSpansUpdated?.sort(
-                (a, b) => b.avgTimeDifference - a.avgTimeDifference
-              );
-              // reverse the span list when trendChangeType is improvement so most negative (improved) change is first
-              return (
-                <div style={{marginTop: space(4)}}>
-                  <h6>{t('Relevant Suspect Spans')}</h6>
-                  <NumberedSpansList
-                    spans={
-                      trendChangeType === TrendChangeType.REGRESSION
-                        ? spanList
-                        : spanList?.reverse()
-                    }
-                    projectID={projectID}
-                    location={location}
-                    organization={organization}
-                    transactionName={transaction.transaction}
-                    limit={4}
-                    isLoading={
-                      transactionsLoadingBefore ||
-                      transactionsLoadingAfter ||
-                      spansLoadingBefore ||
-                      spansLoadingAfter
-                    }
-                    isError={
-                      transactionsErrorBefore ||
-                      transactionsErrorAfter ||
-                      hasSpansErrorBefore ||
-                      hasSpansErrorAfter
-                    }
-                  />
-                </div>
-              );
-            }}
-          </SuspectSpansQuery>
-        );
-      }}
-    </SuspectSpansQuery>
-  );
-}
-
-function updateLocation(
-  location: Location,
-  start: string,
-  end: string,
-  transaction: NormalizedTrendsTransaction,
-  projectID?: string
-) {
-  return {
-    ...location,
-    start,
-    end,
-    statsPeriod: undefined,
-    sort: SpanSortOthers.SUM_EXCLUSIVE_TIME,
-    project: projectID,
-    query: {
-      query: 'transaction:' + transaction.transaction,
-      statsPeriod: undefined,
-      start,
-      end,
-      project: projectID,
-    },
-  };
-}
-
-function updateEventView(
-  trendView: TrendView,
-  start: string,
-  end: string,
-  transaction: NormalizedTrendsTransaction,
-  sort: SpanSortOption,
-  projectID?: string
-) {
-  const newEventView = trendView.clone();
-  newEventView.start = start;
-  newEventView.end = end;
-  newEventView.statsPeriod = undefined;
-  newEventView.query = `event.type:transaction transaction:${transaction.transaction}`;
-  newEventView.project = projectID ? [parseInt(projectID, 10)] : [];
-  newEventView.additionalConditions = new MutableSearch('');
-  return newEventView
-    .withColumns(
-      [...Object.values(SpanSortOthers), ...Object.values(SpanSortPercentiles)].map(
-        field => ({kind: 'field', field})
-      )
-    )
-    .withSorts([{kind: 'desc', field: sort.field}]);
-}
-
-function findSpansNotIn(
-  initialSpans: AveragedSuspectSpan[] | undefined,
-  comparingSpans: AveragedSuspectSpan[] | undefined
-) {
-  return initialSpans?.filter(initialValue => {
-    const spanInComparingSet = comparingSpans?.find(
-      comparingValue =>
-        comparingValue.op === initialValue.op &&
-        comparingValue.group === initialValue.group
-    );
-    return spanInComparingSet === undefined;
-  });
-}
-
-function findSpansIn(
-  initialSpans: AveragedSuspectSpan[] | undefined,
-  comparingSpans: AveragedSuspectSpan[] | undefined
-) {
-  return initialSpans?.filter(initialValue => {
-    const spanInComparingSet = comparingSpans?.find(
-      comparingValue =>
-        comparingValue.op === initialValue.op &&
-        comparingValue.group === initialValue.group
-    );
-    return spanInComparingSet !== undefined;
-  });
-}
-
-/**
- *
- * adds an average of the sumExclusive time so it is more comparable when the breakpoint
- * is not close to the middle of the timeseries
- */
-function addAvgSumExclusiveTime(
-  suspectSpans: SuspectSpans | null,
-  transactionCount: number
-) {
-  return suspectSpans?.map(span => {
-    return {
-      ...span,
-      avgSumExclusiveTime: span.sumExclusiveTime
-        ? span.sumExclusiveTime / transactionCount
-        : 0,
-    };
-  });
-}
-
-function addPercentChangeInSpans(
-  before: AveragedSuspectSpan[] | undefined,
-  after: AveragedSuspectSpan[] | undefined
-) {
-  return after?.map(spanAfter => {
-    const spanBefore = before?.find(
-      beforeValue =>
-        spanAfter.op === beforeValue.op && spanAfter.group === beforeValue.group
-    );
-    const percentageChange =
-      relativeChange(
-        spanBefore?.avgSumExclusiveTime || 0,
-        spanAfter.avgSumExclusiveTime
-      ) * 100;
-    return {
-      ...spanAfter,
-      percentChange: percentageChange,
-      avgTimeDifference:
-        spanAfter.avgSumExclusiveTime - (spanBefore?.avgSumExclusiveTime || 0),
-      changeType:
-        percentageChange < 0 ? SpanChangeType.improved : SpanChangeType.regressed,
-    };
-  });
-}
-
-function addSpanChangeFields(
-  spans: AveragedSuspectSpan[] | undefined,
-  added: boolean
-): ChangedSuspectSpan[] | undefined {
-  // percent change is hardcoded to pass the 1% change threshold,
-  // avoid infinite values and reflect correct change type
-  return spans?.map(span => {
-    if (added) {
-      return {
-        ...span,
-        percentChange: 100,
-        avgTimeDifference: span.avgSumExclusiveTime,
-        changeType: SpanChangeType.added,
-      };
-    }
-    return {
-      ...span,
-      percentChange: -100,
-      avgTimeDifference: 0 - span.avgSumExclusiveTime,
-      changeType: SpanChangeType.removed,
-    };
-  });
-}
-
-export function TimeDifference({difference}: {difference: number}) {
-  const positive = difference >= 0;
-  const roundedDifference = difference.toPrecision(3);
-  return (
-    <p
-      style={{
-        alignSelf: 'end',
-        color: positive ? theme.red300 : theme.green300,
-        marginLeft: space(2),
-      }}
-      data-test-id="list-delta"
-    >
-      {positive ? `+${roundedDifference} ms` : `${roundedDifference} ms`}
-    </p>
-  );
-}
-
-export function NumberedSpansList(props: NumberedSpansListProps) {
-  const {
-    spans,
-    projectID,
-    location,
-    transactionName,
-    organization,
-    limit,
-    isLoading,
-    isError,
-  } = props;
-
-  if (isLoading) {
-    return <LoadingIndicator />;
-  }
-
-  if (isError) {
-    return (
-      <ErrorWrapper>
-        <IconWarning data-test-id="error-indicator-spans" color="gray200" size="xxl" />
-        <p>{t('There was an issue finding suspect spans for this transaction')}</p>
-      </ErrorWrapper>
-    );
-  }
-
-  if (spans?.length === 0 || !spans) {
-    return (
-      <EmptyStateWarning>
-        <p data-test-id="spans-no-results">{t('No results found for suspect spans')}</p>
-      </EmptyStateWarning>
-    );
-  }
-
-  // percent change of a span must be more than 1%
-  const formattedSpans = spans
-    ?.filter(span => (spans.length > 10 ? Math.abs(span.percentChange) >= 1 : true))
-    .slice(0, limit)
-    .map((span, index) => {
-      const spanDetailsPage = spanDetailsRouteWithQuery({
-        orgSlug: organization.slug,
-        transaction: transactionName,
-        query: location.query,
-        spanSlug: {op: span.op, group: span.group},
-        projectID,
-      });
-
-      const handleClickAnalytics = () => {
-        trackAnalytics(
-          'performance_views.performance_change_explorer.span_link_clicked',
-          {
-            organization,
-            transaction: transactionName,
-            op: span.op,
-            group: span.group,
-          }
-        );
-      };
-
-      return (
-        <li key={`list-item-${index}`}>
-          <ListItemWrapper data-test-id="list-item">
-            <p style={{marginLeft: space(2)}}>
-              {tct('[changeType] suspect span', {changeType: span.changeType})}
-            </p>
-            <ListLink to={spanDetailsPage} onClick={handleClickAnalytics}>
-              {span.description ? `${span.op} - ${span.description}` : span.op}
-            </ListLink>
-            <TimeDifference difference={span.avgTimeDifference} />
-          </ListItemWrapper>
-        </li>
-      );
-    });
-
-  if (formattedSpans?.length === 0) {
-    return (
-      <EmptyStateWarning>
-        <p data-test-id="spans-no-changes">{t('No sizable changes in suspect spans')}</p>
-      </EmptyStateWarning>
-    );
-  }
-
-  return <ol>{formattedSpans}</ol>;
-}
-
-export const ListLink = styled(Link)`
-  margin-left: ${space(1)};
-  ${p => p.theme.overflowEllipsis}
-`;
-export const ListItemWrapper = styled('div')`
-  display: flex;
-  white-space: nowrap;
-`;
-
-export const ErrorWrapper = styled('div')`
-  display: flex;
-  margin-top: ${space(4)};
-  flex-direction: column;
-  align-items: center;
-  gap: ${space(3)};
-`;
diff --git a/static/app/views/performance/trends/changedTransactions.tsx b/static/app/views/performance/trends/changedTransactions.tsx
index 57307540b3ac15..0740f243f23786 100644
--- a/static/app/views/performance/trends/changedTransactions.tsx
+++ b/static/app/views/performance/trends/changedTransactions.tsx
@@ -1,9 +1,8 @@
-import {Fragment, useCallback, useState} from 'react';
+import {Fragment, useCallback} from 'react';
 import styled from '@emotion/styled';
 import type {Location} from 'history';
 
 import type {Client} from 'sentry/api';
-import Feature from 'sentry/components/acl/feature';
 import {HeaderTitleLegend} from 'sentry/components/charts/styles';
 import Count from 'sentry/components/count';
 import {DropdownMenu} from 'sentry/components/dropdownMenu';
@@ -39,7 +38,6 @@ import {
   DisplayModes,
   transactionSummaryRouteWithQuery,
 } from 'sentry/views/performance/transactionSummary/utils';
-import {PerformanceChangeExplorer} from 'sentry/views/performance/trends/changeExplorer';
 import getSelectedQueryKey from 'sentry/views/performance/trends/utils/getSelectedQueryKey';
 import {getSelectedTransaction} from 'sentry/views/performance/utils/getSelectedTransaction';
 
@@ -47,9 +45,7 @@ import Chart from './chart';
 import type {
   NormalizedTrendsTransaction,
   TrendFunctionField,
-  TrendParameter,
   TrendParameterColumn,
-  TrendsStats,
   TrendView,
 } from './types';
 import {TrendChangeType} from './types';
@@ -323,14 +319,11 @@ function ChangedTransactions(props: Props) {
                           transactions={transactionsList}
                           location={location}
                           projects={projects}
-                          statsData={statsData}
                           handleSelectTransaction={handleChangeSelected(
                             location,
                             organization,
                             trendChangeType
                           )}
-                          isLoading={isLoading}
-                          trendParameter={trendParameter}
                         />
                       ))}
                     </Fragment>
@@ -360,15 +353,12 @@ type TrendsListItemProps = {
   currentTrendFunction: string;
   handleSelectTransaction: (transaction: NormalizedTrendsTransaction) => void;
   index: number;
-  isLoading: boolean;
   location: Location;
   organization: Organization;
   projects: Project[];
-  statsData: TrendsStats;
   transaction: NormalizedTrendsTransaction;
   transactions: NormalizedTrendsTransaction[];
   trendChangeType: TrendChangeType;
-  trendParameter: TrendParameter;
   trendView: TrendView;
 };
 
@@ -385,14 +375,9 @@ function TrendsListItem(props: TrendsListItemProps) {
     projects,
     handleSelectTransaction,
     trendView,
-    statsData,
-    isLoading,
-    trendParameter,
   } = props;
   const color = trendToColor[trendChangeType].default;
 
-  const [openedTransaction, setOpenedTransaction] = useState<null | string>(null);
-
   const selectedTransaction = getSelectedTransaction(
     location,
     trendChangeType,
@@ -471,7 +456,7 @@ function TrendsListItem(props: TrendsListItemProps) {
             </RadioLineItem>
           )}
         </ItemRadioContainer>
-        <TransactionSummaryLink {...props} onItemClicked={setOpenedTransaction} />
+        <TransactionSummaryLink {...props} />
         <ItemTransactionPercentage>
           <Tooltip title={percentChangeExplanation}>
             <Fragment>
@@ -540,22 +525,6 @@ function TrendsListItem(props: TrendsListItemProps) {
           <ValueDelta {...props} />
         </ItemTransactionStatus>
       </ListItemContainer>
-      <Feature features="performance-change-explorer">
-        <PerformanceChangeExplorer
-          collapsed={openedTransaction === null}
-          onClose={() => setOpenedTransaction(null)}
-          transaction={transaction}
-          trendChangeType={trendChangeType}
-          trendFunction={currentTrendFunction}
-          trendView={trendView}
-          statsData={statsData}
-          isLoading={isLoading}
-          organization={organization}
-          projects={projects}
-          trendParameter={trendParameter}
-          location={location}
-        />
-      </Feature>
     </Fragment>
   );
 }
@@ -592,9 +561,7 @@ function ValueDelta({transaction, trendChangeType}: TrendsListItemProps) {
   );
 }
 
-type TransactionSummaryLinkProps = TrendsListItemProps & {
-  onItemClicked: React.Dispatch<React.SetStateAction<null | string>>;
-};
+type TransactionSummaryLinkProps = TrendsListItemProps;
 
 function TransactionSummaryLink(props: TransactionSummaryLinkProps) {
   const {
@@ -604,7 +571,6 @@ function TransactionSummaryLink(props: TransactionSummaryLinkProps) {
     projects,
     location,
     currentTrendFunction,
-    onItemClicked: onTransactionSelection,
   } = props;
   const summaryView = eventView.clone();
   const projectID = getTrendProjectId(transaction, projects);
@@ -623,13 +589,12 @@ function TransactionSummaryLink(props: TransactionSummaryLinkProps) {
   const handleClick = useCallback<React.MouseEventHandler>(
     event => {
       event.preventDefault();
-      onTransactionSelection(transaction.transaction);
       trackAnalytics('performance_views.performance_change_explorer.open', {
         organization,
         transaction: transaction.transaction,
       });
     },
-    [onTransactionSelection, transaction.transaction, organization]
+    [transaction.transaction, organization]
   );
 
   if (organization.features.includes('performance-change-explorer')) {
diff --git a/static/app/views/performance/trends/index.spec.tsx b/static/app/views/performance/trends/index.spec.tsx
index f8429a527db10d..ad5a8e86f517d9 100644
--- a/static/app/views/performance/trends/index.spec.tsx
+++ b/static/app/views/performance/trends/index.spec.tsx
@@ -267,43 +267,6 @@ describe('Performance > Trends', function () {
       },
     });
 
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
-      body: {
-        data: [
-          {
-            'p95()': 1010.9232499999998,
-            'p50()': 47.34580982348902,
-            'tps()': 3.7226926286168966,
-            'count()': 34872349,
-            'failure_rate()': 0.43428379,
-            'examples()': ['djk3w308er', '3298a9ui3h'],
-          },
-        ],
-        meta: {
-          fields: {
-            'p95()': 'duration',
-            '950()': 'duration',
-            'tps()': 'number',
-            'count()': 'number',
-            'failure_rate()': 'number',
-            'examples()': 'Array',
-          },
-          units: {
-            'p95()': 'millisecond',
-            'p50()': 'millisecond',
-            'tps()': null,
-            'count()': null,
-            'failure_rate()': null,
-            'examples()': null,
-          },
-          isMetricsData: true,
-          tips: {},
-          dataset: 'metrics',
-        },
-      },
-    });
-
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/events-spans-performance/',
       body: [],
@@ -370,41 +333,6 @@ describe('Performance > Trends', function () {
     );
   });
 
-  it('view summary menu action opens performance change explorer with feature flag', async function () {
-    const projects = [ProjectFixture({id: '1', slug: 'internal'}), ProjectFixture()];
-    const data = initializeTrendsData(projects, {project: ['1']}, true, [
-      'performance-change-explorer',
-    ]);
-
-    render(
-      <TrendsIndex location={data.router.location} organization={data.organization} />,
-      {
-        router: data.router,
-        organization: data.organization,
-      }
-    );
-
-    const transactions = await screen.findAllByTestId('trends-list-item-improved');
-    expect(transactions).toHaveLength(2);
-    const firstTransaction = transactions[0];
-
-    const summaryLink = within(firstTransaction).getByTestId('item-transaction-name');
-
-    expect(summaryLink.closest('a')).toHaveAttribute(
-      'href',
-      '/trends/?project=1&query=tpm%28%29%3A%3E0.01%20transaction.duration%3A%3E0%20transaction.duration%3A%3C15min'
-    );
-
-    await clickEl(summaryLink);
-    await waitFor(() => {
-      expect(screen.getByText('Ongoing Improvement')).toBeInTheDocument();
-      expect(screen.getByText('Throughput')).toBeInTheDocument();
-      expect(screen.getByText('P95')).toBeInTheDocument();
-      expect(screen.getByText('P50')).toBeInTheDocument();
-      expect(screen.getByText('Failure Rate')).toBeInTheDocument();
-    });
-  });
-
   it('hide from list menu action modifies query', async function () {
     const projects = [ProjectFixture({id: '1', slug: 'internal'}), ProjectFixture()];
     const data = initializeTrendsData(projects, {project: ['1']});
diff --git a/static/app/views/performance/utils/useSpanFieldSupportedTags.tsx b/static/app/views/performance/utils/useSpanFieldSupportedTags.tsx
index 7023051ad694b8..26ece7815db1e4 100644
--- a/static/app/views/performance/utils/useSpanFieldSupportedTags.tsx
+++ b/static/app/views/performance/utils/useSpanFieldSupportedTags.tsx
@@ -66,8 +66,11 @@ export function useSpanMetricsFieldSupportedTags(options?: {excludedTags?: strin
   );
 }
 
-export function useSpanFieldCustomTags(options?: {projects?: PageFilters['projects']}) {
-  const {projects} = options || {};
+export function useSpanFieldCustomTags(options?: {
+  enabled?: boolean;
+  projects?: PageFilters['projects'];
+}) {
+  const {enabled, projects} = options || {};
   const {selection} = usePageFilters();
   const organization = useOrganization();
 
@@ -80,6 +83,7 @@ export function useSpanFieldCustomTags(options?: {projects?: PageFilters['projec
     {
       staleTime: 0,
       retry: false,
+      enabled,
     }
   );
 
diff --git a/static/app/views/profiling/content.tsx b/static/app/views/profiling/content.tsx
index b9ab22441ba658..989cdae0fae4f4 100644
--- a/static/app/views/profiling/content.tsx
+++ b/static/app/views/profiling/content.tsx
@@ -51,7 +51,6 @@ import {LandingWidgetSelector} from './landing/landingWidgetSelector';
 import {ProfilesChart} from './landing/profileCharts';
 import {ProfilesChartWidget} from './landing/profilesChartWidget';
 import {ProfilingSlowestTransactionsPanel} from './landing/profilingSlowestTransactionsPanel';
-import {SlowestFunctionsTable} from './landing/slowestFunctionsTable';
 import {ProfilingOnboardingPanel} from './profilingOnboardingPanel';
 
 const LEFT_WIDGET_CURSOR = 'leftCursor';
@@ -62,239 +61,6 @@ interface ProfilingContentProps {
   location: Location;
 }
 
-function ProfilingContentLegacy({location}: ProfilingContentProps) {
-  const organization = useOrganization();
-  const {selection} = usePageFilters();
-  const cursor = decodeScalar(location.query.cursor);
-  const query = decodeScalar(location.query.query, '');
-
-  const fields = ALL_FIELDS;
-
-  const sort = formatSort<FieldType>(decodeScalar(location.query.sort), fields, {
-    key: 'count()',
-    order: 'desc',
-  });
-
-  const {projects} = useProjects();
-
-  const transactions = useProfileEvents<FieldType>({
-    cursor,
-    fields,
-    query,
-    sort,
-    referrer: 'api.profiling.landing-table',
-  });
-
-  const transactionsError =
-    transactions.status === 'error' ? formatError(transactions.error) : null;
-
-  useEffect(() => {
-    trackAnalytics('profiling_views.landing', {
-      organization,
-    });
-  }, [organization]);
-
-  const handleSearch: SmartSearchBarProps['onSearch'] = useCallback(
-    (searchQuery: string) => {
-      browserHistory.push({
-        ...location,
-        query: {
-          ...location.query,
-          cursor: undefined,
-          query: searchQuery || undefined,
-        },
-      });
-    },
-    [location]
-  );
-
-  // Open the modal on demand
-  const onSetupProfilingClick = useCallback(() => {
-    trackAnalytics('profiling_views.onboarding', {
-      organization,
-    });
-    SidebarPanelStore.activatePanel(SidebarPanelKey.PROFILING_ONBOARDING);
-  }, [organization]);
-
-  const shouldShowProfilingOnboardingPanel = useMemo((): boolean => {
-    // if it's My Projects or All projects, only show onboarding if we can't
-    // find any projects with profiles
-    if (
-      selection.projects.length === 0 ||
-      selection.projects[0] === ALL_ACCESS_PROJECTS
-    ) {
-      return projects.every(project => !project.hasProfiles);
-    }
-
-    // otherwise, only show onboarding if we can't find any projects with profiles
-    // from those that were selected
-    const projectsWithProfiles = new Set(
-      projects.filter(project => project.hasProfiles).map(project => project.id)
-    );
-    return selection.projects.every(
-      project => !projectsWithProfiles.has(String(project))
-    );
-  }, [selection.projects, projects]);
-
-  return (
-    <SentryDocumentTitle title={t('Profiling')} orgSlug={organization.slug}>
-      <PageFiltersContainer
-        defaultSelection={{datetime: DEFAULT_PROFILING_DATETIME_SELECTION}}
-      >
-        <Layout.Page>
-          <ProfilingBetaAlertBanner organization={organization} />
-          <Layout.Header>
-            <StyledHeaderContent>
-              <Layout.Title>
-                {t('Profiling')}
-                <PageHeadingQuestionTooltip
-                  docsUrl="https://docs.sentry.io/product/profiling/"
-                  title={t(
-                    'Profiling collects detailed information in production about the functions executing in your application and how long they take to run, giving you code-level visibility into your hot paths.'
-                  )}
-                />
-              </Layout.Title>
-              <FeedbackWidgetButton />
-            </StyledHeaderContent>
-          </Layout.Header>
-          <Layout.Body>
-            <Layout.Main fullWidth>
-              {transactionsError && (
-                <Alert type="error" showIcon>
-                  {transactionsError}
-                </Alert>
-              )}
-              <ActionBar>
-                <PageFilterBar condensed>
-                  <ProjectPageFilter resetParamsOnChange={CURSOR_PARAMS} />
-                  <EnvironmentPageFilter resetParamsOnChange={CURSOR_PARAMS} />
-                  <DatePageFilter resetParamsOnChange={CURSOR_PARAMS} />
-                </PageFilterBar>
-                {organization.features.includes('search-query-builder-performance') ? (
-                  <TransactionSearchQueryBuilder
-                    projects={selection.projects}
-                    initialQuery={query}
-                    onSearch={handleSearch}
-                    searchSource="profile_landing"
-                  />
-                ) : (
-                  <SearchBar
-                    searchSource="profile_landing"
-                    organization={organization}
-                    projectIds={selection.projects}
-                    query={query}
-                    onSearch={handleSearch}
-                    maxQueryLength={MAX_QUERY_LENGTH}
-                  />
-                )}
-              </ActionBar>
-              {shouldShowProfilingOnboardingPanel ? (
-                <Fragment>
-                  <ProfilingOnboardingPanel
-                    content={
-                      // If user is on m2, show default
-                      <ProfilingAM1OrMMXUpgrade
-                        organization={organization}
-                        fallback={
-                          <Fragment>
-                            <h3>{t('Function level insights')}</h3>
-                            <p>
-                              {t(
-                                'Discover slow-to-execute or resource intensive functions within your application'
-                              )}
-                            </p>
-                          </Fragment>
-                        }
-                      />
-                    }
-                  >
-                    <ProfilingUpgradeButton
-                      data-test-id="profiling-upgrade"
-                      organization={organization}
-                      priority="primary"
-                      onClick={onSetupProfilingClick}
-                      fallback={
-                        <Button onClick={onSetupProfilingClick} priority="primary">
-                          {t('Set Up Profiling')}
-                        </Button>
-                      }
-                    >
-                      {t('Set Up Profiling')}
-                    </ProfilingUpgradeButton>
-                    <LinkButton href="https://docs.sentry.io/product/profiling/" external>
-                      {t('Read Docs')}
-                    </LinkButton>
-                  </ProfilingOnboardingPanel>
-                </Fragment>
-              ) : (
-                <Fragment>
-                  {organization.features.includes(
-                    'profiling-global-suspect-functions'
-                  ) ? (
-                    <Fragment>
-                      <ProfilesChartWidget
-                        chartHeight={150}
-                        referrer="api.profiling.landing-chart"
-                        userQuery={query}
-                        selection={selection}
-                      />
-                      <WidgetsContainer>
-                        <LandingWidgetSelector
-                          cursorName={LEFT_WIDGET_CURSOR}
-                          widgetHeight="340px"
-                          defaultWidget="slowest functions"
-                          query={query}
-                          storageKey="profiling-landing-widget-0"
-                        />
-                        <LandingWidgetSelector
-                          cursorName={RIGHT_WIDGET_CURSOR}
-                          widgetHeight="340px"
-                          defaultWidget="regressed functions"
-                          query={query}
-                          storageKey="profiling-landing-widget-1"
-                        />
-                      </WidgetsContainer>
-                    </Fragment>
-                  ) : (
-                    <PanelsGrid>
-                      <ProfilingSlowestTransactionsPanel />
-                      <ProfilesChart
-                        referrer="api.profiling.landing-chart"
-                        query={query}
-                        selection={selection}
-                        hideCount
-                      />
-                    </PanelsGrid>
-                  )}
-                  <ProfileEventsTable
-                    columns={fields.slice()}
-                    data={transactions.status === 'success' ? transactions.data : null}
-                    error={
-                      transactions.status === 'error'
-                        ? t('Unable to load profiles')
-                        : null
-                    }
-                    isLoading={transactions.status === 'pending'}
-                    sort={sort}
-                    sortableColumns={new Set(fields)}
-                  />
-                  <Pagination
-                    pageLinks={
-                      transactions.status === 'success'
-                        ? transactions.getResponseHeader?.('Link') ?? null
-                        : null
-                    }
-                  />
-                </Fragment>
-              )}
-            </Layout.Main>
-          </Layout.Body>
-        </Layout.Page>
-      </PageFiltersContainer>
-    </SentryDocumentTitle>
-  );
-}
-
 function validateTab(tab: unknown): tab is 'flamegraph' | 'transactions' {
   return tab === 'flamegraph' || tab === 'transactions';
 }
@@ -305,7 +71,7 @@ function decodeTab(tab: unknown): 'flamegraph' | 'transactions' {
   return validateTab(tab) ? tab : 'transactions';
 }
 
-function ProfilingContent({location}: ProfilingContentProps) {
+export default function ProfilingContent({location}: ProfilingContentProps) {
   const organization = useOrganization();
   const {selection} = usePageFilters();
   const {projects} = useProjects();
@@ -430,7 +196,6 @@ function ProfilingTransactionsContent(props: ProfilingTabContentProps) {
     query,
     sort,
     referrer: 'api.profiling.landing-table',
-    continuousProfilingCompat: true,
   });
 
   const transactionsError =
@@ -485,25 +250,13 @@ function ProfilingTransactionsContent(props: ProfilingTabContentProps) {
         <ProfilingOnboardingCTA />
       ) : (
         <Fragment>
-          {organization.features.includes('continuous-profiling-ui') ? (
-            <Fragment>
-              <ProfilesChartWidget
-                chartHeight={150}
-                referrer="api.profiling.landing-chart"
-                userQuery={query}
-                selection={selection}
-                continuousProfilingCompat
-              />
-              <SlowestFunctionsTable userQuery={query} />
-            </Fragment>
-          ) : organization.features.includes('profiling-global-suspect-functions') ? (
+          {organization.features.includes('profiling-global-suspect-functions') ? (
             <Fragment>
               <ProfilesChartWidget
                 chartHeight={150}
                 referrer="api.profiling.landing-chart"
                 userQuery={query}
                 selection={selection}
-                continuousProfilingCompat
               />
               <WidgetsContainer>
                 <LandingWidgetSelector
@@ -733,15 +486,3 @@ const WidgetsContainer = styled('div')`
 const StyledPagination = styled(Pagination)`
   margin: 0;
 `;
-
-function ProfilingContentWrapper(props: ProfilingContentProps) {
-  const organization = useOrganization();
-
-  if (organization.features.includes('continuous-profiling-compat')) {
-    return <ProfilingContent {...props} />;
-  }
-
-  return <ProfilingContentLegacy {...props} />;
-}
-
-export default ProfilingContentWrapper;
diff --git a/static/app/views/profiling/differentialFlamegraph.tsx b/static/app/views/profiling/differentialFlamegraph.tsx
index f0618e09edb632..c2ee9d50e0f0f1 100644
--- a/static/app/views/profiling/differentialFlamegraph.tsx
+++ b/static/app/views/profiling/differentialFlamegraph.tsx
@@ -81,7 +81,6 @@ function DifferentialFlamegraphView() {
     breakpoint: location.query.breakpoint as unknown as number,
     environments: selection.selection.environments,
     fingerprint: location.query.fingerprint as unknown as string,
-    transaction: location.query.transaction as unknown as string,
   });
 
   const differentialFlamegraph = useDifferentialFlamegraphModel({
diff --git a/static/app/views/profiling/landing/functionTrendsWidget.tsx b/static/app/views/profiling/landing/functionTrendsWidget.tsx
index 9c37aa6dc11482..f5b854da3f31d8 100644
--- a/static/app/views/profiling/landing/functionTrendsWidget.tsx
+++ b/static/app/views/profiling/landing/functionTrendsWidget.tsx
@@ -27,7 +27,7 @@ import {browserHistory} from 'sentry/utils/browserHistory';
 import {axisLabelFormatter, tooltipFormatter} from 'sentry/utils/discover/charts';
 import type {FunctionTrend, TrendType} from 'sentry/utils/profiling/hooks/types';
 import {useProfileFunctionTrends} from 'sentry/utils/profiling/hooks/useProfileFunctionTrends';
-import {generateProfileFlamechartRouteWithQuery} from 'sentry/utils/profiling/routes';
+import {generateProfileRouteFromProfileReference} from 'sentry/utils/profiling/routes';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -211,7 +211,7 @@ function FunctionTrendsEntry({
   const project = projects.find(p => p.id === func.project);
 
   const [beforeExamples, afterExamples] = useMemo(() => {
-    return partition(func.worst, ([ts, _example]) => ts <= func.breakpoint);
+    return partition(func.examples, ([ts, _example]) => ts <= func.breakpoint);
   }, [func]);
 
   let before = <PerformanceDuration nanoseconds={func.aggregate_range_1} abbreviation />;
@@ -241,14 +241,12 @@ function FunctionTrendsEntry({
     // occurred within the period and eliminate confusion with picking an example in
     // the same bucket as the breakpoint.
 
-    const beforeTarget = generateProfileFlamechartRouteWithQuery({
+    const beforeTarget = generateProfileRouteFromProfileReference({
       orgSlug: organization.slug,
       projectSlug: project.slug,
-      profileId: beforeExamples[beforeExamples.length - 2][1],
-      query: {
-        frameName: func.function as string,
-        framePackage: func.package as string,
-      },
+      reference: beforeExamples[beforeExamples.length - 2][1],
+      frameName: func.function as string,
+      framePackage: func.package as string,
     });
 
     before = (
@@ -257,14 +255,12 @@ function FunctionTrendsEntry({
       </Link>
     );
 
-    const afterTarget = generateProfileFlamechartRouteWithQuery({
+    const afterTarget = generateProfileRouteFromProfileReference({
       orgSlug: organization.slug,
       projectSlug: project.slug,
-      profileId: afterExamples[afterExamples.length - 2][1],
-      query: {
-        frameName: func.function as string,
-        framePackage: func.package as string,
-      },
+      reference: afterExamples[afterExamples.length - 2][1],
+      frameName: func.function as string,
+      framePackage: func.package as string,
     });
 
     after = (
@@ -277,6 +273,14 @@ function FunctionTrendsEntry({
   return (
     <Fragment>
       <StyledAccordionItem>
+        <Button
+          icon={<IconChevron size="xs" direction={isExpanded ? 'up' : 'down'} />}
+          aria-label={t('Expand')}
+          aria-expanded={isExpanded}
+          size="zero"
+          borderless
+          onClick={() => setExpanded()}
+        />
         {project && (
           <Tooltip title={project.name}>
             <IdBadge project={project} avatarSize={16} hideName />
@@ -296,14 +300,6 @@ function FunctionTrendsEntry({
             {after}
           </DurationChange>
         </Tooltip>
-        <Button
-          icon={<IconChevron size="xs" direction={isExpanded ? 'up' : 'down'} />}
-          aria-label={t('Expand')}
-          aria-expanded={isExpanded}
-          size="zero"
-          borderless
-          onClick={() => setExpanded()}
-        />
       </StyledAccordionItem>
       {isExpanded && (
         <FunctionTrendsChartContainer>
@@ -492,7 +488,7 @@ const StyledPagination = styled(Pagination)`
 
 const StyledAccordionItem = styled(AccordionItem)`
   display: grid;
-  grid-template-columns: auto 1fr auto auto;
+  grid-template-columns: auto auto 1fr auto;
 `;
 
 const FunctionName = styled(TextOverflow)`
diff --git a/static/app/views/profiling/landing/profilesChartWidget.tsx b/static/app/views/profiling/landing/profilesChartWidget.tsx
index 3d8c6cb63d8700..bc9f5a2dd5c968 100644
--- a/static/app/views/profiling/landing/profilesChartWidget.tsx
+++ b/static/app/views/profiling/landing/profilesChartWidget.tsx
@@ -9,7 +9,6 @@ import type {PageFilters} from 'sentry/types/core';
 import type {Series} from 'sentry/types/echarts';
 import {axisLabelFormatter, tooltipFormatter} from 'sentry/utils/discover/charts';
 import {useProfileEventsStats} from 'sentry/utils/profiling/hooks/useProfileEventsStats';
-import useOrganization from 'sentry/utils/useOrganization';
 
 import {
   ContentContainer,
@@ -21,7 +20,6 @@ import {
 interface ProfilesChartWidgetProps {
   chartHeight: number;
   referrer: string;
-  continuousProfilingCompat?: boolean;
   header?: ReactNode;
   selection?: PageFilters;
   userQuery?: string;
@@ -32,7 +30,6 @@ const SERIES_ORDER = ['p99()', 'p95()', 'p75()', 'p50()'] as const;
 
 export function ProfilesChartWidget({
   chartHeight,
-  continuousProfilingCompat,
   header,
   referrer,
   selection,
@@ -40,14 +37,12 @@ export function ProfilesChartWidget({
   widgetHeight,
 }: ProfilesChartWidgetProps) {
   const theme = useTheme();
-  const organization = useOrganization();
 
   const profileStats = useProfileEventsStats({
     dataset: 'profiles',
     query: userQuery,
     referrer,
     yAxes: SERIES_ORDER,
-    continuousProfilingCompat,
   });
 
   const series: Series[] = useMemo(() => {
@@ -119,11 +114,7 @@ export function ProfilesChartWidget({
     <WidgetContainer height={widgetHeight}>
       <HeaderContainer>
         {header ?? (
-          <HeaderTitleLegend>
-            {organization.features.includes('continuous-profiling-compat')
-              ? t('Transactions by Percentiles')
-              : t('Profiles by Percentiles')}
-          </HeaderTitleLegend>
+          <HeaderTitleLegend>{t('Transactions by Percentiles')}</HeaderTitleLegend>
         )}
       </HeaderContainer>
       <ContentContainer>
diff --git a/static/app/views/profiling/landing/slowestFunctionsTable.spec.tsx b/static/app/views/profiling/landing/slowestFunctionsTable.spec.tsx
deleted file mode 100644
index 28593d3464090c..00000000000000
--- a/static/app/views/profiling/landing/slowestFunctionsTable.spec.tsx
+++ /dev/null
@@ -1,238 +0,0 @@
-import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import {SlowestFunctionsTable} from 'sentry/views/profiling/landing/slowestFunctionsTable';
-
-describe('SlowestFunctionsTable', () => {
-  it('shows loading state', () => {
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/profiling/flamegraph/',
-      body: [],
-    });
-
-    render(<SlowestFunctionsTable />);
-    expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
-  });
-
-  it('shows error state', async () => {
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/profiling/flamegraph/',
-      body: [],
-      statusCode: 500,
-    });
-
-    render(<SlowestFunctionsTable />);
-    expect(await screen.findByTestId('error-indicator')).toBeInTheDocument();
-  });
-
-  it('shows no functions state', async () => {
-    // @ts-expect-error partial schema mock
-    const schema: Profiling.Schema = {
-      metrics: [],
-    };
-
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/profiling/flamegraph/',
-      match: [
-        MockApiClient.matchQuery({
-          expand: 'metrics',
-        }),
-      ],
-      body: schema,
-    });
-
-    render(<SlowestFunctionsTable />);
-    expect(await screen.findByText('No functions found')).toBeInTheDocument();
-  });
-  it('renders function fields', async () => {
-    // @ts-expect-error partial schema mock
-    const schema: Profiling.Schema = {
-      metrics: [
-        {
-          name: 'slow-function',
-          package: 'slow-package',
-          p75: 1500 * 1e6,
-          p95: 2000 * 1e6,
-          p99: 3000 * 1e6,
-          sum: 60_000 * 1e6,
-          count: 5000,
-          avg: 0.5 * 1e6,
-          in_app: true,
-          fingerprint: 12345,
-          examples: [
-            {
-              project_id: 1,
-              profile_id: 'profile-id',
-            },
-          ],
-        },
-      ],
-    };
-
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/profiling/flamegraph/',
-      match: [
-        MockApiClient.matchQuery({
-          expand: 'metrics',
-        }),
-      ],
-      body: schema,
-    });
-
-    render(<SlowestFunctionsTable />);
-    for (const value of ['slow-function', 'slow-package', '1.50s', '2.00s', '3.00s']) {
-      expect(await screen.findByText(value)).toBeInTheDocument();
-    }
-  });
-  it('paginates response', async () => {
-    // @ts-expect-error partial schema mock
-    const schema: Profiling.Schema = {
-      metrics: [],
-    };
-
-    for (let i = 0; i < 10; i++) {
-      schema.metrics?.push({
-        name: 'slow-function',
-        package: 'slow-package',
-        p75: 1500 * 1e6,
-        p95: 2000 * 1e6,
-        p99: 3000 * 1e6,
-        sum: 60_000 * 1e6,
-        count: 5000,
-        avg: 0.5 * 1e6,
-        in_app: true,
-        fingerprint: 12345,
-        examples: [
-          {
-            project_id: 1,
-            profile_id: 'profile-id',
-          },
-        ],
-      });
-    }
-
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/profiling/flamegraph/',
-      match: [
-        MockApiClient.matchQuery({
-          expand: 'metrics',
-        }),
-      ],
-      body: schema,
-    });
-
-    render(<SlowestFunctionsTable />);
-
-    expect(await screen.findAllByText('slow-function')).toHaveLength(5);
-  });
-
-  it('paginates results', async () => {
-    // @ts-expect-error partial schema mock
-    const schema: Profiling.Schema = {
-      metrics: [],
-    };
-
-    for (let i = 0; i < 10; i++) {
-      schema.metrics?.push({
-        name: 'slow-function-' + i,
-        package: 'slow-package',
-        p75: 1500 * 1e6,
-        p95: 2000 * 1e6,
-        p99: 3000 * 1e6,
-        sum: 60_000 * 1e6,
-        count: 5000,
-        avg: 0.5 * 1e6,
-        in_app: true,
-        fingerprint: 12345,
-        examples: [
-          {
-            project_id: 1,
-            profile_id: 'profile-id',
-          },
-        ],
-      });
-    }
-
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/profiling/flamegraph/',
-      match: [
-        MockApiClient.matchQuery({
-          expand: 'metrics',
-        }),
-      ],
-      body: schema,
-    });
-
-    render(<SlowestFunctionsTable />);
-    expect(await screen.findAllByText('slow-package')).toHaveLength(5);
-
-    await userEvent.click(screen.getByLabelText('Next'));
-    for (let i = 6; i < 10; i++) {
-      expect(await screen.findByText('slow-function-' + i)).toBeInTheDocument();
-    }
-    expect(screen.getByLabelText('Next')).toBeDisabled();
-
-    await userEvent.click(screen.getByLabelText('Previous'));
-    for (let i = 0; i < 5; i++) {
-      expect(await screen.findByText('slow-function-' + i)).toBeInTheDocument();
-    }
-    expect(screen.getByLabelText('Previous')).toBeDisabled();
-  });
-  it('fetches function metrics', async () => {
-    // @ts-expect-error partial schema mock
-    const schema: Profiling.Schema = {
-      metrics: [],
-    };
-
-    for (let i = 0; i < 10; i++) {
-      schema.metrics?.push({
-        name: 'slow-function-' + i,
-        package: 'slow-package',
-        p75: 1500 * 1e6,
-        p95: 2000 * 1e6,
-        p99: 3000 * 1e6,
-        sum: 60_000 * 1e6,
-        count: 5000,
-        avg: 0.5 * 1e6,
-        in_app: true,
-        fingerprint: 12345,
-        examples: [
-          {
-            project_id: 1,
-            profile_id: 'profile-id',
-          },
-        ],
-      });
-    }
-
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/profiling/flamegraph/',
-      match: [
-        MockApiClient.matchQuery({
-          expand: 'metrics',
-        }),
-      ],
-      body: schema,
-    });
-
-    const functionMetricsRequest = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events-stats/',
-      match: [
-        MockApiClient.matchQuery({
-          query: 'fingerprint:12345',
-          dataset: 'profileFunctionsMetrics',
-        }),
-      ],
-      body: [],
-    });
-
-    render(<SlowestFunctionsTable />);
-
-    const expandButtons = await screen.findAllByLabelText('View Function Metrics');
-    expect(expandButtons).toHaveLength(5);
-
-    await userEvent.click(expandButtons[0]);
-    await waitFor(() => {
-      expect(functionMetricsRequest).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/static/app/views/profiling/landing/slowestFunctionsTable.tsx b/static/app/views/profiling/landing/slowestFunctionsTable.tsx
deleted file mode 100644
index c256c87959abf3..00000000000000
--- a/static/app/views/profiling/landing/slowestFunctionsTable.tsx
+++ /dev/null
@@ -1,546 +0,0 @@
-import {Fragment, useCallback, useMemo, useState} from 'react';
-import styled from '@emotion/styled';
-import clamp from 'lodash/clamp';
-
-import {Button} from 'sentry/components/button';
-import ButtonBar from 'sentry/components/buttonBar';
-import {LineChart, type LineChartProps} from 'sentry/components/charts/lineChart';
-import EmptyStateWarning from 'sentry/components/emptyStateWarning';
-import ProjectBadge from 'sentry/components/idBadge/projectBadge';
-import Link from 'sentry/components/links/link';
-import LoadingIndicator from 'sentry/components/loadingIndicator';
-import TextOverflow from 'sentry/components/textOverflow';
-import {Tooltip} from 'sentry/components/tooltip';
-import {IconChevron, IconOpen, IconWarning} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {Series} from 'sentry/types/echarts';
-import type {Organization} from 'sentry/types/organization';
-import type {Project} from 'sentry/types/project';
-import {defined} from 'sentry/utils';
-import {axisLabelFormatter, tooltipFormatter} from 'sentry/utils/discover/charts';
-import {getShortEventId} from 'sentry/utils/events';
-import {useAggregateFlamegraphQuery} from 'sentry/utils/profiling/hooks/useAggregateFlamegraphQuery';
-import {useProfilingFunctionMetrics} from 'sentry/utils/profiling/hooks/useProfilingFunctionMetrics';
-import {generateProfileRouteFromProfileReference} from 'sentry/utils/profiling/routes';
-import useOrganization from 'sentry/utils/useOrganization';
-import useProjects from 'sentry/utils/useProjects';
-import {
-  Table,
-  TableBody,
-  TableBodyCell,
-  TableHead,
-  TableHeadCell,
-  TableHeader,
-  TableHeaderActions,
-  TableHeaderTitle,
-  TableRow,
-  TableStatus,
-  useTableStyles,
-} from 'sentry/views/explore/components/table';
-import {getPerformanceDuration} from 'sentry/views/performance/utils/getPerformanceDuration';
-
-function sortFunctions(a: Profiling.FunctionMetric, b: Profiling.FunctionMetric) {
-  return b.sum - a.sum;
-}
-function makeProfileLinkFromExample(
-  organization: Organization,
-  f: Profiling.FunctionMetric,
-  example: Profiling.FunctionMetric['examples'][0],
-  projectsLookupTable: Record<string, Project>
-) {
-  if ('project_id' in example) {
-    return generateProfileRouteFromProfileReference({
-      frameName: f.name,
-      framePackage: f.package,
-      orgSlug: organization.slug,
-      projectSlug: projectsLookupTable[example.project_id]?.slug,
-      reference: example,
-    });
-  }
-  return null;
-}
-
-function useMemoryPagination(items: any[], size: number) {
-  const [pagination, setPagination] = useState({
-    start: 0,
-    end: size,
-  });
-
-  const page = Math.floor(pagination.start / size);
-  const toPage = useCallback(
-    (p: number) => {
-      const next = clamp(p, 0, Math.floor(items.length / size));
-
-      setPagination({
-        start: clamp(next * size, 0, items.length - size),
-        end: Math.min(next * size + size, items.length),
-      });
-    },
-    [size, items]
-  );
-
-  return {
-    page,
-    start: pagination.start,
-    end: pagination.end,
-    nextButtonProps: {
-      disabled: pagination.end >= items.length,
-      onClick: () => toPage(page + 1),
-    },
-    previousButtonProps: {
-      disabled: pagination.start <= 0,
-      onClick: () => toPage(page - 1),
-    },
-  };
-}
-
-export function SlowestFunctionsTable({userQuery}: {userQuery?: string}) {
-  const {projects} = useProjects();
-
-  const query = useAggregateFlamegraphQuery({
-    // User query is only permitted when using transactions.
-    // If this is to be reused for strictly continuous profiling,
-    // it'll need to be swapped to use the `profiles` data source
-    // with no user query.
-    dataSource: 'transactions',
-    query: userQuery ?? '',
-    metrics: true,
-  });
-
-  const sortedMetrics = useMemo(() => {
-    return query.data?.metrics?.sort(sortFunctions) ?? [];
-  }, [query.data?.metrics]);
-
-  const pagination = useMemoryPagination(sortedMetrics, 5);
-
-  const projectsLookupTable = useMemo(() => {
-    return projects.reduce(
-      (acc, project) => {
-        acc[project.id] = project;
-        return acc;
-      },
-      {} as Record<string, Project>
-    );
-  }, [projects]);
-
-  const hasFunctions = query.data?.metrics && query.data.metrics.length > 0;
-
-  const columns = [
-    {label: t('Function'), value: 'function'},
-    {label: t('Package'), value: 'package'},
-    {label: t('Project'), value: 'project'},
-    {label: t('p75()'), value: 'p75', width: 'min-content' as const},
-    {label: t('p95()'), value: 'p95', width: 'min-content' as const},
-    {label: t('p99()'), value: 'p99', width: 'min-content' as const},
-  ];
-
-  const {tableStyles} = useTableStyles({items: columns});
-
-  return (
-    <Fragment>
-      <TableHeader>
-        <TableHeaderTitle>{t('Slowest Functions')}</TableHeaderTitle>
-        <TableHeaderActions>
-          <SlowestFunctionsPaginationContainer>
-            <ButtonBar merged>
-              <Button
-                icon={<IconChevron direction="left" />}
-                aria-label={t('Previous')}
-                size={'sm'}
-                {...pagination.previousButtonProps}
-              />
-              <Button
-                icon={<IconChevron direction="right" />}
-                aria-label={t('Next')}
-                size={'sm'}
-                {...pagination.nextButtonProps}
-              />
-            </ButtonBar>
-          </SlowestFunctionsPaginationContainer>
-        </TableHeaderActions>
-      </TableHeader>
-      <Table style={tableStyles}>
-        <TableHead>
-          <TableRow>
-            {columns.map((column, i) => (
-              <TableHeadCell key={column.value} isFirst={i === 0}>
-                {column.label}
-              </TableHeadCell>
-            ))}
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {query.isPending && (
-            <TableStatus>
-              <LoadingIndicator size={36} />
-            </TableStatus>
-          )}
-          {query.isError && (
-            <TableStatus>
-              <IconWarning data-test-id="error-indicator" color="gray300" size="lg" />
-            </TableStatus>
-          )}
-          {!query.isError && !query.isPending && !hasFunctions && (
-            <TableStatus>
-              <EmptyStateWarning>
-                <p>{t('No functions found')}</p>
-              </EmptyStateWarning>
-            </TableStatus>
-          )}
-          {hasFunctions &&
-            query.isFetched &&
-            sortedMetrics.slice(pagination.start, pagination.end).map((f, i) => {
-              return (
-                <SlowestFunction
-                  key={i}
-                  function={f}
-                  projectsLookupTable={projectsLookupTable}
-                />
-              );
-            })}
-        </TableBody>
-      </Table>
-    </Fragment>
-  );
-}
-
-interface SlowestFunctionProps {
-  function: NonNullable<Profiling.Schema['metrics']>[0];
-  projectsLookupTable: Record<string, Project>;
-}
-
-function SlowestFunction(props: SlowestFunctionProps) {
-  const [expanded, setExpanded] = useState(false);
-  const organization = useOrganization();
-
-  const exampleLink = makeProfileLinkFromExample(
-    organization,
-    props.function,
-    props.function.examples[0],
-    props.projectsLookupTable
-  );
-
-  return (
-    <Fragment>
-      <TableRow>
-        <TableBodyCell>
-          <TableButtonWrapper>
-            <Button
-              icon={<IconChevron direction={expanded ? 'up' : 'down'} />}
-              aria-label={t('View Function Metrics')}
-              onClick={() => setExpanded(!expanded)}
-              size="xs"
-              borderless
-            />
-            <Tooltip title={props.function.name}>
-              <TextOverflow>
-                {exampleLink ? (
-                  <Link to={exampleLink}>
-                    {props.function.name || t('<unknown function>')}
-                  </Link>
-                ) : (
-                  props.function.name || t('<unknown function>')
-                )}
-              </TextOverflow>
-            </Tooltip>
-          </TableButtonWrapper>
-        </TableBodyCell>
-        <TableBodyCell>
-          <TextOverflow>
-            <Tooltip title={props.function.package || t('<unknown package>')}>
-              {props.function.package}
-            </Tooltip>
-          </TextOverflow>
-        </TableBodyCell>
-        <TableBodyCell>
-          <SlowestFunctionsProjectBadge
-            examples={props.function.examples}
-            projectsLookupTable={props.projectsLookupTable}
-          />{' '}
-        </TableBodyCell>
-        <TableBodyCell>{getPerformanceDuration(props.function.p75 / 1e6)}</TableBodyCell>
-        <TableBodyCell>{getPerformanceDuration(props.function.p95 / 1e6)}</TableBodyCell>
-        <TableBodyCell>{getPerformanceDuration(props.function.p99 / 1e6)}</TableBodyCell>
-      </TableRow>
-      {expanded ? (
-        <SlowestFunctionTimeSeries
-          function={props.function}
-          projectsLookupTable={props.projectsLookupTable}
-        />
-      ) : null}
-    </Fragment>
-  );
-}
-
-interface SlowestFunctionsProjectBadgeProps {
-  examples: Profiling.FunctionMetric['examples'];
-  projectsLookupTable: Record<string, Project>;
-}
-
-function SlowestFunctionsProjectBadge(props: SlowestFunctionsProjectBadgeProps) {
-  const resolvedProjects = useMemo(() => {
-    const projects: Project[] = [];
-
-    for (const example of props.examples) {
-      if ('project_id' in example) {
-        const project = props.projectsLookupTable[example.project_id];
-        if (project) {
-          projects.push(project);
-        }
-      }
-    }
-
-    return projects;
-  }, [props.examples, props.projectsLookupTable]);
-
-  return resolvedProjects[0] ? (
-    <ProjectBadge avatarSize={16} project={resolvedProjects[0]} />
-  ) : null;
-}
-
-const METRICS_CHART_OPTIONS: Partial<LineChartProps> = {
-  tooltip: {
-    valueFormatter: (value: number) => tooltipFormatter(value, 'number'),
-  },
-  xAxis: {
-    show: true,
-    type: 'time' as const,
-  },
-  yAxis: {
-    axisLabel: {
-      formatter(value: number) {
-        return axisLabelFormatter(value, 'integer');
-      },
-    },
-  },
-};
-
-interface SlowestFunctionTimeSeriesProps {
-  function: Profiling.FunctionMetric;
-  projectsLookupTable: Record<string, Project>;
-}
-
-function SlowestFunctionTimeSeries(props: SlowestFunctionTimeSeriesProps) {
-  const organization = useOrganization();
-  const projects = useMemo(() => {
-    const projectsMap = props.function.examples.reduce<Record<string, number>>(
-      (acc, f) => {
-        if (typeof f !== 'string' && 'project_id' in f) {
-          acc[f.project_id] = f.project_id;
-        }
-        return acc;
-      },
-      {}
-    );
-
-    return Object.values(projectsMap);
-  }, [props.function]);
-
-  const metrics = useProfilingFunctionMetrics({
-    fingerprint: props.function.fingerprint,
-    projects,
-  });
-
-  const series: Series[] = useMemo(() => {
-    if (!metrics.isFetched) {
-      return [];
-    }
-
-    const serie: Series = {
-      seriesName: props.function.name,
-      data:
-        metrics.data?.data?.map?.(entry => {
-          return {
-            name: entry[0] * 1000,
-            value: entry[1][0].count,
-          };
-        }) ?? [],
-    };
-
-    return [serie];
-  }, [metrics, props.function]);
-
-  const examples = useMemo(() => {
-    const uniqueExamples: Profiling.FunctionMetric['examples'] = [];
-
-    const profileIds = new Set<string>();
-    const transactionIds = new Set<string>();
-
-    for (const example of props.function.examples) {
-      if ('profile_id' in example) {
-        if (!profileIds.has(example.profile_id)) {
-          profileIds.add(example.profile_id);
-          uniqueExamples.push(example);
-        }
-      } else {
-        if (
-          defined(example.transaction_id) &&
-          !transactionIds.has(example.transaction_id)
-        ) {
-          transactionIds.add(example.transaction_id);
-          uniqueExamples.push(example);
-        }
-      }
-    }
-
-    return uniqueExamples;
-  }, [props.function.examples]);
-
-  return (
-    <TableRow>
-      <SlowestFunctionsTimeSeriesContainer>
-        <SlowestFunctionsHeader>
-          <SlowestFunctionsHeaderCell>{t('Examples')}</SlowestFunctionsHeaderCell>
-          <SlowestFunctionsHeaderCell>{t('Occurrences')}</SlowestFunctionsHeaderCell>
-        </SlowestFunctionsHeader>
-        <SlowestFunctionsExamplesContainer>
-          {examples.slice(0, 5).map((example, i) => {
-            const exampleLink = makeProfileLinkFromExample(
-              organization,
-              props.function,
-              example,
-              props.projectsLookupTable
-            );
-
-            const eventId =
-              'profile_id' in example ? example.profile_id : example.transaction_id;
-
-            return (
-              <SlowestFunctionsExamplesContainerRow key={i}>
-                <SlowestFunctionsExamplesContainerRowInner>
-                  {defined(exampleLink) && defined(eventId) && (
-                    <SlowestFunctionExampleLink to={exampleLink}>
-                      <IconOpen size="xs" /> {getShortEventId(eventId)}
-                    </SlowestFunctionExampleLink>
-                  )}
-                </SlowestFunctionsExamplesContainerRowInner>
-              </SlowestFunctionsExamplesContainerRow>
-            );
-          })}
-        </SlowestFunctionsExamplesContainer>
-        <SlowestFunctionsChartContainer>
-          {metrics.isPending && (
-            <TableStatusContainer>
-              <LoadingIndicator size={36} />
-            </TableStatusContainer>
-          )}
-          {metrics.isError && (
-            <TableStatusContainer>
-              <IconWarning data-test-id="error-indicator" color="gray300" size="lg" />
-            </TableStatusContainer>
-          )}
-          {!metrics.isError && !metrics.isPending && !series.length && (
-            <TableStatusContainer>
-              <EmptyStateWarning>
-                <p>{t('No function metrics found')}</p>
-              </EmptyStateWarning>
-            </TableStatusContainer>
-          )}
-          {metrics.isFetched && series.length > 0 ? (
-            <LineChart
-              {...METRICS_CHART_OPTIONS}
-              isGroupedByDate
-              showTimeInTooltip
-              series={series}
-            />
-          ) : null}
-        </SlowestFunctionsChartContainer>
-      </SlowestFunctionsTimeSeriesContainer>
-    </TableRow>
-  );
-}
-
-const TableStatusContainer = styled('div')`
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-  height: 100px;
-  grid-column: 1 / -1;
-`;
-
-const TableButtonWrapper = styled('div')`
-  display: flex;
-  align-items: center;
-  gap: ${space(1)};
-  min-width: 0;
-`;
-
-const SlowestFunctionsHeader = styled('div')`
-  display: grid;
-  grid-template-columns: subgrid;
-  grid-column: 1 / -1;
-
-  background-color: ${p => p.theme.backgroundSecondary};
-  border-bottom: 1px solid ${p => p.theme.border};
-  color: ${p => p.theme.subText};
-  text-transform: uppercase;
-  font-size: ${p => p.theme.fontSizeSmall};
-  font-weight: 600;
-  text-align: left;
-
-  > div:nth-child(n + 4) {
-    text-align: right;
-  }
-`;
-
-const SlowestFunctionsHeaderCell = styled('div')`
-  padding: ${space(1)} ${space(2)};
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-
-  &:last-child {
-    grid-column: 3 / -1;
-  }
-`;
-
-const SlowestFunctionsTimeSeriesContainer = styled(TableBodyCell)`
-  display: grid;
-  grid-column: 1 / -1;
-  grid-template-columns: 160px 1fr;
-  padding: 0 !important;
-`;
-
-const SlowestFunctionExampleLink = styled(Link)`
-  display: flex;
-  align-items: center;
-  gap: ${space(1)};
-`;
-
-const SlowestFunctionsChartContainer = styled('div')`
-  grid-column: 2 / -1;
-  padding: ${space(3)} ${space(2)} ${space(1)} ${space(2)};
-  height: 214px;
-`;
-
-const SlowestFunctionsExamplesContainer = styled('div')`
-  grid-column: 1;
-  border-right: 1px solid ${p => p.theme.border};
-
-  display: grid;
-  grid-template-columns: subgrid;
-`;
-
-const SlowestFunctionsExamplesContainerRowInner = styled('div')`
-  grid-column: 2 / 3;
-  display: flex;
-  align-items: center;
-  padding: ${space(1)} ${space(2)};
-`;
-
-const SlowestFunctionsExamplesContainerRow = styled('div')`
-  display: grid;
-  grid-template-columns: subgrid;
-  grid-column: 1 / 3;
-
-  &:not(:last-child) {
-    border-bottom: 1px solid ${p => p.theme.border};
-  }
-`;
-
-const SlowestFunctionsPaginationContainer = styled('div')`
-  display: flex;
-  justify-content: flex-end;
-`;
diff --git a/static/app/views/profiling/landing/slowestFunctionsWidget.spec.tsx b/static/app/views/profiling/landing/slowestFunctionsWidget.spec.tsx
index 30fa5c0cfa5945..7a33c442595804 100644
--- a/static/app/views/profiling/landing/slowestFunctionsWidget.spec.tsx
+++ b/static/app/views/profiling/landing/slowestFunctionsWidget.spec.tsx
@@ -1,6 +1,6 @@
 import {ProjectFixture} from 'sentry-fixture/project';
 
-import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+import {getAllByRole, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
 import {SlowestFunctionsWidget} from 'sentry/views/profiling/landing/slowestFunctionsWidget';
@@ -59,7 +59,7 @@ describe('SlowestFunctionsWidget', function () {
     expect(await screen.findByText('No functions found')).toBeInTheDocument();
   });
 
-  it('renders example transactions', async function () {
+  it('renders examples and chart', async function () {
     // for the slowest functions query
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/events/',
@@ -102,68 +102,135 @@ describe('SlowestFunctionsWidget', function () {
       ],
     });
 
-    // first function examples
+    // for the chart + examples
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: '/organizations/org-slug/events-stats/',
       body: {
-        data: [
-          {
-            transaction: 'transaction-1',
-            'count()': 1000,
-            'p75()': 100000,
-            'sum()': 1000000,
-            'all_examples()': [
-              {profile_id: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'},
-              {profile_id: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'},
+        123: {
+          'all_examples()': {
+            order: 0,
+            start: 0,
+            end: 1000,
+            meta: {
+              fields: {
+                time: 'date',
+                fingerprint: 'integer',
+                p75: 'duration',
+                all_examples: 'string',
+              },
+              units: {
+                time: null,
+                fingerprint: null,
+                p75: 'nanosecond',
+                all_examples: null,
+              },
+            },
+            data: [
+              [0, [{count: 0}]],
+              [500, [{count: [{profile_id: '1'.repeat(32)}]}]],
+              [
+                1000,
+                [
+                  {
+                    count: [
+                      {profiler_id: '2'.repeat(32), thread_id: '0', start: 0, end: 1000},
+                    ],
+                  },
+                ],
+              ],
             ],
           },
-          {
-            transaction: 'transaction-2',
-            'count()': 2500,
-            'p75()': 50000,
-            'sum()': 500000,
-            'all_examples()': [{profile_id: 'cccccccccccccccccccccccccccccccc'}],
+          'p75()': {
+            order: 1,
+            start: 0,
+            end: 1000,
+            meta: {
+              fields: {
+                time: 'date',
+                fingerprint: 'integer',
+                p75: 'duration',
+                all_examples: 'string',
+              },
+              units: {
+                time: null,
+                fingerprint: null,
+                p75: 'nanosecond',
+                all_examples: null,
+              },
+            },
+            data: [
+              [0, [{count: 1}]],
+              [500, [{count: 2}]],
+              [1000, [{count: 3}]],
+            ],
           },
-        ],
-      },
-      match: [
-        MockApiClient.matchQuery({
-          dataset: 'profileFunctions',
-          query: 'project.id:1 fingerprint:123',
-          field: ['transaction', 'count()', 'sum()', 'all_examples()', 'p75()'],
-        }),
-      ],
-    });
-
-    // second function examples
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
-      body: {
-        data: [
-          {
-            transaction: 'transaction-3',
-            'count()': 2000,
-            'p75()': 200000,
-            'sum()': 2000000,
-            'all_examples()': [
-              {profile_id: 'dddddddddddddddddddddddddddddddd'},
-              {profile_id: 'eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'},
+        },
+        456: {
+          'all_examples()': {
+            order: 0,
+            start: 0,
+            end: 1000,
+            meta: {
+              fields: {
+                time: 'date',
+                fingerprint: 'integer',
+                p75: 'duration',
+                all_examples: 'string',
+              },
+              units: {
+                time: null,
+                fingerprint: null,
+                p75: 'nanosecond',
+                all_examples: null,
+              },
+            },
+            data: [
+              [0, [{count: 0}]],
+              [500, [{count: [{profile_id: '3'.repeat(32)}]}]],
+              [
+                1000,
+                [
+                  {
+                    count: [
+                      {profiler_id: '4'.repeat(32), thread_id: '0', start: 0, end: 1000},
+                    ],
+                  },
+                ],
+              ],
             ],
           },
-          {
-            transaction: 'transaction-4',
-            'count()': 3500,
-            'p75()': 70000,
-            'sum()': 700000,
-            'all_examples()': [{profile_id: 'ffffffffffffffffffffffffffffffff'}],
+          'p75()': {
+            order: 1,
+            start: 0,
+            end: 1000,
+            meta: {
+              fields: {
+                time: 'date',
+                fingerprint: 'integer',
+                p75: 'duration',
+                all_examples: 'string',
+              },
+              units: {
+                time: null,
+                fingerprint: null,
+                p75: 'nanosecond',
+                all_examples: null,
+              },
+            },
+            data: [
+              [0, [{count: 1}]],
+              [500, [{count: 2}]],
+              [1000, [{count: 3}]],
+            ],
           },
-        ],
+        },
       },
       match: [
         MockApiClient.matchQuery({
           dataset: 'profileFunctions',
-          query: 'project.id:1 fingerprint:456',
-          field: ['transaction', 'count()', 'sum()', 'all_examples()', 'p75()'],
+          field: ['fingerprint', 'all_examples()', 'p75()'],
+          yAxis: ['all_examples()', 'p75()'],
+          project: [1],
         }),
       ],
     });
@@ -173,57 +240,17 @@ describe('SlowestFunctionsWidget', function () {
     // starts by rendering loading
     expect(screen.getByTestId('loading-indicator')).toBeInTheDocument();
 
-    // switches to the transactions list  once the api responds with data
-    expect(await screen.findByTestId('transactions-list')).toBeInTheDocument();
-
-    // headers
-    expect(screen.getByText('Transaction')).toBeInTheDocument();
-    expect(screen.getByText('Count')).toBeInTheDocument();
-    expect(screen.getByText('Time Spent')).toBeInTheDocument();
-
-    // first row
-    const transaction1 = screen.getByText('transaction-1');
-    expect(transaction1).toBeInTheDocument();
-    expect(transaction1).toHaveAttribute(
-      'href',
-      '/organizations/org-slug/profiling/profile/proj-slug/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/flamegraph/?frameName=bar&framePackage=foo'
-    );
-    expect(screen.getByText('1k')).toBeInTheDocument();
-    expect(screen.getByText('1.00ms')).toBeInTheDocument();
-
-    // second row
-    const transaction2 = screen.getByText('transaction-2');
-    expect(transaction2).toBeInTheDocument();
-    expect(transaction2).toHaveAttribute(
-      'href',
-      '/organizations/org-slug/profiling/profile/proj-slug/cccccccccccccccccccccccccccccccc/flamegraph/?frameName=bar&framePackage=foo'
-    );
-    expect(screen.getByText('2.5k')).toBeInTheDocument();
-    expect(screen.getByText('0.50ms')).toBeInTheDocument();
-
-    // toggle the second function
-    const toggles = screen.getAllByRole('button', {});
-    expect(toggles.length).toEqual(2);
-    await userEvent.click(toggles[1]);
-
-    // first row
-    const transaction3 = await screen.findByText('transaction-3');
-    expect(transaction3).toBeInTheDocument();
-    expect(transaction3).toHaveAttribute(
-      'href',
-      '/organizations/org-slug/profiling/profile/proj-slug/dddddddddddddddddddddddddddddddd/flamegraph/?frameName=qux&framePackage=baz'
-    );
-    expect(screen.getByText('2k')).toBeInTheDocument();
-    expect(screen.getByText('2.00ms')).toBeInTheDocument();
-
-    // second row
-    const transaction4 = screen.getByText('transaction-4');
-    expect(transaction4).toBeInTheDocument();
-    expect(transaction4).toHaveAttribute(
-      'href',
-      '/organizations/org-slug/profiling/profile/proj-slug/ffffffffffffffffffffffffffffffff/flamegraph/?frameName=qux&framePackage=baz'
-    );
-    expect(screen.getByText('3.5k')).toBeInTheDocument();
-    expect(screen.getByText('0.70ms')).toBeInTheDocument();
+    // switches to the functions-chart  once the api responds with data
+    expect(await screen.findByTestId('function-chart')).toBeInTheDocument();
+
+    const items = screen.getAllByRole('listitem', {});
+    expect(items.length).toEqual(2);
+
+    const buttons = getAllByRole(items[0], 'button', {});
+    expect(buttons.length).toEqual(2);
+    await userEvent.click(buttons[1]);
+
+    expect(screen.getByText('1'.repeat(8))).toBeInTheDocument();
+    expect(screen.getByText('2'.repeat(8))).toBeInTheDocument();
   });
 });
diff --git a/static/app/views/profiling/landing/slowestFunctionsWidget.tsx b/static/app/views/profiling/landing/slowestFunctionsWidget.tsx
index 6181b513159208..eaad7c5d40327e 100644
--- a/static/app/views/profiling/landing/slowestFunctionsWidget.tsx
+++ b/static/app/views/profiling/landing/slowestFunctionsWidget.tsx
@@ -1,34 +1,48 @@
-import type {CSSProperties, ReactNode} from 'react';
+import type {ReactNode} from 'react';
 import {Fragment, useCallback, useMemo, useState} from 'react';
+import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/button';
+import ChartZoom from 'sentry/components/charts/chartZoom';
+import {LineChart} from 'sentry/components/charts/lineChart';
 import Count from 'sentry/components/count';
+import type {MenuItemProps} from 'sentry/components/dropdownMenu';
+import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
 import IdBadge from 'sentry/components/idBadge';
-import Link from 'sentry/components/links/link';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import Pagination from 'sentry/components/pagination';
 import PerformanceDuration from 'sentry/components/performanceDuration';
 import ScoreBar from 'sentry/components/scoreBar';
 import TextOverflow from 'sentry/components/textOverflow';
+import TimeSince from 'sentry/components/timeSince';
 import {Tooltip} from 'sentry/components/tooltip';
 import {CHART_PALETTE} from 'sentry/constants/chartPalette';
-import {IconChevron, IconWarning} from 'sentry/icons';
+import {IconChevron} from 'sentry/icons/iconChevron';
+import {IconEllipsis} from 'sentry/icons/iconEllipsis';
+import {IconWarning} from 'sentry/icons/iconWarning';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import type {Series} from 'sentry/types/echarts';
+import type {EventsStatsSeries} from 'sentry/types/organization';
 import {defined} from 'sentry/utils';
-import {trackAnalytics} from 'sentry/utils/analytics';
 import {browserHistory} from 'sentry/utils/browserHistory';
+import {axisLabelFormatter, tooltipFormatter} from 'sentry/utils/discover/charts';
+import {getShortEventId} from 'sentry/utils/events';
 import {Frame} from 'sentry/utils/profiling/frame';
 import type {EventsResultsDataRow} from 'sentry/utils/profiling/hooks/types';
 import {useProfileFunctions} from 'sentry/utils/profiling/hooks/useProfileFunctions';
+import {useProfileTopEventsStats} from 'sentry/utils/profiling/hooks/useProfileTopEventsStats';
 import {generateProfileRouteFromProfileReference} from 'sentry/utils/profiling/routes';
+import type {UseApiQueryResult} from 'sentry/utils/queryClient';
 import {decodeScalar} from 'sentry/utils/queryString';
-import {MutableSearch} from 'sentry/utils/tokenizeSearch';
+import type RequestError from 'sentry/utils/requestError/requestError';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
+import usePageFilters from 'sentry/utils/usePageFilters';
 import useProjects from 'sentry/utils/useProjects';
+import {getProfileTargetId} from 'sentry/views/profiling/utils';
 
 import {
   Accordion,
@@ -45,22 +59,23 @@ const MAX_FUNCTIONS = 3;
 const DEFAULT_CURSOR_NAME = 'slowFnCursor';
 
 type BreakdownFunction = 'avg()' | 'p50()' | 'p75()' | 'p95()' | 'p99()';
+type ChartFunctions<F extends BreakdownFunction> = F | 'all_examples()';
 
-interface SlowestFunctionsWidgetProps {
-  breakdownFunction: BreakdownFunction;
+interface SlowestFunctionsWidgetProps<F extends BreakdownFunction> {
+  breakdownFunction: F;
   cursorName?: string;
   header?: ReactNode;
   userQuery?: string;
   widgetHeight?: string;
 }
 
-export function SlowestFunctionsWidget({
+export function SlowestFunctionsWidget<F extends BreakdownFunction>({
   breakdownFunction,
   cursorName = DEFAULT_CURSOR_NAME,
   header,
   userQuery,
   widgetHeight,
-}: SlowestFunctionsWidgetProps) {
+}: SlowestFunctionsWidgetProps<F>) {
   const location = useLocation();
 
   const [expandedIndex, setExpandedIndex] = useState(0);
@@ -92,7 +107,18 @@ export function SlowestFunctionsWidget({
     cursor: slowFnCursor,
   });
 
-  const hasFunctions = (functionsQuery.data?.data?.length || 0) > 0;
+  const functionsData = functionsQuery.data?.data || [];
+
+  const hasFunctions = (functionsData.length || 0) > 0;
+
+  // make sure to query for the projects from the top functions
+  const projects = functionsQuery.isFetched
+    ? [
+        ...new Set(
+          (functionsQuery.data?.data ?? []).map(func => func['project.id'] as number)
+        ),
+      ]
+    : [];
 
   const totalsQuery = useProfileFunctions<TotalsField>({
     fields: totalsFields,
@@ -103,20 +129,25 @@ export function SlowestFunctionsWidget({
     },
     query: userQuery,
     limit: MAX_FUNCTIONS,
-    // make sure to query for the projects from the top functions
-    projects: functionsQuery.isFetched
-      ? [
-          ...new Set(
-            (functionsQuery.data?.data ?? []).map(func => func['project.id'] as number)
-          ),
-        ]
-      : [],
+    projects,
     enabled: functionsQuery.isFetched && hasFunctions,
   });
 
   const isLoading = functionsQuery.isPending || (hasFunctions && totalsQuery.isPending);
   const isError = functionsQuery.isError || totalsQuery.isError;
 
+  const functionStats = useProfileTopEventsStats({
+    dataset: 'profileFunctions',
+    fields: ['fingerprint', 'all_examples()', breakdownFunction],
+    query: functionsData.map(f => `fingerprint:${f.fingerprint}`).join(' OR '),
+    referrer: 'api.profiling.suspect-functions.stats',
+    yAxes: ['all_examples()', breakdownFunction],
+    projects,
+    others: false,
+    topEvents: functionsData.length,
+    enabled: totalsQuery.isFetched && hasFunctions,
+  });
+
   return (
     <WidgetContainer height={widgetHeight}>
       <HeaderContainer>
@@ -146,11 +177,12 @@ export function SlowestFunctionsWidget({
         )}
         {hasFunctions && totalsQuery.isFetched && (
           <StyledAccordion>
-            {(functionsQuery.data?.data ?? []).map((f, i, l) => {
+            {functionsData.map((f, i, l) => {
               const projectEntry = totalsQuery.data?.data?.find(
                 row => row['project.id'] === f['project.id']
               );
               const projectTotalDuration = projectEntry?.['sum()'] ?? f['sum()'];
+
               return (
                 <SlowestFunctionEntry
                   key={`${f['project.id']}-${f.package}-${f.function}`}
@@ -161,6 +193,7 @@ export function SlowestFunctionsWidget({
                     setExpandedIndex(nextIndex);
                   }}
                   func={f}
+                  stats={functionStats}
                   totalDuration={projectTotalDuration as number}
                   query={userQuery ?? ''}
                 />
@@ -173,27 +206,27 @@ export function SlowestFunctionsWidget({
   );
 }
 
-interface SlowestFunctionEntryProps {
+interface SlowestFunctionEntryProps<F extends BreakdownFunction> {
   breakdownFunction: BreakdownFunction;
   func: EventsResultsDataRow<FunctionsField>;
   isExpanded: boolean;
   query: string;
   setExpanded: () => void;
   totalDuration: number;
+  stats?: UseApiQueryResult<EventsStatsSeries<ChartFunctions<F>>, RequestError>;
 }
 
 const BARS = 10;
 
-function SlowestFunctionEntry({
+function SlowestFunctionEntry<F extends BreakdownFunction>({
   breakdownFunction,
   func,
   isExpanded,
-  query,
   setExpanded,
+  stats,
   totalDuration,
-}: SlowestFunctionEntryProps) {
+}: SlowestFunctionEntryProps<F>) {
   const organization = useOrganization();
-
   const {projects} = useProjects();
   const project = projects.find(p => p.id === String(func['project.id']));
 
@@ -215,34 +248,65 @@ function SlowestFunctionEntry({
     );
   }, [func, project]);
 
-  const userQuery = useMemo(() => {
-    const conditions = new MutableSearch(query);
-
-    conditions.setFilterValues('project.id', [String(func['project.id'])]);
-    // it is more efficient to filter on the fingerprint
-    // than it is to filter on the package + function
-    conditions.setFilterValues('fingerprint', [String(func.fingerprint)]);
-
-    return conditions.formatString();
-  }, [func, query]);
+  const examples: MenuItemProps[] = useMemo(() => {
+    const rawExamples = stats?.data?.data?.find(
+      s => s.axis === 'all_examples()' && s.label === String(func.fingerprint)
+    );
 
-  const functionTransactionsQuery = useProfileFunctions<FunctionTransactionField>({
-    fields: [...functionTransactionsFields, breakdownFunction],
-    referrer: 'api.profiling.suspect-functions.transactions',
-    sort: {
-      key: 'sum()',
-      order: 'desc',
-    },
-    query: userQuery,
-    limit: 5,
-    enabled: isExpanded,
-  });
+    if (!defined(rawExamples?.values)) {
+      return [];
+    }
+
+    const timestamps = stats?.data?.timestamps ?? [];
+
+    return rawExamples.values
+      .map(values => (Array.isArray(values) ? values : []))
+      .flatMap((example, i) => {
+        const timestamp = (
+          <TimeSince
+            unitStyle="extraShort"
+            date={timestamps[i] * 1000}
+            tooltipShowSeconds
+          />
+        );
+        return example.slice(0, 1).map(profileRef => {
+          const targetId = getProfileTargetId(profileRef);
+          return {
+            key: targetId,
+            label: (
+              <DropdownItem>
+                {getShortEventId(targetId)}
+                {timestamp}
+              </DropdownItem>
+            ),
+            textValue: targetId,
+            to: generateProfileRouteFromProfileReference({
+              orgSlug: organization.slug,
+              projectSlug: project?.slug || '',
+              reference: profileRef,
+              frameName: frame.name,
+              framePackage: frame.package,
+            }),
+          };
+        });
+      })
+      .reverse()
+      .slice(0, 10);
+  }, [func, stats, organization, project, frame]);
 
   return (
     <Fragment>
       <StyledAccordionItem>
+        <Button
+          icon={<IconChevron size="xs" direction={isExpanded ? 'up' : 'down'} />}
+          aria-label={t('Expand')}
+          aria-expanded={isExpanded}
+          size="zero"
+          borderless
+          onClick={setExpanded}
+        />
         {project && (
-          <Tooltip title={project.name}>
+          <Tooltip title={project.slug}>
             <IdBadge project={project} avatarSize={16} hideName />
           </Tooltip>
         )}
@@ -259,99 +323,122 @@ function SlowestFunctionEntry({
         >
           <ScoreBar score={score} palette={palette} size={20} radius={0} />
         </Tooltip>
-        <Button
-          icon={<IconChevron size="xs" direction={isExpanded ? 'up' : 'down'} />}
-          aria-label={t('Expand')}
-          aria-expanded={isExpanded}
-          size="zero"
-          borderless
-          onClick={setExpanded}
+        <DropdownMenu
+          position="bottom-end"
+          triggerProps={{
+            icon: <IconEllipsis size="xs" />,
+            borderless: true,
+            showChevron: false,
+            size: 'xs',
+          }}
+          items={examples}
+          menuTitle={t('Example Profiles')}
         />
       </StyledAccordionItem>
       {isExpanded && (
-        <Fragment>
-          {functionTransactionsQuery.isError && (
-            <StatusContainer>
-              <IconWarning data-test-id="error-indicator" color="gray300" size="lg" />
-            </StatusContainer>
-          )}
-          {functionTransactionsQuery.isPending && (
-            <StatusContainer>
-              <LoadingIndicator />
-            </StatusContainer>
-          )}
-          {functionTransactionsQuery.isFetched && (
-            <TransactionsList data-test-id="transactions-list">
-              <TransactionsListHeader>
-                <TextOverflow>{t('Transaction')}</TextOverflow>
-              </TransactionsListHeader>
-              <TransactionsListHeader align="right">
-                <TextOverflow>{t('Count')}</TextOverflow>
-              </TransactionsListHeader>
-              <TransactionsListHeader align="right">
-                <TextOverflow>{breakdownFunction.toUpperCase()}</TextOverflow>
-              </TransactionsListHeader>
-              <TransactionsListHeader align="right">
-                <TextOverflow>{t('Time Spent')}</TextOverflow>
-              </TransactionsListHeader>
-              {(functionTransactionsQuery.data?.data ?? []).map(transaction => {
-                const example = transaction['all_examples()']?.[0];
-                let transactionCol = <Fragment>{transaction.transaction}</Fragment>;
-
-                if (project && defined(example)) {
-                  const target = generateProfileRouteFromProfileReference({
-                    orgSlug: organization.slug,
-                    projectSlug: project.slug,
-                    frameName: frame.name,
-                    framePackage: frame.package,
-                    reference: example,
-                  });
-                  transactionCol = (
-                    <Link
-                      to={target}
-                      onClick={() => {
-                        trackAnalytics('profiling_views.go_to_flamegraph', {
-                          organization,
-                          source: 'profiling.global_suspect_functions',
-                        });
-                      }}
-                    >
-                      {transactionCol}
-                    </Link>
-                  );
-                }
-
-                return (
-                  <Fragment key={transaction.transaction as string}>
-                    <TransactionsListCell>
-                      <TextOverflow>{transactionCol}</TextOverflow>
-                    </TransactionsListCell>
-                    <TransactionsListCell align="right">
-                      <Count value={transaction['count()'] as number} />
-                    </TransactionsListCell>
-                    <TransactionsListCell align="right">
-                      <PerformanceDuration
-                        nanoseconds={transaction[breakdownFunction] as number}
-                        abbreviation
-                      />
-                    </TransactionsListCell>
-                    <TransactionsListCell align="right">
-                      <PerformanceDuration
-                        nanoseconds={transaction['sum()'] as number}
-                        abbreviation
-                      />
-                    </TransactionsListCell>
-                  </Fragment>
-                );
-              })}
-            </TransactionsList>
-          )}
-        </Fragment>
+        <FunctionChartContainer>
+          <FunctionChart
+            func={func}
+            breakdownFunction={breakdownFunction}
+            stats={stats}
+          />
+        </FunctionChartContainer>
       )}
     </Fragment>
   );
 }
 
+interface FunctionChartProps<F extends BreakdownFunction> {
+  breakdownFunction: F;
+  func: EventsResultsDataRow<FunctionsField>;
+  stats?: UseApiQueryResult<EventsStatsSeries<ChartFunctions<F>>, RequestError>;
+}
+
+function FunctionChart<F extends BreakdownFunction>({
+  breakdownFunction,
+  func,
+  stats,
+}: FunctionChartProps<F>) {
+  const {selection} = usePageFilters();
+  const theme = useTheme();
+
+  const series: Series[] = useMemo(() => {
+    const timestamps = stats?.data?.timestamps ?? [];
+    const rawData = stats?.data?.data?.find(
+      s => s.axis === breakdownFunction && s.label === String(func.fingerprint)
+    );
+
+    if (!defined(rawData?.values)) {
+      return [];
+    }
+
+    return [
+      {
+        data: timestamps.map((timestamp, i) => {
+          return {
+            name: timestamp * 1000,
+            value: rawData.values[i],
+          };
+        }),
+        seriesName: breakdownFunction,
+      },
+    ];
+  }, [breakdownFunction, func, stats]);
+
+  const chartOptions = useMemo(() => {
+    return {
+      height: 150,
+      grid: {
+        top: '10px',
+        bottom: '10px',
+        left: '10px',
+        right: '10px',
+      },
+      yAxis: {
+        axisLabel: {
+          color: theme.chartLabel,
+          formatter: (value: number) => axisLabelFormatter(value, 'duration'),
+        },
+      },
+      xAxis: {
+        type: 'time' as const,
+      },
+      tooltip: {
+        valueFormatter: (value: number) => tooltipFormatter(value, 'duration'),
+      },
+    };
+  }, [theme.chartLabel]);
+
+  if (stats?.isPending) {
+    return (
+      <StatusContainer>
+        <LoadingIndicator />
+      </StatusContainer>
+    );
+  }
+
+  if (stats?.isError) {
+    return (
+      <StatusContainer>
+        <IconWarning data-test-id="error-indicator" color="gray300" size="lg" />
+      </StatusContainer>
+    );
+  }
+
+  return (
+    <ChartZoom {...selection.datetime}>
+      {zoomRenderProps => (
+        <LineChart
+          data-test-id="function-chart"
+          {...zoomRenderProps}
+          {...chartOptions}
+          series={series}
+        />
+      )}
+    </ChartZoom>
+  );
+}
+
 const functionsFields = [
   'project.id',
   'fingerprint',
@@ -367,17 +454,6 @@ const totalsFields = ['project.id', 'sum()'] as const;
 
 type TotalsField = (typeof totalsFields)[number];
 
-const functionTransactionsFields = [
-  'transaction',
-  'count()',
-  'sum()',
-  'all_examples()',
-] as const;
-
-type FunctionTransactionField =
-  | BreakdownFunction
-  | (typeof functionTransactionsFields)[number];
-
 const StyledPagination = styled(Pagination)`
   margin: 0;
 `;
@@ -389,34 +465,23 @@ const StyledAccordion = styled(Accordion)`
 
 const StyledAccordionItem = styled(AccordionItem)`
   display: grid;
-  grid-template-columns: auto 1fr auto auto;
+  grid-template-columns: auto auto 1fr auto auto;
+  padding: ${space(0.5)} ${space(2)};
 `;
 
 const FunctionName = styled(TextOverflow)`
   flex: 1 1 auto;
 `;
 
-const TransactionsList = styled('div')`
+const FunctionChartContainer = styled('div')`
   flex: 1 1 auto;
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) repeat(3, auto);
-  grid-template-rows: 18px repeat(5, min-content);
-  column-gap: ${space(1)};
-  padding: 0 ${space(2)};
-`;
-
-const TransactionsListHeader = styled('span')<{
-  align?: CSSProperties['textAlign'];
-}>`
-  text-transform: uppercase;
-  font-size: ${p => p.theme.fontSizeExtraSmall};
-  font-weight: ${p => p.theme.fontWeightBold};
-  color: ${p => p.theme.subText};
-  text-align: ${p => p.align};
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
 `;
 
-const TransactionsListCell = styled('div')<{align?: CSSProperties['textAlign']}>`
-  font-size: ${p => p.theme.fontSizeSmall};
-  text-align: ${p => p.align};
-  padding: ${space(0.5)} 0px;
+const DropdownItem = styled('div')`
+  width: 150px;
+  display: flex;
+  justify-content: space-between;
 `;
diff --git a/static/app/views/profiling/profileSummary/index.tsx b/static/app/views/profiling/profileSummary/index.tsx
index 906270924dbef9..6299cbc9a76b1b 100644
--- a/static/app/views/profiling/profileSummary/index.tsx
+++ b/static/app/views/profiling/profileSummary/index.tsx
@@ -514,7 +514,6 @@ const AggregateFlamegraphContainer = styled('div')`
   flex: 1 1 100%;
   height: 100%;
   width: 100%;
-  overflow: hidden;
   position: absolute;
   left: 0px;
   top: 0px;
diff --git a/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx b/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx
index c91c2319bd48d2..805c47ec93ef44 100644
--- a/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx
+++ b/static/app/views/profiling/profileSummary/regressedProfileFunctions.tsx
@@ -22,7 +22,7 @@ import {useCurrentProjectFromRouteParam} from 'sentry/utils/profiling/hooks/useC
 import {useProfileFunctionTrends} from 'sentry/utils/profiling/hooks/useProfileFunctionTrends';
 import {
   generateProfileDifferentialFlamegraphRouteWithQuery,
-  generateProfileFlamechartRouteWithQuery,
+  generateProfileRouteFromProfileReference,
 } from 'sentry/utils/profiling/routes';
 import {relativeChange} from 'sentry/utils/profiling/units/units';
 import {decodeScalar} from 'sentry/utils/queryString';
@@ -48,16 +48,19 @@ function trendToPoints(trend: FunctionTrend): {timestamp: number; value: number}
   });
 }
 
-function findBreakPointIndex(breakpoint: number, worst: FunctionTrend['worst']): number {
+function findBreakPointIndex(
+  breakpoint: number,
+  examples: FunctionTrend['examples']
+): number {
   let low = 0;
-  let high = worst.length - 1;
+  let high = examples.length - 1;
   let mid = 0;
-  let bestMatch: number = worst.length;
+  let bestMatch: number = examples.length;
 
   // eslint-disable-next-line
   while (low <= high) {
     mid = Math.floor((low + high) / 2);
-    const value = worst[mid][0];
+    const value = examples[mid][0];
 
     if (breakpoint === value) {
       return mid;
@@ -78,39 +81,39 @@ function findBreakPointIndex(breakpoint: number, worst: FunctionTrend['worst']):
 }
 
 function findWorstProfileIDBeforeAndAfter(trend: FunctionTrend): {
-  after: string | null;
-  before: string | null;
+  after: Profiling.BaseProfileReference | null;
+  before: Profiling.BaseProfileReference | null;
 } {
-  const breakPointIndex = findBreakPointIndex(trend.breakpoint, trend.worst);
+  const breakPointIndex = findBreakPointIndex(trend.breakpoint, trend.examples);
 
-  let beforeProfileID: string | null = null;
-  let afterProfileID: string | null = null;
+  let beforeProfile: Profiling.BaseProfileReference | null = null;
+  let afterProfile: Profiling.BaseProfileReference | null = null;
 
   const STABILITY_WINDOW = 2 * 60 * 1000;
   for (let i = breakPointIndex; i >= 0; i--) {
-    if (!defined(trend.worst[i])) {
+    if (!defined(trend.examples[i])) {
       continue;
     }
-    if (trend.worst[i][0] < trend.breakpoint - STABILITY_WINDOW) {
+    if (trend.examples[i][0] < trend.breakpoint - STABILITY_WINDOW) {
       break;
     }
 
-    beforeProfileID = trend.worst[i][1];
+    beforeProfile = trend.examples[i][1];
   }
 
-  for (let i = breakPointIndex; i < trend.worst.length; i++) {
-    if (!defined(trend.worst[i])) {
+  for (let i = breakPointIndex; i < trend.examples.length; i++) {
+    if (!defined(trend.examples[i])) {
       continue;
     }
-    if (trend.worst[i][0] > trend.breakpoint + STABILITY_WINDOW) {
+    if (trend.examples[i][0] > trend.breakpoint + STABILITY_WINDOW) {
       break;
     }
-    afterProfileID = trend.worst[i][1];
+    afterProfile = trend.examples[i][1];
   }
 
   return {
-    before: beforeProfileID,
-    after: afterProfileID,
+    before: beforeProfile,
+    after: afterProfile,
   };
 }
 
@@ -305,8 +308,8 @@ function RegressedFunctionDifferentialFlamegraph(
 }
 
 interface RegressedFunctionBeforeAfterProps {
-  after: string | null;
-  before: string | null;
+  after: Profiling.BaseProfileReference | null;
+  before: Profiling.BaseProfileReference | null;
   fn: FunctionTrend;
   organization: Organization;
   project: Project | null;
@@ -323,20 +326,19 @@ function RegressedFunctionBeforeAfterFlamechart(
   }, [props.organization]);
 
   let rendered = <TextTruncateOverflow>{props.fn.function}</TextTruncateOverflow>;
-  if (defined(props.fn['examples()']?.[0])) {
+  const example = props.fn['all_examples()']?.[0];
+  if (defined(example)) {
     rendered = (
       <Link
         onClick={onRegressedFunctionClick}
-        to={generateProfileFlamechartRouteWithQuery({
+        to={generateProfileRouteFromProfileReference({
           orgSlug: props.organization.slug,
           projectSlug: props.project?.slug ?? '',
-          profileId: (props.fn['examples()']?.[0] as string) ?? '',
-          query: {
-            // specify the frame to focus, the flamegraph will switch
-            // to the appropriate thread when these are specified
-            frameName: props.fn.function as string,
-            framePackage: props.fn.package as string,
-          },
+          reference: example,
+          // specify the frame to focus, the flamegraph will switch
+          // to the appropriate thread when these are specified
+          frameName: props.fn.function as string,
+          framePackage: props.fn.package as string,
         })}
       >
         {rendered}
@@ -354,16 +356,14 @@ function RegressedFunctionBeforeAfterFlamechart(
     before = (
       <Link
         onClick={onRegressedFunctionClick}
-        to={generateProfileFlamechartRouteWithQuery({
+        to={generateProfileRouteFromProfileReference({
           orgSlug: props.organization.slug,
           projectSlug: props.project?.slug ?? '',
-          profileId: props.before,
-          query: {
-            // specify the frame to focus, the flamegraph will switch
-            // to the appropriate thread when these are specified
-            frameName: props.fn.function as string,
-            framePackage: props.fn.package as string,
-          },
+          reference: props.before,
+          // specify the frame to focus, the flamegraph will switch
+          // to the appropriate thread when these are specified
+          frameName: props.fn.function as string,
+          framePackage: props.fn.package as string,
         })}
       >
         {before}
@@ -381,16 +381,14 @@ function RegressedFunctionBeforeAfterFlamechart(
     after = (
       <Link
         onClick={onRegressedFunctionClick}
-        to={generateProfileFlamechartRouteWithQuery({
+        to={generateProfileRouteFromProfileReference({
           orgSlug: props.organization.slug,
           projectSlug: props.project?.slug ?? '',
-          profileId: props.after,
-          query: {
-            // specify the frame to focus, the flamegraph will switch
-            // to the appropriate thread when these are specified
-            frameName: props.fn.function as string,
-            framePackage: props.fn.package as string,
-          },
+          reference: props.after,
+          // specify the frame to focus, the flamegraph will switch
+          // to the appropriate thread when these are specified
+          frameName: props.fn.function as string,
+          framePackage: props.fn.package as string,
         })}
       >
         {after}
diff --git a/static/app/views/profiling/utils.tsx b/static/app/views/profiling/utils.tsx
index 38dda3800ff7a0..aadb0658a94297 100644
--- a/static/app/views/profiling/utils.tsx
+++ b/static/app/views/profiling/utils.tsx
@@ -5,6 +5,10 @@ import SortLink from 'sentry/components/gridEditable/sortLink';
 import {t} from 'sentry/locale';
 import type {SelectValue} from 'sentry/types/core';
 import {defined} from 'sentry/utils';
+import {
+  isContinuousProfileReference,
+  isTransactionProfileReference,
+} from 'sentry/utils/profiling/guards/profile';
 import {decodeScalar} from 'sentry/utils/queryString';
 
 type ColorEncoding =
@@ -75,3 +79,13 @@ export const DEFAULT_PROFILING_DATETIME_SELECTION = {
   utc: false,
   period: '24h',
 };
+
+export function getProfileTargetId(reference: Profiling.BaseProfileReference): string {
+  if (isTransactionProfileReference(reference)) {
+    return reference.profile_id;
+  }
+  if (isContinuousProfileReference(reference)) {
+    return reference.profiler_id;
+  }
+  return reference;
+}
diff --git a/static/app/views/projectDetail/projectDetail.tsx b/static/app/views/projectDetail/projectDetail.tsx
index 996f5869a0ecb8..ef09c0800936de 100644
--- a/static/app/views/projectDetail/projectDetail.tsx
+++ b/static/app/views/projectDetail/projectDetail.tsx
@@ -10,6 +10,7 @@ import {Breadcrumbs} from 'sentry/components/breadcrumbs';
 import {LinkButton} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
 import CreateAlertButton from 'sentry/components/createAlertButton';
+import ErrorBoundary from 'sentry/components/errorBoundary';
 import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import GlobalEventProcessingAlert from 'sentry/components/globalEventProcessingAlert';
 import IdBadge from 'sentry/components/idBadge';
@@ -206,7 +207,9 @@ export default function ProjectDetail({router, location, organization}: Props) {
             </Layout.Header>
 
             <Layout.Body noRowGap>
-              {project && <StyledGlobalEventProcessingAlert projects={[project]} />}
+              <ErrorBoundary customComponent={null}>
+                {project && <StyledGlobalEventProcessingAlert projects={[project]} />}
+              </ErrorBoundary>
               <Layout.Main>
                 <ProjectFiltersWrapper>
                   <ProjectFilters
diff --git a/static/app/views/projectsDashboard/projectCard.tsx b/static/app/views/projectsDashboard/projectCard.tsx
index e74d2a8e72df2a..32818f944dff78 100644
--- a/static/app/views/projectsDashboard/projectCard.tsx
+++ b/static/app/views/projectsDashboard/projectCard.tsx
@@ -139,6 +139,7 @@ class ProjectCard extends Component<Props> {
                 borderless
                 size="zero"
                 icon={<IconSettings color="subText" />}
+                title={t('Settings')}
                 aria-label={t('Settings')}
                 to={`/settings/${organization.slug}/projects/${slug}/`}
               />
@@ -314,6 +315,8 @@ const SettingsButton = styled(LinkButton)`
   margin-top: -${space(0.5)};
   padding: 3px;
   border-radius: 50%;
+  width: 24px;
+  height: 24px;
 `;
 
 const StyledBookmarkStar = styled(BookmarkStar)`
diff --git a/static/app/views/releases/detail/commitsAndFiles/commits.spec.tsx b/static/app/views/releases/detail/commitsAndFiles/commits.spec.tsx
index c73784190f458d..71095d07127ff9 100644
--- a/static/app/views/releases/detail/commitsAndFiles/commits.spec.tsx
+++ b/static/app/views/releases/detail/commitsAndFiles/commits.spec.tsx
@@ -7,7 +7,6 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 import selectEvent from 'sentry-test/selectEvent';
 
-import RepositoryStore from 'sentry/stores/repositoryStore';
 import type {ReleaseProject} from 'sentry/types/release';
 import {ReleaseContext} from 'sentry/views/releases/detail';
 
@@ -16,7 +15,7 @@ import Commits from './commits';
 describe('Commits', () => {
   const release = ReleaseFixture();
   const project = ReleaseProjectFixture() as Required<ReleaseProject>;
-  const {routerProps, router, organization} = initializeOrg({
+  const {router, organization} = initializeOrg({
     router: {params: {release: release.version}},
   });
   const repos = [RepositoryFixture({integrationId: '1'})];
@@ -34,7 +33,7 @@ describe('Commits', () => {
           releaseMeta: {} as any,
         }}
       >
-        <Commits releaseRepos={[]} projectSlug={project.slug} {...routerProps} />
+        <Commits />
       </ReleaseContext.Provider>,
       {router}
     );
@@ -46,7 +45,12 @@ describe('Commits', () => {
       url: `/organizations/${organization.slug}/repos/`,
       body: repos,
     });
-    RepositoryStore.init();
+    MockApiClient.addMockResponse({
+      url: `/projects/${organization.slug}/${project.slug}/releases/${encodeURIComponent(
+        release.version
+      )}/repositories/`,
+      body: repos,
+    });
   });
 
   it('should render no repositories message', async () => {
@@ -133,7 +137,7 @@ describe('Commits', () => {
       integrationId: '1',
     });
     // Current repo is stored in query parameter activeRepo
-    const {router: newRouterContext, routerProps: newRouterProps} = initializeOrg({
+    const {router: newRouterContext} = initializeOrg({
       router: {
         params: {release: release.version},
         location: {query: {activeRepo: otherRepo.name}},
@@ -168,7 +172,7 @@ describe('Commits', () => {
           releaseMeta: {} as any,
         }}
       >
-        <Commits releaseRepos={[]} projectSlug={project.slug} {...newRouterProps} />
+        <Commits />
       </ReleaseContext.Provider>,
       {router: newRouterContext}
     );
diff --git a/static/app/views/releases/detail/commitsAndFiles/commits.tsx b/static/app/views/releases/detail/commitsAndFiles/commits.tsx
index 2e42b40a9ae3d1..80e2bf646b44ed 100644
--- a/static/app/views/releases/detail/commitsAndFiles/commits.tsx
+++ b/static/app/views/releases/detail/commitsAndFiles/commits.tsx
@@ -1,6 +1,5 @@
-import {Fragment} from 'react';
+import {Fragment, useContext} from 'react';
 import styled from '@emotion/styled';
-import type {Location} from 'history';
 
 import * as Layout from 'sentry/components/layouts/thirds';
 import LoadingError from 'sentry/components/loadingError';
@@ -13,33 +12,35 @@ import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Commit, Repository} from 'sentry/types/integrations';
-import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
+import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {useApiQuery} from 'sentry/utils/queryClient';
 import routeTitleGen from 'sentry/utils/routeTitle';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
+import {useReleaseRepositories} from 'sentry/utils/useReleaseRepositories';
+import {useRepositories} from 'sentry/utils/useRepositories';
 import {formatVersion} from 'sentry/utils/versions/formatVersion';
+import {ReleaseContext} from 'sentry/views/releases/detail';
 import {ReleaseCommit} from 'sentry/views/releases/detail/commitsAndFiles/releaseCommit';
 
 import {getCommitsByRepository, getQuery, getReposToRender} from '../utils';
 
-import EmptyState from './emptyState';
+import {EmptyState, NoReleaseRepos, NoRepositories} from './emptyState';
 import RepositorySwitcher from './repositorySwitcher';
-import withReleaseRepos from './withReleaseRepos';
 
-interface CommitsProps extends RouteComponentProps<{release: string}, {}> {
-  location: Location;
+interface CommitsProps {
+  organization: Organization;
   projectSlug: Project['slug'];
   releaseRepos: Repository[];
-  activeReleaseRepo?: Repository;
 }
 
-function Commits({activeReleaseRepo, releaseRepos, projectSlug}: CommitsProps) {
+function CommitsList({organization, releaseRepos, projectSlug}: CommitsProps) {
   const location = useLocation();
   const params = useParams<{release: string}>();
-  const organization = useOrganization();
+  const activeReleaseRepo =
+    releaseRepos.find(repo => repo.name === location.query.activeRepo) ?? releaseRepos[0];
 
   const query = getQuery({location, activeRepository: activeReleaseRepo});
   const {
@@ -114,8 +115,68 @@ function Commits({activeReleaseRepo, releaseRepos, projectSlug}: CommitsProps) {
   );
 }
 
+function Commits() {
+  const organization = useOrganization();
+  const params = useParams<{release: string}>();
+  const releaseContext = useContext(ReleaseContext);
+  const {
+    data: repositories,
+    isLoading: isLoadingRepositories,
+    isError: isRepositoriesError,
+    refetch: refetchRepositories,
+  } = useRepositories({
+    orgSlug: organization.slug,
+  });
+  const {
+    data: releaseRepos,
+    isLoading: isLoadingReleaseRepos,
+    isError: isReleaseReposError,
+    refetch: refetchReleaseRepos,
+  } = useReleaseRepositories({
+    orgSlug: organization.slug,
+    projectSlug: releaseContext.project.slug,
+    release: params.release,
+    options: {
+      enabled: !!releaseContext.project.slug,
+    },
+  });
+
+  if (isLoadingReleaseRepos || isLoadingRepositories) {
+    return <LoadingIndicator />;
+  }
+
+  if (isRepositoriesError || isReleaseReposError) {
+    return (
+      <LoadingError
+        onRetry={() => {
+          refetchRepositories();
+          refetchReleaseRepos();
+        }}
+      />
+    );
+  }
+
+  const noReleaseReposFound = !releaseRepos?.length;
+  if (noReleaseReposFound) {
+    return <NoReleaseRepos />;
+  }
+
+  const noRepositoryOrgRelatedFound = !repositories?.length;
+  if (noRepositoryOrgRelatedFound) {
+    return <NoRepositories orgSlug={organization.slug} />;
+  }
+
+  return (
+    <CommitsList
+      releaseRepos={releaseRepos}
+      organization={organization}
+      projectSlug={releaseContext.project.slug}
+    />
+  );
+}
+
 const Actions = styled('div')`
   margin-bottom: ${space(2)};
 `;
 
-export default withReleaseRepos(Commits);
+export default Commits;
diff --git a/static/app/views/releases/detail/commitsAndFiles/emptyState.tsx b/static/app/views/releases/detail/commitsAndFiles/emptyState.tsx
index 8c0db3a7868897..25043771ef4dda 100644
--- a/static/app/views/releases/detail/commitsAndFiles/emptyState.tsx
+++ b/static/app/views/releases/detail/commitsAndFiles/emptyState.tsx
@@ -1,12 +1,17 @@
+import {LinkButton} from 'sentry/components/button';
+import EmptyMessage from 'sentry/components/emptyMessage';
 import EmptyStateWarning from 'sentry/components/emptyStateWarning';
+import {Body, Main} from 'sentry/components/layouts/thirds';
 import Panel from 'sentry/components/panels/panel';
 import PanelBody from 'sentry/components/panels/panelBody';
+import {IconCommit} from 'sentry/icons';
+import {t} from 'sentry/locale';
 
 type Props = {
   children: React.ReactNode;
 };
 
-function EmptyState({children}: Props) {
+export function EmptyState({children}: Props) {
   return (
     <Panel>
       <PanelBody>
@@ -18,4 +23,41 @@ function EmptyState({children}: Props) {
   );
 }
 
-export default EmptyState;
+export function NoReleaseRepos() {
+  return (
+    <Body>
+      <Main fullWidth>
+        <Panel dashedBorder>
+          <EmptyMessage
+            icon={<IconCommit size="xl" />}
+            title={t('Releases are better with commit data!')}
+            description={t('No commits associated with this release have been found.')}
+          />
+        </Panel>
+      </Main>
+    </Body>
+  );
+}
+
+export function NoRepositories({orgSlug}: {orgSlug: string}) {
+  return (
+    <Body>
+      <Main fullWidth>
+        <Panel dashedBorder>
+          <EmptyMessage
+            icon={<IconCommit size="xl" />}
+            title={t('Releases are better with commit data!')}
+            description={t(
+              'Connect a repository to see commit info, files changed, and authors involved in future releases.'
+            )}
+            action={
+              <LinkButton priority="primary" to={`/settings/${orgSlug}/repos/`}>
+                {t('Connect a repository')}
+              </LinkButton>
+            }
+          />
+        </Panel>
+      </Main>
+    </Body>
+  );
+}
diff --git a/static/app/views/releases/detail/commitsAndFiles/filesChanged.spec.tsx b/static/app/views/releases/detail/commitsAndFiles/filesChanged.spec.tsx
index 06861a32b707af..5ad4d8b49a3bea 100644
--- a/static/app/views/releases/detail/commitsAndFiles/filesChanged.spec.tsx
+++ b/static/app/views/releases/detail/commitsAndFiles/filesChanged.spec.tsx
@@ -7,7 +7,6 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 import selectEvent from 'sentry-test/selectEvent';
 
-import RepositoryStore from 'sentry/stores/repositoryStore';
 import type {CommitFile} from 'sentry/types/integrations';
 import type {ReleaseProject} from 'sentry/types/release';
 import {ReleaseContext} from 'sentry/views/releases/detail';
@@ -30,7 +29,7 @@ function CommitFileFixture(params: Partial<CommitFile> = {}): CommitFile {
 describe('FilesChanged', () => {
   const release = ReleaseFixture();
   const project = ReleaseProjectFixture() as Required<ReleaseProject>;
-  const {routerProps, router, organization} = initializeOrg({
+  const {router, organization} = initializeOrg({
     router: {params: {release: release.version}},
   });
   const repos = [RepositoryFixture({integrationId: '1'})];
@@ -48,12 +47,7 @@ describe('FilesChanged', () => {
           releaseMeta: {} as any,
         }}
       >
-        <FilesChanged
-          releaseRepos={[]}
-          orgSlug={organization.slug}
-          projectSlug={project.slug}
-          {...routerProps}
-        />
+        <FilesChanged />
       </ReleaseContext.Provider>,
       {router}
     );
@@ -65,7 +59,12 @@ describe('FilesChanged', () => {
       url: `/organizations/${organization.slug}/repos/`,
       body: repos,
     });
-    RepositoryStore.init();
+    MockApiClient.addMockResponse({
+      url: `/projects/${organization.slug}/${project.slug}/releases/${encodeURIComponent(
+        release.version
+      )}/repositories/`,
+      body: repos,
+    });
   });
 
   it('should render no repositories message', async () => {
diff --git a/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx b/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx
index cc56b5a7863a0a..d1da9709edc91d 100644
--- a/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx
+++ b/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx
@@ -1,4 +1,4 @@
-import {Fragment} from 'react';
+import {Fragment, useContext} from 'react';
 
 import * as Layout from 'sentry/components/layouts/thirds';
 import LoadingError from 'sentry/components/loadingError';
@@ -10,7 +10,6 @@ import PanelHeader from 'sentry/components/panels/panelHeader';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {t, tn} from 'sentry/locale';
 import type {CommitFile, Repository} from 'sentry/types/integrations';
-import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
 import {useApiQuery} from 'sentry/utils/queryClient';
@@ -18,27 +17,28 @@ import routeTitleGen from 'sentry/utils/routeTitle';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
+import {useReleaseRepositories} from 'sentry/utils/useReleaseRepositories';
+import {useRepositories} from 'sentry/utils/useRepositories';
 import {formatVersion} from 'sentry/utils/versions/formatVersion';
+import {ReleaseContext} from 'sentry/views/releases/detail';
 
 import {getFilesByRepository, getQuery, getReposToRender} from '../utils';
 
-import EmptyState from './emptyState';
+import {EmptyState, NoReleaseRepos, NoRepositories} from './emptyState';
 import FileChange from './fileChange';
 import RepositorySwitcher from './repositorySwitcher';
-import withReleaseRepos from './withReleaseRepos';
 
-// TODO(scttcper): Some props are no longer used, but required because of the HoC
-interface FilesChangedProps extends RouteComponentProps<{release: string}, {}> {
-  orgSlug: Organization['slug'];
+interface FilesChangedProps {
+  organization: Organization;
   projectSlug: Project['slug'];
   releaseRepos: Repository[];
-  activeReleaseRepo?: Repository;
 }
 
-function FilesChanged({activeReleaseRepo, releaseRepos, projectSlug}: FilesChangedProps) {
+function FilesChangedList({organization, releaseRepos, projectSlug}: FilesChangedProps) {
   const location = useLocation();
   const params = useParams<{release: string}>();
-  const organization = useOrganization();
+  const activeReleaseRepo =
+    releaseRepos.find(repo => repo.name === location.query.activeRepo) ?? releaseRepos[0];
 
   const query = getQuery({location, activeRepository: activeReleaseRepo});
   const {
@@ -74,13 +74,15 @@ function FilesChanged({activeReleaseRepo, releaseRepos, projectSlug}: FilesChang
         )}
       />
       <Layout.Body>
-        <Layout.Main fullWidth>
-          {releaseRepos.length > 1 && (
+        {releaseRepos.length > 1 && (
+          <Layout.Main fullWidth>
             <RepositorySwitcher
               repositories={releaseRepos}
               activeRepository={activeReleaseRepo}
             />
-          )}
+          </Layout.Main>
+        )}
+        <Layout.Main fullWidth>
           {fileListError && <LoadingError onRetry={refetch} />}
           {isLoadingFileList ? (
             <LoadingIndicator />
@@ -129,4 +131,64 @@ function FilesChanged({activeReleaseRepo, releaseRepos, projectSlug}: FilesChang
   );
 }
 
-export default withReleaseRepos(FilesChanged);
+function FilesChanged() {
+  const organization = useOrganization();
+  const params = useParams<{release: string}>();
+  const releaseContext = useContext(ReleaseContext);
+  const {
+    data: repositories,
+    isLoading: isLoadingRepositories,
+    isError: isRepositoriesError,
+    refetch: refetchRepositories,
+  } = useRepositories({
+    orgSlug: organization.slug,
+  });
+  const {
+    data: releaseRepos,
+    isLoading: isLoadingReleaseRepos,
+    isError: isReleaseReposError,
+    refetch: refetchReleaseRepos,
+  } = useReleaseRepositories({
+    orgSlug: organization.slug,
+    projectSlug: releaseContext.project.slug,
+    release: params.release,
+    options: {
+      enabled: !!releaseContext.project.slug,
+    },
+  });
+
+  if (isLoadingReleaseRepos || isLoadingRepositories) {
+    return <LoadingIndicator />;
+  }
+
+  if (isRepositoriesError || isReleaseReposError) {
+    return (
+      <LoadingError
+        onRetry={() => {
+          refetchRepositories();
+          refetchReleaseRepos();
+        }}
+      />
+    );
+  }
+
+  const noReleaseReposFound = !releaseRepos?.length;
+  if (noReleaseReposFound) {
+    return <NoReleaseRepos />;
+  }
+
+  const noRepositoryOrgRelatedFound = !repositories?.length;
+  if (noRepositoryOrgRelatedFound) {
+    return <NoRepositories orgSlug={organization.slug} />;
+  }
+
+  return (
+    <FilesChangedList
+      releaseRepos={releaseRepos}
+      organization={organization}
+      projectSlug={releaseContext.project.slug}
+    />
+  );
+}
+
+export default FilesChanged;
diff --git a/static/app/views/releases/detail/commitsAndFiles/withReleaseRepos.tsx b/static/app/views/releases/detail/commitsAndFiles/withReleaseRepos.tsx
deleted file mode 100644
index 92eb7f96507ff3..00000000000000
--- a/static/app/views/releases/detail/commitsAndFiles/withReleaseRepos.tsx
+++ /dev/null
@@ -1,226 +0,0 @@
-import {Component} from 'react';
-import * as Sentry from '@sentry/react';
-
-import {addErrorMessage} from 'sentry/actionCreators/indicator';
-import type {Client} from 'sentry/api';
-import {LinkButton} from 'sentry/components/button';
-import EmptyMessage from 'sentry/components/emptyMessage';
-import {Body, Main} from 'sentry/components/layouts/thirds';
-import LoadingIndicator from 'sentry/components/loadingIndicator';
-import Panel from 'sentry/components/panels/panel';
-import {IconCommit} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import type {Repository} from 'sentry/types/integrations';
-import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
-import type {Organization} from 'sentry/types/organization';
-import getDisplayName from 'sentry/utils/getDisplayName';
-import withApi from 'sentry/utils/withApi';
-import withOrganization from 'sentry/utils/withOrganization';
-import withRepositories from 'sentry/utils/withRepositories';
-
-import {ReleaseContext} from '..';
-
-// These props are required when using this HoC
-type DependentProps = RouteComponentProps<{release: string}, {}>;
-
-type HoCsProps = {
-  api: Client;
-  organization: Organization;
-  repositories?: Repository[];
-  repositoriesError?: Error;
-  repositoriesLoading?: boolean;
-};
-
-type State = {
-  isLoading: boolean;
-  releaseRepos: Repository[];
-  activeReleaseRepo?: Repository;
-};
-
-function withReleaseRepos<P extends DependentProps>(
-  WrappedComponent: React.ComponentType<P>
-) {
-  class WithReleaseRepos extends Component<P & HoCsProps, State> {
-    static displayName = `withReleaseRepos(${getDisplayName(WrappedComponent)})`;
-
-    state: State = {
-      releaseRepos: [],
-      isLoading: true,
-    };
-
-    componentDidMount() {
-      this.fetchReleaseRepos();
-    }
-
-    componentDidUpdate(prevProps: P & HoCsProps, prevState: State) {
-      if (
-        this.props.params.release !== prevProps.params.release ||
-        (!!prevProps.repositoriesLoading && !this.props.repositoriesLoading)
-      ) {
-        this.fetchReleaseRepos();
-        return;
-      }
-
-      if (
-        prevState.releaseRepos.length !== this.state.releaseRepos.length ||
-        prevProps.location.query?.activeRepo !== this.props.location.query?.activeRepo
-      ) {
-        this.setActiveReleaseRepo(this.props);
-      }
-    }
-
-    declare context: React.ContextType<typeof ReleaseContext>;
-    static contextType = ReleaseContext;
-
-    setActiveReleaseRepo(props: P & HoCsProps) {
-      const {releaseRepos, activeReleaseRepo} = this.state;
-
-      if (!releaseRepos.length) {
-        return;
-      }
-
-      const activeCommitRepo = props.location.query?.activeRepo;
-
-      if (!activeCommitRepo) {
-        this.setState({
-          activeReleaseRepo: releaseRepos[0] ?? null,
-        });
-        return;
-      }
-
-      if (activeCommitRepo === activeReleaseRepo?.name) {
-        return;
-      }
-
-      const matchedRepository = releaseRepos.find(
-        commitRepo => commitRepo.name === activeCommitRepo
-      );
-
-      if (matchedRepository) {
-        this.setState({
-          activeReleaseRepo: matchedRepository,
-        });
-        return;
-      }
-
-      addErrorMessage(t('The repository you were looking for was not found.'));
-    }
-
-    async fetchReleaseRepos() {
-      const {params, api, organization, repositories, repositoriesLoading} = this.props;
-
-      if (repositoriesLoading === undefined || repositoriesLoading === true) {
-        return;
-      }
-
-      if (!repositories?.length) {
-        this.setState({isLoading: false});
-        return;
-      }
-
-      const {release} = params;
-      const {project} = this.context;
-
-      this.setState({isLoading: true});
-
-      try {
-        const releasePath = encodeURIComponent(release);
-        const releaseRepos = await api.requestPromise(
-          `/projects/${organization.slug}/${project.slug}/releases/${releasePath}/repositories/`
-        );
-        this.setState({releaseRepos, isLoading: false});
-        this.setActiveReleaseRepo(this.props);
-      } catch (error) {
-        Sentry.captureException(error);
-        addErrorMessage(
-          t(
-            'An error occurred while trying to fetch the repositories of the release: %s',
-            release
-          )
-        );
-      }
-    }
-
-    render() {
-      const {isLoading, activeReleaseRepo, releaseRepos} = this.state;
-      const {repositoriesLoading, repositories, params, router, location, organization} =
-        this.props;
-
-      if (isLoading || repositoriesLoading) {
-        return <LoadingIndicator />;
-      }
-
-      const noRepositoryOrgRelatedFound = !repositories?.length;
-
-      if (noRepositoryOrgRelatedFound) {
-        return (
-          <Body>
-            <Main fullWidth>
-              <Panel dashedBorder>
-                <EmptyMessage
-                  icon={<IconCommit size="xl" />}
-                  title={t('Releases are better with commit data!')}
-                  description={t(
-                    'Connect a repository to see commit info, files changed, and authors involved in future releases.'
-                  )}
-                  action={
-                    <LinkButton
-                      priority="primary"
-                      to={`/settings/${organization.slug}/repos/`}
-                    >
-                      {t('Connect a repository')}
-                    </LinkButton>
-                  }
-                />
-              </Panel>
-            </Main>
-          </Body>
-        );
-      }
-
-      const noReleaseReposFound = !releaseRepos.length;
-
-      if (noReleaseReposFound) {
-        return (
-          <Body>
-            <Main fullWidth>
-              <Panel dashedBorder>
-                <EmptyMessage
-                  icon={<IconCommit size="xl" />}
-                  title={t('Releases are better with commit data!')}
-                  description={t(
-                    'No commits associated with this release have been found.'
-                  )}
-                />
-              </Panel>
-            </Main>
-          </Body>
-        );
-      }
-
-      if (activeReleaseRepo === undefined) {
-        return <LoadingIndicator />;
-      }
-
-      const {release} = params;
-      const orgSlug = organization.slug;
-
-      return (
-        <WrappedComponent
-          {...this.props}
-          orgSlug={orgSlug}
-          projectSlug={this.context.project.slug}
-          release={release}
-          router={router}
-          location={location}
-          releaseRepos={releaseRepos}
-          activeReleaseRepo={activeReleaseRepo}
-        />
-      );
-    }
-  }
-
-  return withApi(withOrganization(withRepositories(WithReleaseRepos)));
-}
-
-export default withReleaseRepos;
diff --git a/static/app/views/releases/detail/overview/releaseIssues.tsx b/static/app/views/releases/detail/overview/releaseIssues.tsx
index 13d7bb6e6081ff..e12c770c6b41ad 100644
--- a/static/app/views/releases/detail/overview/releaseIssues.tsx
+++ b/static/app/views/releases/detail/overview/releaseIssues.tsx
@@ -24,7 +24,7 @@ import {IssueSortOptions} from 'sentry/views/issueList/utils';
 
 import type {ReleaseBounds} from '../../utils';
 import {getReleaseParams} from '../../utils';
-import EmptyState from '../commitsAndFiles/emptyState';
+import {EmptyState} from '../commitsAndFiles/emptyState';
 
 enum IssuesType {
   NEW = 'new',
diff --git a/static/app/views/releases/list/releaseCard/releaseCardCommits.tsx b/static/app/views/releases/list/releaseCard/releaseCardCommits.tsx
index 44c5e42c6422c3..fac25b62fee7f6 100644
--- a/static/app/views/releases/list/releaseCard/releaseCardCommits.tsx
+++ b/static/app/views/releases/list/releaseCard/releaseCardCommits.tsx
@@ -1,9 +1,13 @@
+import {useMemo} from 'react';
 import styled from '@emotion/styled';
 
 import AvatarList from 'sentry/components/avatar/avatarList';
 import {t, tn} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import type {Actor} from 'sentry/types/core';
 import type {Release} from 'sentry/types/release';
+import type {User} from 'sentry/types/user';
+import {uniqueId} from 'sentry/utils/guid';
 
 type Props = {
   release: Release;
@@ -13,6 +17,20 @@ type Props = {
 function ReleaseCardCommits({release, withHeading = true}: Props) {
   const commitCount = release.commitCount || 0;
   const authorCount = release.authors?.length || 0;
+
+  const authors = useMemo(
+    () =>
+      release.authors.map<Actor | User>(author =>
+        // Add a unique id if missing
+        ({
+          ...author,
+          type: 'user',
+          id: 'id' in author ? author.id : uniqueId(),
+        })
+      ),
+    [release.authors]
+  );
+
   if (commitCount === 0) {
     return null;
   }
@@ -27,7 +45,7 @@ function ReleaseCardCommits({release, withHeading = true}: Props) {
     <div className="release-stats">
       {withHeading && <ReleaseSummaryHeading>{releaseSummary}</ReleaseSummaryHeading>}
       <span style={{display: 'inline-block'}}>
-        <AvatarList users={release.authors} avatarSize={25} typeAvatars="authors" />
+        <AvatarList users={authors} avatarSize={25} typeAvatars="authors" />
       </span>
     </div>
   );
diff --git a/static/app/views/replays/detail/breadcrumbs/breadcrumbRow.tsx b/static/app/views/replays/detail/breadcrumbs/breadcrumbRow.tsx
index f043f8d08e4e05..abb56d5e362a25 100644
--- a/static/app/views/replays/detail/breadcrumbs/breadcrumbRow.tsx
+++ b/static/app/views/replays/detail/breadcrumbs/breadcrumbRow.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 
 import BreadcrumbItem from 'sentry/components/replays/breadcrumbs/breadcrumbItem';
 import {useReplayContext} from 'sentry/components/replays/replayContext';
-import type {Extraction} from 'sentry/utils/replays/extractHtml';
+import type {Extraction} from 'sentry/utils/replays/extractDomNodes';
 import useCrumbHandlers from 'sentry/utils/replays/hooks/useCrumbHandlers';
 import useCurrentHoverTime from 'sentry/utils/replays/playback/providers/useCurrentHoverTime';
 import type {ReplayFrame} from 'sentry/utils/replays/types';
diff --git a/static/app/views/replays/detail/console/useConsoleFilters.tsx b/static/app/views/replays/detail/console/useConsoleFilters.tsx
index fffde1d8a3992d..99d580650900c0 100644
--- a/static/app/views/replays/detail/console/useConsoleFilters.tsx
+++ b/static/app/views/replays/detail/console/useConsoleFilters.tsx
@@ -5,7 +5,11 @@ import type {SelectOption} from 'sentry/components/compactSelect';
 import {defined} from 'sentry/utils';
 import {decodeList, decodeScalar} from 'sentry/utils/queryString';
 import useFiltersInLocationQuery from 'sentry/utils/replays/hooks/useFiltersInLocationQuery';
-import type {BreadcrumbFrame, ConsoleFrame} from 'sentry/utils/replays/types';
+import {
+  type BreadcrumbFrame,
+  type ConsoleFrame,
+  isConsoleFrame,
+} from 'sentry/utils/replays/types';
 import {filterItems} from 'sentry/views/replays/detail/utils';
 
 export interface ConsoleSelectOption extends SelectOption<string> {
@@ -32,7 +36,7 @@ type Return = {
 };
 
 function getFilterableField(frame: BreadcrumbFrame) {
-  if (frame.category === 'console') {
+  if (isConsoleFrame(frame)) {
     const consoleFrame = frame as ConsoleFrame;
     return consoleFrame.level;
   }
diff --git a/static/app/views/replays/detail/trace/trace.tsx b/static/app/views/replays/detail/trace/trace.tsx
index c598ebc56a1992..5b6b4fe3959380 100644
--- a/static/app/views/replays/detail/trace/trace.tsx
+++ b/static/app/views/replays/detail/trace/trace.tsx
@@ -12,7 +12,6 @@ import useRouteAnalyticsParams from 'sentry/utils/routeAnalytics/useRouteAnalyti
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import useProjects from 'sentry/utils/useProjects';
-import {TraceViewWaterfall} from 'sentry/views/performance/newTraceDetails';
 import {useReplayTraceMeta} from 'sentry/views/performance/newTraceDetails/traceApi/useReplayTraceMeta';
 import {useTrace} from 'sentry/views/performance/newTraceDetails/traceApi/useTrace';
 import {useTraceRootEvent} from 'sentry/views/performance/newTraceDetails/traceApi/useTraceRootEvent';
@@ -21,6 +20,7 @@ import type {TraceTree} from 'sentry/views/performance/newTraceDetails/traceMode
 import type {TracePreferencesState} from 'sentry/views/performance/newTraceDetails/traceState/tracePreferences';
 import {loadTraceViewPreferences} from 'sentry/views/performance/newTraceDetails/traceState/tracePreferences';
 import {TraceStateProvider} from 'sentry/views/performance/newTraceDetails/traceState/traceStateProvider';
+import {TraceWaterfall} from 'sentry/views/performance/newTraceDetails/traceWaterfall';
 import TraceView, {
   StyledTracePanel,
 } from 'sentry/views/performance/traceDetails/traceView';
@@ -223,7 +223,7 @@ export function NewTraceView({replay}: {replay: undefined | ReplayRecord}) {
       preferencesStorageKey="replay-trace-view-preferences"
     >
       <TraceViewWaterfallWrapper>
-        <TraceViewWaterfall
+        <TraceWaterfall
           traceSlug={undefined}
           trace={trace}
           tree={tree}
@@ -234,8 +234,6 @@ export function NewTraceView({replay}: {replay: undefined | ReplayRecord}) {
           meta={meta}
           source="replay"
           replay={replay}
-          // Replays might want to enable this in the future
-          isEmbedded={false}
         />
       </TraceViewWaterfallWrapper>
     </TraceStateProvider>
diff --git a/static/app/views/settings/account/accountAuthorizations.tsx b/static/app/views/settings/account/accountAuthorizations.tsx
index b2ad74fff090e1..f542bada22582c 100644
--- a/static/app/views/settings/account/accountAuthorizations.tsx
+++ b/static/app/views/settings/account/accountAuthorizations.tsx
@@ -15,6 +15,7 @@ import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {IconDelete} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
+import type {Organization} from 'sentry/types/organization';
 import type {ApiApplication} from 'sentry/types/user';
 import {setApiQueryData, useApiQuery, useQueryClient} from 'sentry/utils/queryClient';
 import useApi from 'sentry/utils/useApi';
@@ -24,6 +25,7 @@ type Authorization = {
   application: ApiApplication;
   homepageUrl: string;
   id: string;
+  organization: Organization | null;
   scopes: string[];
 };
 
@@ -94,7 +96,13 @@ function AccountAuthorizations() {
                         </ExternalLink>
                       </Url>
                     )}
-                    <Scopes>{authorization.scopes.join(', ')}</Scopes>
+                    <DetailRow>{authorization.scopes.join(', ')}</DetailRow>
+                    {authorization.organization && (
+                      <DetailRow>
+                        {t('scopes are limited to ')}
+                        {authorization.organization.slug}
+                      </DetailRow>
+                    )}
                   </ApplicationDetails>
                   <Button
                     size="sm"
@@ -144,7 +152,7 @@ const Url = styled('div')`
   font-size: ${p => p.theme.fontSizeRelativeSmall};
 `;
 
-const Scopes = styled('div')`
+const DetailRow = styled('div')`
   color: ${p => p.theme.gray300};
   font-size: ${p => p.theme.fontSizeRelativeSmall};
 `;
diff --git a/static/app/views/settings/account/notifications/utils.tsx b/static/app/views/settings/account/notifications/utils.tsx
index 1f45a0cd4f0b0b..71ba63a4d142fb 100644
--- a/static/app/views/settings/account/notifications/utils.tsx
+++ b/static/app/views/settings/account/notifications/utils.tsx
@@ -44,7 +44,10 @@ export function getDocsLinkForEventType(
     case DataCategoryExact.TRANSACTION || 'transaction':
       // For pre-AM3 plans prior to June 11th, 2024
       return 'https://docs.sentry.io/pricing/quotas/legacy-manage-transaction-quota/';
-    case DataCategoryExact.SPAN || 'span':
+    case DataCategoryExact.SPAN ||
+      DataCategoryExact.SPAN_INDEXED ||
+      'span' ||
+      'span_indexed':
       // For post-AM3 plans after June 11th, 2024
       return 'https://docs.sentry.io/pricing/quotas/manage-transaction-quota/';
     case DataCategoryExact.ATTACHMENT || 'attachment':
diff --git a/static/app/views/settings/dynamicSampling/index.tsx b/static/app/views/settings/dynamicSampling/index.tsx
index 18dbb781aeff76..c3295b82a5d71b 100644
--- a/static/app/views/settings/dynamicSampling/index.tsx
+++ b/static/app/views/settings/dynamicSampling/index.tsx
@@ -1,6 +1,8 @@
 import {Fragment} from 'react';
 
 import {Alert} from 'sentry/components/alert';
+import FeatureBadge from 'sentry/components/badge/featureBadge';
+import {LinkButton} from 'sentry/components/button';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import {t} from 'sentry/locale';
 import {hasDynamicSamplingCustomFeature} from 'sentry/utils/dynamicSampling/features';
@@ -8,9 +10,11 @@ import useOrganization from 'sentry/utils/useOrganization';
 import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
 import {OrganizationSampling} from 'sentry/views/settings/dynamicSampling/organizationSampling';
 import {ProjectSampling} from 'sentry/views/settings/dynamicSampling/projectSampling';
+import {useHasDynamicSamplingWriteAccess} from 'sentry/views/settings/dynamicSampling/utils/access';
 
 export default function DynamicSamplingSettings() {
   const organization = useOrganization();
+  const hasWriteAccess = useHasDynamicSamplingWriteAccess();
 
   if (!hasDynamicSamplingCustomFeature(organization)) {
     return <Alert type="warning">{t("You don't have access to this feature")}</Alert>;
@@ -19,19 +23,39 @@ export default function DynamicSamplingSettings() {
   return (
     <Fragment>
       <SentryDocumentTitle title={t('Dynamic Sampling')} orgSlug={organization.slug} />
-      <div>
-        <SettingsPageHeader title={t('Dynamic Sampling')} />
-        <p>
+      <SettingsPageHeader
+        title={
+          <Fragment>
+            {t('Dynamic Sampling')}
+            <FeatureBadge type="alpha" />
+          </Fragment>
+        }
+        action={
+          <LinkButton
+            external
+            href="https://docs.sentry.io/product/performance/retention-priorities/"
+          >
+            {t('Read the docs')}
+          </LinkButton>
+        }
+      />
+      {!hasWriteAccess && (
+        <Alert type="warning">
           {t(
-            'Dynamic sampling adaptively reduces the number of spans stored in Sentry without changing SDK sample rates. It allows you to keep the most relevant samples and obtain accurate high-level insights while limiting redundancy and stored span volume. You can customize sample rates and priorities in these settings to control which data is stored.'
+            'These settings can only be edited by users with the organization owner or manager role.'
           )}
-        </p>
-        {organization.samplingMode === 'organization' ? (
-          <OrganizationSampling />
-        ) : (
-          <ProjectSampling />
+        </Alert>
+      )}
+      <p>
+        {t(
+          'Dynamic sampling adaptively reduces the number of spans stored in Sentry without changing SDK sample rates. It allows you to keep the most relevant samples and obtain accurate high-level insights while limiting redundancy and stored span volume. You can customize sample rates and priorities in these settings to control which data is stored.'
         )}
-      </div>
+      </p>
+      {organization.samplingMode === 'organization' ? (
+        <OrganizationSampling />
+      ) : (
+        <ProjectSampling />
+      )}
     </Fragment>
   );
 }
diff --git a/static/app/views/settings/dynamicSampling/projectsEditTable.tsx b/static/app/views/settings/dynamicSampling/projectsEditTable.tsx
index 405584bdd4e29f..e1705a4ef5766b 100644
--- a/static/app/views/settings/dynamicSampling/projectsEditTable.tsx
+++ b/static/app/views/settings/dynamicSampling/projectsEditTable.tsx
@@ -7,6 +7,7 @@ import {Button} from 'sentry/components/button';
 import FieldGroup from 'sentry/components/forms/fieldGroup';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import Panel from 'sentry/components/panels/panel';
+import {Tooltip} from 'sentry/components/tooltip';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import useProjects from 'sentry/utils/useProjects';
@@ -111,6 +112,12 @@ export function ProjectsEditTable({
     [dataByProjectId, editMode, onChange, onEditModeChange, value]
   );
 
+  const handleOrgBlur = useCallback(() => {
+    setIsBulkEditEnabled(false);
+    // Parse to ensure valid values
+    setOrgRate(rate => (parsePercent(rate, 1) * 100).toString());
+  }, []);
+
   const items = useMemo(
     () =>
       projects.map(project => {
@@ -131,7 +138,6 @@ export function ProjectsEditTable({
       }),
     [dataByProjectId, error, initialValue, projects, value]
   );
-  const [activeItems, inactiveItems] = partition(items, item => item.count > 0);
 
   const totalSpanCount = useMemo(
     () => items.reduce((acc, item) => acc + item.count, 0),
@@ -169,6 +175,11 @@ export function ProjectsEditTable({
     [value]
   );
 
+  const [activeItems, inactiveItems] = useMemo(
+    () => partition(items, item => item.count > 0 || item.initialSampleRate !== '100'),
+    [items]
+  );
+
   const isLoading = fetching || isLoadingProp;
 
   return (
@@ -177,7 +188,7 @@ export function ProjectsEditTable({
         {isLoading ? (
           <LoadingIndicator
             css={css`
-              margin: ${space(4)} 0;
+              margin: 60px 0;
             `}
           />
         ) : (
@@ -195,21 +206,26 @@ export function ProjectsEditTable({
               alignRight
             >
               <InputWrapper>
-                <PercentInput
-                  type="number"
-                  ref={inputRef}
-                  disabled={!hasAccess || !isBulkEditEnabled}
-                  size="sm"
-                  onChange={handleOrgChange}
-                  value={projectedOrgRate}
-                  onKeyDown={event => {
-                    if (event.key === 'Enter') {
-                      event.preventDefault();
-                      inputRef.current?.blur();
-                    }
-                  }}
-                  onBlur={() => setIsBulkEditEnabled(false)}
-                />
+                <Tooltip
+                  disabled={hasAccess}
+                  title={t('You do not have permission to change the sample rate')}
+                >
+                  <PercentInput
+                    type="number"
+                    ref={inputRef}
+                    disabled={!hasAccess || !isBulkEditEnabled}
+                    size="sm"
+                    onChange={handleOrgChange}
+                    value={projectedOrgRate}
+                    onKeyDown={event => {
+                      if (event.key === 'Enter') {
+                        event.preventDefault();
+                        inputRef.current?.blur();
+                      }
+                    }}
+                    onBlur={handleOrgBlur}
+                  />
+                </Tooltip>
                 <FlexRow>
                   <PreviousValue>
                     {initialOrgRate !== projectedOrgRate
diff --git a/static/app/views/settings/dynamicSampling/projectsTable.tsx b/static/app/views/settings/dynamicSampling/projectsTable.tsx
index 404a90247ef96f..7432d4f73845ff 100644
--- a/static/app/views/settings/dynamicSampling/projectsTable.tsx
+++ b/static/app/views/settings/dynamicSampling/projectsTable.tsx
@@ -14,6 +14,7 @@ import {formatAbbreviatedNumber} from 'sentry/utils/formatters';
 import oxfordizeArray from 'sentry/utils/oxfordizeArray';
 import useOrganization from 'sentry/utils/useOrganization';
 import {PercentInput} from 'sentry/views/settings/dynamicSampling/percentInput';
+import {useHasDynamicSamplingWriteAccess} from 'sentry/views/settings/dynamicSampling/utils/access';
 import {parsePercent} from 'sentry/views/settings/dynamicSampling/utils/parsePercent';
 
 interface ProjectItem {
@@ -46,6 +47,7 @@ export function ProjectsTable({
   onChange,
   ...props
 }: Props) {
+  const hasAccess = useHasDynamicSamplingWriteAccess();
   const [tableSort, setTableSort] = useState<'asc' | 'desc'>('desc');
 
   const handleTableSort = useCallback(() => {
@@ -64,7 +66,7 @@ export function ProjectsTable({
       headers={[
         t('Project'),
         <SortableHeader type="button" key="spans" onClick={handleTableSort}>
-          {t('Sent Spans')}
+          {t('Accepted Spans')}
           <IconArrow direction={tableSort === 'desc' ? 'down' : 'up'} size="xs" />
         </SortableHeader>,
         t('Stored Spans'),
@@ -87,6 +89,7 @@ export function ProjectsTable({
             canEdit={canEdit}
             onChange={onChange}
             inputTooltip={inputTooltip}
+            hasAccess={hasAccess}
             {...item}
           />
         ))}
@@ -110,6 +113,7 @@ export function ProjectsTable({
               key={item.project.id}
               canEdit={canEdit}
               onChange={onChange}
+              hasAccess={hasAccess}
               {...item}
             />
           ))}
@@ -164,7 +168,7 @@ function getSubProjectContent(
   isExpanded: boolean
 ) {
   let subProjectContent: React.ReactNode = t('No distributed traces');
-  if (subProjects.length > 1) {
+  if (subProjects.length > 0) {
     const truncatedSubProjects = subProjects.slice(0, MAX_PROJECTS_COLLAPSED);
     const overflowCount = subProjects.length - MAX_PROJECTS_COLLAPSED;
     const moreTranslation = t('+%d more', overflowCount);
@@ -194,7 +198,7 @@ function getSubSpansContent(
   isExpanded: boolean
 ) {
   let subSpansContent: React.ReactNode = '';
-  if (subProjects.length > 1) {
+  if (subProjects.length > 0) {
     const subProjectSum = subProjects.reduce(
       (acc, subProject) => acc + subProject.count,
       0
@@ -215,9 +219,40 @@ function getSubSpansContent(
   return subSpansContent;
 }
 
+function getStoredSpansContent(
+  ownCount: number,
+  subProjects: SubProject[],
+  sampleRate: number,
+  isExpanded: boolean
+) {
+  let subSpansContent: React.ReactNode = '';
+  if (subProjects.length > 0) {
+    const subProjectSum = subProjects.reduce(
+      (acc, subProject) => acc + Math.floor(subProject.count * sampleRate),
+      0
+    );
+
+    subSpansContent = isExpanded ? (
+      <Fragment>
+        <div>{formatAbbreviatedNumber(Math.floor(ownCount * sampleRate), 2)}</div>
+        {subProjects.map(subProject => (
+          <div key={subProject.slug}>
+            {formatAbbreviatedNumber(Math.floor(subProject.count * sampleRate))}
+          </div>
+        ))}
+      </Fragment>
+    ) : (
+      formatAbbreviatedNumber(subProjectSum)
+    );
+  }
+
+  return subSpansContent;
+}
+
 const MAX_PROJECTS_COLLAPSED = 3;
 const TableRow = memo(function TableRow({
   project,
+  hasAccess,
   canEdit,
   count,
   ownCount,
@@ -225,10 +260,11 @@ const TableRow = memo(function TableRow({
   initialSampleRate,
   subProjects,
   error,
-  inputTooltip,
+  inputTooltip: inputTooltipProp,
   onChange,
 }: {
   count: number;
+  hasAccess: boolean;
   initialSampleRate: string;
   ownCount: number;
   project: Project;
@@ -243,11 +279,16 @@ const TableRow = memo(function TableRow({
   const [isExpanded, setIsExpanded] = useState(false);
 
   const isExpandable = subProjects.length > 0;
-  const hasAccess = hasEveryAccess(['project:write'], {organization, project});
+  const hasProjectAccess = hasEveryAccess(['project:write'], {organization, project});
 
   const subProjectContent = getSubProjectContent(project.slug, subProjects, isExpanded);
   const subSpansContent = getSubSpansContent(ownCount, subProjects, isExpanded);
 
+  let inputTooltip = inputTooltipProp;
+  if (!hasAccess) {
+    inputTooltip = t('You do not have permission to change the sample rate.');
+  }
+
   const handleChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       onChange?.(project.id, event.target.value);
@@ -256,8 +297,6 @@ const TableRow = memo(function TableRow({
   );
 
   const storedSpans = Math.floor(count * parsePercent(sampleRate));
-  const initialStoredSpans = Math.floor(count * parsePercent(initialSampleRate));
-
   return (
     <Fragment key={project.slug}>
       <Cell>
@@ -273,8 +312,9 @@ const TableRow = memo(function TableRow({
             )}
             <ProjectBadge project={project} disableLink avatarSize={16} />
           </HiddenButton>
-          {hasAccess && (
+          {hasProjectAccess && (
             <SettingsButton
+              tabIndex={-1}
               title={t('Open Project Settings')}
               aria-label={t('Open Project Settings')}
               size="xs"
@@ -284,30 +324,31 @@ const TableRow = memo(function TableRow({
             />
           )}
         </FirstCellLine>
-        <SubProjects>{subProjectContent}</SubProjects>
+        <SubProjects data-is-first-column>{subProjectContent}</SubProjects>
       </Cell>
       <Cell>
         <FirstCellLine data-align="right">{formatAbbreviatedNumber(count)}</FirstCellLine>
-        <SubSpans>{subSpansContent}</SubSpans>
+        <SubContent>{subSpansContent}</SubContent>
       </Cell>
       <Cell>
         <FirstCellLine data-align="right">
           {formatAbbreviatedNumber(storedSpans)}
         </FirstCellLine>
-        <SubSpans>
-          {storedSpans !== initialStoredSpans ? (
-            <SmallPrint>
-              {t('previous: %s', formatAbbreviatedNumber(initialStoredSpans))}
-            </SmallPrint>
-          ) : null}
-        </SubSpans>
+        <SubContent data-is-last-column>
+          {getStoredSpansContent(
+            ownCount,
+            subProjects,
+            parsePercent(sampleRate),
+            isExpanded
+          )}
+        </SubContent>
       </Cell>
       <Cell>
         <FirstCellLine>
           <Tooltip disabled={!inputTooltip} title={inputTooltip}>
             <PercentInput
               type="number"
-              disabled={!canEdit}
+              disabled={!canEdit || !hasAccess}
               onChange={handleChange}
               size="sm"
               value={sampleRate}
@@ -383,42 +424,42 @@ const FirstCellLine = styled('div')`
   }
 `;
 
-const SubProjects = styled('div')`
+const SubContent = styled('div')`
   color: ${p => p.theme.subText};
   font-size: ${p => p.theme.fontSizeSmall};
-  margin-left: ${space(2)};
+  text-align: right;
+
   & > div {
     line-height: 2;
+    margin-left: -${space(2)};
+    padding-left: ${space(2)};
     margin-right: -${space(2)};
     padding-right: ${space(2)};
+    &:nth-child(odd) {
+      background: ${p => p.theme.backgroundSecondary};
+    }
+  }
+
+  &[data-is-first-column] > div {
     margin-left: -${space(1)};
     padding-left: ${space(1)};
     border-top-left-radius: ${p => p.theme.borderRadius};
     border-bottom-left-radius: ${p => p.theme.borderRadius};
-    &:nth-child(odd) {
-      background: ${p => p.theme.backgroundSecondary};
-    }
   }
-`;
 
-const SubSpans = styled('div')`
-  color: ${p => p.theme.subText};
-  font-size: ${p => p.theme.fontSizeSmall};
-  text-align: right;
-  & > div {
-    line-height: 2;
-    margin-left: -${space(2)};
-    padding-left: ${space(2)};
+  &[data-is-last-column] > div {
     margin-right: -${space(1)};
     padding-right: ${space(1)};
     border-top-right-radius: ${p => p.theme.borderRadius};
     border-bottom-right-radius: ${p => p.theme.borderRadius};
-    &:nth-child(odd) {
-      background: ${p => p.theme.backgroundSecondary};
-    }
   }
 `;
 
+const SubProjects = styled(SubContent)`
+  text-align: left;
+  margin-left: ${space(2)};
+`;
+
 const HiddenButton = styled('button')`
   background: none;
   border: none;
diff --git a/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx b/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx
index 6dec26fcf06be2..9c9abfd571baf7 100644
--- a/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx
+++ b/static/app/views/settings/dynamicSampling/samplingBreakdown.tsx
@@ -63,13 +63,13 @@ export function SamplingBreakdown({sampleCounts, sampleRates, ...props}: Props)
     .reduce((acc, item) => acc + item.sampledSpans, 0);
   const total = spansWithSampleRates.reduce((acc, item) => acc + item.sampledSpans, 0);
 
-  const getSpanRate = spanCount => (total === 0 ? 1 : spanCount / total);
+  const getSpanRate = spanCount => (total === 0 ? 0 : spanCount / total);
   const otherRate = getSpanRate(otherSpanCount);
 
   return (
     <div {...props}>
       <Heading>
-        {t('Breakdown of stored spans')}
+        {t('Breakdown of stored spans originating in these projects')}
         <SubText>{t('Total: %s', formatAbbreviatedNumber(total))}</SubText>
       </Heading>
       <Breakdown>
diff --git a/static/app/views/settings/dynamicSampling/samplingModeField.tsx b/static/app/views/settings/dynamicSampling/samplingModeField.tsx
index eb9e267fb26b20..446bcd40b72862 100644
--- a/static/app/views/settings/dynamicSampling/samplingModeField.tsx
+++ b/static/app/views/settings/dynamicSampling/samplingModeField.tsx
@@ -4,6 +4,7 @@ import FieldGroup from 'sentry/components/forms/fieldGroup';
 import ExternalLink from 'sentry/components/links/externalLink';
 import QuestionTooltip from 'sentry/components/questionTooltip';
 import {SegmentedControl} from 'sentry/components/segmentedControl';
+import {Tooltip} from 'sentry/components/tooltip';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -30,52 +31,64 @@ export function SamplingModeField({initialTargetRate}: Props) {
 
   return (
     <FieldGroup
+      disabledReason={t('You do not have permission to change this setting.')}
       disabled={!hasAccess}
       label={t('Sampling Mode')}
       help={t('The current operating mode for dynamic sampling.')}
     >
       <ControlWrapper>
-        <SegmentedControl
-          disabled={!hasAccess}
-          label={t('Sampling mode')}
-          value={samplingMode}
-          onChange={handleSwitchMode}
+        <Tooltip
+          disabled={hasAccess}
+          title={t('You do not have permission to change this setting.')}
         >
-          <SegmentedControl.Item key="organization" textValue={t('Automatic')}>
-            <LabelWrapper>
-              {t('Automatic')}
-              <QuestionTooltip
-                isHoverable
-                size="sm"
-                title={tct(
-                  'Automatic mode allows you to set a target sample rate for your organization. Sentry automatically adjusts individual project rates to boost small projects and ensure equal visibility. [link:Learn more]',
-                  {
-                    link: (
-                      <ExternalLink href="https://docs.sentry.io/product/performance/retention-priorities/" />
-                    ),
+          <SegmentedControl
+            disabled={!hasAccess}
+            label={t('Sampling mode')}
+            value={samplingMode}
+            onChange={handleSwitchMode}
+          >
+            <SegmentedControl.Item key="organization" textValue={t('Automatic')}>
+              <LabelWrapper>
+                {t('Automatic')}
+                <QuestionTooltip
+                  isHoverable
+                  size="sm"
+                  title={
+                    hasAccess &&
+                    tct(
+                      'Automatic mode allows you to set a target sample rate for your organization. Sentry automatically adjusts individual project rates to boost small projects and ensure equal visibility. [link:Learn more]',
+                      {
+                        link: (
+                          <ExternalLink href="https://docs.sentry.io/product/performance/retention-priorities/" />
+                        ),
+                      }
+                    )
                   }
-                )}
-              />
-            </LabelWrapper>
-          </SegmentedControl.Item>
-          <SegmentedControl.Item key="project" textValue={t('Manual')}>
-            <LabelWrapper>
-              {t('Manual')}
-              <QuestionTooltip
-                isHoverable
-                size="sm"
-                title={tct(
-                  'Manual mode allows you to set fixed sample rates for each project. [link:Learn more]',
-                  {
-                    link: (
-                      <ExternalLink href="https://docs.sentry.io/product/performance/retention-priorities/" />
-                    ),
+                />
+              </LabelWrapper>
+            </SegmentedControl.Item>
+            <SegmentedControl.Item key="project" textValue={t('Manual')}>
+              <LabelWrapper>
+                {t('Manual')}
+                <QuestionTooltip
+                  isHoverable
+                  size="sm"
+                  title={
+                    hasAccess &&
+                    tct(
+                      'Manual mode allows you to set fixed sample rates for each project. [link:Learn more]',
+                      {
+                        link: (
+                          <ExternalLink href="https://docs.sentry.io/product/performance/retention-priorities/" />
+                        ),
+                      }
+                    )
                   }
-                )}
-              />
-            </LabelWrapper>
-          </SegmentedControl.Item>
-        </SegmentedControl>
+                />
+              </LabelWrapper>
+            </SegmentedControl.Item>
+          </SegmentedControl>
+        </Tooltip>
       </ControlWrapper>
     </FieldGroup>
   );
diff --git a/static/app/views/settings/dynamicSampling/samplingModeSwitchModal.tsx b/static/app/views/settings/dynamicSampling/samplingModeSwitchModal.tsx
index 4322775746f5da..7128aca5ca9159 100644
--- a/static/app/views/settings/dynamicSampling/samplingModeSwitchModal.tsx
+++ b/static/app/views/settings/dynamicSampling/samplingModeSwitchModal.tsx
@@ -101,8 +101,11 @@ function SamplingModeSwitchModal({
                   }
                 )
               : tct(
-                  'Switching to manual mode disables automatic adjustments. After the switch, you can configure individual sample rates for each project. Dynamic sampling priorities continue to apply within the projects. [link:Learn more]',
+                  'Switching to manual mode disables automatic adjustments. After the switch, you can configure individual sample rates for each project. [prioritiesLink:Dynamic sampling priorities] continue to apply within the projects. [link:Learn more]',
                   {
+                    prioritiesLink: (
+                      <ExternalLink href="https://docs.sentry.io/product/performance/retention-priorities/" />
+                    ),
                     link: (
                       <ExternalLink href="https://docs.sentry.io/product/performance/retention-priorities/" />
                     ),
diff --git a/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx b/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx
index 9ac4cb311f1619..8b783946ba7143 100644
--- a/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx
+++ b/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx
@@ -1,24 +1,11 @@
 import {useMemo} from 'react';
 
-import type {MRI} from 'sentry/types/metrics';
+import type {MetricsQueryApiResponse} from 'sentry/types/metrics';
 import type {Project} from 'sentry/types/project';
-import {
-  type MetricsQueryApiQueryParams,
-  useMetricsQuery,
-} from 'sentry/utils/metrics/useMetricsQuery';
+import {useApiQuery} from 'sentry/utils/queryClient';
+import useOrganization from 'sentry/utils/useOrganization';
 import useProjects from 'sentry/utils/useProjects';
 
-const SPANS_COUNT_METRIC: MRI = `c:spans/count_per_root_project@none`;
-const metricsQuery: MetricsQueryApiQueryParams[] = [
-  {
-    mri: SPANS_COUNT_METRIC,
-    aggregation: 'sum',
-    name: 'spans',
-    groupBy: ['project', 'target_project_id'],
-    orderBy: 'desc',
-  },
-];
-
 export interface ProjectSampleCount {
   count: number;
   ownCount: number;
@@ -29,23 +16,20 @@ export interface ProjectSampleCount {
 export type ProjectionSamplePeriod = '24h' | '30d';
 
 export function useProjectSampleCounts({period}: {period: ProjectionSamplePeriod}) {
+  const organization = useOrganization();
   const {projects, fetching} = useProjects();
 
-  const {data, isPending, isError, refetch} = useMetricsQuery(
-    metricsQuery,
-    {
-      datetime: {
-        start: null,
-        end: null,
-        utc: true,
-        period,
+  const {data, isPending, isError, refetch} = useApiQuery<MetricsQueryApiResponse>(
+    [
+      `/organizations/${organization.slug}/sampling/project-root-counts/`,
+      {
+        query: {
+          statsPeriod: period,
+        },
       },
-      environments: [],
-      projects: [],
-    },
+    ],
     {
-      includeSeries: false,
-      interval: period === '24h' ? '1h' : '1d',
+      staleTime: 0,
     }
   );
 
@@ -122,17 +106,14 @@ export function useProjectSampleCounts({period}: {period: ProjectionSamplePeriod
 
   const items = useMemo(
     () =>
-      projectEntries
-        .entries()
-        .map<ProjectSampleCount>(([key, value]) => {
-          return {
-            project: projectBySlug[key],
-            count: value.count,
-            ownCount: value.ownCount,
-            subProjects: value.subProjects.toSorted((a, b) => b.count - a.count),
-          };
-        })
-        .toArray(),
+      Array.from(projectEntries.entries()).map<ProjectSampleCount>(([key, value]) => {
+        return {
+          project: projectBySlug[key],
+          count: value.count,
+          ownCount: value.ownCount,
+          subProjects: value.subProjects.toSorted((a, b) => b.count - a.count),
+        };
+      }),
     [projectBySlug, projectEntries]
   );
 
diff --git a/static/app/views/settings/featureFlags/index.spec.tsx b/static/app/views/settings/featureFlags/index.spec.tsx
new file mode 100644
index 00000000000000..7fa2633f10616b
--- /dev/null
+++ b/static/app/views/settings/featureFlags/index.spec.tsx
@@ -0,0 +1,174 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
+import {SecretFixture} from 'sentry-fixture/secret';
+
+import {initializeOrg} from 'sentry-test/initializeOrg';
+import {
+  render,
+  renderGlobalModal,
+  screen,
+  userEvent,
+  waitForElementToBeRemoved,
+} from 'sentry-test/reactTestingLibrary';
+
+import * as indicators from 'sentry/actionCreators/indicator';
+import OrganizationsStore from 'sentry/stores/organizationsStore';
+import {
+  OrganizationFeatureFlagsIndex,
+  type Secret,
+} from 'sentry/views/settings/featureFlags';
+
+describe('OrganizationFeatureFlagsIndex', function () {
+  const ENDPOINT = '/organizations/org-slug/flags/signing-secrets/';
+  const {organization} = initializeOrg();
+
+  beforeEach(function () {
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/users/1234/',
+      body: {},
+    });
+    OrganizationsStore.addOrReplace(organization);
+  });
+
+  afterEach(function () {
+    MockApiClient.clearMockResponses();
+  });
+
+  it('shows secrets', async function () {
+    const secrets: Secret[] = [
+      SecretFixture(),
+      SecretFixture({id: 2, provider: 'openfeature', secret: '456def****'}),
+    ];
+
+    const mock = MockApiClient.addMockResponse({
+      url: ENDPOINT,
+      method: 'GET',
+      body: {data: secrets},
+    });
+
+    render(<OrganizationFeatureFlagsIndex />);
+
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
+
+    // Then list
+    expect(screen.getByText('launchdarkly')).toBeInTheDocument();
+    expect(screen.getByText('openfeature')).toBeInTheDocument();
+
+    expect(screen.queryByTestId('loading-error')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('loading-indicator')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('empty-state')).not.toBeInTheDocument();
+
+    expect(mock).toHaveBeenCalledTimes(1);
+    expect(mock).toHaveBeenCalledWith(ENDPOINT, expect.objectContaining({method: 'GET'}));
+  });
+
+  it('handle error when loading secrets', async function () {
+    const mock = MockApiClient.addMockResponse({
+      url: ENDPOINT,
+      method: 'GET',
+      statusCode: 400,
+    });
+
+    render(<OrganizationFeatureFlagsIndex />);
+
+    expect(await screen.findByTestId('loading-error')).toHaveTextContent(
+      'Failed to load secrets and providers for the organization.'
+    );
+    expect(screen.queryByTestId('loading-indicator')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('empty-state')).not.toBeInTheDocument();
+
+    expect(mock).toHaveBeenCalledTimes(1);
+  });
+
+  it('shows empty state', async function () {
+    const secrets: Secret[] = [];
+
+    MockApiClient.addMockResponse({
+      url: ENDPOINT,
+      method: 'GET',
+      body: {data: secrets},
+    });
+
+    render(<OrganizationFeatureFlagsIndex />);
+
+    await waitForElementToBeRemoved(() => screen.queryByTestId('loading-indicator'));
+
+    expect(screen.getByTestId('empty-state')).toBeInTheDocument();
+    expect(screen.queryByTestId('loading-error')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('loading-indicator')).not.toBeInTheDocument();
+  });
+
+  describe('removing', function () {
+    it('allows to remove secrets', async function () {
+      jest.spyOn(indicators, 'addSuccessMessage');
+
+      const secrets: Secret[] = [
+        SecretFixture(),
+        SecretFixture({id: 2, provider: 'openfeature', secret: '456def****'}),
+      ];
+
+      MockApiClient.addMockResponse({
+        url: ENDPOINT,
+        method: 'GET',
+        body: {data: secrets},
+      });
+
+      const deleteMock = MockApiClient.addMockResponse({
+        url: `${ENDPOINT}1/`,
+        method: 'DELETE',
+      });
+
+      render(<OrganizationFeatureFlagsIndex />);
+      renderGlobalModal();
+
+      expect(await screen.findByText('openfeature')).toBeInTheDocument();
+      expect(screen.getByText('launchdarkly')).toBeInTheDocument();
+
+      expect(
+        screen.getByLabelText('Remove secret for launchdarkly provider')
+      ).toBeEnabled();
+
+      await userEvent.click(
+        screen.getByLabelText('Remove secret for launchdarkly provider')
+      );
+      // Confirm modal
+      await userEvent.click(screen.getByRole('button', {name: 'Confirm'}));
+
+      expect(screen.getByText('openfeature')).toBeInTheDocument();
+      expect(screen.queryByText('launchdarkly')).not.toBeInTheDocument();
+
+      expect(indicators.addSuccessMessage).toHaveBeenCalledWith(
+        'Removed the provider and signing secret for the organization.'
+      );
+
+      expect(deleteMock).toHaveBeenCalledTimes(1);
+    });
+    it('does not allow to remove without permission', async function () {
+      const org = OrganizationFixture({
+        access: ['org:integrations'],
+      });
+
+      const secrets: Secret[] = [
+        SecretFixture(),
+        SecretFixture({
+          id: 2,
+          provider: 'openfeature',
+          secret: '456def**************************',
+        }),
+      ];
+
+      MockApiClient.addMockResponse({
+        url: ENDPOINT,
+        method: 'GET',
+        body: {data: secrets},
+      });
+
+      render(<OrganizationFeatureFlagsIndex />, {organization: org});
+
+      expect(await screen.findByText('launchdarkly')).toBeInTheDocument();
+
+      expect(
+        screen.getByLabelText('Remove secret for launchdarkly provider')
+      ).toBeDisabled();
+    });
+  });
+});
diff --git a/static/app/views/settings/featureFlags/index.tsx b/static/app/views/settings/featureFlags/index.tsx
new file mode 100644
index 00000000000000..3d297c5aa23795
--- /dev/null
+++ b/static/app/views/settings/featureFlags/index.tsx
@@ -0,0 +1,204 @@
+import {Fragment} from 'react';
+import styled from '@emotion/styled';
+
+import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
+import {hasEveryAccess} from 'sentry/components/acl/access';
+import {LinkButton} from 'sentry/components/button';
+import ExternalLink from 'sentry/components/links/externalLink';
+import LoadingError from 'sentry/components/loadingError';
+import {PanelTable} from 'sentry/components/panels/panelTable';
+import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
+import {Tooltip} from 'sentry/components/tooltip';
+import {t, tct} from 'sentry/locale';
+import {handleXhrErrorResponse} from 'sentry/utils/handleXhrErrorResponse';
+import {
+  setApiQueryData,
+  useApiQuery,
+  useMutation,
+  useQueryClient,
+} from 'sentry/utils/queryClient';
+import type RequestError from 'sentry/utils/requestError/requestError';
+import useApi from 'sentry/utils/useApi';
+import useOrganization from 'sentry/utils/useOrganization';
+import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
+import TextBlock from 'sentry/views/settings/components/text/textBlock';
+import {OrganizationFeatureFlagsProviderRow} from 'sentry/views/settings/featureFlags/organizationFeatureFlagsProviderRow';
+
+export type Secret = {
+  createdAt: string;
+  createdBy: number;
+  id: number;
+  provider: string;
+  secret: string;
+};
+
+type FetchSecretResponse = {data: Secret[]};
+
+type FetchSecretParameters = {
+  orgSlug: string;
+};
+
+type RemoveSecretQueryVariables = {
+  id: number;
+};
+
+export const makeFetchSecretQueryKey = ({orgSlug}: FetchSecretParameters) =>
+  [`/organizations/${orgSlug}/flags/signing-secrets/`] as const;
+
+function SecretList({
+  secretList,
+  isRemoving,
+  removeSecret,
+}: {
+  isRemoving: boolean;
+  secretList: Secret[];
+  removeSecret?: (data: {id: number}) => void;
+}) {
+  return (
+    <Fragment>
+      {secretList.map(secret => {
+        return (
+          <OrganizationFeatureFlagsProviderRow
+            key={secret.id}
+            secret={secret}
+            isRemoving={isRemoving}
+            removeSecret={removeSecret ? () => removeSecret({id: secret.id}) : undefined}
+          />
+        );
+      })}
+    </Fragment>
+  );
+}
+
+export function OrganizationFeatureFlagsIndex() {
+  const organization = useOrganization();
+  const api = useApi();
+  const queryClient = useQueryClient();
+
+  const {
+    isPending,
+    isError,
+    data: secretList,
+    refetch: refetchSecretList,
+  } = useApiQuery<FetchSecretResponse>(
+    makeFetchSecretQueryKey({orgSlug: organization.slug}),
+    {
+      staleTime: Infinity,
+    }
+  );
+
+  const {mutate: handleRemoveSecret, isPending: isRemoving} = useMutation<
+    {},
+    RequestError,
+    RemoveSecretQueryVariables
+  >({
+    mutationFn: ({id}) =>
+      api.requestPromise(
+        `/organizations/${organization.slug}/flags/signing-secrets/${id}/`,
+        {
+          method: 'DELETE',
+        }
+      ),
+
+    onSuccess: (_data, {id}) => {
+      addSuccessMessage(
+        t('Removed the provider and signing secret for the organization.')
+      );
+
+      setApiQueryData(
+        queryClient,
+        makeFetchSecretQueryKey({orgSlug: organization.slug}),
+        (oldData: FetchSecretResponse) => {
+          return {data: oldData.data.filter(oldSecret => oldSecret.id !== id)};
+        }
+      );
+    },
+    onError: error => {
+      const message = t('Failed to remove the provider or signing secret.');
+      handleXhrErrorResponse(message, error);
+      addErrorMessage(message);
+    },
+  });
+
+  const addNewProvider = hasAccess => (
+    <Tooltip
+      title={t('You must be an organization member to add a provider.')}
+      disabled={hasAccess}
+    >
+      <LinkButton
+        priority="primary"
+        size="sm"
+        to={`/settings/${organization.slug}/feature-flags/new-provider/`}
+        data-test-id="create-new-provider"
+        disabled={!hasAccess}
+      >
+        {t('Add New Provider')}
+      </LinkButton>
+    </Tooltip>
+  );
+
+  const canRead = hasEveryAccess(['org:read'], {organization});
+  const canWrite = hasEveryAccess(['org:write'], {organization});
+  const canAdmin = hasEveryAccess(['org:admin'], {organization});
+  const hasAccess = canRead || canWrite || canAdmin;
+  const hasDeleteAccess = canWrite || canAdmin;
+
+  return (
+    <Fragment>
+      <SentryDocumentTitle title={t('Feature Flags')} />
+      <SettingsPageHeader title={t('Feature Flags')} action={addNewProvider(hasAccess)} />
+
+      <TextBlock>
+        {t(
+          'Integrating Sentry with your feature flag provider enables Sentry to correlate feature flag changes with new error events and mark certain changes as suspicious. This page lists the webhooks you have set up with external providers. Note that each provider can only have one associated signing secret.'
+        )}
+      </TextBlock>
+      <TextBlock>
+        {tct(
+          'Learn more about how to interact with feature flag insights within the Sentry UI by reading the [link:documentation].',
+          {
+            link: (
+              <ExternalLink href="https://docs.sentry.io/product/explore/feature-flags/#change-tracking" />
+            ),
+          }
+        )}
+      </TextBlock>
+
+      <ResponsivePanelTable
+        isLoading={isPending || isError}
+        isEmpty={!isPending && !secretList?.data?.length}
+        loader={
+          isError ? (
+            <LoadingError
+              message={t('Failed to load secrets and providers for the organization.')}
+              onRetry={refetchSecretList}
+            />
+          ) : undefined
+        }
+        emptyMessage={t("You haven't linked any providers yet.")}
+        headers={[t('Provider'), t('Created'), t('Created by'), '']}
+      >
+        {!isError && !isPending && !!secretList?.data?.length && (
+          <SecretList
+            secretList={secretList.data}
+            isRemoving={isRemoving}
+            removeSecret={hasDeleteAccess ? handleRemoveSecret : undefined}
+          />
+        )}
+      </ResponsivePanelTable>
+    </Fragment>
+  );
+}
+
+export default OrganizationFeatureFlagsIndex;
+
+const ResponsivePanelTable = styled(PanelTable)`
+  @media (max-width: ${p => p.theme.breakpoints.small}) {
+    grid-template-columns: 1fr 1fr;
+
+    > *:nth-child(4n + 2),
+    > *:nth-child(4n + 3) {
+      display: none;
+    }
+  }
+`;
diff --git a/static/app/views/settings/featureFlags/newProviderForm.spec.tsx b/static/app/views/settings/featureFlags/newProviderForm.spec.tsx
new file mode 100644
index 00000000000000..1e4c11647800cb
--- /dev/null
+++ b/static/app/views/settings/featureFlags/newProviderForm.spec.tsx
@@ -0,0 +1,10 @@
+import {render} from 'sentry-test/reactTestingLibrary';
+
+import NewProviderForm from 'sentry/views/settings/featureFlags/newProviderForm';
+
+describe('NewProviderForm', () => {
+  it('renders', () => {
+    const callback = ({}) => {};
+    render(<NewProviderForm onSetProvider={callback} onCreatedSecret={callback} />);
+  });
+});
diff --git a/static/app/views/settings/featureFlags/newProviderForm.tsx b/static/app/views/settings/featureFlags/newProviderForm.tsx
new file mode 100644
index 00000000000000..07f2c7df76eaa2
--- /dev/null
+++ b/static/app/views/settings/featureFlags/newProviderForm.tsx
@@ -0,0 +1,154 @@
+import {useCallback, useState} from 'react';
+import styled from '@emotion/styled';
+
+import {
+  addErrorMessage,
+  addLoadingMessage,
+  addSuccessMessage,
+} from 'sentry/actionCreators/indicator';
+import {hasEveryAccess} from 'sentry/components/acl/access';
+import {PROVIDER_OPTION_TO_URLS} from 'sentry/components/events/featureFlags/utils';
+import FieldGroup from 'sentry/components/forms/fieldGroup';
+import SelectField from 'sentry/components/forms/fields/selectField';
+import TextField from 'sentry/components/forms/fields/textField';
+import Form from 'sentry/components/forms/form';
+import ExternalLink from 'sentry/components/links/externalLink';
+import TextCopyInput from 'sentry/components/textCopyInput';
+import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import {browserHistory} from 'sentry/utils/browserHistory';
+import {handleXhrErrorResponse} from 'sentry/utils/handleXhrErrorResponse';
+import {useMutation, useQueryClient} from 'sentry/utils/queryClient';
+import type RequestError from 'sentry/utils/requestError/requestError';
+import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import useApi from 'sentry/utils/useApi';
+import useOrganization from 'sentry/utils/useOrganization';
+import {makeFetchSecretQueryKey} from 'sentry/views/settings/featureFlags';
+
+export type CreateSecretQueryVariables = {
+  provider: string;
+  secret: string;
+};
+
+export type CreateSecretResponse = string;
+
+export default function NewProviderForm({
+  onCreatedSecret,
+  onSetProvider,
+}: {
+  onCreatedSecret: (secret: string) => void;
+  onSetProvider: (provider: string) => void;
+}) {
+  const initialData = {
+    provider: '',
+    secret: '',
+  };
+  const organization = useOrganization();
+  const api = useApi();
+  const queryClient = useQueryClient();
+
+  const [selectedProvider, setSelectedProvider] = useState('<provider_name>');
+
+  const handleGoBack = useCallback(() => {
+    browserHistory.push(normalizeUrl(`/settings/${organization.slug}/feature-flags/`));
+  }, [organization.slug]);
+
+  const {mutate: submitSecret, isPending} = useMutation<
+    CreateSecretResponse,
+    RequestError,
+    CreateSecretQueryVariables
+  >({
+    mutationFn: ({provider, secret}) => {
+      addLoadingMessage();
+      return api.requestPromise(
+        `/organizations/${organization.slug}/flags/signing-secrets/`,
+        {
+          method: 'POST',
+          data: {
+            provider: provider.toLowerCase(),
+            secret,
+          },
+        }
+      );
+    },
+
+    onSuccess: (_response, {secret, provider}) => {
+      addSuccessMessage(t('Added provider and secret.'));
+      onCreatedSecret(secret);
+      onSetProvider(provider);
+      queryClient.invalidateQueries({
+        queryKey: makeFetchSecretQueryKey({orgSlug: organization.slug}),
+      });
+    },
+    onError: error => {
+      const message = t('Failed to add provider or secret.');
+      handleXhrErrorResponse(message, error);
+      addErrorMessage(message);
+    },
+  });
+
+  const canRead = hasEveryAccess(['org:read'], {organization});
+  const canWrite = hasEveryAccess(['org:write'], {organization});
+  const canAdmin = hasEveryAccess(['org:admin'], {organization});
+  const hasAccess = canRead || canWrite || canAdmin;
+
+  return (
+    <Form
+      apiMethod="POST"
+      initialData={initialData}
+      apiEndpoint={`/organizations/${organization.slug}/flags/signing-secret/`}
+      onSubmit={({provider, secret}) => {
+        submitSecret({
+          provider,
+          secret,
+        });
+      }}
+      onCancel={handleGoBack}
+      submitLabel={t('Add Provider')}
+      requireChanges
+      submitDisabled={!hasAccess || isPending}
+    >
+      <SelectField
+        required
+        label={t('Provider')}
+        onChange={setSelectedProvider}
+        value={selectedProvider}
+        placeholder={t('Select a provider')}
+        name="provider"
+        options={[{value: 'LaunchDarkly', label: 'LaunchDarkly'}]}
+        help={t(
+          'If you have already linked this provider, pasting a new secret will override the existing secret.'
+        )}
+      />
+      <StyledFieldGroup
+        label={t('Webhook URL')}
+        help={tct(
+          "Create a webhook integration with your [link:feature flag service]. When you do so, you'll need to enter this URL.",
+          {
+            link: <ExternalLink href={PROVIDER_OPTION_TO_URLS[selectedProvider]} />,
+          }
+        )}
+        inline
+        flexibleControlStateSize
+      >
+        <TextCopyInput
+          aria-label={t('Webhook URL')}
+        >{`https://sentry.io/api/0/organizations/sentry/flags/hooks/provider/${selectedProvider.toLowerCase()}/`}</TextCopyInput>
+      </StyledFieldGroup>
+      <TextField
+        name="secret"
+        label={t('Secret')}
+        maxLength={32}
+        minLength={32}
+        required
+        help={t(
+          'Paste the signing secret given by your provider when creating the webhook.'
+        )}
+      />
+    </Form>
+  );
+}
+
+const StyledFieldGroup = styled(FieldGroup)`
+  padding: ${space(2)};
+`;
diff --git a/static/app/views/settings/featureFlags/newSecretHandler.spec.tsx b/static/app/views/settings/featureFlags/newSecretHandler.spec.tsx
new file mode 100644
index 00000000000000..cc6aa8af32070e
--- /dev/null
+++ b/static/app/views/settings/featureFlags/newSecretHandler.spec.tsx
@@ -0,0 +1,18 @@
+import {SecretFixture} from 'sentry-fixture/secret';
+
+import {render} from 'sentry-test/reactTestingLibrary';
+
+import NewSecretHandler from 'sentry/views/settings/featureFlags/newSecretHandler';
+
+describe('NewSecretHandler', () => {
+  it('renders', () => {
+    const callback = ({}) => {};
+    render(
+      <NewSecretHandler
+        secret={SecretFixture().secret}
+        onGoBack={callback}
+        provider={SecretFixture().provider}
+      />
+    );
+  });
+});
diff --git a/static/app/views/settings/featureFlags/newSecretHandler.tsx b/static/app/views/settings/featureFlags/newSecretHandler.tsx
new file mode 100644
index 00000000000000..a75de2dc7ccc82
--- /dev/null
+++ b/static/app/views/settings/featureFlags/newSecretHandler.tsx
@@ -0,0 +1,96 @@
+import type {MouseEventHandler} from 'react';
+import styled from '@emotion/styled';
+
+import Alert from 'sentry/components/alert';
+import {Button} from 'sentry/components/button';
+import {PROVIDER_OPTION_TO_URLS} from 'sentry/components/events/featureFlags/utils';
+import FieldGroup from 'sentry/components/forms/fieldGroup';
+import ExternalLink from 'sentry/components/links/externalLink';
+import PanelItem from 'sentry/components/panels/panelItem';
+import TextCopyInput from 'sentry/components/textCopyInput';
+import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+
+function NewSecretHandler({
+  secret,
+  provider,
+  onGoBack,
+}: {
+  onGoBack: MouseEventHandler;
+  provider: string;
+  secret: string;
+}) {
+  return (
+    <div>
+      <StyledAlert type="warning" showIcon system>
+        {t('The secret has been posted.')}
+      </StyledAlert>
+
+      <StyledPanelItem>
+        <InputWrapper>
+          <StyledFieldGroup
+            label={t('Webhook URL')}
+            help={tct(
+              "Create a webhook integration with your [link:feature flag service]. When you do so, you'll need to enter this URL.",
+              {
+                link: (
+                  <ExternalLink href={PROVIDER_OPTION_TO_URLS[provider.toLowerCase()]} />
+                ),
+              }
+            )}
+            inline
+            flexibleControlStateSize
+          >
+            <TextCopyInput
+              aria-label={t('Webhook URL')}
+            >{`https://sentry.io/api/0/organizations/sentry/flags/hooks/provider/${provider.toLowerCase()}/`}</TextCopyInput>
+          </StyledFieldGroup>
+          <StyledFieldGroup
+            label={t('Secret')}
+            help={t(
+              'The secret should not be shared and will not be retrievable once you leave this page.'
+            )}
+            inline
+            flexibleControlStateSize
+          >
+            <TextCopyInput aria-label={t('Secret')}>{secret}</TextCopyInput>
+          </StyledFieldGroup>
+        </InputWrapper>
+      </StyledPanelItem>
+
+      <StyledPanelItem>
+        <ButtonWrapper>
+          <Button onClick={onGoBack} priority="primary">
+            {t('Done')}
+          </Button>
+        </ButtonWrapper>
+      </StyledPanelItem>
+    </div>
+  );
+}
+
+const InputWrapper = styled('div')`
+  flex: 1;
+`;
+
+const StyledFieldGroup = styled(FieldGroup)`
+  padding: ${space(1)};
+`;
+
+const ButtonWrapper = styled('div')`
+  margin-left: auto;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  font-size: ${p => p.theme.fontSizeSmall};
+  gap: ${space(1)};
+`;
+
+const StyledPanelItem = styled(PanelItem)`
+  padding: ${space(1.5)};
+`;
+
+const StyledAlert = styled(Alert)`
+  margin: 0;
+`;
+export default NewSecretHandler;
diff --git a/static/app/views/settings/featureFlags/organizationFeatureFlagsNewSecret.spec.tsx b/static/app/views/settings/featureFlags/organizationFeatureFlagsNewSecret.spec.tsx
new file mode 100644
index 00000000000000..ca24a24f50c94a
--- /dev/null
+++ b/static/app/views/settings/featureFlags/organizationFeatureFlagsNewSecret.spec.tsx
@@ -0,0 +1,89 @@
+import {SecretFixture} from 'sentry-fixture/secret';
+
+import {initializeOrg} from 'sentry-test/initializeOrg';
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import * as indicators from 'sentry/actionCreators/indicator';
+import OrganizationsStore from 'sentry/stores/organizationsStore';
+import OrganizationFeatureFlagsNewSecet from 'sentry/views/settings/featureFlags/organizationFeatureFlagsNewSecret';
+
+describe('OrganizationFeatureFlagsNewSecret', function () {
+  const ENDPOINT = '/organizations/org-slug/flags/signing-secrets/';
+  const {organization} = initializeOrg();
+
+  beforeEach(function () {
+    OrganizationsStore.addOrReplace(organization);
+  });
+
+  afterEach(function () {
+    MockApiClient.clearMockResponses();
+  });
+
+  it('can create secret', async function () {
+    render(<OrganizationFeatureFlagsNewSecet />);
+
+    const mock = MockApiClient.addMockResponse({
+      url: ENDPOINT,
+      method: 'POST',
+    });
+
+    await userEvent.type(screen.getByLabelText('Secret'), SecretFixture().secret);
+    const providerDropdown = screen.getByRole('textbox', {
+      name: 'Provider',
+    });
+    await userEvent.click(providerDropdown);
+    await userEvent.click(screen.getByRole('menuitemradio', {name: 'LaunchDarkly'}));
+    await userEvent.click(screen.getByRole('button', {name: 'Add Provider'}));
+
+    expect(screen.getByRole('textbox', {name: 'Secret'})).toHaveValue(
+      SecretFixture().secret
+    );
+
+    expect(mock).toHaveBeenCalledWith(
+      ENDPOINT,
+      expect.objectContaining({
+        data: {
+          provider: 'launchdarkly',
+          secret: SecretFixture().secret,
+        },
+      })
+    );
+  });
+
+  it('handles API errors when creating secret', async function () {
+    jest.spyOn(indicators, 'addErrorMessage');
+
+    render(<OrganizationFeatureFlagsNewSecet />);
+
+    const mock = MockApiClient.addMockResponse({
+      url: ENDPOINT,
+      method: 'POST',
+      body: {
+        detail: 'Test API error occurred.',
+      },
+      statusCode: 403,
+    });
+
+    await userEvent.type(screen.getByLabelText('Secret'), SecretFixture().secret);
+    const providerDropdown = screen.getByRole('textbox', {
+      name: 'Provider',
+    });
+    await userEvent.click(providerDropdown);
+    await userEvent.click(screen.getByRole('menuitemradio', {name: 'LaunchDarkly'}));
+    await userEvent.click(screen.getByRole('button', {name: 'Add Provider'}));
+
+    expect(indicators.addErrorMessage).toHaveBeenCalledWith(
+      'Failed to add provider or secret.'
+    );
+
+    expect(mock).toHaveBeenCalledWith(
+      ENDPOINT,
+      expect.objectContaining({
+        data: {
+          provider: 'launchdarkly',
+          secret: SecretFixture().secret,
+        },
+      })
+    );
+  });
+});
diff --git a/static/app/views/settings/featureFlags/organizationFeatureFlagsNewSecret.tsx b/static/app/views/settings/featureFlags/organizationFeatureFlagsNewSecret.tsx
new file mode 100644
index 00000000000000..01bc117a296e2b
--- /dev/null
+++ b/static/app/views/settings/featureFlags/organizationFeatureFlagsNewSecret.tsx
@@ -0,0 +1,65 @@
+import {Fragment, useCallback, useState} from 'react';
+
+import ExternalLink from 'sentry/components/links/externalLink';
+import Panel from 'sentry/components/panels/panel';
+import PanelBody from 'sentry/components/panels/panelBody';
+import PanelHeader from 'sentry/components/panels/panelHeader';
+import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
+import {t, tct} from 'sentry/locale';
+import {browserHistory} from 'sentry/utils/browserHistory';
+import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import useOrganization from 'sentry/utils/useOrganization';
+import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
+import TextBlock from 'sentry/views/settings/components/text/textBlock';
+import NewProviderForm from 'sentry/views/settings/featureFlags/newProviderForm';
+import NewSecretHandler from 'sentry/views/settings/featureFlags/newSecretHandler';
+
+export function OrganizationFeatureFlagsNewSecet() {
+  const [newSecret, setNewSecret] = useState<string | null>(null);
+  const [provider, setProvider] = useState<string>('');
+  const organization = useOrganization();
+
+  const handleGoBack = useCallback(() => {
+    browserHistory.push(normalizeUrl(`/settings/${organization.slug}/feature-flags/`));
+  }, [organization.slug]);
+
+  return (
+    <Fragment>
+      <SentryDocumentTitle title={t('Add New Provider')} />
+      <SettingsPageHeader title={t('Add New Provider')} />
+
+      <TextBlock>
+        {t(
+          'Integrating Sentry with your feature flag provider enables Sentry to correlate feature flag changes with new error events and mark certain changes as suspicious. This page lists the webhooks you have set up with external providers. Note that each provider can only have one associated signing secret.'
+        )}
+      </TextBlock>
+      <TextBlock>
+        {tct(
+          'Learn more about how to interact with feature flag insights within the Sentry UI by reading the [link:documentation].',
+          {
+            link: (
+              <ExternalLink href="https://docs.sentry.io/product/explore/feature-flags/#change-tracking" />
+            ),
+          }
+        )}
+      </TextBlock>
+
+      <Panel>
+        <PanelHeader>{t('Add New Provider')}</PanelHeader>
+        <PanelBody>
+          {newSecret ? (
+            <NewSecretHandler
+              onGoBack={handleGoBack}
+              secret={newSecret}
+              provider={provider}
+            />
+          ) : (
+            <NewProviderForm onCreatedSecret={setNewSecret} onSetProvider={setProvider} />
+          )}
+        </PanelBody>
+      </Panel>
+    </Fragment>
+  );
+}
+
+export default OrganizationFeatureFlagsNewSecet;
diff --git a/static/app/views/settings/featureFlags/organizationFeatureFlagsProviderRow.spec.tsx b/static/app/views/settings/featureFlags/organizationFeatureFlagsProviderRow.spec.tsx
new file mode 100644
index 00000000000000..1ce8e63c7daeee
--- /dev/null
+++ b/static/app/views/settings/featureFlags/organizationFeatureFlagsProviderRow.spec.tsx
@@ -0,0 +1,98 @@
+import {SecretFixture} from 'sentry-fixture/secret';
+
+import {initializeOrg} from 'sentry-test/initializeOrg';
+import {
+  render,
+  renderGlobalModal,
+  screen,
+  userEvent,
+} from 'sentry-test/reactTestingLibrary';
+
+import OrganizationsStore from 'sentry/stores/organizationsStore';
+import type {Secret} from 'sentry/views/settings/featureFlags';
+import {OrganizationFeatureFlagsProviderRow} from 'sentry/views/settings/featureFlags/organizationFeatureFlagsProviderRow';
+
+describe('OrganizationFeatureFlagsProviderRow', function () {
+  const {organization, router} = initializeOrg();
+
+  const removeSecret = jest.fn();
+
+  const secret: Secret = SecretFixture();
+
+  const defaultProps = {
+    organization,
+    isRemoving: false,
+    secret,
+    removeSecret,
+    router,
+    location: router.location,
+    params: {orgId: organization.slug},
+    routes: router.routes,
+    route: {},
+    routeParams: router.params,
+  };
+
+  beforeEach(function () {
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/users/1234/',
+      body: {},
+    });
+    OrganizationsStore.addOrReplace(organization);
+  });
+
+  afterEach(function () {
+    MockApiClient.clearMockResponses();
+  });
+
+  it('shows secret and provider name', function () {
+    render(<OrganizationFeatureFlagsProviderRow {...defaultProps} />);
+
+    expect(screen.getByLabelText('Secret preview')).toHaveTextContent('123abc*****');
+    expect(screen.getByText('launchdarkly')).toBeInTheDocument();
+  });
+
+  describe('removing', function () {
+    it('does not allow to remove without access', function () {
+      const props = {
+        ...defaultProps,
+        removeSecret: undefined,
+      };
+
+      render(<OrganizationFeatureFlagsProviderRow {...props} />);
+
+      expect(
+        screen.getByRole('button', {name: 'Remove secret for launchdarkly provider'})
+      ).toBeDisabled();
+    });
+
+    it('allows to remove', async function () {
+      render(<OrganizationFeatureFlagsProviderRow {...defaultProps} />);
+      renderGlobalModal();
+
+      expect(
+        screen.getByRole('button', {name: 'Remove secret for launchdarkly provider'})
+      ).toBeEnabled();
+
+      await userEvent.click(
+        screen.getByRole('button', {name: 'Remove secret for launchdarkly provider'})
+      );
+      // Confirm modal
+      await userEvent.click(screen.getByRole('button', {name: 'Confirm'}));
+
+      expect(removeSecret).toHaveBeenCalledWith(1); // the id of the secret
+    });
+
+    it('does not allow to remove while removing in progress', function () {
+      const props = {
+        ...defaultProps,
+        isRemoving: true,
+      };
+
+      render(<OrganizationFeatureFlagsProviderRow {...props} />);
+
+      expect(
+        screen.getByRole('button', {name: 'Remove secret for launchdarkly provider'})
+      ).toBeDisabled();
+    });
+  });
+});
diff --git a/static/app/views/settings/featureFlags/organizationFeatureFlagsProviderRow.tsx b/static/app/views/settings/featureFlags/organizationFeatureFlagsProviderRow.tsx
new file mode 100644
index 00000000000000..72e18d6541f525
--- /dev/null
+++ b/static/app/views/settings/featureFlags/organizationFeatureFlagsProviderRow.tsx
@@ -0,0 +1,89 @@
+import {Fragment} from 'react';
+import styled from '@emotion/styled';
+
+import {Button} from 'sentry/components/button';
+import Confirm from 'sentry/components/confirm';
+import {Flex} from 'sentry/components/container/flex';
+import LoadingIndicator from 'sentry/components/loadingIndicator';
+import TimeSince from 'sentry/components/timeSince';
+import {Tooltip} from 'sentry/components/tooltip';
+import {IconSubtract} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import type {Secret} from 'sentry/views/settings/featureFlags';
+import useUserFromId from 'sentry/views/settings/featureFlags/useUserFromId';
+
+export function OrganizationFeatureFlagsProviderRow({
+  isRemoving,
+  secret,
+  removeSecret,
+}: {
+  isRemoving: boolean;
+  secret: Secret;
+  removeSecret?: (id: number) => void;
+}) {
+  const {isPending: isUserPending, data: user} = useUserFromId({id: secret.createdBy});
+
+  return (
+    <Fragment>
+      <div>
+        <div>{secret.provider}</div>
+        <SecretPreview aria-label={t('Secret preview')}>{secret.secret}</SecretPreview>
+      </div>
+
+      <DateTime>
+        <TimeSince date={secret.createdAt} />
+      </DateTime>
+
+      <Flex align="center">{isUserPending ? <LoadingIndicator mini /> : user?.name}</Flex>
+
+      <Actions>
+        <Tooltip
+          title={t(
+            'You must be an organization owner, manager or admin to remove a secret.'
+          )}
+          disabled={!!removeSecret}
+        >
+          <Confirm
+            disabled={!removeSecret || isRemoving}
+            onConfirm={removeSecret ? () => removeSecret(secret.id) : undefined}
+            message={t(
+              'Are you sure you want to remove the secret for %s provider? It will not be usable anymore, and this cannot be undone.',
+              secret.provider
+            )}
+          >
+            <Button
+              size="sm"
+              disabled={isRemoving || !removeSecret}
+              aria-label={t('Remove secret for %s provider', secret.provider)}
+              icon={
+                isRemoving ? (
+                  <LoadingIndicator mini />
+                ) : (
+                  <IconSubtract isCircled size="xs" />
+                )
+              }
+            >
+              {t('Remove')}
+            </Button>
+          </Confirm>
+        </Tooltip>
+      </Actions>
+    </Fragment>
+  );
+}
+
+const Actions = styled('div')`
+  display: flex;
+  justify-content: flex-end;
+`;
+
+const DateTime = styled('div')`
+  display: flex;
+  align-items: center;
+  gap: ${space(0.5)};
+`;
+
+const SecretPreview = styled('div')`
+  color: ${p => p.theme.gray300};
+`;
diff --git a/static/app/views/settings/featureFlags/useUserFromId.tsx b/static/app/views/settings/featureFlags/useUserFromId.tsx
new file mode 100644
index 00000000000000..837dbe8300218c
--- /dev/null
+++ b/static/app/views/settings/featureFlags/useUserFromId.tsx
@@ -0,0 +1,19 @@
+import type {User} from '@sentry/types';
+
+import {useApiQuery} from 'sentry/utils/queryClient';
+import useOrganization from 'sentry/utils/useOrganization';
+
+export default function useUserFromId({id}: {id: number}) {
+  const organization = useOrganization();
+
+  const {isPending, isError, data} = useApiQuery<User>(
+    [`/organizations/${organization.slug}/users/${id}/`],
+    {staleTime: 0, enabled: typeof id === 'number'}
+  );
+
+  if (isError) {
+    return {isPending: false, data: {name: id}};
+  }
+
+  return {isPending, data};
+}
diff --git a/static/app/views/settings/organization/navigationConfiguration.tsx b/static/app/views/settings/organization/navigationConfiguration.tsx
index 69a5040499f134..e404844402f106 100644
--- a/static/app/views/settings/organization/navigationConfiguration.tsx
+++ b/static/app/views/settings/organization/navigationConfiguration.tsx
@@ -114,9 +114,18 @@ const organizationNavigation: NavigationSection[] = [
         path: `${organizationSettingsPathPrefix}/dynamic-sampling/`,
         title: t('Dynamic Sampling'),
         description: t('Manage your sampling rate'),
+        badge: () => <FeatureBadge type="alpha" />,
         show: ({organization}) =>
           !!organization && hasDynamicSamplingCustomFeature(organization),
       },
+      {
+        path: `${organizationSettingsPathPrefix}/feature-flags/`,
+        title: t('Feature Flags'),
+        description: t('Set up your provider webhooks'),
+        badge: () => <FeatureBadge type="beta" />,
+        show: ({organization}) =>
+          !!organization && organization.features.includes('feature-flag-ui'),
+      },
     ],
   },
   {
diff --git a/static/app/views/settings/organizationAuthTokens/index.tsx b/static/app/views/settings/organizationAuthTokens/index.tsx
index c87353f42c5666..d381bd61d2734b 100644
--- a/static/app/views/settings/organizationAuthTokens/index.tsx
+++ b/static/app/views/settings/organizationAuthTokens/index.tsx
@@ -217,7 +217,7 @@ const ResponsivePanelTable = styled(PanelTable)`
     grid-template-columns: 1fr 1fr;
 
     > *:nth-child(4n + 2),
-    *:nth-child(4n + 3) {
+    > *:nth-child(4n + 3) {
       display: none;
     }
   }
diff --git a/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.tsx b/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.tsx
index 291e271b43d18a..71eb1d18465f19 100644
--- a/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.tsx
+++ b/static/app/views/settings/organizationGeneralSettings/organizationSettingsForm.tsx
@@ -120,6 +120,16 @@ function OrganizationSettingsForm({initialData, onSave}: Props) {
           </PoweredByCodecov>
         ),
       },
+      ...(organization.features.includes('sentry-rollback-settings')
+        ? [
+            {
+              name: 'rollbackEnabled',
+              type: 'boolean',
+              label: t('2024 Sentry Rollback'),
+              help: t('Allow organization members to view their year in review'),
+            } as FieldObject,
+          ]
+        : []),
     ];
     return formsConfig;
   }, [access, organization]);
diff --git a/static/app/views/settings/organizationMembers/organizationMembersList.tsx b/static/app/views/settings/organizationMembers/organizationMembersList.tsx
index 8b3e23b892b738..fe0658efe50b2c 100644
--- a/static/app/views/settings/organizationMembers/organizationMembersList.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMembersList.tsx
@@ -311,7 +311,7 @@ function OrganizationMembersList() {
           refetchInviteRequests();
           refetchMembers();
         }}
-        allowedRoles={currentMember ? currentMember.roles : ORG_ROLES}
+        allowedRoles={currentMember?.orgRoleList ?? currentMember?.roles ?? ORG_ROLES}
       />
       {inviteRequests.length > 0 && (
         <Panel>
@@ -329,7 +329,7 @@ function OrganizationMembersList() {
                 organization={organization}
                 inviteRequest={inviteRequest}
                 inviteRequestBusy={{}}
-                allRoles={currentMember?.roles ?? ORG_ROLES}
+                allRoles={currentMember?.orgRoleList ?? currentMember?.roles ?? ORG_ROLES}
                 onApprove={handleInviteRequestApprove}
                 onDeny={handleInviteRequestDeny}
                 onUpdate={data => updateInviteRequest(inviteRequest.id, data)}
@@ -340,7 +340,7 @@ function OrganizationMembersList() {
       )}
       <SearchWrapperWithFilter>
         <MembersFilter
-          roles={currentMember?.roles ?? ORG_ROLES}
+          roles={currentMember?.orgRoleList ?? currentMember?.roles ?? ORG_ROLES}
           query={searchQuery}
           onChange={handleQueryChange}
         />
diff --git a/static/app/views/settings/organizationProjects/index.spec.tsx b/static/app/views/settings/organizationProjects/index.spec.tsx
index 88873db6b70dd9..a0cd7f770fbf41 100644
--- a/static/app/views/settings/organizationProjects/index.spec.tsx
+++ b/static/app/views/settings/organizationProjects/index.spec.tsx
@@ -53,9 +53,9 @@ describe('OrganizationProjects', function () {
     );
     expect(projectsPutMock).toHaveBeenCalledTimes(0);
 
-    await userEvent.click(await screen.findByRole('button', {name: 'Bookmark Project'}));
+    await userEvent.click(await screen.findByRole('button', {name: 'Bookmark'}));
     expect(
-      await screen.findByRole('button', {name: 'Bookmark Project', pressed: true})
+      await screen.findByRole('button', {name: 'Remove Bookmark', pressed: true})
     ).toBeInTheDocument();
 
     expect(projectsPutMock).toHaveBeenCalledTimes(1);
diff --git a/static/app/views/settings/organizationTeams/teamProjects.spec.tsx b/static/app/views/settings/organizationTeams/teamProjects.spec.tsx
index 53dbf32774ae69..765541e804da45 100644
--- a/static/app/views/settings/organizationTeams/teamProjects.spec.tsx
+++ b/static/app/views/settings/organizationTeams/teamProjects.spec.tsx
@@ -82,12 +82,12 @@ describe('OrganizationTeamProjects', function () {
       organization,
     });
 
-    const stars = await screen.findAllByRole('button', {name: 'Bookmark Project'});
+    const stars = await screen.findAllByRole('button', {name: 'Bookmark'});
     expect(stars).toHaveLength(2);
 
     await userEvent.click(stars[0]);
     expect(
-      screen.getByRole('button', {name: 'Bookmark Project', pressed: true})
+      screen.getByRole('button', {name: 'Remove Bookmark', pressed: true})
     ).toBeInTheDocument();
 
     expect(putMock).toHaveBeenCalledTimes(1);
diff --git a/static/app/views/settings/projectSecurityAndPrivacy/index.spec.tsx b/static/app/views/settings/projectSecurityAndPrivacy/index.spec.tsx
index 0ff6dca45d69a0..b8adf72054965a 100644
--- a/static/app/views/settings/projectSecurityAndPrivacy/index.spec.tsx
+++ b/static/app/views/settings/projectSecurityAndPrivacy/index.spec.tsx
@@ -87,4 +87,22 @@ describe('projectSecurityAndPrivacy', function () {
       screen.getByRole('checkbox', {name: 'Enable server-side data scrubbing'})
     ).toBeChecked();
   });
+
+  it('disables fields when missing project:write access', function () {
+    const {organization} = initializeOrg({
+      organization: {
+        access: [], // Remove all access
+      },
+    });
+    const project = ProjectFixture();
+
+    render(<ProjectSecurityAndPrivacy project={project} organization={organization} />);
+
+    // Check that the data scrubber toggle is disabled
+    expect(
+      screen.getByRole('checkbox', {
+        name: 'Enable server-side data scrubbing',
+      })
+    ).toBeDisabled();
+  });
 });
diff --git a/static/app/views/settings/projectSecurityAndPrivacy/index.tsx b/static/app/views/settings/projectSecurityAndPrivacy/index.tsx
index 0749a85bb3d186..599cdecd31e443 100644
--- a/static/app/views/settings/projectSecurityAndPrivacy/index.tsx
+++ b/static/app/views/settings/projectSecurityAndPrivacy/index.tsx
@@ -53,7 +53,7 @@ export default function ProjectSecurityAndPrivacy({organization, project}: Props
         onSubmitError={() => addErrorMessage('Unable to save change')}
       >
         <JsonForm
-          additionalFieldProps={{organization}}
+          additionalFieldProps={{organization, project}}
           features={features}
           disabled={!hasAccess}
           forms={projectSecurityAndPrivacyGroups}
diff --git a/static/app/views/settings/settingsIndex.tsx b/static/app/views/settings/settingsIndex.tsx
index 2b8005e4ff29ba..5e01899d8b8ca9 100644
--- a/static/app/views/settings/settingsIndex.tsx
+++ b/static/app/views/settings/settingsIndex.tsx
@@ -30,7 +30,7 @@ const LINKS = {
   DOCUMENTATION: 'https://docs.sentry.io/',
   DOCUMENTATION_PLATFORMS: 'https://docs.sentry.io/platforms/',
   DOCUMENTATION_QUICKSTART: 'https://docs.sentry.io/platform-redirect/?next=/',
-  DOCUMENTATION_CLI: 'https://docs.sentry.io/product/cli/',
+  DOCUMENTATION_CLI: 'https://docs.sentry.io/cli/',
   DOCUMENTATION_API: 'https://docs.sentry.io/api/',
   API: '/settings/account/api/',
   MANAGE: '/manage/',
diff --git a/static/app/views/stories/index.tsx b/static/app/views/stories/index.tsx
index 7a038b75b0b63e..530c4930d1b906 100644
--- a/static/app/views/stories/index.tsx
+++ b/static/app/views/stories/index.tsx
@@ -6,6 +6,7 @@ import {space} from 'sentry/styles/space';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import {useHotkeys} from 'sentry/utils/useHotkeys';
 import OrganizationContainer from 'sentry/views/organizationContainer';
+import RouteAnalyticsContextProvider from 'sentry/views/routeAnalyticsContextProvider';
 import EmptyStory from 'sentry/views/stories/emptyStory';
 import ErrorStory from 'sentry/views/stories/errorStory';
 import storiesContext from 'sentry/views/stories/storiesContext';
@@ -25,40 +26,42 @@ export default function Stories({location}: Props) {
   useHotkeys([{match: '/', callback: () => searchInput.current?.focus()}], []);
 
   return (
-    <OrganizationContainer>
-      <Layout>
-        <StoryHeader style={{gridArea: 'head'}} />
-
-        <Sidebar style={{gridArea: 'aside'}}>
-          <Input
-            ref={searchInput}
-            placeholder="Search files by name"
-            onChange={e => setSearchTerm(e.target.value.toLowerCase())}
-          />
-          <TreeContainer>
-            <StoryTree
-              files={storiesContext()
-                .files()
-                .filter(s => s.toLowerCase().includes(searchTerm))}
+    <RouteAnalyticsContextProvider>
+      <OrganizationContainer>
+        <Layout>
+          <StoryHeader style={{gridArea: 'head'}} />
+
+          <Sidebar style={{gridArea: 'aside'}}>
+            <Input
+              ref={searchInput}
+              placeholder="Search files by name"
+              onChange={e => setSearchTerm(e.target.value.toLowerCase())}
             />
-          </TreeContainer>
-        </Sidebar>
-
-        {story.error ? (
-          <VerticalScroll style={{gridArea: 'body'}}>
-            <ErrorStory error={story.error} />
-          </VerticalScroll>
-        ) : story.resolved ? (
-          <Main style={{gridArea: 'body'}}>
-            <StoryFile filename={story.filename} resolved={story.resolved} />
-          </Main>
-        ) : (
-          <VerticalScroll style={{gridArea: 'body'}}>
-            <EmptyStory />
-          </VerticalScroll>
-        )}
-      </Layout>
-    </OrganizationContainer>
+            <TreeContainer>
+              <StoryTree
+                files={storiesContext()
+                  .files()
+                  .filter(s => s.toLowerCase().includes(searchTerm))}
+              />
+            </TreeContainer>
+          </Sidebar>
+
+          {story.error ? (
+            <VerticalScroll style={{gridArea: 'body'}}>
+              <ErrorStory error={story.error} />
+            </VerticalScroll>
+          ) : story.resolved ? (
+            <Main style={{gridArea: 'body'}}>
+              <StoryFile filename={story.filename} resolved={story.resolved} />
+            </Main>
+          ) : (
+            <VerticalScroll style={{gridArea: 'body'}}>
+              <EmptyStory />
+            </VerticalScroll>
+          )}
+        </Layout>
+      </OrganizationContainer>
+    </RouteAnalyticsContextProvider>
   );
 }
 
diff --git a/static/app/views/traces/content.tsx b/static/app/views/traces/content.tsx
index 253bc2c650ca8e..46e8e0519dc67e 100644
--- a/static/app/views/traces/content.tsx
+++ b/static/app/views/traces/content.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useMemo} from 'react';
 import styled from '@emotion/styled';
-import omit from 'lodash/omit';
 
 import {Alert} from 'sentry/components/alert';
 import FeatureBadge from 'sentry/components/badge/featureBadge';
@@ -13,12 +12,9 @@ import PageFiltersContainer from 'sentry/components/organizations/pageFilters/co
 import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
 import {PageHeadingQuestionTooltip} from 'sentry/components/pageHeadingQuestionTooltip';
 import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
-import {IconClose} from 'sentry/icons/iconClose';
-import {t, tct} from 'sentry/locale';
+import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {MetricAggregation, MRI} from 'sentry/types/metrics';
 import {browserHistory} from 'sentry/utils/browserHistory';
-import {getFormattedMQL} from 'sentry/utils/metrics';
 import {decodeInteger} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
@@ -58,23 +54,7 @@ function Content() {
     return decodeInteger(location.query.perPage, DEFAULT_PER_PAGE);
   }, [location.query.perPage]);
 
-  const {queries, metricsMax, metricsMin, metricsOp, metricsQuery, mri} =
-    usePageParams(location);
-
-  const hasMetric = metricsOp && mri;
-
-  const removeMetric = useCallback(() => {
-    browserHistory.push({
-      ...location,
-      query: omit(location.query, [
-        'mri',
-        'metricsOp',
-        'metricsQuery',
-        'metricsMax',
-        'metricsMin',
-      ]),
-    });
-  }, [location]);
+  const {queries} = usePageParams(location);
 
   const handleSearch = useCallback(
     (searchIndex: number, searchQuery: string) => {
@@ -119,11 +99,6 @@ function Content() {
   const tracesQuery = useTraces({
     limit,
     query: queries,
-    mri: hasMetric ? mri : undefined,
-    metricsMax: hasMetric ? metricsMax : undefined,
-    metricsMin: hasMetric ? metricsMin : undefined,
-    metricsOp: hasMetric ? metricsOp : undefined,
-    metricsQuery: hasMetric ? metricsQuery : undefined,
   });
 
   const isLoading = tracesQuery.isFetching;
@@ -164,25 +139,6 @@ function Content() {
                 <EnvironmentPageFilter />
                 <DatePageFilter defaultPeriod="2h" />
               </PageFilterBar>
-              {hasMetric && (
-                <StyledAlert
-                  type="info"
-                  showIcon
-                  trailingItems={<StyledCloseButton onClick={removeMetric} />}
-                >
-                  {tct('The metric query [metricQuery] is filtering the results below.', {
-                    metricQuery: (
-                      <strong>
-                        {getFormattedMQL({
-                          mri: mri as MRI,
-                          aggregation: metricsOp as MetricAggregation,
-                          query: metricsQuery,
-                        })}
-                      </strong>
-                    ),
-                  })}
-                </StyledAlert>
-              )}
               {isError && typeof tracesQuery.error?.responseJSON?.detail === 'string' ? (
                 <StyledAlert type="error" showIcon>
                   {tracesQuery.error?.responseJSON?.detail}
@@ -228,7 +184,3 @@ const LayoutMain = styled(Layout.Main)`
 const StyledAlert = styled(Alert)`
   margin-bottom: 0;
 `;
-
-const StyledCloseButton = styled(IconClose)`
-  cursor: pointer;
-`;
diff --git a/static/app/views/traces/fieldRenderers.tsx b/static/app/views/traces/fieldRenderers.tsx
index fdf4cc983d5bbc..4d5bc9e340ccb4 100644
--- a/static/app/views/traces/fieldRenderers.tsx
+++ b/static/app/views/traces/fieldRenderers.tsx
@@ -444,7 +444,7 @@ interface TraceIdRendererProps {
   location: Location;
   timestamp: number; // in milliseconds
   traceId: string;
-  onClick?: () => void;
+  onClick?: React.ComponentProps<typeof Link>['onClick'];
   transactionId?: string;
 }
 
diff --git a/static/app/views/traces/hooks/usePageParams.spec.tsx b/static/app/views/traces/hooks/usePageParams.spec.tsx
index a1766fab548c92..4612f9b2400ab1 100644
--- a/static/app/views/traces/hooks/usePageParams.spec.tsx
+++ b/static/app/views/traces/hooks/usePageParams.spec.tsx
@@ -29,28 +29,4 @@ describe('usePageParams', function () {
 
     expect(result.current.queries).toEqual(['query1', 'query2', 'query3']);
   });
-
-  it('decodes metrics related params', function () {
-    const location = {
-      query: {
-        metricsMax: '456',
-        metricsMin: '123',
-        metricsOp: 'sum',
-        metricsQuery: 'foo:bar',
-        mri: 'd:transactions/duration@millisecond',
-      },
-    };
-    const {result} = renderHook(() => usePageParams(location), {
-      initialProps: {location},
-    });
-
-    expect(result.current).toEqual({
-      queries: [],
-      metricsMax: '456',
-      metricsMin: '123',
-      metricsOp: 'sum',
-      metricsQuery: 'foo:bar',
-      mri: 'd:transactions/duration@millisecond',
-    });
-  });
 });
diff --git a/static/app/views/traces/hooks/usePageParams.tsx b/static/app/views/traces/hooks/usePageParams.tsx
index 36d6671ba23b80..425ff5384a2249 100644
--- a/static/app/views/traces/hooks/usePageParams.tsx
+++ b/static/app/views/traces/hooks/usePageParams.tsx
@@ -1,24 +1,13 @@
 import {useMemo} from 'react';
 
-import {decodeList, decodeScalar} from 'sentry/utils/queryString';
+import {decodeList} from 'sentry/utils/queryString';
 
 export function usePageParams(location) {
   const queries = useMemo(() => {
     return decodeList(location.query.query);
   }, [location.query.query]);
 
-  const metricsMax = decodeScalar(location.query.metricsMax);
-  const metricsMin = decodeScalar(location.query.metricsMin);
-  const metricsOp = decodeScalar(location.query.metricsOp);
-  const metricsQuery = decodeScalar(location.query.metricsQuery);
-  const mri = decodeScalar(location.query.mri);
-
   return {
     queries,
-    metricsMax,
-    metricsMin,
-    metricsOp,
-    metricsQuery,
-    mri,
   };
 }
diff --git a/static/app/views/traces/hooks/useTraces.spec.tsx b/static/app/views/traces/hooks/useTraces.spec.tsx
index 4a6206951f3224..a7035ea899b81a 100644
--- a/static/app/views/traces/hooks/useTraces.spec.tsx
+++ b/static/app/views/traces/hooks/useTraces.spec.tsx
@@ -97,11 +97,6 @@ describe('useTraces', function () {
           statsPeriod: '3d',
           per_page: 10,
           breakdownSlices: 40,
-          mri: 'd:transactions/duration@millisecond',
-          metricsMax: '456',
-          metricsMin: '123',
-          metricsOp: 'sum',
-          metricsQuery: 'foo:bar',
         }),
       ],
     });
@@ -118,11 +113,6 @@ describe('useTraces', function () {
         },
         limit: 10,
         query: 'foo:bar',
-        mri: 'd:transactions/duration@millisecond',
-        metricsMax: '456',
-        metricsMin: '123',
-        metricsOp: 'sum',
-        metricsQuery: 'foo:bar',
       },
     });
 
diff --git a/static/app/views/traces/hooks/useTraces.tsx b/static/app/views/traces/hooks/useTraces.tsx
index 1c6d6174764a97..90e317b44ed175 100644
--- a/static/app/views/traces/hooks/useTraces.tsx
+++ b/static/app/views/traces/hooks/useTraces.tsx
@@ -57,25 +57,10 @@ interface UseTracesOptions {
   datetime?: PageFilters['datetime'];
   enabled?: boolean;
   limit?: number;
-  metricsMax?: string;
-  metricsMin?: string;
-  metricsOp?: string;
-  metricsQuery?: string;
-  mri?: string;
   query?: string | string[];
 }
 
-export function useTraces({
-  datetime,
-  enabled,
-  limit,
-  mri,
-  metricsMax,
-  metricsMin,
-  metricsOp,
-  metricsQuery,
-  query,
-}: UseTracesOptions) {
+export function useTraces({datetime, enabled, limit, query}: UseTracesOptions) {
   const organization = useOrganization();
   const {projects} = useProjects();
   const {selection} = usePageFilters();
@@ -90,11 +75,6 @@ export function useTraces({
       query,
       per_page: limit,
       breakdownSlices: BREAKDOWN_SLICES,
-      mri,
-      metricsMax,
-      metricsMin,
-      metricsOp,
-      metricsQuery,
     },
   };
 
diff --git a/static/app/views/traces/spansTable.tsx b/static/app/views/traces/spansTable.tsx
index bdd49d8d9771ec..0bda742f372e5c 100644
--- a/static/app/views/traces/spansTable.tsx
+++ b/static/app/views/traces/spansTable.tsx
@@ -49,9 +49,7 @@ export function SpanTable({
   const location = useLocation();
   const organization = useOrganization();
 
-  const {queries, metricsMax, metricsMin, metricsOp, metricsQuery, mri} =
-    usePageParams(location);
-  const hasMetric = metricsOp && mri;
+  const {queries} = usePageParams(location);
 
   const spansQuery = useTraceSpans({
     trace,
@@ -71,11 +69,6 @@ export function SpanTable({
     limit: 10,
     query: queries,
     sort: SORTS,
-    mri: hasMetric ? mri : undefined,
-    metricsMax: hasMetric ? metricsMax : undefined,
-    metricsMin: hasMetric ? metricsMin : undefined,
-    metricsOp: hasMetric ? metricsOp : undefined,
-    metricsQuery: hasMetric ? metricsQuery : undefined,
   });
 
   const isLoading = spansQuery.isPending;
@@ -161,6 +154,7 @@ function SpanRow({
           onClick={() =>
             trackAnalytics('trace_explorer.open_trace_span', {
               organization,
+              source: 'trace explorer',
             })
           }
         />
diff --git a/static/app/views/traces/tracesTable.tsx b/static/app/views/traces/tracesTable.tsx
index aee22c91ca8dbb..9c2cbb7970cd13 100644
--- a/static/app/views/traces/tracesTable.tsx
+++ b/static/app/views/traces/tracesTable.tsx
@@ -195,17 +195,20 @@ function TraceRow({defaultExpanded, trace}: {defaultExpanded; trace: TraceResult
             trackAnalytics('trace_explorer.toggle_trace_details', {
               organization,
               expanded,
+              source: 'trace explorer',
             })
           }
         />
         <TraceIdRenderer
           traceId={trace.trace}
           timestamp={trace.end}
-          onClick={() =>
+          onClick={event => {
+            event.stopPropagation();
             trackAnalytics('trace_explorer.open_trace', {
               organization,
-            })
-          }
+              source: 'trace explorer',
+            });
+          }}
           location={location}
         />
       </StyledPanelItem>
diff --git a/tests/acceptance/test_organization_dashboards.py b/tests/acceptance/test_organization_dashboards.py
index d82b1fb1809ae8..4be11043fcb38f 100644
--- a/tests/acceptance/test_organization_dashboards.py
+++ b/tests/acceptance/test_organization_dashboards.py
@@ -360,42 +360,6 @@ def test_default_layout_when_widgets_do_not_have_layout_set(self):
 
             self.page.wait_until_loaded()
 
-    def test_duplicate_widget_in_view_mode(self):
-        existing_widget = DashboardWidget.objects.create(
-            dashboard=self.dashboard,
-            order=0,
-            title="Big Number Widget",
-            display_type=DashboardWidgetDisplayTypes.BIG_NUMBER,
-            widget_type=DashboardWidgetTypes.DISCOVER,
-            interval="1d",
-        )
-        DashboardWidgetQuery.objects.create(
-            widget=existing_widget,
-            fields=["count_unique(issue)"],
-            columns=[],
-            aggregates=["count_unique(issue)"],
-            order=0,
-        )
-        with self.feature(FEATURE_NAMES + EDIT_FEATURE):
-            self.page.visit_dashboard_detail()
-
-            # Hover over the widget to show widget actions
-            self.browser.move_to('[aria-label="Widget panel"]')
-
-            self.browser.element('[aria-label="Widget actions"]').click()
-            self.browser.element('[data-test-id="duplicate-widget"]').click()
-            self.page.wait_until_loaded()
-
-            self.browser.element('[aria-label="Widget actions"]').click()
-            self.browser.element('[data-test-id="duplicate-widget"]').click()
-            self.page.wait_until_loaded()
-
-            # Should not trigger alert
-            self.page.enter_edit_state()
-            self.page.click_cancel_button()
-            wait = WebDriverWait(self.browser.driver, 5)
-            wait.until_not(EC.alert_is_present())
-
     def test_delete_widget_in_view_mode(self):
         existing_widget = DashboardWidget.objects.create(
             dashboard=self.dashboard,
diff --git a/tests/apidocs/endpoints/events/test_group_hashes.py b/tests/apidocs/endpoints/events/test_group_hashes.py
index e4601bf57c4393..78df9f8507fda2 100644
--- a/tests/apidocs/endpoints/events/test_group_hashes.py
+++ b/tests/apidocs/endpoints/events/test_group_hashes.py
@@ -8,7 +8,7 @@ def setUp(self):
         self.create_event("a")
         event = self.create_event("b")
 
-        self.url = f"/api/0/issues/{event.group_id}/hashes/"
+        self.url = f"/api/0/organizations/{self.organization.slug}/issues/{event.group_id}/hashes/"
 
         self.login_as(user=self.user)
 
diff --git a/tests/apidocs/endpoints/events/test_group_issue_details.py b/tests/apidocs/endpoints/events/test_group_issue_details.py
index b30f95fbd8f72c..d417a66f92cf43 100644
--- a/tests/apidocs/endpoints/events/test_group_issue_details.py
+++ b/tests/apidocs/endpoints/events/test_group_issue_details.py
@@ -24,7 +24,7 @@ def setUp(self):
         for timestamp in last_release.values():
             event = self.create_event("c", release="1.0a", timestamp=timestamp.isoformat())
 
-        self.url = f"/api/0/issues/{event.group.id}/"
+        self.url = f"/api/0/organizations/{self.organization.slug}/issues/{event.group.id}/"
 
         self.login_as(user=self.user)
 
diff --git a/tests/apidocs/endpoints/events/test_group_tagkey_values.py b/tests/apidocs/endpoints/events/test_group_tagkey_values.py
index fbace8fac0193f..001404c99520c1 100644
--- a/tests/apidocs/endpoints/events/test_group_tagkey_values.py
+++ b/tests/apidocs/endpoints/events/test_group_tagkey_values.py
@@ -10,7 +10,7 @@ def setUp(self):
 
         self.login_as(user=self.user)
 
-        self.url = f"/api/0/issues/{event.group_id}/tags/{key}/values/"
+        self.url = f"/api/0/organizations/{self.organization.slug}/issues/{event.group_id}/tags/{key}/values/"
 
     def test_get(self):
         response = self.client.get(self.url)
diff --git a/tests/js/fixtures/autofixData.ts b/tests/js/fixtures/autofixData.ts
index 6856a9ee011fe9..395fb7d68b3dbc 100644
--- a/tests/js/fixtures/autofixData.ts
+++ b/tests/js/fixtures/autofixData.ts
@@ -1,9 +1,9 @@
-import { AutofixData } from 'sentry/components/events/autofix/types';
+import { AutofixData, AutofixStatus } from 'sentry/components/events/autofix/types';
 
 export function AutofixDataFixture(params: Partial<AutofixData>): AutofixData {
   return {
     run_id: '1',
-    status: 'PROCESSING',
+    status: AutofixStatus.PROCESSING,
     completed_at: '',
     created_at: '',
     steps: [],
diff --git a/tests/js/fixtures/deploy.ts b/tests/js/fixtures/deploy.ts
new file mode 100644
index 00000000000000..74c79e4b36c272
--- /dev/null
+++ b/tests/js/fixtures/deploy.ts
@@ -0,0 +1,14 @@
+import type {Deploy} from 'sentry/types/release';
+
+export function DeployFixture(params?: Partial<Deploy>): Deploy {
+  return {
+    id: '6348842',
+    version: '4.2.0',
+    name: '85fedddce5a61a58b160fa6b3d6a1a8451e94eb9 to prod',
+    url: '',
+    environment: 'production',
+    dateStarted: '2020-05-11T18:12:00.025928Z',
+    dateFinished: '2020-05-11T18:12:00.025928Z',
+    ...params,
+  };
+}
diff --git a/tests/js/fixtures/integrationListDirectory.ts b/tests/js/fixtures/integrationListDirectory.ts
index feff168fcc6b67..7f576f6469ebe6 100644
--- a/tests/js/fixtures/integrationListDirectory.ts
+++ b/tests/js/fixtures/integrationListDirectory.ts
@@ -215,7 +215,6 @@ export function SentryAppInstallsFixture() {
 export function PluginListConfigFixture() {
   return [
     {
-      assets: [],
       author: {name: 'Sentry Team', url: 'https://github.com/getsentry/sentry'},
       canDisable: true,
       contexts: [],
@@ -259,7 +258,6 @@ export function PluginListConfigFixture() {
       hasConfiguration: true,
       shortName: 'PagerDuty',
       id: 'pagerduty',
-      assets: [],
       featureDescriptions: [
         {
           description:
@@ -314,7 +312,6 @@ export function WebhookPluginConfigFixture(plugin?: Partial<Plugin>): Plugin {
     metadata: {},
     contexts: [],
     status: 'unknown',
-    assets: [],
     doc: '',
     enabled: true,
     version: '24.1.0.dev0',
diff --git a/tests/js/fixtures/organization.ts b/tests/js/fixtures/organization.ts
index bf49d9a46215be..f3f259dee331fb 100644
--- a/tests/js/fixtures/organization.ts
+++ b/tests/js/fixtures/organization.ts
@@ -37,7 +37,6 @@ export function OrganizationFixture( params: Partial<Organization> = {}): Organi
     scrapeJavaScript: true,
     features: [],
     onboardingTasks: [],
-    aiSuggestedSolution: false,
     alertsMemberWrite: false,
     allowJoinRequests: false,
     allowMemberInvite: true,
diff --git a/tests/js/fixtures/plugin.ts b/tests/js/fixtures/plugin.ts
index 5b59f29fceebe0..18d437ffdbcd8f 100644
--- a/tests/js/fixtures/plugin.ts
+++ b/tests/js/fixtures/plugin.ts
@@ -9,7 +9,6 @@ export function PluginFixture(params: Partial<Plugin> = {}): Plugin {
     name: 'Amazon SQS',
     slug: 'amazon-sqs',
     version: '8.23.0.dev0',
-    assets: [],
     hasConfiguration: true,
     canDisable: true,
     contexts: [],
diff --git a/tests/js/fixtures/release.ts b/tests/js/fixtures/release.ts
index 44f99a72b69e0f..4e89afc6325f7e 100644
--- a/tests/js/fixtures/release.ts
+++ b/tests/js/fixtures/release.ts
@@ -1,3 +1,4 @@
+import {CommitFixture} from 'sentry-fixture/commit';
 import {HealthFixture} from 'sentry-fixture/health';
 
 import type {Health, ReleaseWithHealth} from 'sentry/types/release';
@@ -31,12 +32,7 @@ export function ReleaseFixture(
     lastEvent: '2020-03-24T02:04:50Z',
     version: 'sentry-android-shop@1.2.0',
     firstEvent: '',
-    lastCommit: {
-      dateCreated: '',
-      id: '',
-      message: null,
-      releases: [],
-    },
+    lastCommit: CommitFixture(),
     authors: [],
     owner: null,
     versionInfo: {
diff --git a/tests/js/fixtures/secret.ts b/tests/js/fixtures/secret.ts
new file mode 100644
index 00000000000000..b834b432c26bf7
--- /dev/null
+++ b/tests/js/fixtures/secret.ts
@@ -0,0 +1,15 @@
+import { Secret } from "sentry/views/settings/featureFlags";
+
+
+export function SecretFixture(
+  params: Partial<Secret> = {}
+): Secret {
+  return {
+    id: 1,
+    provider: 'launchdarkly',
+    secret: '123abc**************************',
+    createdAt: "2024-12-12T00:00:00+00:00",
+    createdBy: 1234,
+    ...params,
+  };
+}
diff --git a/tests/js/fixtures/uptimeRule.ts b/tests/js/fixtures/uptimeRule.ts
index a3d5d2a123779d..1c232e27648822 100644
--- a/tests/js/fixtures/uptimeRule.ts
+++ b/tests/js/fixtures/uptimeRule.ts
@@ -16,6 +16,7 @@ export function UptimeRuleFixture(params: Partial<UptimeRule> = {}): UptimeRule
     headers: [],
     method: 'GET',
     body: null,
+    traceSampling: false,
     ...params,
   }
 }
diff --git a/tests/relay_integration/lang/java/test_plugin.py b/tests/relay_integration/lang/java/test_plugin.py
index 283d69414d9227..76db769fd0cc1e 100644
--- a/tests/relay_integration/lang/java/test_plugin.py
+++ b/tests/relay_integration/lang/java/test_plugin.py
@@ -8,6 +8,7 @@
 
 from sentry.models.debugfile import ProjectDebugFile
 from sentry.models.files.file import File
+from sentry.stacktraces.processing import find_stacktraces_in_data
 from sentry.testutils.cases import TransactionTestCase
 from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.relay import RelayStoreHelper
@@ -1585,7 +1586,9 @@ def test_is_jvm_event(self):
             },
             "timestamp": before_now(seconds=1),
         }
-        assert is_jvm_event(event)
+
+        stacktraces = find_stacktraces_in_data(event)
+        assert is_jvm_event(event, stacktraces)
 
         event = {
             "user": {"ip_address": "31.172.207.97"},
@@ -1615,7 +1618,8 @@ def test_is_jvm_event(self):
             "timestamp": before_now(seconds=1),
         }
         # has no platform
-        assert is_jvm_event(event)
+        stacktraces = find_stacktraces_in_data(event)
+        assert is_jvm_event(event, stacktraces)
 
         event = {
             "user": {"ip_address": "31.172.207.97"},
@@ -1646,4 +1650,68 @@ def test_is_jvm_event(self):
             "timestamp": before_now(seconds=1),
         }
         # has no modules
-        assert not is_jvm_event(event)
+        stacktraces = find_stacktraces_in_data(event)
+        assert is_jvm_event(event, stacktraces)
+
+        event = {
+            "user": {"ip_address": "31.172.207.97"},
+            "extra": {},
+            "project": self.project.id,
+            "debug_meta": {},
+            "exception": {
+                "values": [
+                    {
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "platform": "java",
+                                    "function": "whoops4",
+                                    "abs_path": "SourceFile",
+                                    "module": "io.sentry.samples.MainActivity$OneMoreInnerClass",
+                                    "filename": "SourceFile",
+                                    "lineno": 38,
+                                },
+                            ]
+                        },
+                        "module": "io.sentry.samples",
+                        "type": "RuntimeException",
+                        "value": "whoops",
+                    }
+                ]
+            },
+            "timestamp": before_now(seconds=1),
+        }
+        # has a Java frame
+        stacktraces = find_stacktraces_in_data(event)
+        assert is_jvm_event(event, stacktraces)
+
+        event = {
+            "user": {"ip_address": "31.172.207.97"},
+            "extra": {},
+            "project": self.project.id,
+            "debug_meta": {},
+            "exception": {
+                "values": [
+                    {
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "function": "whoops4",
+                                    "abs_path": "SourceFile",
+                                    "module": "io.sentry.samples.MainActivity$OneMoreInnerClass",
+                                    "filename": "SourceFile",
+                                    "lineno": 38,
+                                },
+                            ]
+                        },
+                        "module": "io.sentry.samples",
+                        "type": "RuntimeException",
+                        "value": "whoops",
+                    }
+                ]
+            },
+            "timestamp": before_now(seconds=1),
+        }
+        # has no platform, frame, or modules
+        stacktraces = find_stacktraces_in_data(event)
+        assert not is_jvm_event(event, stacktraces)
diff --git a/tests/sentry/api/endpoints/notifications/test_notification_actions_available.py b/tests/sentry/api/endpoints/notifications/test_notification_actions_available.py
index 51ec73db99769e..4cddaa1a1f7aa7 100644
--- a/tests/sentry/api/endpoints/notifications/test_notification_actions_available.py
+++ b/tests/sentry/api/endpoints/notifications/test_notification_actions_available.py
@@ -2,7 +2,7 @@
 
 from rest_framework import status
 
-from sentry.models.notificationaction import (
+from sentry.notifications.models.notificationaction import (
     ActionRegistration,
     ActionService,
     ActionTarget,
@@ -23,7 +23,7 @@ def setUp(self):
     def test_get_success(self):
         self.get_success_response(self.organization.slug)
 
-    @patch("sentry.models.notificationaction.ActionTrigger")
+    @patch("sentry.notifications.models.notificationaction.ActionTrigger")
     def test_get_dynamic_response(self, mock_action_trigger):
         """
         Note: This test assumes the ActionTrigger already contains reference to the trigger. Only
diff --git a/tests/sentry/api/endpoints/notifications/test_notification_actions_details.py b/tests/sentry/api/endpoints/notifications/test_notification_actions_details.py
index e7e05636bf1210..10c09f55151da0 100644
--- a/tests/sentry/api/endpoints/notifications/test_notification_actions_details.py
+++ b/tests/sentry/api/endpoints/notifications/test_notification_actions_details.py
@@ -4,7 +4,8 @@
 
 from sentry.api.serializers.base import serialize
 from sentry.integrations.pagerduty.utils import add_service
-from sentry.models.notificationaction import (
+from sentry.models.organizationmemberteam import OrganizationMemberTeam
+from sentry.notifications.models.notificationaction import (
     ActionRegistration,
     ActionService,
     ActionTarget,
@@ -12,7 +13,6 @@
     NotificationAction,
     NotificationActionProject,
 )
-from sentry.models.organizationmemberteam import OrganizationMemberTeam
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers.slack import install_slack
diff --git a/tests/sentry/api/endpoints/notifications/test_notification_actions_index.py b/tests/sentry/api/endpoints/notifications/test_notification_actions_index.py
index 0b21313108f58e..0de6bb0741d7fa 100644
--- a/tests/sentry/api/endpoints/notifications/test_notification_actions_index.py
+++ b/tests/sentry/api/endpoints/notifications/test_notification_actions_index.py
@@ -5,7 +5,8 @@
 
 from sentry.api.serializers.base import serialize
 from sentry.integrations.pagerduty.utils import add_service
-from sentry.models.notificationaction import (
+from sentry.models.organizationmemberteam import OrganizationMemberTeam
+from sentry.notifications.models.notificationaction import (
     ActionRegistration,
     ActionService,
     ActionTarget,
@@ -13,7 +14,6 @@
     NotificationAction,
     NotificationActionProject,
 )
-from sentry.models.organizationmemberteam import OrganizationMemberTeam
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers.slack import install_slack
diff --git a/tests/sentry/api/endpoints/relocations/test_index.py b/tests/sentry/api/endpoints/relocations/test_index.py
index a6f99b282ff53f..b06592eedae8dd 100644
--- a/tests/sentry/api/endpoints/relocations/test_index.py
+++ b/tests/sentry/api/endpoints/relocations/test_index.py
@@ -437,7 +437,7 @@ def test_good_promo_code(
         {
             "relocation.enabled": True,
             "relocation.daily-limit.small": 1,
-            "relocation.autopause": "IMPORTING",
+            "relocation.autopause.self-hosted": "IMPORTING",
         }
     )
     @patch("sentry.tasks.relocation.uploading_start.apply_async")
@@ -492,7 +492,44 @@ def test_good_with_valid_autopause_option(
         {
             "relocation.enabled": True,
             "relocation.daily-limit.small": 1,
-            "relocation.autopause": "DOESNOTEXIST",
+            "relocation.autopause.saas-to-saas": "IMPORTING",
+        }
+    )
+    @patch("sentry.tasks.relocation.uploading_start.apply_async")
+    def test_good_with_untriggered_autopause_option(
+        self,
+        uploading_start_mock: Mock,
+        relocation_link_promo_code_signal_mock: Mock,
+        analytics_record_mock: Mock,
+    ):
+        self.login_as(user=self.owner, superuser=False)
+
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            (_, tmp_pub_key_path) = self.tmp_keys(tmp_dir)
+            with open(FRESH_INSTALL_PATH, "rb") as f:
+                data = orjson.loads(f.read())
+                with open(tmp_pub_key_path, "rb") as p:
+                    response = self.get_success_response(
+                        owner=self.owner.username,
+                        file=SimpleUploadedFile(
+                            "export.tar",
+                            create_encrypted_export_tarball(data, LocalFileEncryptor(p)).getvalue(),
+                            content_type="application/tar",
+                        ),
+                        orgs="testing",
+                        format="multipart",
+                        status_code=201,
+                    )
+
+        assert response.data["status"] == Relocation.Status.IN_PROGRESS.name
+        assert response.data["step"] == Relocation.Step.UPLOADING.name
+        assert response.data["scheduledPauseAtStep"] is None
+
+    @override_options(
+        {
+            "relocation.enabled": True,
+            "relocation.daily-limit.small": 1,
+            "relocation.autopause.self-hosted": "DOESNOTEXIST",
         }
     )
     @patch("sentry.tasks.relocation.uploading_start.apply_async")
diff --git a/tests/sentry/api/endpoints/test_api_authorizations.py b/tests/sentry/api/endpoints/test_api_authorizations.py
index 087f7c8db3d437..0f5b7a73fb7dc8 100644
--- a/tests/sentry/api/endpoints/test_api_authorizations.py
+++ b/tests/sentry/api/endpoints/test_api_authorizations.py
@@ -25,6 +25,18 @@ def test_simple(self):
         response = self.get_success_response()
         assert len(response.data) == 1
         assert response.data[0]["id"] == str(auth.id)
+        assert response.data[0]["organization"] is None
+
+    def test_org_level_auth(self):
+        org = self.create_organization(owner=self.user, slug="test-org-slug")
+        app = ApiApplication.objects.create(
+            name="test", owner=self.user, requires_org_level_access=True
+        )
+        ApiAuthorization.objects.create(application=app, user=self.user, organization_id=org.id)
+
+        response = self.get_success_response()
+        assert len(response.data) == 1
+        assert response.data[0]["organization"]["slug"] == org.slug
 
 
 @control_silo_test
diff --git a/tests/sentry/api/endpoints/test_event_ai_suggested_fix.py b/tests/sentry/api/endpoints/test_event_ai_suggested_fix.py
deleted file mode 100644
index 67f00754de76b0..00000000000000
--- a/tests/sentry/api/endpoints/test_event_ai_suggested_fix.py
+++ /dev/null
@@ -1,178 +0,0 @@
-import time
-from unittest.mock import Mock, patch
-
-import pytest
-import responses
-from django.test.utils import override_settings
-from django.urls import reverse
-from openai.types.chat.chat_completion import ChatCompletion, Choice
-from openai.types.chat.chat_completion_message import ChatCompletionMessage
-
-from sentry.testutils.cases import APITestCase
-from sentry.testutils.skips import requires_snuba
-
-pytestmark = [requires_snuba]
-
-
-@pytest.fixture(autouse=True)
-def openai_features():
-    with override_settings(OPENAI_API_KEY="X"):
-        yield
-
-
-@pytest.fixture(autouse=True)
-def openai_mock(monkeypatch):
-    def dummy_response(*args, **kwargs):
-        return ChatCompletion(
-            id="test",
-            choices=[
-                Choice(
-                    index=0,
-                    message=ChatCompletionMessage(
-                        content="AI generated response", role="assistant"
-                    ),
-                    finish_reason="stop",
-                )
-            ],
-            created=int(time.time()),
-            model="gpt3.5-trubo",
-            object="chat.completion",
-        )
-
-    mock_openai = Mock()
-    mock_openai().chat.completions.create = dummy_response
-
-    monkeypatch.setattr("sentry.api.endpoints.event_ai_suggested_fix.OpenAI", mock_openai)
-
-
-class EventAiSuggestedFixEndpointTest(APITestCase):
-    def setUp(self):
-        super().setUp()
-        self.event = self.store_event(
-            project_id=self.project.id,
-            data={
-                "exception": {
-                    "values": [
-                        {
-                            "type": "ZeroDivisionError",
-                            "stacktrace": {"frames": [{"function": "a"}, {"function": "b"}]},
-                        }
-                    ]
-                }
-            },
-        )
-        self.path = reverse(
-            "sentry-api-0-event-ai-fix-suggest",
-            kwargs={
-                "organization_id_or_slug": self.organization.slug,
-                "project_id_or_slug": self.project.slug,
-                "event_id": self.event.event_id,
-            },
-        )
-        self.login_as(self.user)
-
-    @responses.activate
-    def test_consent(self):
-        with patch(
-            "sentry.api.endpoints.event_ai_suggested_fix.get_openai_policy",
-            return_value="individual_consent",
-        ):
-            response = self.client.get(self.path)
-            assert response.status_code == 403
-            assert response.json() == {"restriction": "organization_consent_required"}
-
-            self.organization.update_option("sentry:ai_suggested_solution", True)
-            response = self.client.get(self.path)
-            assert response.status_code == 403
-            assert response.json() == {"restriction": "individual_consent"}
-
-            response = self.client.get(self.path + "?consent=yes")
-            assert response.status_code == 200
-            assert response.json() == {"suggestion": "AI generated response"}
-
-            self.organization.update_option("sentry:ai_suggested_solution", False)
-            response = self.client.get(self.path + "?consent=yes")
-            assert response.status_code == 403
-            assert response.json() == {"restriction": "organization_consent_required"}
-
-        self.organization.update_option("sentry:ai_suggested_solution", True)
-        with patch(
-            "sentry.api.endpoints.event_ai_suggested_fix.get_openai_policy",
-            return_value="subprocessor",
-        ):
-            response = self.client.get(self.path)
-            assert response.status_code == 403
-            assert response.json() == {"restriction": "subprocessor"}
-
-        with patch(
-            "sentry.api.endpoints.event_ai_suggested_fix.get_openai_policy",
-            return_value="pii_certification_required",
-        ):
-            response = self.client.get(self.path)
-            assert response.status_code == 403
-            assert response.json() == {"restriction": "pii_certification_required"}
-
-        with patch(
-            "sentry.api.endpoints.event_ai_suggested_fix.get_openai_policy",
-            return_value="allowed",
-        ):
-            response = self.client.get(self.path)
-            assert response.status_code == 200
-            assert response.json() == {"suggestion": "AI generated response"}
-
-    def test_describe_event_for_ai(self):
-        from sentry.api.endpoints.event_ai_suggested_fix import describe_event_for_ai
-
-        event_data = {
-            "exception": {
-                "values": [
-                    {
-                        "type": "ArithmeticError",
-                        "value": "division by zero",
-                        "stacktrace": {
-                            "frames": [
-                                {
-                                    "function": "divide",
-                                    "filename": "math_operations.py",
-                                    "lineno": 27,
-                                    "context_line": "result = 1 / 0",
-                                    "pre_context": [
-                                        "def divide(x, y):",
-                                        "    # Attempt to divide by zero",
-                                    ],
-                                    "post_context": ["    return result", ""],
-                                    "in_app": True,
-                                },
-                                None,  # Edge case, just to make sure it doesn't break
-                                {
-                                    "function": "calculate",
-                                    "filename": "main.py",
-                                    "lineno": 15,
-                                    "context_line": "divide(10, 0)",
-                                    "pre_context": ["def calculate():", "    # Calculate division"],
-                                    "post_context": ["    print('Calculation complete')", ""],
-                                    "in_app": True,
-                                },
-                            ]
-                        },
-                    }
-                ]
-            }
-        }
-        exceptions = describe_event_for_ai(event=event_data, model="gpt-3.5-turbo")
-        assert (
-            len(exceptions.get("exceptions", [])) == 1
-        ), "Should have one exception in the event data"
-        exception = exceptions["exceptions"][0]
-        assert exception["type"] == "ArithmeticError", "Exception type should be 'ArithmeticError'"
-        assert (
-            exception["message"] == "division by zero"
-        ), "Exception message should be 'division by zero'"
-        assert "stacktrace" in exception, "Exception should have a stacktrace"
-        assert len(exception["stacktrace"]) == 2, "Stacktrace should have two frames"
-        assert (
-            exception["stacktrace"][0]["func"] == "calculate"
-        ), "First frame function should be 'calculate'"
-        assert (
-            exception["stacktrace"][1]["func"] == "divide"
-        ), "Second frame function should be 'divide'"
diff --git a/tests/sentry/api/endpoints/test_group_ai_autofix.py b/tests/sentry/api/endpoints/test_group_ai_autofix.py
index cec7bb3f25789a..915274955569d3 100644
--- a/tests/sentry/api/endpoints/test_group_ai_autofix.py
+++ b/tests/sentry/api/endpoints/test_group_ai_autofix.py
@@ -13,11 +13,16 @@
 pytestmark = [requires_snuba]
 
 
-@apply_feature_flag_on_cls("organizations:autofix")
+@apply_feature_flag_on_cls("organizations:gen-ai-features")
 class GroupAutofixEndpointTest(APITestCase, SnubaTestCase):
     def _get_url(self, group_id: int):
         return f"/api/0/issues/{group_id}/autofix/"
 
+    def setUp(self):
+        super().setUp()
+
+        self.organization.update_option("sentry:gen_ai_consent_v2024_11_14", True)
+
     @patch("sentry.api.endpoints.group_ai_autofix.get_autofix_state")
     def test_ai_autofix_get_endpoint_with_autofix(self, mock_get_autofix_state):
         group = self.create_group()
diff --git a/tests/sentry/api/endpoints/test_group_ai_summary.py b/tests/sentry/api/endpoints/test_group_ai_summary.py
index 284f199659c7af..ee72ff619e4505 100644
--- a/tests/sentry/api/endpoints/test_group_ai_summary.py
+++ b/tests/sentry/api/endpoints/test_group_ai_summary.py
@@ -13,7 +13,7 @@
 pytestmark = [requires_snuba]
 
 
-@apply_feature_flag_on_cls("organizations:ai-summary")
+@apply_feature_flag_on_cls("organizations:gen-ai-features")
 class GroupAiSummaryEndpointTest(APITestCase, SnubaTestCase):
     def setUp(self):
         super().setUp()
diff --git a/tests/sentry/api/endpoints/test_group_attachments.py b/tests/sentry/api/endpoints/test_group_attachments.py
index 7e505129e1e71e..128f7b9d0fbebd 100644
--- a/tests/sentry/api/endpoints/test_group_attachments.py
+++ b/tests/sentry/api/endpoints/test_group_attachments.py
@@ -4,13 +4,14 @@
 from sentry.models.eventattachment import EventAttachment
 from sentry.models.files.file import File
 from sentry.testutils.cases import APITestCase
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.skips import requires_snuba
 
 pytestmark = [requires_snuba]
 
 
 class GroupEventAttachmentsTest(APITestCase):
-    def create_attachment(self, type=None, event_id=None, file_name="hello.png"):
+    def create_attachment(self, type=None, event_id=None, file_name="hello.png", group_id=None):
         if type is None:
             type = "event.attachment"
 
@@ -20,7 +21,7 @@ def create_attachment(self, type=None, event_id=None, file_name="hello.png"):
         self.attachment = EventAttachment.objects.create(
             event_id=event_id or self.event.event_id,
             project_id=self.event.project_id,
-            group_id=self.group.id,
+            group_id=group_id or self.group.id,
             file_id=self.file.id,
             type=self.file.type,
             name=file_name,
@@ -127,3 +128,143 @@ def test_multi_event_id_filter(self):
         assert len(response.data) == 2
         assert response.data[0]["event_id"] == attachment2.event_id
         assert response.data[1]["event_id"] == attachment.event_id
+
+    def test_date_range_filter(self):
+        self.login_as(user=self.user)
+
+        old_attachment = self.create_attachment(event_id="b" * 32)
+        old_attachment.date_added = before_now(days=28).isoformat()
+        old_attachment.save()
+
+        newer_attachment = self.create_attachment(event_id="c" * 32)
+
+        with self.feature("organizations:event-attachments"):
+            all_response = self.client.get(f"/api/0/issues/{self.group.id}/attachments/")
+        assert len(all_response.data) == 2
+
+        with self.feature("organizations:event-attachments"):
+            range_response = self.client.get(
+                f"/api/0/issues/{self.group.id}/attachments/?statsPeriod=14d"
+            )
+
+        assert range_response.status_code == 200, range_response.content
+        assert len(range_response.data) == 1
+        assert range_response.data[0]["id"] == str(newer_attachment.id)
+        assert range_response.data[0]["event_id"] == newer_attachment.event_id
+
+    def test_event_environment_filter(self):
+        self.login_as(user=self.user)
+        data = {}
+
+        for env in ["production", "development"]:
+            event = self.store_event(
+                data={
+                    "fingerprint": ["same-group"],
+                    "timestamp": before_now(days=1).isoformat(),
+                    "environment": env,
+                },
+                project_id=self.project.id,
+            )
+            attachment = self.create_attachment(event_id=event.event_id, group_id=event.group_id)
+            data[env] = (event, attachment)
+
+        prod_event, prod_attachment = data["production"]
+        assert prod_event.group is not None
+
+        with self.feature("organizations:event-attachments"):
+            all_response = self.client.get(f"/api/0/issues/{prod_event.group.id}/attachments/")
+        assert len(all_response.data) == 2
+
+        with self.feature("organizations:event-attachments"):
+            prod_response = self.client.get(
+                f"/api/0/issues/{prod_event.group.id}/attachments/?environment=production"
+            )
+        assert len(prod_response.data) == 1
+        assert prod_response.data[0]["id"] == str(prod_attachment.id)
+        assert prod_response.data[0]["event_id"] == prod_attachment.event_id
+
+    def test_event_query_filter(self):
+        self.login_as(user=self.user)
+        data = {}
+
+        for org in ["sentry", "not-sentry"]:
+            event = self.store_event(
+                data={
+                    "fingerprint": ["same-group"],
+                    "timestamp": before_now(days=1).isoformat(),
+                    "tags": {"organization": org},
+                },
+                project_id=self.project.id,
+            )
+            attachment = self.create_attachment(event_id=event.event_id, group_id=event.group_id)
+            data[org] = (event, attachment)
+
+        sentry_event, sentry_attachment = data["sentry"]
+        assert sentry_event.group is not None
+
+        with self.feature("organizations:event-attachments"):
+            all_response = self.client.get(f"/api/0/issues/{sentry_event.group.id}/attachments/")
+        assert len(all_response.data) == 2
+
+        with self.feature("organizations:event-attachments"):
+            prod_response = self.client.get(
+                f"/api/0/issues/{sentry_event.group.id}/attachments/?query=organization:sentry"
+            )
+        assert len(prod_response.data) == 1
+        assert prod_response.data[0]["id"] == str(sentry_attachment.id)
+        assert prod_response.data[0]["event_id"] == sentry_attachment.event_id
+
+    def test_erroneous_event_filter(self):
+        self.login_as(user=self.user)
+        event = self.store_event(
+            data={
+                "fingerprint": ["same-group"],
+                "timestamp": before_now(days=1).isoformat(),
+                "tags": {"organization": "sentry"},
+                "environment": "production",
+            },
+            project_id=self.project.id,
+        )
+        self.create_attachment(event_id=event.event_id, group_id=event.group_id)
+        assert event.group is not None
+
+        with self.feature("organizations:event-attachments"):
+            response = self.client.get(
+                f"/api/0/issues/{event.group.id}/attachments/?query=issue:None"
+            )
+        assert response.status_code == 400
+
+    def test_event_filters_not_matching_should_return_no_attachments(self):
+        self.login_as(user=self.user)
+
+        self.create_environment(name="development", project=self.project)
+        event = self.store_event(
+            data={
+                "fingerprint": ["same-group"],
+                "timestamp": before_now(days=1).isoformat(),
+                "tags": {"organization": "sentry"},
+                "environment": "production",
+            },
+            project_id=self.project.id,
+        )
+        attachment = self.create_attachment(event_id=event.event_id, group_id=event.group_id)
+
+        assert event.group is not None
+
+        with self.feature("organizations:event-attachments"):
+            response = self.client.get(f"/api/0/issues/{event.group.id}/attachments/")
+        assert len(response.data) == 1
+        assert response.data[0]["id"] == str(attachment.id)
+        assert response.data[0]["event_id"] == attachment.event_id
+
+        with self.feature("organizations:event-attachments"):
+            response = self.client.get(
+                f"/api/0/issues/{event.group.id}/attachments/?query=organization:acme"
+            )
+        assert len(response.data) == 0
+
+        with self.feature("organizations:event-attachments"):
+            response = self.client.get(
+                f"/api/0/issues/{event.group.id}/attachments/?environment=development"
+            )
+        assert len(response.data) == 0
diff --git a/tests/sentry/api/endpoints/test_group_autofix_setup_check.py b/tests/sentry/api/endpoints/test_group_autofix_setup_check.py
index c78ae9e25832fb..bf984a32c57f3c 100644
--- a/tests/sentry/api/endpoints/test_group_autofix_setup_check.py
+++ b/tests/sentry/api/endpoints/test_group_autofix_setup_check.py
@@ -1,15 +1,15 @@
 from unittest.mock import patch
 
-from sentry.api.helpers.autofix import AutofixCodebaseIndexingStatus
+from sentry.api.endpoints.group_autofix_setup_check import get_repos_and_access
 from sentry.integrations.models.repository_project_path_config import RepositoryProjectPathConfig
 from sentry.models.repository import Repository
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase, SnubaTestCase
-from sentry.testutils.helpers.features import apply_feature_flag_on_cls, with_feature
+from sentry.testutils.helpers.features import apply_feature_flag_on_cls
 from sentry.testutils.silo import assume_test_silo_mode
 
 
-@apply_feature_flag_on_cls("organizations:autofix")
+@apply_feature_flag_on_cls("organizations:gen-ai-features")
 class GroupAIAutofixEndpointSuccessTest(APITestCase, SnubaTestCase):
     def setUp(self):
         super().setUp()
@@ -30,25 +30,9 @@ def setUp(self):
             stack_root="sentry/",
             source_root="sentry/",
         )
-        self.organization.update_option("sentry:gen_ai_consent", True)
+        self.organization.update_option("sentry:gen_ai_consent_v2024_11_14", True)
 
-    @patch(
-        "sentry.api.endpoints.group_autofix_setup_check.get_repos_and_access",
-        return_value=[
-            {
-                "provider": "github",
-                "owner": "getsentry",
-                "name": "seer",
-                "external_id": "123",
-                "ok": True,
-            }
-        ],
-    )
-    @patch(
-        "sentry.api.endpoints.group_autofix_setup_check.get_project_codebase_indexing_status",
-        return_value=AutofixCodebaseIndexingStatus.UP_TO_DATE,
-    )
-    def test_successful_setup(self, mock_update_codebase_index, mock_get_repos_and_access):
+    def test_successful_setup(self):
         """
         Everything is set up correctly, should respond with OKs.
         """
@@ -67,24 +51,9 @@ def test_successful_setup(self, mock_update_codebase_index, mock_get_repos_and_a
                 "ok": True,
                 "reason": None,
             },
-            "githubWriteIntegration": {
-                "ok": True,
-                "repos": [
-                    {
-                        "provider": "github",
-                        "owner": "getsentry",
-                        "name": "seer",
-                        "external_id": "123",
-                        "ok": True,
-                    }
-                ],
-            },
-            "codebaseIndexing": {
-                "ok": True,
-            },
+            "githubWriteIntegration": None,
         }
 
-    @with_feature("organizations:autofix-disable-codebase-indexing")
     @patch(
         "sentry.api.endpoints.group_autofix_setup_check.get_repos_and_access",
         return_value=[
@@ -97,19 +66,13 @@ def test_successful_setup(self, mock_update_codebase_index, mock_get_repos_and_a
             }
         ],
     )
-    @patch(
-        "sentry.api.endpoints.group_autofix_setup_check.get_project_codebase_indexing_status",
-        return_value=AutofixCodebaseIndexingStatus.NOT_INDEXED,
-    )
-    def test_successful_with_codebase_indexing_disabled_flag(
-        self, mock_update_codebase_index, mock_get_repos_and_access
-    ):
+    def test_successful_with_write_access(self, mock_get_repos_and_access):
         """
         Everything is set up correctly, should respond with OKs.
         """
         group = self.create_group()
         self.login_as(user=self.user)
-        url = f"/api/0/issues/{group.id}/autofix/setup/"
+        url = f"/api/0/issues/{group.id}/autofix/setup/?check_write_access=true"
         response = self.client.get(url, format="json")
 
         assert response.status_code == 200
@@ -134,16 +97,13 @@ def test_successful_with_codebase_indexing_disabled_flag(
                     }
                 ],
             },
-            "codebaseIndexing": {
-                "ok": True,
-            },
         }
 
 
 @apply_feature_flag_on_cls("organizations:autofix")
 class GroupAIAutofixEndpointFailureTest(APITestCase, SnubaTestCase):
     def test_no_gen_ai_consent(self):
-        self.organization.update_option("sentry:gen_ai_consent", False)
+        self.organization.update_option("sentry:gen_ai_consent_v2024_11_14", False)
 
         group = self.create_group()
         self.login_as(user=self.user)
@@ -209,7 +169,7 @@ def test_missing_integration(self):
     def test_repo_write_access_not_ready(self, mock_get_repos_and_access):
         group = self.create_group()
         self.login_as(user=self.user)
-        url = f"/api/0/issues/{group.id}/autofix/setup/"
+        url = f"/api/0/issues/{group.id}/autofix/setup/?check_write_access=true"
         response = self.client.get(url, format="json")
 
         assert response.status_code == 200
@@ -240,7 +200,7 @@ def test_repo_write_access_not_ready(self, mock_get_repos_and_access):
     def test_repo_write_access_no_repos(self, mock_get_repos_and_access):
         group = self.create_group()
         self.login_as(user=self.user)
-        url = f"/api/0/issues/{group.id}/autofix/setup/"
+        url = f"/api/0/issues/{group.id}/autofix/setup/?check_write_access=true"
         response = self.client.get(url, format="json")
 
         assert response.status_code == 200
@@ -249,17 +209,68 @@ def test_repo_write_access_no_repos(self, mock_get_repos_and_access):
             "repos": [],
         }
 
+    @patch("sentry.api.endpoints.group_autofix_setup_check.requests.post")
+    @patch(
+        "sentry.api.endpoints.group_autofix_setup_check.get_autofix_repos_from_project_code_mappings",
+        return_value=[
+            {
+                "provider": "github",
+                "owner": "getsentry",
+                "name": "seer",
+                "external_id": "123",
+            }
+        ],
+    )
+    def test_non_github_provider(self, mock_get_repos, mock_post):
+        # Mock the response from the Seer service
+        mock_response = mock_post.return_value
+        mock_response.json.return_value = {"has_access": True}
+
+        result = get_repos_and_access(self.project)
+
+        # Verify the result
+        assert result == [
+            {
+                "provider": "github",
+                "owner": "getsentry",
+                "name": "seer",
+                "external_id": "123",
+                "ok": True,
+            }
+        ]
+
+        # Verify the API call was made correctly
+        mock_post.assert_called_once()
+        call_kwargs = mock_post.call_args.kwargs
+        assert "data" in call_kwargs
+        assert "headers" in call_kwargs
+        assert "content-type" in call_kwargs["headers"]
+
+    @patch("sentry.api.endpoints.group_autofix_setup_check.requests.post")
     @patch(
-        "sentry.api.endpoints.group_autofix_setup_check.get_project_codebase_indexing_status",
-        return_value=AutofixCodebaseIndexingStatus.NOT_INDEXED,
+        "sentry.api.endpoints.group_autofix_setup_check.get_autofix_repos_from_project_code_mappings",
+        return_value=[
+            {
+                "provider": "github",
+                "owner": "getsentry",
+                "name": "seer",
+                "external_id": "123",
+            }
+        ],
     )
-    def test_codebase_indexing_not_done(self, mock_get_project_codebase_indexing_status):
-        group = self.create_group()
-        self.login_as(user=self.user)
-        url = f"/api/0/issues/{group.id}/autofix/setup/"
-        response = self.client.get(url, format="json")
+    def test_repo_without_access(self, mock_get_repos, mock_post):
+        # Mock the response to indicate no access
+        mock_response = mock_post.return_value
+        mock_response.json.return_value = {"has_access": False}
 
-        assert response.status_code == 200
-        assert response.data["codebaseIndexing"] == {
-            "ok": False,
-        }
+        result = get_repos_and_access(self.project)
+
+        assert result == [
+            {
+                "provider": "github",
+                "owner": "getsentry",
+                "name": "seer",
+                "external_id": "123",
+                "ok": False,
+            }
+        ]
diff --git a/tests/sentry/api/endpoints/test_group_integration_details.py b/tests/sentry/api/endpoints/test_group_integration_details.py
index 8195cdd17012fd..2f71f06150e443 100644
--- a/tests/sentry/api/endpoints/test_group_integration_details.py
+++ b/tests/sentry/api/endpoints/test_group_integration_details.py
@@ -1,10 +1,16 @@
 from unittest import mock
 
+from django.db.utils import IntegrityError
+
 from sentry.integrations.example.integration import ExampleIntegration
+from sentry.integrations.models import Integration
 from sentry.integrations.models.external_issue import ExternalIssue
+from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.activity import Activity
+from sentry.models.group import Group
 from sentry.models.grouplink import GroupLink
-from sentry.shared_integrations.exceptions import IntegrationError
+from sentry.models.organization import Organization
+from sentry.shared_integrations.exceptions import IntegrationError, IntegrationFormError
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.factories import EventType
 from sentry.testutils.helpers.datetime import before_now
@@ -16,6 +22,14 @@
 pytestmark = [requires_snuba]
 
 
+def raise_integration_form_error(*args, **kwargs):
+    raise IntegrationFormError(field_errors={"foo": "Invalid foo provided"})
+
+
+def raise_integration_error(*args, **kwargs):
+    raise IntegrationError("The whole operation was invalid")
+
+
 class GroupIntegrationDetailsTest(APITestCase):
     def setUp(self):
         super().setUp()
@@ -178,7 +192,35 @@ def test_get_feature_disabled(self):
         assert response.status_code == 400
         assert response.data["detail"] == "Your organization does not have access to this feature."
 
-    def test_simple_put(self):
+    def assert_correctly_linked(
+        self, group: Group, external_issue_id: str, integration: Integration, org: Organization
+    ):
+        external_issue = ExternalIssue.objects.get(
+            key=external_issue_id, integration_id=integration.id, organization_id=org.id
+        )
+        assert external_issue.title == "This is a test external issue title"
+        assert external_issue.description == "This is a test external issue description"
+        assert GroupLink.objects.filter(
+            linked_type=GroupLink.LinkedType.issue,
+            group_id=group.id,
+            linked_id=external_issue.id,
+        ).exists()
+
+        activity = Activity.objects.filter(type=ActivityType.CREATE_ISSUE.value)[0]
+        assert activity.project_id == group.project_id
+        assert activity.group_id == group.id
+        assert activity.ident is None
+        assert activity.user_id == self.user.id
+        assert activity.data == {
+            "title": "This is a test external issue title",
+            "provider": "Example",
+            "location": f"https://example/issues/{external_issue_id}",
+            "label": f"display name: {external_issue_id}",
+            "new": False,
+        }
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_simple_put(self, mock_record_event):
         self.login_as(user=self.user)
         org = self.organization
         group = self.create_group()
@@ -191,29 +233,105 @@ def test_simple_put(self):
             response = self.client.put(path, data={"externalIssue": "APP-123"})
 
             assert response.status_code == 201
-            external_issue = ExternalIssue.objects.get(
-                key="APP-123", integration_id=integration.id, organization_id=org.id
-            )
-            assert external_issue.title == "This is a test external issue title"
-            assert external_issue.description == "This is a test external issue description"
-            assert GroupLink.objects.filter(
-                linked_type=GroupLink.LinkedType.issue,
-                group_id=group.id,
-                linked_id=external_issue.id,
-            ).exists()
+            self.assert_correctly_linked(group, "APP-123", integration, org)
 
-            activity = Activity.objects.filter(type=ActivityType.CREATE_ISSUE.value)[0]
-            assert activity.project_id == group.project_id
-            assert activity.group_id == group.id
-            assert activity.ident is None
-            assert activity.user_id == self.user.id
-            assert activity.data == {
-                "title": "This is a test external issue title",
-                "provider": "Example",
-                "location": "https://example/issues/APP-123",
-                "label": "display name: APP-123",
-                "new": False,
-            }
+        mock_record_event.assert_called_with(EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch.object(ExampleIntegration, "get_issue")
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_halt")
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_failure")
+    def test_put_get_issue_raises_exception(
+        self, mock_record_failure, mock_record_halt, mock_get_issue
+    ):
+        self.login_as(user=self.user)
+        org = self.organization
+        group = self.create_group()
+        integration = self.create_integration(
+            organization=org, provider="example", name="Example", external_id="example:1"
+        )
+
+        path = f"/api/0/issues/{group.id}/integrations/{integration.id}/"
+        with self.feature("organizations:integrations-issue-basic"):
+            # Test with IntegrationFormError
+            mock_get_issue.side_effect = raise_integration_form_error
+            response = self.client.put(path, data={"externalIssue": "APP-123"})
+            assert response.status_code == 400
+
+            mock_record_halt.assert_called_once_with(mock.ANY)
+
+            call_arg = mock_record_halt.call_args_list[0][0][0]
+            assert isinstance(call_arg, IntegrationFormError)
+            assert call_arg.field_errors == {"foo": "Invalid foo provided"}
+
+            # Test with IntegrationError
+            mock_get_issue.side_effect = raise_integration_error
+            response = self.client.put(path, data={"externalIssue": "APP-123"})
+            assert response.status_code == 400
+
+            mock_record_failure.assert_called_once_with(mock.ANY)
+            call_arg = mock_record_failure.call_args_list[0][0][0]
+            assert isinstance(call_arg, IntegrationError)
+            assert call_arg.args == ("The whole operation was invalid",)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_halt")
+    def test_put_group_link_already_exists(self, mock_record_halt):
+        self.login_as(user=self.user)
+        org = self.organization
+        group = self.create_group()
+        integration = self.create_integration(
+            organization=org, provider="example", name="Example", external_id="example:1"
+        )
+
+        path = f"/api/0/issues/{group.id}/integrations/{integration.id}/"
+        with self.feature("organizations:integrations-issue-basic"):
+            response = self.client.put(path, data={"externalIssue": "APP-123"})
+
+            assert response.status_code == 201
+            self.assert_correctly_linked(group, "APP-123", integration, org)
+
+            response = self.client.put(path, data={"externalIssue": "APP-123"})
+            assert response.status_code == 400
+            assert response.data == {"non_field_errors": ["That issue is already linked"]}
+
+        mock_record_halt.assert_called_with(mock.ANY)
+        call_arg = mock_record_halt.call_args_list[0][0][0]
+        assert isinstance(call_arg, IntegrityError)
+
+    @mock.patch.object(ExampleIntegration, "after_link_issue")
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_halt")
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_failure")
+    def test_put_group_after_link_raises_exception(
+        self, mock_record_failure, mock_record_halt, mock_after_link_issue
+    ):
+        self.login_as(user=self.user)
+        org = self.organization
+        group = self.create_group()
+        integration = self.create_integration(
+            organization=org, provider="example", name="Example", external_id="example:1"
+        )
+
+        path = f"/api/0/issues/{group.id}/integrations/{integration.id}/"
+        with self.feature("organizations:integrations-issue-basic"):
+            # Test with IntegrationFormError
+            mock_after_link_issue.side_effect = raise_integration_form_error
+            response = self.client.put(path, data={"externalIssue": "APP-123"})
+            assert response.status_code == 400
+
+            mock_record_halt.assert_called_once_with(mock.ANY)
+
+            call_arg = mock_record_halt.call_args_list[0][0][0]
+            assert isinstance(call_arg, IntegrationFormError)
+            assert call_arg.field_errors == {"foo": "Invalid foo provided"}
+
+            # Test with IntegrationError
+            mock_after_link_issue.side_effect = raise_integration_error
+            response = self.client.put(path, data={"externalIssue": "APP-123"})
+            assert response.status_code == 400
+
+            mock_record_failure.assert_called_once_with(mock.ANY)
+            call_arg = mock_record_failure.call_args_list[0][0][0]
+            assert isinstance(call_arg, IntegrationError)
+            assert call_arg.args == ("The whole operation was invalid",)
 
     def test_put_feature_disabled(self):
         self.login_as(user=self.user)
diff --git a/tests/sentry/api/endpoints/test_organization_dashboard_details.py b/tests/sentry/api/endpoints/test_organization_dashboard_details.py
index 7c5227860d7b30..928f6d99b66c87 100644
--- a/tests/sentry/api/endpoints/test_organization_dashboard_details.py
+++ b/tests/sentry/api/endpoints/test_organization_dashboard_details.py
@@ -4,6 +4,7 @@
 from typing import Any
 from unittest import mock
 
+import pytest
 from django.urls import reverse
 
 from sentry.discover.models import DatasetSourcesTypes
@@ -18,12 +19,12 @@
 )
 from sentry.models.project import Project
 from sentry.snuba.metrics.extraction import OnDemandMetricSpecVersioning
-from sentry.testutils.cases import OrganizationDashboardWidgetTestCase
+from sentry.testutils.cases import BaseMetricsTestCase, OrganizationDashboardWidgetTestCase
 from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.skips import requires_snuba
 from sentry.users.models.user import User
 
-pytestmark = [requires_snuba]
+pytestmark = [requires_snuba, pytest.mark.sentry_metrics]
 
 
 class OrganizationDashboardDetailsTestCase(OrganizationDashboardWidgetTestCase):
@@ -417,6 +418,63 @@ def test_dashboard_details_data_returns_permissions_with_teams(self):
         assert "teamsWithEditAccess" in response.data["permissions"]
         assert response.data["permissions"]["teamsWithEditAccess"] == [team1.id, team2.id]
 
+    def test_get_favorited_user_status(self):
+        self.user_1 = self.create_user(email="user1@example.com")
+        self.user_2 = self.create_user(email="user2@example.com")
+        self.create_member(user=self.user_1, organization=self.organization)
+        self.create_member(user=self.user_2, organization=self.organization)
+
+        self.dashboard.favorited_by = [self.user_1.id, self.user_2.id]
+
+        self.login_as(user=self.user_1)
+        with self.feature({"organizations:dashboards-favourite": True}):
+            response = self.do_request("get", self.url(self.dashboard.id))
+            assert response.status_code == 200
+            assert response.data["isFavorited"] is True
+
+    def test_get_not_favorited_user_status(self):
+        self.user_1 = self.create_user(email="user1@example.com")
+        self.create_member(user=self.user_1, organization=self.organization)
+        self.dashboard.favorited_by = [self.user_1.id, self.user.id]
+
+        user_3 = self.create_user()
+        self.create_member(user=user_3, organization=self.organization)
+        self.login_as(user=user_3)
+        with self.feature({"organizations:dashboards-favourite": True}):
+            response = self.do_request("get", self.url(self.dashboard.id))
+            assert response.status_code == 200
+            assert response.data["isFavorited"] is False
+
+    def test_get_favorite_status_no_dashboard_edit_access(self):
+        self.user_1 = self.create_user(email="user1@example.com")
+        self.user_2 = self.create_user(email="user2@example.com")
+        self.create_member(user=self.user_1, organization=self.organization)
+        self.create_member(user=self.user_2, organization=self.organization)
+
+        self.dashboard.favorited_by = [self.user_1.id, self.user_2.id, self.user.id]
+
+        DashboardPermissions.objects.create(is_editable_by_everyone=False, dashboard=self.dashboard)
+        self.login_as(user=self.user_2)
+        dashboard_detail_put_url = reverse(
+            "sentry-api-0-organization-dashboard-details",
+            kwargs={
+                "organization_id_or_slug": self.organization.slug,
+                "dashboard_id": self.dashboard.id,
+            },
+        )
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request(
+                "put", dashboard_detail_put_url, data={"title": "New Dashboard 9"}
+            )
+            # assert user cannot edit dashboard
+            assert response.status_code == 403
+
+        # assert user can see if they favorited the dashboard
+        with self.feature({"organizations:dashboards-favourite": True}):
+            response = self.do_request("get", self.url(self.dashboard.id))
+            assert response.status_code == 200
+            assert response.data["isFavorited"] is True
+
 
 class OrganizationDashboardDetailsDeleteTest(OrganizationDashboardDetailsTestCase):
     def test_delete(self):
@@ -513,6 +571,108 @@ def test_disallow_delete_my_projects_dashboard_when_no_open_membership(self):
         response = self.do_request("delete", self.url(dashboard.id))
         assert response.status_code == 204
 
+    def test_allow_delete_when_no_project_access(self):
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        # assign a project to a dashboard
+        self.dashboard.projects.set([self.project])
+
+        # user has no access to the above project
+        user_no_team = self.create_user(is_superuser=False)
+        self.create_member(
+            user=user_no_team, organization=self.organization, role="member", teams=[]
+        )
+        self.login_as(user_no_team)
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request("delete", self.url(self.dashboard.id))
+        assert response.status_code == 204
+
+    def test_allow_delete_all_projects_dashboard_when_no_open_membership(self):
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        dashboard = Dashboard.objects.create(
+            title="Dashboard For All Projects",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            filters={"all_projects": True},
+        )
+
+        # user has no access to all the projects
+        user_no_team = self.create_user(is_superuser=False)
+        self.create_member(
+            user=user_no_team, organization=self.organization, role="member", teams=[]
+        )
+        self.login_as(user_no_team)
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request("delete", self.url(dashboard.id))
+        assert response.status_code == 204
+
+    def test_allow_delete_my_projects_dashboard_when_no_open_membership(self):
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        dashboard = Dashboard.objects.create(
+            title="Dashboard For My Projects",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            # no 'filter' field means the dashboard covers all available projects
+        )
+
+        # user has no access to all the projects
+        user_no_team = self.create_user(is_superuser=False)
+        self.create_member(
+            user=user_no_team, organization=self.organization, role="member", teams=[]
+        )
+        self.login_as(user_no_team)
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request("delete", self.url(dashboard.id))
+        assert response.status_code == 204
+
+    def test_disallow_delete_when_no_project_access_and_no_edit_perms(self):
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        # assign a project to a dashboard
+        self.dashboard.projects.set([self.project])
+
+        # user has no access to the above project
+        user_no_team = self.create_user(is_superuser=False)
+        self.create_member(
+            user=user_no_team, organization=self.organization, role="member", teams=[]
+        )
+        self.login_as(user_no_team)
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request("delete", self.url(self.dashboard.id))
+        assert response.status_code == 204
+
+    def test_allow_delete_as_superuser_but_no_edit_perms(self):
+        self.create_user(id=12333)
+        dashboard = Dashboard.objects.create(
+            id=67,
+            title="Dashboard With Dataset Source",
+            created_by_id=12333,
+            organization=self.organization,
+        )
+        DashboardPermissions.objects.create(is_editable_by_everyone=False, dashboard=dashboard)
+
+        # Create and login as superuser
+        superuser = self.create_user(is_superuser=True)
+        self.login_as(user=superuser, superuser=True)
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request("delete", self.url(dashboard.id))
+        assert response.status_code == 204, response.content
+
     def test_dashboard_does_not_exist(self):
         response = self.do_request("delete", self.url(1234567890))
         assert response.status_code == 404
@@ -731,6 +891,102 @@ def test_disallow_put_when_no_project_access(self):
         assert response.status_code == 403, response.data
         assert response.data == {"detail": "You do not have permission to perform this action."}
 
+    def test_allow_put_when_no_project_access(self):
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        # assign a project to a dashboard
+        self.dashboard.projects.set([self.project])
+
+        # user has no access to the above project
+        user_no_team = self.create_user(is_superuser=False)
+        self.create_member(
+            user=user_no_team, organization=self.organization, role="member", teams=[]
+        )
+        self.login_as(user_no_team)
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request(
+                "put", self.url(self.dashboard.id), data={"title": "Dashboard Hello"}
+            )
+        assert response.status_code == 200, response.data
+
+    def test_disallow_put_when_no_project_access_and_no_edit_perms(self):
+        # set dashboard edit perms to be editable only by creator
+        self.dashboard.permissions = DashboardPermissions.objects.create(
+            is_editable_by_everyone=False, dashboard=self.dashboard
+        )
+
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        # assign a project to a dashboard
+        self.dashboard.projects.set([self.project])
+
+        # user has no access to the above project
+        user_no_team = self.create_user(is_superuser=False)
+        self.create_member(
+            user=user_no_team, organization=self.organization, role="member", teams=[]
+        )
+        self.login_as(user_no_team)
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request(
+                "put", self.url(self.dashboard.id), data={"title": "Dashboard Hello"}
+            )
+        assert response.status_code == 403, response.data
+        assert response.data == {"detail": "You do not have permission to perform this action."}
+
+    def test_disallow_put_when_has_project_access_and_no_edit_perms(self):
+        # set dashboard edit perms to be editable only by creator
+        self.dashboard.permissions = DashboardPermissions.objects.create(
+            is_editable_by_everyone=False, dashboard=self.dashboard
+        )
+
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        # assign a project to a dashboard
+        self.dashboard.projects.set([self.project])
+
+        # user has access to the above project
+        user = self.create_user(id=3456)
+        team = self.create_team(organization=self.organization)
+        self.create_member(user=user, organization=self.organization, teams=[team])
+        self.project.add_team(team)
+        self.login_as(user)
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request(
+                "put", self.url(self.dashboard.id), data={"title": "Dashboard Hello"}
+            )
+        assert response.status_code == 403, response.data
+        assert response.data == {"detail": "You do not have permission to perform this action."}
+
+    def test_allow_put_as_superuser_but_no_edit_perms(self):
+        self.create_user(id=12333)
+        dashboard = Dashboard.objects.create(
+            id=67,
+            title="Dashboard With Dataset Source",
+            created_by_id=12333,
+            organization=self.organization,
+        )
+        DashboardPermissions.objects.create(is_editable_by_everyone=False, dashboard=dashboard)
+
+        # Create and login as superuser
+        superuser = self.create_user(is_superuser=True)
+        self.login_as(user=superuser, superuser=True)
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request(
+                "put", self.url(dashboard.id), data={"title": "New Dashboard 9"}
+            )
+        assert response.status_code == 200, response.content
+        assert response.data["title"] == "New Dashboard 9"
+
     def test_add_widget(self):
         data: dict[str, Any] = {
             "title": "First dashboard",
@@ -1823,6 +2079,37 @@ def test_add_discover_widget_using_total_count(self):
         response = self.do_request("put", self.url(self.dashboard.id), data=data)
         assert response.status_code == 200, response.data
 
+    def test_add_discover_widget_returns_validation_error(self):
+        data = {
+            "title": "First dashboard",
+            "widgets": [
+                {"id": str(self.widget_1.id)},
+                {
+                    "title": "Issues",
+                    "displayType": "table",
+                    "widgetType": "discover",
+                    "interval": "5m",
+                    "queries": [
+                        {
+                            "name": "",
+                            "fields": ["count()", "total.count"],
+                            "columns": ["total.count"],
+                            "aggregates": ["count()"],
+                            "conditions": "",
+                        }
+                    ],
+                },
+            ],
+        }
+        with self.feature({"organizations:deprecate-discover-widget-type": True}):
+            response = self.do_request("put", self.url(self.dashboard.id), data=data)
+
+        assert response.status_code == 400, response.data
+        assert (
+            "Attribute value `discover` is deprecated. Please use `error-events` or `transaction-like`"
+            in response.content.decode()
+        )
+
     def test_update_dashboard_with_filters(self):
         project1 = self.create_project(name="foo", organization=self.organization)
         project2 = self.create_project(name="bar", organization=self.organization)
@@ -2136,6 +2423,21 @@ def test_user_tries_to_update_dashboard_edit_perms(self):
             in response.content.decode()
         )
 
+    def test_manager_or_owner_can_update_dashboard_edit_perms(self):
+        DashboardPermissions.objects.create(is_editable_by_everyone=False, dashboard=self.dashboard)
+
+        user = self.create_user(id=28193)
+        self.create_member(user=user, organization=self.organization, role="manager")
+        self.login_as(user)
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request(
+                "put",
+                self.url(self.dashboard.id),
+                data={"permissions": {"is_editable_by_everyone": False}},
+            )
+        assert response.status_code == 200
+
     def test_update_dashboard_permissions_with_new_teams(self):
         mock_project = self.create_project()
         permission = DashboardPermissions.objects.create(
@@ -2325,6 +2627,110 @@ def test_update_dashboard_without_projects_does_not_clear_projects(self):
         assert response.status_code == 200, response.data
         assert sorted(response.data["projects"]) == [project1.id, project2.id]
 
+    def test_save_widget_with_custom_measurement_in_equation_tables(self):
+        BaseMetricsTestCase.store_metric(
+            self.organization.id,
+            self.project.id,
+            "d:transactions/measurements.custom_duration@millisecond",
+            {},
+            int(before_now(days=1).timestamp()),
+            1,
+        )
+
+        data: dict[str, Any] = {
+            "title": "First dashboard",
+            "widgets": [
+                {
+                    "title": "EPM table",
+                    "displayType": "table",
+                    "queries": [
+                        {
+                            "name": "",
+                            "fields": [
+                                "transaction.duration",
+                                "measurements.custom_duration",
+                                "equation|measurements.custom_duration / transaction.duration",
+                            ],
+                            "columns": [
+                                "transaction.duration",
+                                "measurements.custom_duration",
+                            ],
+                            "aggregates": [
+                                "equation|measurements.custom_duration / transaction.duration"
+                            ],
+                            "conditions": "",
+                            "orderby": "",
+                            "selectedAggregate": 1,
+                        }
+                    ],
+                },
+            ],
+        }
+        with self.feature({"organizations:performance-use-metrics": True}):
+            response = self.do_request("put", self.url(self.dashboard.id), data=data)
+        assert response.status_code == 200, response.data
+
+        widgets = self.get_widgets(self.dashboard.id)
+        assert len(widgets) == 1
+
+        self.assert_serialized_widget(data["widgets"][0], widgets[0])
+
+        queries = widgets[0].dashboardwidgetquery_set.all()
+        assert len(queries) == 1
+        self.assert_serialized_widget_query(data["widgets"][0]["queries"][0], queries[0])
+
+    def test_save_widget_with_custom_measurement_in_equation_line_chart(self):
+        BaseMetricsTestCase.store_metric(
+            self.organization.id,
+            self.project.id,
+            "d:transactions/measurements.custom_duration@millisecond",
+            {},
+            int(before_now(days=1).timestamp()),
+            1,
+        )
+
+        data: dict[str, Any] = {
+            "title": "First dashboard",
+            "widgets": [
+                {
+                    "title": "EPM line",
+                    "displayType": "line",
+                    "queries": [
+                        {
+                            "name": "",
+                            "fields": [
+                                "transaction.duration",
+                                "measurements.custom_duration",
+                                "equation|avg(measurements.custom_duration) / avg(transaction.duration)",
+                            ],
+                            "columns": [
+                                "transaction.duration",
+                                "measurements.custom_duration",
+                            ],
+                            "aggregates": [
+                                "equation|avg(measurements.custom_duration) / avg(transaction.duration)"
+                            ],
+                            "conditions": "",
+                            "orderby": "",
+                            "selectedAggregate": 1,
+                        }
+                    ],
+                },
+            ],
+        }
+        with self.feature({"organizations:performance-use-metrics": True}):
+            response = self.do_request("put", self.url(self.dashboard.id), data=data)
+        assert response.status_code == 200, response.data
+
+        widgets = self.get_widgets(self.dashboard.id)
+        assert len(widgets) == 1
+
+        self.assert_serialized_widget(data["widgets"][0], widgets[0])
+
+        queries = widgets[0].dashboardwidgetquery_set.all()
+        assert len(queries) == 1
+        self.assert_serialized_widget_query(data["widgets"][0]["queries"][0], queries[0])
+
 
 class OrganizationDashboardDetailsOnDemandTest(OrganizationDashboardDetailsTestCase):
     widget_type = DashboardWidgetTypes.DISCOVER
@@ -2902,3 +3308,72 @@ def test_visit_dashboard_no_access(self):
         dashboard = Dashboard.objects.get(id=self.dashboard.id)
         assert dashboard.visits == 1
         assert dashboard.last_visited == last_visited
+
+
+class OrganizationDashboardFavoriteTest(OrganizationDashboardDetailsTestCase):
+    def setUp(self):
+        super().setUp()
+        # Create two additional users
+        self.user_1 = self.create_user(email="user1@example.com")
+        self.user_2 = self.create_user(email="user2@example.com")
+        self.create_member(user=self.user_1, organization=self.organization)
+        self.create_member(user=self.user_2, organization=self.organization)
+
+        # Both users have favorited the dashboard
+        self.dashboard.favorited_by = [self.user_1.id, self.user_2.id]
+
+    def url(self, dashboard_id):
+        return reverse(
+            "sentry-api-0-organization-dashboard-favorite",
+            kwargs={
+                "organization_id_or_slug": self.organization.slug,
+                "dashboard_id": dashboard_id,
+            },
+        )
+
+    # PUT tests
+    def test_favorite_dashboard(self):
+        assert self.user.id not in self.dashboard.favorited_by
+        self.login_as(user=self.user)
+        with self.feature({"organizations:dashboards-favourite": True}):
+            response = self.do_request(
+                "put", self.url(self.dashboard.id), data={"isFavorited": "true"}
+            )
+            assert response.status_code == 204
+            assert self.user.id in self.dashboard.favorited_by
+
+    def test_unfavorite_dashboard(self):
+        assert self.user_1.id in self.dashboard.favorited_by
+        self.login_as(user=self.user_1)
+        with self.feature({"organizations:dashboards-favourite": True}):
+            response = self.do_request(
+                "put", self.url(self.dashboard.id), data={"isFavorited": False}
+            )
+            assert response.status_code == 204
+            assert self.user_1.id not in self.dashboard.favorited_by
+
+    def test_favorite_dashboard_no_dashboard_edit_access(self):
+        DashboardPermissions.objects.create(is_editable_by_everyone=False, dashboard=self.dashboard)
+        self.login_as(user=self.user_2)
+        dashboard_detail_url = reverse(
+            "sentry-api-0-organization-dashboard-details",
+            kwargs={
+                "organization_id_or_slug": self.organization.slug,
+                "dashboard_id": self.dashboard.id,
+            },
+        )
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request(
+                "put", dashboard_detail_url, data={"title": "New Dashboard 9"}
+            )
+            # assert user cannot edit dashboard
+            assert response.status_code == 403
+
+        # assert if user can edit the favorite status of the dashboard
+        assert self.user_2.id in self.dashboard.favorited_by
+        with self.feature({"organizations:dashboards-favourite": True}):
+            response = self.do_request(
+                "put", self.url(self.dashboard.id), data={"isFavorited": False}
+            )
+            assert response.status_code == 204
+            assert self.user_2.id not in self.dashboard.favorited_by
diff --git a/tests/sentry/api/endpoints/test_organization_dashboards.py b/tests/sentry/api/endpoints/test_organization_dashboards.py
index 7f917e25d17600..8c912424602fdd 100644
--- a/tests/sentry/api/endpoints/test_organization_dashboards.py
+++ b/tests/sentry/api/endpoints/test_organization_dashboards.py
@@ -219,6 +219,205 @@ def test_get_sortby_mydashboards_and_recently_viewed(self):
             "Dashboard 3",
         ]
 
+    def test_get_only_favorites_no_sort(self):
+        user_1 = self.create_user(username="user_1")
+        self.create_member(organization=self.organization, user=user_1)
+        user_2 = self.create_user(username="user_2")
+        self.create_member(organization=self.organization, user=user_2)
+
+        dashboard_4 = Dashboard.objects.create(
+            title="Dashboard 4",
+            created_by_id=user_2.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_4.favorited_by = [user_1.id, user_2.id]
+        dashboard_3 = Dashboard.objects.create(
+            title="Dashboard 3",
+            created_by_id=user_1.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=5),
+        )
+        dashboard_3.favorited_by = [user_1.id]
+        dashboard_5 = Dashboard.objects.create(
+            title="Dashboard 5",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=5),
+        )
+        dashboard_5.favorited_by = [user_1.id]
+        dashboard_6 = Dashboard.objects.create(
+            title="Dashboard 6",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_6.favorited_by = [user_2.id]
+
+        self.login_as(user_1)
+        with self.feature("organizations:dashboards-favourite"):
+            response = self.client.get(self.url, data={"filter": "onlyFavorites"})
+            assert response.status_code == 200, response.content
+
+            values = [row["title"] for row in response.data]
+            # sorted by title by default
+            assert values == ["Dashboard 3", "Dashboard 4", "Dashboard 5"]
+
+    def test_get_only_favorites_with_sort(self):
+        user_1 = self.create_user(username="user_1")
+        self.create_member(organization=self.organization, user=user_1)
+        user_2 = self.create_user(username="user_2")
+        self.create_member(organization=self.organization, user=user_2)
+
+        dashboard_4 = Dashboard.objects.create(
+            title="Dashboard 4",
+            created_by_id=user_2.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_4.favorited_by = [user_1.id, user_2.id]
+        dashboard_3 = Dashboard.objects.create(
+            title="Dashboard 3",
+            created_by_id=user_1.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=5),
+        )
+        dashboard_3.favorited_by = [user_1.id]
+        dashboard_5 = Dashboard.objects.create(
+            title="Dashboard 5",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=5),
+        )
+        dashboard_5.favorited_by = [user_1.id]
+        dashboard_6 = Dashboard.objects.create(
+            title="Dashboard 7",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_6.favorited_by = [user_2.id]
+        dashboard_7 = Dashboard.objects.create(
+            title="Dashboard 6",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_7.favorited_by = [user_2.id]
+
+        self.login_as(user_1)
+        with self.feature("organizations:dashboards-favourite"):
+            response = self.client.get(
+                self.url, data={"filter": "onlyFavorites", "sort": "dateCreated"}
+            )
+            assert response.status_code == 200, response.content
+
+            values = [row["title"] for row in response.data]
+            assert values == ["Dashboard 4", "Dashboard 3", "Dashboard 5"]
+
+    def test_get_exclude_favorites_with_no_sort(self):
+        user_1 = self.create_user(username="user_1")
+        self.create_member(organization=self.organization, user=user_1)
+        user_2 = self.create_user(username="user_2")
+        self.create_member(organization=self.organization, user=user_2)
+
+        dashboard_4 = Dashboard.objects.create(
+            title="Dashboard 4",
+            created_by_id=user_2.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_4.favorited_by = [user_1.id, user_2.id]
+        dashboard_3 = Dashboard.objects.create(
+            title="Dashboard 3",
+            created_by_id=user_1.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=5),
+        )
+        dashboard_3.favorited_by = [user_1.id]
+        dashboard_7 = Dashboard.objects.create(
+            title="Dashboard 7",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_7.favorited_by = [user_2.id]
+        dashboard_5 = Dashboard.objects.create(
+            title="Dashboard 5",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=5),
+        )
+        dashboard_5.favorited_by = [user_1.id]
+        dashboard_6 = Dashboard.objects.create(
+            title="Dashboard 6",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_6.favorited_by = [user_2.id]
+
+        self.login_as(user_1)
+        with self.feature("organizations:dashboards-favourite"):
+            response = self.client.get(self.url, data={"filter": "excludeFavorites"})
+            assert response.status_code == 200, response.content
+
+            values = [row["title"] for row in response.data]
+            # sorted by title by default
+            assert values == ["General", "Dashboard 1", "Dashboard 2", "Dashboard 6", "Dashboard 7"]
+
+    def test_get_exclude_favorites_with_sort(self):
+        user_1 = self.create_user(username="user_1")
+        self.create_member(organization=self.organization, user=user_1)
+        user_2 = self.create_user(username="user_2")
+        self.create_member(organization=self.organization, user=user_2)
+
+        dashboard_4 = Dashboard.objects.create(
+            title="Dashboard 4",
+            created_by_id=user_2.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_4.favorited_by = [user_1.id, user_2.id]
+        dashboard_3 = Dashboard.objects.create(
+            title="Dashboard 3",
+            created_by_id=user_1.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=5),
+        )
+        dashboard_3.favorited_by = [user_1.id]
+        dashboard_7 = Dashboard.objects.create(
+            title="Dashboard 7",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_7.favorited_by = [user_2.id]
+        dashboard_5 = Dashboard.objects.create(
+            title="Dashboard 5",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=5),
+        )
+        dashboard_5.favorited_by = [user_1.id]
+        dashboard_6 = Dashboard.objects.create(
+            title="Dashboard 6",
+            created_by_id=self.user.id,
+            organization=self.organization,
+            last_visited=before_now(minutes=0),
+        )
+        dashboard_6.favorited_by = [user_2.id]
+
+        self.login_as(user_1)
+        with self.feature("organizations:dashboards-favourite"):
+            response = self.client.get(
+                self.url, data={"filter": "excludeFavorites", "sort": "dateCreated"}
+            )
+            assert response.status_code == 200, response.content
+
+            values = [row["title"] for row in response.data]
+            assert values == ["General", "Dashboard 1", "Dashboard 2", "Dashboard 7", "Dashboard 6"]
+
     def test_post(self):
         response = self.do_request("post", self.url, data={"title": "Dashboard from Post"})
         assert response.status_code == 201
@@ -1043,3 +1242,53 @@ def test_create_new_edit_perms_with_teams(self):
         assert response.status_code == 201, response.content
         assert response.data["permissions"]["isEditableByEveryone"] is False
         assert response.data["permissions"]["teamsWithEditAccess"] == [team1.id, team2.id]
+
+    def test_gets_dashboard_permissions_with_dashboard_list(self):
+        response = self.do_request("get", self.url)
+        assert response.status_code == 200, response.content
+        assert len(response.data) > 1
+        # Ensure the "permissions" field exists in each dashboard
+        for dashboard in response.data:
+            assert (
+                "permissions" in dashboard
+            ), f"Permissions field not found in dashboard: {dashboard}"
+        self.assert_equal_dashboards(self.dashboard, response.data[1])
+        assert response.data[1]["permissions"] is None
+
+    def test_dasboard_list_permissions_is_valid(self):
+        team1 = self.create_team(organization=self.organization)
+        team2 = self.create_team(organization=self.organization)
+
+        data = {
+            "title": "New Dashboard 7",
+            "permissions": {
+                "isEditableByEveryone": "false",
+                "teamsWithEditAccess": [str(team1.id), str(team2.id)],
+            },
+            "createdBy": {"id": "23516"},
+            "id": "7136",
+        }
+
+        with self.feature({"organizations:dashboards-edit-access": True}):
+            response = self.do_request("post", self.url, data=data)
+        assert response.status_code == 201
+
+        response = self.do_request("get", self.url)
+        assert response.status_code == 200, response.content
+        assert len(response.data) == 4
+        assert response.data[3]["permissions"]["isEditableByEveryone"] is False
+        assert response.data[3]["permissions"]["teamsWithEditAccess"] == [team1.id, team2.id]
+
+    def test_gets_dashboard_favorited_with_dashboard_list(self):
+        self.dashboard.favorited_by = [self.user.id]
+
+        with self.feature({"organizations:dashboards-favourite": True}):
+            response = self.do_request("get", self.url)
+            assert response.status_code == 200, response.content
+
+            for dashboard in response.data:
+                assert "isFavorited" in dashboard
+            self.assert_equal_dashboards(self.dashboard, response.data[1])
+            assert response.data[1]["isFavorited"] is True
+            assert response.data[0]["isFavorited"] is False  # general template
+            assert response.data[2]["isFavorited"] is False  # dashboard_2 w/ no favorites set
diff --git a/tests/sentry/api/endpoints/test_organization_details.py b/tests/sentry/api/endpoints/test_organization_details.py
index b2554bc31ca418..f02afa413d9341 100644
--- a/tests/sentry/api/endpoints/test_organization_details.py
+++ b/tests/sentry/api/endpoints/test_organization_details.py
@@ -341,6 +341,8 @@ def test_is_dynamically_sampled_org_option(self):
         with self.feature({"organizations:dynamic-sampling-custom": True}):
             response = self.get_success_response(self.organization.slug)
             assert response.data["isDynamicallySampled"]
+            assert "planSampleRate" in response.data
+            assert "desiredSampleRate" in response.data
 
         self.organization.update_option(
             "sentry:sampling_mode", DynamicSamplingMode.ORGANIZATION.value
@@ -365,6 +367,8 @@ def test_is_dynamically_sampled_proj_option(self):
         with self.feature({"organizations:dynamic-sampling-custom": True}):
             response = self.get_success_response(self.organization.slug)
             assert response.data["isDynamicallySampled"]
+            assert "planSampleRate" not in response.data
+            assert "desiredSampleRate" not in response.data
 
     def test_dynamic_sampling_custom_target_sample_rate(self):
         with self.feature({"organizations:dynamic-sampling-custom": True}):
@@ -703,7 +707,6 @@ def test_various_options(self, mock_get_repositories):
             "codecovAccess": True,
             "allowSuperuserAccess": False,
             "allowMemberInvite": False,
-            "aiSuggestedSolution": False,
             "hideAiFeatures": True,
             "githubOpenPRBot": False,
             "githubNudgeInvite": False,
@@ -800,7 +803,6 @@ def test_various_options(self, mock_get_repositories):
         assert "to {}".format(data["allowJoinRequests"]) in log.data["allowJoinRequests"]
         assert "to {}".format(data["eventsMemberAdmin"]) in log.data["eventsMemberAdmin"]
         assert "to {}".format(data["alertsMemberWrite"]) in log.data["alertsMemberWrite"]
-        assert "to {}".format(data["aiSuggestedSolution"]) in log.data["aiSuggestedSolution"]
         assert "to {}".format(data["hideAiFeatures"]) in log.data["hideAiFeatures"]
         assert "to {}".format(data["githubPRBot"]) in log.data["githubPRBot"]
         assert "to {}".format(data["githubOpenPRBot"]) in log.data["githubOpenPRBot"]
diff --git a/tests/sentry/api/endpoints/test_organization_fork.py b/tests/sentry/api/endpoints/test_organization_fork.py
index 2fe2a2b75eb9cf..88354f209cf35f 100644
--- a/tests/sentry/api/endpoints/test_organization_fork.py
+++ b/tests/sentry/api/endpoints/test_organization_fork.py
@@ -135,7 +135,7 @@ def test_good_simple_using_organization_id(
         {
             "relocation.enabled": True,
             "relocation.daily-limit.small": 1,
-            "relocation.autopause": "IMPORTING",
+            "relocation.autopause.saas-to-saas": "IMPORTING",
         }
     )
     @assume_test_silo_mode(SiloMode.REGION, region_name=REQUESTING_TEST_REGION)
@@ -169,6 +169,44 @@ def test_good_with_valid_autopause_option(
             replying_region_name=EXPORTING_TEST_REGION,
         )
 
+    @override_options(
+        {
+            "relocation.enabled": True,
+            "relocation.daily-limit.small": 1,
+            "relocation.autopause.self-hosted": "IMPORTING",
+        }
+    )
+    @assume_test_silo_mode(SiloMode.REGION, region_name=REQUESTING_TEST_REGION)
+    def test_good_with_untriggered_autopause_option(
+        self,
+        uploading_start_mock: Mock,
+        analytics_record_mock: Mock,
+    ):
+        self.login_as(user=self.superuser, superuser=True)
+
+        response = self.get_success_response(self.existing_org.slug)
+
+        assert response.data["status"] == Relocation.Status.IN_PROGRESS.name
+        assert response.data["step"] == Relocation.Step.UPLOADING.name
+        assert response.data["provenance"] == Relocation.Provenance.SAAS_TO_SAAS.name
+        assert response.data["scheduledPauseAtStep"] is None
+
+        assert uploading_start_mock.call_count == 1
+        uploading_start_mock.assert_called_with(
+            args=[UUID(response.data["uuid"]), EXPORTING_TEST_REGION, self.requested_org_slug]
+        )
+
+        assert analytics_record_mock.call_count == 1
+        analytics_record_mock.assert_called_with(
+            "relocation.forked",
+            creator_id=int(response.data["creator"]["id"]),
+            owner_id=int(response.data["owner"]["id"]),
+            uuid=response.data["uuid"],
+            from_org_slug=self.requested_org_slug,
+            requesting_region_name=REQUESTING_TEST_REGION,
+            replying_region_name=EXPORTING_TEST_REGION,
+        )
+
     @override_options(
         {"relocation.enabled": False, "relocation.daily-limit.small": 1, "staff.ga-rollout": True}
     )
diff --git a/tests/sentry/api/endpoints/test_organization_index.py b/tests/sentry/api/endpoints/test_organization_index.py
index 5808c929c511f6..4a5ad9439b2444 100644
--- a/tests/sentry/api/endpoints/test_organization_index.py
+++ b/tests/sentry/api/endpoints/test_organization_index.py
@@ -5,8 +5,10 @@
 from unittest.mock import patch
 
 from django.test import override_settings
+from django.urls import reverse
 
 from sentry.auth.authenticators.totp import TotpInterface
+from sentry.models.apitoken import ApiToken
 from sentry.models.options.organization_option import OrganizationOption
 from sentry.models.organization import Organization, OrganizationStatus
 from sentry.models.organizationmapping import OrganizationMapping
@@ -105,6 +107,27 @@ def test_member_id_query(self):
         response = self.get_success_response(qs_params={"query": f"member_id:{om.id + 10}"})
         assert len(response.data) == 0
 
+    def test_show_only_token_organization(self):
+        org1 = self.create_organization(owner=self.user)
+        self.create_organization(owner=self.user)
+        self.login_as(user=self.user)
+        with assume_test_silo_mode(SiloMode.CONTROL):
+            user_token = ApiToken.objects.create(user=self.user, scope_list=["org:read"])
+        self.client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token.plaintext_token}")
+        response = self.client.get(reverse(self.endpoint))
+        # if token is not specific to any organization, it should return all the organizations
+        assert len(response.data) == 2
+
+        with assume_test_silo_mode(SiloMode.CONTROL):
+            org_scoped_token = ApiToken.objects.create(
+                user=self.user, scoping_organization_id=org1.id, scope_list=["org:read"]
+            )
+        self.client.credentials(HTTP_AUTHORIZATION=f"Bearer {org_scoped_token.plaintext_token}")
+        response = self.client.get(reverse(self.endpoint))
+        # if token is specific to an organization, it should return only that organization
+        assert len(response.data) == 1
+        assert response.data[0]["id"] == str(org1.id)
+
 
 class OrganizationsCreateTest(OrganizationIndexTest, HybridCloudTestMixin):
     method = "post"
diff --git a/tests/sentry/api/endpoints/test_organization_member_index.py b/tests/sentry/api/endpoints/test_organization_member_index.py
index 3ece837da375cb..9a4a14a8f3a3c3 100644
--- a/tests/sentry/api/endpoints/test_organization_member_index.py
+++ b/tests/sentry/api/endpoints/test_organization_member_index.py
@@ -154,6 +154,29 @@ def test_invalid_team_role(self):
         assert not serializer.is_valid()
         assert serializer.errors == {"teamRoles": ["Invalid team-role"]}
 
+    @with_feature("organizations:invite-billing")
+    def test_valid_invite_billing_member(self):
+        context = {"organization": self.organization, "allowed_roles": [roles.get("member")]}
+        data = {
+            "email": "bill@localhost",
+            "orgRole": "billing",
+            "teamRoles": [],
+        }
+
+        serializer = OrganizationMemberRequestSerializer(context=context, data=data)
+        assert serializer.is_valid()
+
+    def test_invalid_invite_billing_member(self):
+        context = {"organization": self.organization, "allowed_roles": [roles.get("member")]}
+        data = {
+            "email": "bill@localhost",
+            "orgRole": "billing",
+            "teamRoles": [],
+        }
+
+        serializer = OrganizationMemberRequestSerializer(context=context, data=data)
+        assert not serializer.is_valid()
+
 
 class OrganizationMemberListTestBase(APITestCase):
     endpoint = "sentry-api-0-organization-member-index"
diff --git a/tests/sentry/api/endpoints/test_organization_member_unreleased_commits.py b/tests/sentry/api/endpoints/test_organization_member_unreleased_commits.py
deleted file mode 100644
index 323b9c339698da..00000000000000
--- a/tests/sentry/api/endpoints/test_organization_member_unreleased_commits.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from datetime import datetime, timezone
-
-from sentry.testutils.cases import APITestCase
-
-
-class OrganizationMemberUnreleasedCommitsTest(APITestCase):
-    endpoint = "sentry-api-0-organization-member-unreleased-commits"
-
-    def test_simple(self):
-        repo = self.create_repo(self.project)
-        repo2 = self.create_repo(self.project)
-
-        # we first need to create a release attached to a repository, or that repository
-        # will never be included
-        release = self.create_release(self.project)
-        author = self.create_commit_author(project=self.project, user=self.user)
-
-        # note: passing 'release' to create_commit causes it to bind ReleaseCommit
-        self.create_commit(
-            project=self.project,
-            repo=repo,
-            release=release,
-            author=author,
-            date_added=datetime(2015, 1, 1, tzinfo=timezone.utc),
-        )
-
-        # create a commit associated with an unreleased repo -- which should not appear
-        self.create_commit(
-            project=self.project,
-            repo=repo2,
-            author=author,
-            date_added=datetime(2015, 1, 2, tzinfo=timezone.utc),
-        )
-
-        # create several unreleased commits associated with repo
-        unreleased_commit = self.create_commit(
-            project=self.project,
-            repo=repo,
-            author=author,
-            date_added=datetime(2015, 1, 2, tzinfo=timezone.utc),
-        )
-        unreleased_commit2 = self.create_commit(
-            project=self.project,
-            repo=repo,
-            author=author,
-            date_added=datetime(2015, 1, 3, tzinfo=timezone.utc),
-        )
-        self.create_commit(
-            project=self.project,
-            repo=repo,
-            date_added=datetime(2015, 1, 3, tzinfo=timezone.utc),
-        )
-
-        self.login_as(self.user)
-
-        response = self.get_success_response(self.organization.slug, "me")
-
-        assert len(response.data["commits"]) == 2
-        assert response.data["commits"][0]["id"] == unreleased_commit2.key
-        assert response.data["commits"][1]["id"] == unreleased_commit.key
-        assert len(response.data["repositories"]) == 1
-        assert str(repo.id) in response.data["repositories"]
diff --git a/tests/sentry/api/endpoints/test_organization_metrics.py b/tests/sentry/api/endpoints/test_organization_metrics.py
index ae9a95f8815831..bfda3dbdc1d6d4 100644
--- a/tests/sentry/api/endpoints/test_organization_metrics.py
+++ b/tests/sentry/api/endpoints/test_organization_metrics.py
@@ -32,7 +32,8 @@
             ],
             unit="percentage",
             snql=lambda crashed_count, errored_set, entity, metric_ids, alias=None: complement(
-                division_float(crashed_count, errored_set, alias=alias), alias="crash_free_fake"
+                division_float(crashed_count, errored_set, alias=alias),
+                alias="crash_free_fake",
             ),
         )
     }
@@ -54,7 +55,6 @@ def indexer_record(use_case_id: UseCaseID, org_id: int, string: str) -> int:
 
 
 class OrganizationMetricsPermissionTest(APITestCase):
-
     endpoints = (
         (
             "get",
@@ -73,7 +73,6 @@ class OrganizationMetricsPermissionTest(APITestCase):
             "post",
             "sentry-api-0-organization-metrics-query",
         ),
-        ("get", "sentry-api-0-organization-metrics-samples"),
     )
 
     def setUp(self):
diff --git a/tests/sentry/api/endpoints/test_organization_metrics_samples.py b/tests/sentry/api/endpoints/test_organization_metrics_samples.py
deleted file mode 100644
index 5a80374344e384..00000000000000
--- a/tests/sentry/api/endpoints/test_organization_metrics_samples.py
+++ /dev/null
@@ -1,638 +0,0 @@
-from datetime import timedelta
-from uuid import uuid4
-
-from django.urls import reverse
-from rest_framework.exceptions import ErrorDetail
-
-from sentry.testutils.cases import APITestCase, BaseSpansTestCase
-from sentry.testutils.helpers.datetime import before_now
-from sentry.utils.samples import load_data
-
-
-class OrganizationMetricsSamplesEndpointTest(BaseSpansTestCase, APITestCase):
-    view = "sentry-api-0-organization-metrics-samples"
-
-    def setUp(self):
-        super().setUp()
-        self.login_as(user=self.user)
-
-    def do_request(self, query, **kwargs):
-        return self.client.get(
-            reverse(self.view, kwargs={"organization_id_or_slug": self.organization.slug}),
-            query,
-            format="json",
-            **kwargs,
-        )
-
-    def test_no_project(self):
-        query = {
-            "mri": "d:spans/exclusive_time@millisecond",
-            "field": ["id"],
-            "project": [],
-        }
-
-        response = self.do_request(query)
-        assert response.status_code == 404, response.data
-
-    def test_bad_params(self):
-        query = {
-            "mri": "foo",
-            "field": [],
-            "project": [self.project.id],
-        }
-
-        response = self.do_request(query)
-        assert response.status_code == 400, response.data
-        assert response.data == {
-            "mri": [ErrorDetail(string="Invalid MRI: foo", code="invalid")],
-            "field": [ErrorDetail(string="This field is required.", code="required")],
-        }
-
-    def test_unsupported_mri(self):
-        query = {
-            "mri": "d:spans/made_up@none",
-            "field": ["id"],
-            "project": [self.project.id],
-        }
-
-        response = self.do_request(query)
-        assert response.status_code == 400, response.data
-        assert response.data == {
-            "detail": ErrorDetail(
-                string="Unsupported MRI: d:spans/made_up@none", code="parse_error"
-            )
-        }
-
-    def test_unsupported_sort(self):
-        query = {
-            "mri": "d:spans/exclusive_time@millisecond",
-            "field": ["id"],
-            "project": [self.project.id],
-            "sort": "id",
-        }
-
-        response = self.do_request(query)
-        assert response.status_code == 400, response.data
-        assert response.data == {
-            "detail": ErrorDetail(string="Unsupported sort: id for MRI", code="parse_error")
-        }
-
-    def test_span_exclusive_time_samples_zero_group(self):
-        durations = [100, 200, 300]
-        span_ids = [uuid4().hex[:16] for _ in durations]
-        good_span_id = span_ids[1]
-
-        for i, (span_id, duration) in enumerate(zip(span_ids, durations)):
-            ts = before_now(days=i, minutes=10).replace(microsecond=0)
-
-            self.store_indexed_span(
-                self.project.id,
-                uuid4().hex,
-                uuid4().hex,
-                span_id=span_id,
-                duration=duration,
-                exclusive_time=duration,
-                timestamp=ts,
-            )
-
-        query = {
-            "mri": "d:spans/exclusive_time@millisecond",
-            "field": ["id"],
-            "project": [self.project.id],
-            "statsPeriod": "14d",
-            "min": 150,
-            "max": 250,
-        }
-        response = self.do_request(query)
-        assert response.status_code == 200, response.data
-        expected = {int(good_span_id, 16)}
-        actual = {int(row["id"], 16) for row in response.data["data"]}
-        assert actual == expected
-
-        for row in response.data["data"]:
-            assert row["summary"] == {
-                "min": 200.0,
-                "max": 200.0,
-                "sum": 200.0,
-                "count": 1,
-            }
-
-        query = {
-            "mri": "d:spans/duration@millisecond",
-            "field": ["id", "span.self_time"],
-            "project": [self.project.id],
-            "statsPeriod": "14d",
-            "sort": "-summary",
-        }
-        response = self.do_request(query)
-        assert response.status_code == 200, response.data
-        expected = {int(span_id, 16) for span_id in span_ids}
-        actual = {int(row["id"], 16) for row in response.data["data"]}
-        assert actual == expected
-
-        for duration, row in zip(reversed(durations), response.data["data"]):
-            assert row["summary"] == {
-                "min": duration,
-                "max": duration,
-                "sum": duration,
-                "count": 1,
-            }
-
-    def test_span_measurement_samples(self):
-        durations = [100, 200, 300]
-        span_ids = [uuid4().hex[:16] for _ in durations]
-        good_span_id = span_ids[1]
-
-        for i, (span_id, duration) in enumerate(zip(span_ids, durations)):
-            ts = before_now(days=i, minutes=10).replace(microsecond=0)
-
-            self.store_indexed_span(
-                self.project.id,
-                uuid4().hex,
-                uuid4().hex,
-                span_id=span_id,
-                duration=duration,
-                timestamp=ts,
-                measurements={
-                    measurement: duration + j + 1
-                    for j, measurement in enumerate(
-                        [
-                            "frames.slow",
-                            "score.total",
-                            "score.inp",
-                            "score.weight.inp",
-                            "http.response_content_length",
-                            "http.decoded_response_content_length",
-                            "http.response_transfer_size",
-                        ]
-                    )
-                },
-            )
-
-            self.store_indexed_span(
-                self.project.id,
-                uuid4().hex,
-                uuid4().hex,
-                span_id=uuid4().hex[:16],
-                timestamp=ts,
-            )
-
-        for i, mri in enumerate(
-            [
-                "g:spans/mobile.slow_frames@none",
-                "d:spans/webvital.score.total@ratio",
-                "d:spans/webvital.score.inp@ratio",
-                "d:spans/webvital.score.weight.inp@ratio",
-                "d:spans/http.response_content_length@byte",
-                "d:spans/http.decoded_response_content_length@byte",
-                "d:spans/http.response_transfer_size@byte",
-            ]
-        ):
-            query = {
-                "mri": mri,
-                "field": ["id"],
-                "project": [self.project.id],
-                "statsPeriod": "14d",
-                "min": 150.0,
-                "max": 250.0,
-            }
-            response = self.do_request(query)
-            assert response.status_code == 200, response.data
-            expected = {int(good_span_id, 16)}
-            actual = {int(row["id"], 16) for row in response.data["data"]}
-            assert actual == expected, mri
-
-            for row in response.data["data"]:
-                assert row["summary"] == {
-                    "min": 201 + i,
-                    "max": 201 + i,
-                    "sum": 201 + i,
-                    "count": 1,
-                }, mri
-
-            query = {
-                "mri": mri,
-                "field": ["id", "span.duration"],
-                "project": [self.project.id],
-                "statsPeriod": "14d",
-                "sort": "-summary",
-            }
-            response = self.do_request(query)
-            assert response.status_code == 200, response.data
-            expected = {int(span_id, 16) for span_id in span_ids}
-            actual = {int(row["id"], 16) for row in response.data["data"]}
-            assert actual == expected, mri
-
-            for duration, row in zip(reversed(durations), response.data["data"]):
-                assert row["summary"] == {
-                    "min": duration + i + 1,
-                    "max": duration + i + 1,
-                    "sum": duration + i + 1,
-                    "count": 1,
-                }, mri
-
-    def test_transaction_duration_samples(self):
-        durations = [100, 200, 300]
-        span_ids = [uuid4().hex[:16] for _ in durations]
-        good_span_id = span_ids[1]
-
-        for i, (span_id, duration) in enumerate(zip(span_ids, durations)):
-            ts = before_now(days=i, minutes=10).replace(microsecond=0)
-            start_ts = ts - timedelta(microseconds=duration * 1000)
-
-            # first write to the transactions dataset
-            data = load_data("transaction", start_timestamp=start_ts, timestamp=ts)
-            data["contexts"]["trace"]["span_id"] = span_id
-            self.store_event(
-                data=data,
-                project_id=self.project.id,
-            )
-
-            # next write to the spans dataset
-            self.store_segment(
-                self.project.id,
-                uuid4().hex,
-                uuid4().hex,
-                duration=duration,
-                span_id=span_id,
-                timestamp=ts,
-            )
-
-        query = {
-            "mri": "d:transactions/duration@millisecond",
-            "field": ["id"],
-            "project": [self.project.id],
-            "statsPeriod": "14d",
-            "min": 150,
-            "max": 250,
-        }
-        response = self.do_request(query)
-        assert response.status_code == 200, response.data
-        expected = {int(good_span_id, 16)}
-        actual = {int(row["id"], 16) for row in response.data["data"]}
-        assert actual == expected
-
-        for row in response.data["data"]:
-            assert row["summary"] == {
-                "min": 200,
-                "max": 200,
-                "sum": 200,
-                "count": 1,
-            }
-
-        query = {
-            "mri": "d:transactions/duration@millisecond",
-            "field": ["id", "span.duration"],
-            "project": [self.project.id],
-            "statsPeriod": "14d",
-            "sort": "-summary",
-        }
-        response = self.do_request(query)
-        assert response.status_code == 200, response.data
-        expected = {int(span_id, 16) for span_id in span_ids}
-        actual = {int(row["id"], 16) for row in response.data["data"]}
-        assert actual == expected
-
-        for duration, row in zip(reversed(durations), response.data["data"]):
-            assert row["summary"] == {
-                "min": duration,
-                "max": duration,
-                "sum": duration,
-                "count": 1,
-            }
-
-    def test_transaction_measurement_samples(self):
-        durations = [100, 200, 300]
-        span_ids = [uuid4().hex[:16] for _ in durations]
-        good_span_id = span_ids[1]
-
-        for i, (span_id, duration) in enumerate(zip(span_ids, durations)):
-            ts = before_now(days=i, minutes=10).replace(microsecond=0)
-            start_ts = ts - timedelta(microseconds=duration * 1000)
-
-            # first write to the transactions dataset
-            data = load_data("transaction", start_timestamp=start_ts, timestamp=ts)
-            # good span ids will have the measurement
-            data["measurements"] = {"lcp": {"value": duration}}
-            data["contexts"]["trace"]["span_id"] = span_id
-            self.store_event(
-                data=data,
-                project_id=self.project.id,
-            )
-
-            # next write to the spans dataset
-            self.store_segment(
-                self.project.id,
-                uuid4().hex,
-                uuid4().hex,
-                duration=duration,
-                span_id=span_id,
-                timestamp=ts,
-            )
-
-        span_id = uuid4().hex[:16]
-        ts = before_now(days=10, minutes=10).replace(microsecond=0)
-
-        # first write to the transactions dataset
-        data = load_data("transaction", timestamp=ts)
-        # bad span ids will not have the measurement
-        data["measurements"] = {}
-        data["contexts"]["trace"]["span_id"] = span_id
-        self.store_event(
-            data=data,
-            project_id=self.project.id,
-        )
-
-        # next write to the spans dataset
-        self.store_segment(
-            self.project.id,
-            uuid4().hex,
-            uuid4().hex,
-            span_id=span_id,
-            timestamp=ts,
-        )
-
-        query = {
-            "mri": "d:transactions/measurements.lcp@millisecond",
-            "field": ["id"],
-            "project": [self.project.id],
-            "statsPeriod": "14d",
-            "min": 150.0,
-            "max": 250.0,
-        }
-        response = self.do_request(query)
-        assert response.status_code == 200, response.data
-        expected = {int(good_span_id, 16)}
-        actual = {int(row["id"], 16) for row in response.data["data"]}
-        assert actual == expected
-
-        for row in response.data["data"]:
-            assert row["summary"] == {
-                "min": 200.0,
-                "max": 200.0,
-                "sum": 200.0,
-                "count": 1,
-            }
-
-        query = {
-            "mri": "d:transactions/measurements.lcp@millisecond",
-            "field": ["id", "span.duration"],
-            "project": [self.project.id],
-            "statsPeriod": "14d",
-            "sort": "-summary",
-        }
-        response = self.do_request(query)
-        assert response.status_code == 200, response.data
-        expected = {int(span_id, 16) for span_id in span_ids}
-        actual = {int(row["id"], 16) for row in response.data["data"]}
-        assert actual == expected
-
-        for duration, row in zip(reversed(durations), response.data["data"]):
-            assert row["summary"] == {
-                "min": duration,
-                "max": duration,
-                "sum": duration,
-                "count": 1,
-            }
-
-    def test_custom_samples(self):
-        mri = "d:custom/value@millisecond"
-        values = [100, 200, 300]
-        span_ids = [uuid4().hex[:16] for _ in values]
-        good_span_id = span_ids[1]
-
-        # 10 is below the min
-        # 20 is within bounds
-        # 30 is above the max
-        for i, (span_id, val) in enumerate(zip(span_ids, values)):
-            ts = before_now(days=i, minutes=10).replace(microsecond=0)
-            self.store_indexed_span(
-                self.project.id,
-                uuid4().hex,
-                uuid4().hex,
-                span_id=span_id,
-                duration=val,
-                timestamp=ts,
-                store_metrics_summary={
-                    mri: [
-                        {
-                            "min": val - 1,
-                            "max": val + 1,
-                            "sum": val * (i + 1) * 2,
-                            "count": (i + 1) * 2,
-                            "tags": {},
-                        }
-                    ]
-                },
-            )
-
-        self.store_indexed_span(
-            self.project.id,
-            uuid4().hex,
-            uuid4().hex,
-            span_id=uuid4().hex[:16],
-            timestamp=before_now(days=10, minutes=10).replace(microsecond=0),
-            store_metrics_summary={
-                "d:custom/other@millisecond": [
-                    {
-                        "min": 210.0,
-                        "max": 210.0,
-                        "sum": 210.0,
-                        "count": 1,
-                        "tags": {},
-                    }
-                ]
-            },
-        )
-
-        for operation, min_bound, max_bound in [
-            ("avg", 150.0, 250.0),
-            ("min", 150.0, 250.0),
-            ("max", 150.0, 250.0),
-            ("count", 3, 5),
-        ]:
-            query = {
-                "mri": mri,
-                "field": ["id"],
-                "project": [self.project.id],
-                "statsPeriod": "14d",
-                "min": min_bound,
-                "max": max_bound,
-                "operation": operation,
-            }
-            response = self.do_request(query)
-            assert response.status_code == 200, (operation, response.data)
-            expected = {int(good_span_id, 16)}
-            actual = {int(row["id"], 16) for row in response.data["data"]}
-            assert actual == expected, operation
-
-            for row in response.data["data"]:
-                assert row["summary"] == {
-                    "min": 199.0,
-                    "max": 201.0,
-                    "sum": 800.0,
-                    "count": 4,
-                }, operation
-
-        for operation in ["avg", "min", "max", "count"]:
-            query = {
-                "mri": mri,
-                "field": ["id", "span.duration"],
-                "project": [self.project.id],
-                "statsPeriod": "14d",
-                "sort": "-summary",
-                "operation": operation,
-            }
-            response = self.do_request(query)
-            assert response.status_code == 200, response.data
-            expected = {int(span_id, 16) for span_id in span_ids}
-            actual = {int(row["id"], 16) for row in response.data["data"]}
-            assert actual == expected
-
-            for i, (val, row) in enumerate(zip(reversed(values), response.data["data"])):
-                assert row["summary"] == {
-                    "min": val - 1,
-                    "max": val + 1,
-                    "sum": val * (len(values) - i) * 2,
-                    "count": (len(values) - i) * 2,
-                }
-
-    def test_multiple_span_sample_per_time_bucket(self):
-        custom_mri = "d:custom/value@millisecond"
-        values = [100, 200, 300, 400, 500]
-        span_ids = [uuid4().hex[:16] for _ in values]
-        ts = before_now(days=0, minutes=10).replace(microsecond=0)
-
-        for span_id, value in zip(span_ids, values):
-            self.store_indexed_span(
-                self.project.id,
-                uuid4().hex,
-                uuid4().hex,
-                span_id=span_id,
-                duration=value,
-                exclusive_time=value,
-                timestamp=ts,
-                measurements={"score.total": value},
-                store_metrics_summary={
-                    custom_mri: [
-                        {
-                            "min": value - 1,
-                            "max": value + 1,
-                            "sum": value * 2,
-                            "count": 2,
-                            "tags": {},
-                        }
-                    ]
-                },
-            )
-
-        for mri in [
-            "d:spans/exclusive_time@millisecond",
-            "d:spans/webvital.score.total@ratio",
-            custom_mri,
-        ]:
-            query = {
-                "mri": mri,
-                "field": ["id"],
-                "project": [self.project.id],
-                "statsPeriod": "24h",
-            }
-            response = self.do_request(query)
-            assert response.status_code == 200, response.data
-            expected = {int(span_ids[i], 16) for i in [2, 3, 4]}
-            actual = {int(row["id"], 16) for row in response.data["data"]}
-            assert actual == expected
-
-    def test_multiple_transaction_sample_per_time_bucket(self):
-        values = [100, 200, 300, 400, 500]
-        span_ids = [uuid4().hex[:16] for _ in values]
-        ts = before_now(days=0, minutes=10).replace(microsecond=0)
-
-        for span_id, value in zip(span_ids, values):
-            start_ts = ts - timedelta(microseconds=value * 1000)
-
-            # first write to the transactions dataset
-            data = load_data("transaction", start_timestamp=start_ts, timestamp=ts)
-            # good span ids will have the measurement
-            data["measurements"] = {"lcp": {"value": value}}
-            data["contexts"]["trace"]["span_id"] = span_id
-            self.store_event(
-                data=data,
-                project_id=self.project.id,
-            )
-
-            # next write to the spans dataset
-            self.store_segment(
-                self.project.id,
-                uuid4().hex,
-                uuid4().hex,
-                duration=value,
-                span_id=span_id,
-                timestamp=ts,
-            )
-
-        for mri in [
-            "d:transactions/duration@millisecond",
-            "d:transactions/measurements.lcp@millisecond",
-        ]:
-            query = {
-                "mri": mri,
-                "field": ["id"],
-                "project": [self.project.id],
-                "statsPeriod": "24h",
-            }
-            response = self.do_request(query)
-            assert response.status_code == 200, response.data
-            expected = {int(span_ids[i], 16) for i in [2, 3, 4]}
-            actual = {int(row["id"], 16) for row in response.data["data"]}
-            assert actual == expected
-
-    def test_filtering_custom_metrics_by_project(self):
-        custom_mri = "d:custom/value@millisecond"
-        value = 100
-        span_id = uuid4().hex[:16]
-        first_project = self.create_project(name="My New Project")
-        ts = before_now(days=0, minutes=10).replace(microsecond=0)
-
-        self.store_indexed_span(
-            first_project.id,
-            uuid4().hex,
-            uuid4().hex,
-            span_id=span_id,
-            duration=value,
-            exclusive_time=value,
-            timestamp=ts,
-            measurements={"score.total": value},
-            store_metrics_summary={
-                custom_mri: [
-                    {
-                        "min": value - 1,
-                        "max": value + 2,
-                        "sum": value * 2,
-                        "count": 2,
-                        "tags": {},
-                    }
-                ]
-            },
-        )
-
-        responses = []
-        for query in (f"project:{first_project.slug}", f"project_id:{first_project.id}"):
-            request = {
-                "mri": custom_mri,
-                "field": ["id"],
-                "project": [first_project.id],
-                "query": query,
-                "statsPeriod": "24h",
-            }
-            response = self.do_request(request)
-            assert response.status_code == 200
-            assert response.data
-
-            expected = {int(span_id, 16)}
-            actual = {int(row["id"], 16) for row in response.data["data"]}
-            assert actual == expected, f"failed for query {query}"
-
-            responses.append(response)
-
-        assert len({str(r.data) for r in responses}) == 1
diff --git a/tests/sentry/api/endpoints/test_organization_profiling_profiles.py b/tests/sentry/api/endpoints/test_organization_profiling_profiles.py
index d5b6fda6133132..16a5863d91bcbe 100644
--- a/tests/sentry/api/endpoints/test_organization_profiling_profiles.py
+++ b/tests/sentry/api/endpoints/test_organization_profiling_profiles.py
@@ -16,111 +16,17 @@
 from sentry.utils.snuba import bulk_snuba_queries, raw_snql_query
 
 
-class OrganizationProfilingFlamegraphTestLegacy(APITestCase):
-    endpoint = "sentry-api-0-organization-profiling-flamegraph"
-    features = {"organizations:profiling": True}
-
-    def setUp(self):
-        self.login_as(user=self.user)
-        self.url = reverse(self.endpoint, args=(self.organization.slug,))
-
-    def do_request(self, query, features=None, compat=True, **kwargs):
-        if features is None:
-            features = self.features
-        with self.feature(features):
-            return self.client.get(
-                self.url,
-                query,
-                format="json",
-                **kwargs,
-            )
-
-    def test_more_than_one_project(self):
-        projects = [
-            self.create_project(),
-            self.create_project(),
-        ]
-        # Need this feature so we don't get the multiple project without global view error
-        with self.feature("organizations:global-views"):
-            response = self.do_request(
-                {
-                    "projects": [p.id for p in projects],
-                }
-            )
-        assert response.status_code == 400, response.data
-        assert response.data == {
-            "detail": ErrorDetail(
-                "You cannot get a flamegraph from multiple projects.",
-                code="parse_error",
-            ),
-        }
-
-    @patch("sentry.search.events.builder.base.raw_snql_query", wraps=raw_snql_query)
-    @patch("sentry.api.endpoints.organization_profiling_profiles.proxy_profiling_service")
-    def test_queries_functions(self, mock_proxy_profiling_service, mock_raw_snql_query):
-        mock_proxy_profiling_service.return_value = HttpResponse(status=200)
-
-        fingerprint = int(uuid4().hex[:8], 16)
-
-        response = self.do_request(
-            {
-                "project": [self.project.id],
-                "query": "transaction:foo",
-                "fingerprint": str(fingerprint),
-            },
-        )
-        assert response.status_code == 200, response.content
-
-        mock_raw_snql_query.assert_called_once()
-
-        call_args = mock_raw_snql_query.call_args.args
-        snql_request = call_args[0]
-
-        assert snql_request.dataset == Dataset.Functions.value
-        assert (
-            Condition(
-                Function("toUInt32", [Column("fingerprint")], "fingerprint"),
-                Op.EQ,
-                fingerprint,
-            )
-            in snql_request.query.where
-        )
-        assert Condition(Column("transaction_name"), Op.EQ, "foo") in snql_request.query.where
-
-    @patch("sentry.search.events.builder.base.raw_snql_query", wraps=raw_snql_query)
-    @patch("sentry.api.endpoints.organization_profiling_profiles.proxy_profiling_service")
-    def test_queries_transactions(self, mock_proxy_profiling_service, mock_raw_snql_query):
-        mock_proxy_profiling_service.return_value = HttpResponse(status=200)
-
-        response = self.do_request(
-            {
-                "project": [self.project.id],
-                "query": "transaction:foo",
-            },
-        )
-        assert response.status_code == 200, response.content
-
-        mock_raw_snql_query.assert_called_once()
-
-        call_args = mock_raw_snql_query.call_args.args
-        snql_request = call_args[0]
-
-        assert snql_request.dataset == Dataset.Discover.value
-        assert Condition(Column("profile_id"), Op.IS_NOT_NULL) in snql_request.query.where
-        assert Condition(Column("transaction"), Op.EQ, "foo") in snql_request.query.where
-
-
 class OrganizationProfilingFlamegraphTest(ProfilesSnubaTestCase):
     endpoint = "sentry-api-0-organization-profiling-flamegraph"
     features = {
         "organizations:profiling": True,
-        "organizations:continuous-profiling-compat": True,
     }
 
     def setUp(self):
         self.login_as(user=self.user)
         self.url = reverse(self.endpoint, args=(self.organization.slug,))
         self.ten_mins_ago = before_now(minutes=10)
+        self.hour_ago = before_now(hours=1).replace(minute=0, second=0, microsecond=0)
 
     def do_request(self, query, features=None, compat=True, **kwargs):
         if features is None:
@@ -404,22 +310,24 @@ def test_queries_profile_candidates_from_profiles(self):
 
             assert profiles_snql_request.dataset == Dataset.Profiles.value
 
+    @patch("sentry.profiles.flamegraph.bulk_snuba_queries", wraps=bulk_snuba_queries)
     @patch("sentry.search.events.builder.base.raw_snql_query", wraps=raw_snql_query)
     @patch("sentry.api.endpoints.organization_profiling_profiles.proxy_profiling_service")
     def test_queries_profile_candidates_from_functions_with_data(
         self,
         mock_proxy_profiling_service,
         mock_raw_snql_query,
+        mock_bulk_snuba_queries,
     ):
-        data = load_data("transaction", timestamp=self.ten_mins_ago)
+        data = load_data("transaction", timestamp=self.hour_ago)
         data["transaction"] = "foo"
         profile_id = uuid4().hex
         data.setdefault("contexts", {}).setdefault("profile", {})["profile_id"] = profile_id
 
-        stored = self.store_functions(
+        stored_1 = self.store_functions(
             [
                 {
-                    "self_times_ns": [100],
+                    "self_times_ns": [100_000_000],
                     "package": "foo",
                     "function": "bar",
                     "in_app": True,
@@ -427,17 +335,40 @@ def test_queries_profile_candidates_from_functions_with_data(
             ],
             project=self.project,
             transaction=data,
+            timestamp=self.hour_ago,
+        )
+        stored_2 = self.store_functions_chunk(
+            [
+                {
+                    "self_times_ns": [100_000_000],
+                    "package": "foo",
+                    "function": "bar",
+                    "thread_id": "1",
+                    "in_app": True,
+                },
+            ],
+            project=self.project,
+            timestamp=self.hour_ago,
         )
 
+        chunk = {
+            "project_id": self.project.id,
+            "profiler_id": stored_2["profiler_id"],
+            "chunk_id": stored_2["chunk_id"],
+            "start_timestamp": self.hour_ago.isoformat(),
+            "end_timestamp": (self.hour_ago + timedelta(microseconds=100_000)).isoformat(),
+        }
+
+        mock_bulk_snuba_queries.return_value = [{"data": [chunk]}]
+
         mock_proxy_profiling_service.return_value = HttpResponse(status=200)
 
-        fingerprint = stored["functions"][0]["fingerprint"]
+        fingerprint = stored_1["functions"][0]["fingerprint"]
 
         response = self.do_request(
             {
                 "project": [self.project.id],
                 "dataSource": "functions",
-                "query": "transaction:foo",
                 "fingerprint": str(fingerprint),
             },
         )
@@ -457,7 +388,6 @@ def test_queries_profile_candidates_from_functions_with_data(
             )
             in snql_request.query.where
         )
-        assert Condition(Column("transaction_name"), Op.EQ, "foo") in snql_request.query.where
 
         mock_proxy_profiling_service.assert_called_once_with(
             method="POST",
@@ -469,7 +399,18 @@ def test_queries_profile_candidates_from_functions_with_data(
                         "profile_id": profile_id,
                     },
                 ],
-                "continuous": [],
+                "continuous": [
+                    {
+                        "project_id": self.project.id,
+                        "profiler_id": stored_2["profiler_id"],
+                        "chunk_id": stored_2["chunk_id"],
+                        "thread_id": "1",
+                        "start": str(int(self.hour_ago.timestamp() * 1e9)),
+                        "end": str(
+                            int((self.hour_ago + timedelta(microseconds=100_000)).timestamp() * 1e9)
+                        ),
+                    },
+                ],
             },
         )
 
diff --git a/tests/sentry/api/endpoints/test_organization_projects.py b/tests/sentry/api/endpoints/test_organization_projects.py
index 7f4cd3bb5ded58..d268e6c6c437d3 100644
--- a/tests/sentry/api/endpoints/test_organization_projects.py
+++ b/tests/sentry/api/endpoints/test_organization_projects.py
@@ -1,3 +1,4 @@
+import pytest
 from django.urls import reverse
 
 from sentry.models.apikey import ApiKey
@@ -6,7 +7,7 @@
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.testutils.skips import requires_snuba
 
-pytestmark = [requires_snuba]
+pytestmark = [pytest.mark.sentry_metrics, requires_snuba]
 
 
 class OrganizationProjectsTestBase(APITestCase):
@@ -85,6 +86,70 @@ def test_with_stats(self):
             self.organization.slug, qs_params={"statsPeriod": "48h"}, status_code=400
         )
 
+    def test_staff_with_stats(self):
+        projects = [self.create_project(teams=[self.team])]
+
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        staff_user = self.create_user(is_staff=True)
+        self.login_as(user=staff_user, staff=True)
+
+        response = self.get_success_response(
+            self.organization.slug,
+            qs_params={"statsPeriod": "24h", "transactionStats": "1", "sessionStats": "1"},
+        )
+        self.check_valid_response(response, projects)
+
+        assert "stats" in response.data[0]
+        assert "transactionStats" in response.data[0]
+        assert "sessionStats" in response.data[0]
+
+    def test_superuser_with_stats(self):
+        projects = [self.create_project(teams=[self.team])]
+
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        superuser = self.create_user(is_superuser=True)
+        self.login_as(user=superuser, superuser=True)
+
+        response = self.get_success_response(
+            self.organization.slug,
+            qs_params={"statsPeriod": "24h", "transactionStats": "1", "sessionStats": "1"},
+        )
+        self.check_valid_response(response, projects)
+
+        assert "stats" in response.data[0]
+        assert "transactionStats" in response.data[0]
+        assert "sessionStats" in response.data[0]
+
+    def test_no_stats_if_no_project_access(self):
+        projects = [self.create_project(teams=[self.team])]
+
+        # disable Open Membership
+        self.organization.flags.allow_joinleave = False
+        self.organization.save()
+
+        # user has no access to the first project
+        user_no_team = self.create_user(is_superuser=False)
+        self.create_member(
+            user=user_no_team, organization=self.organization, role="member", teams=[]
+        )
+        self.login_as(user_no_team)
+
+        response = self.get_success_response(
+            self.organization.slug,
+            qs_params={"statsPeriod": "24h", "transactionStats": "1", "sessionStats": "1"},
+        )
+        self.check_valid_response(response, projects)
+
+        assert "stats" not in response.data[0]
+        assert "transactionStats" not in response.data[0]
+        assert "sessionStats" not in response.data[0]
+
     def test_search(self):
         project = self.create_project(teams=[self.team], name="bar", slug="bar")
 
diff --git a/tests/sentry/api/endpoints/test_organization_sampling_project_rates.py b/tests/sentry/api/endpoints/test_organization_sampling_project_rates.py
index 34baf490559fb4..9357f322b5ddf2 100644
--- a/tests/sentry/api/endpoints/test_organization_sampling_project_rates.py
+++ b/tests/sentry/api/endpoints/test_organization_sampling_project_rates.py
@@ -37,10 +37,13 @@ def test_put(self):
         project1.update_option("sentry:target_sample_rate", 0.2)
         project2 = self.create_project(teams=[self.team])
         project2.update_option("sentry:target_sample_rate", 0.2)
+        project3 = self.create_project(teams=[self.team])
+        project3.update_option("sentry:target_sample_rate", 0.2)
 
         data = [
             # we leave project 1 unchanged
             {"id": project2.id, "sampleRate": 0.5},
+            {"id": project3.id, "sampleRate": 0.123456789},
         ]
 
         with self.feature(self.features):
@@ -50,10 +53,12 @@ def test_put(self):
 
         assert response.data == [
             {"id": project2.id, "sampleRate": 0.5},
+            {"id": project3.id, "sampleRate": 0.1235},
         ]
 
         assert project1.get_option("sentry:target_sample_rate") == 0.2
         assert project2.get_option("sentry:target_sample_rate") == 0.5
+        assert project3.get_option("sentry:target_sample_rate") == 0.1235
 
     def test_put_automatic_mode(self):
         self.organization.update_option(
diff --git a/tests/sentry/api/endpoints/test_organization_sampling_project_span_counts.py b/tests/sentry/api/endpoints/test_organization_sampling_project_span_counts.py
index 03ce204470ea40..af7be212b59504 100644
--- a/tests/sentry/api/endpoints/test_organization_sampling_project_span_counts.py
+++ b/tests/sentry/api/endpoints/test_organization_sampling_project_span_counts.py
@@ -6,6 +6,7 @@
 from sentry.snuba.metrics import SpanMRI
 from sentry.testutils.cases import MetricsEnhancedPerformanceTestCase
 from sentry.testutils.helpers.datetime import freeze_time
+from sentry.testutils.pytest.fixtures import django_db_all
 from sentry.testutils.silo import region_silo_test
 
 pytestmark = [pytest.mark.sentry_metrics]
@@ -67,6 +68,7 @@ def test_feature_flag_required(self):
         response = self.client.get(self.url)
         assert response.status_code == 404
 
+    @django_db_all
     def test_get_span_counts_without_permission(self):
         user = self.create_user()
         self.login_as(user)
@@ -79,6 +81,7 @@ def test_get_span_counts_without_permission(self):
 
         assert response.status_code == 403
 
+    @django_db_all
     def test_get_span_counts_with_ingested_data_24h(self):
         """Test span counts endpoint with actual ingested metrics data"""
         with self.feature("organizations:dynamic-sampling-custom"):
@@ -106,6 +109,7 @@ def test_get_span_counts_with_ingested_data_24h(self):
         assert data["end"] == MetricsEnhancedPerformanceTestCase.MOCK_DATETIME
         assert (data["end"] - data["start"]) == timedelta(days=1)
 
+    @django_db_all
     def test_get_span_counts_with_ingested_data_30d(self):
         with self.feature("organizations:dynamic-sampling-custom"):
             response = self.client.get(
@@ -131,3 +135,34 @@ def test_get_span_counts_with_ingested_data_30d(self):
 
         assert data["end"] == MetricsEnhancedPerformanceTestCase.MOCK_DATETIME
         assert (data["end"] - data["start"]) == timedelta(days=30)
+
+    @django_db_all
+    def test_get_span_counts_with_many_projects(self):
+        # Create 200 projects with incrementing span counts
+        projects = []
+        days_ago = self.MOCK_DATETIME - timedelta(days=5)
+        for i in range(200):
+            project = self.create_project(organization=self.org, name=f"gen_project_{i}")
+            projects.append(project)
+
+            self.store_metric(
+                org_id=self.org.id,
+                value=i,
+                project_id=int(project.id),
+                mri=SpanMRI.COUNT_PER_ROOT_PROJECT.value,
+                tags={"target_project_id": str(self.project_1.id)},
+                timestamp=int(days_ago.timestamp()),
+            )
+
+        with self.feature("organizations:dynamic-sampling-custom"):
+            response = self.client.get(
+                self.url,
+                data={"statsPeriod": "30d"},
+            )
+
+        assert response.status_code == 200
+        data = response.data  # type: ignore[attr-defined]
+        span_counts = sorted(data["data"][0], key=lambda x: x["totals"], reverse=True)
+
+        # Verify we get all 200 projects back
+        assert len(span_counts) >= 200
diff --git a/tests/sentry/api/endpoints/test_organization_spans_fields.py b/tests/sentry/api/endpoints/test_organization_spans_fields.py
index c19c48b9b431f2..17fd278161ed22 100644
--- a/tests/sentry/api/endpoints/test_organization_spans_fields.py
+++ b/tests/sentry/api/endpoints/test_organization_spans_fields.py
@@ -35,13 +35,13 @@ def test_no_project(self):
         assert response.status_code == 200, response.data
         assert response.data == []
 
-    def test_tags_list(self):
+    def test_tags_list_str(self):
         for tag in ["foo", "bar", "baz"]:
             self.store_segment(
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=before_now(days=0, minutes=10).replace(microsecond=0),
@@ -72,8 +72,6 @@ def do_request(self, query=None, features=None, **kwargs):
         if features is None:
             features = ["organizations:performance-trace-explorer"]
 
-        features.append("organizations:visibility-explore-dataset")
-
         if query is None:
             query = {}
         query["dataset"] = "spans"
@@ -88,13 +86,13 @@ def do_request(self, query=None, features=None, **kwargs):
                 **kwargs,
             )
 
-    def test_tags_list(self):
+    def test_tags_list_str(self):
         for tag in ["foo", "bar", "baz"]:
             self.store_segment(
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=before_now(days=0, minutes=10).replace(microsecond=0),
@@ -114,14 +112,42 @@ def test_tags_list(self):
             )
             assert response.status_code == 200, response.data
             assert {"key": "bar", "name": "Bar"} in response.data
-            assert {"key": "foo", "name": "Foo"} in response.data
             assert {"key": "baz", "name": "Baz"} in response.data
-            # Skipping for now
-            # assert response.data == [
-            #     {"key": "span.description", "name": "Span.Description"},
-            #     {"key": "transaction", "name": "Transaction"},
-            #     {"key": "project", "name": "Project"},
-            # ]
+            assert {"key": "foo", "name": "Foo"} in response.data
+
+    def test_tags_list_str_processed(self):
+        for tag in ["foo", "bar", "baz"]:
+            self.store_segment(
+                self.project.id,
+                uuid4().hex,
+                uuid4().hex,
+                span_id=uuid4().hex[:16],
+                organization_id=self.organization.id,
+                parent_span_id=None,
+                timestamp=before_now(days=0, minutes=10).replace(microsecond=0),
+                transaction="foo",
+                duration=100,
+                exclusive_time=100,
+                tags={tag: tag},
+                is_eap=self.is_eap,
+            )
+
+        for features in [
+            None,  # use the default features
+            ["organizations:performance-trace-explorer"],
+        ]:
+            response = self.do_request(
+                features=features, query={"dataset": "spans", "type": "string", "process": 1}
+            )
+            assert response.status_code == 200, response.data
+            assert response.data == [
+                {"key": "bar", "name": "bar"},
+                {"key": "baz", "name": "baz"},
+                {"key": "foo", "name": "foo"},
+                {"key": "span.description", "name": "span.description"},
+                {"key": "transaction", "name": "transaction"},
+                {"key": "project", "name": "project"},
+            ]
 
     def test_tags_list_nums(self):
         for tag in ["foo", "bar", "baz"]:
@@ -129,7 +155,7 @@ def test_tags_list_nums(self):
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=before_now(days=0, minutes=10).replace(microsecond=0),
@@ -149,8 +175,63 @@ def test_tags_list_nums(self):
             )
             assert response.status_code == 200, response.data
             assert {"key": "bar", "name": "Bar"} in response.data
-            assert {"key": "foo", "name": "Foo"} in response.data
             assert {"key": "baz", "name": "Baz"} in response.data
+            assert {"key": "foo", "name": "Foo"} in response.data
+
+    def test_tags_list_nums_processed(self):
+        for tag in [
+            "foo",
+            "bar",
+            "baz",
+            "lcp",
+            "fcp",
+            "http.decoded_response_content_length",
+            "http.response_content_length",
+            "http.response_transfer_size",
+        ]:
+            self.store_segment(
+                self.project.id,
+                uuid4().hex,
+                uuid4().hex,
+                span_id=uuid4().hex[:16],
+                organization_id=self.organization.id,
+                parent_span_id=None,
+                timestamp=before_now(days=0, minutes=10).replace(microsecond=0),
+                transaction="foo",
+                duration=100,
+                exclusive_time=100,
+                measurements={tag: 0},
+                is_eap=self.is_eap,
+            )
+
+        for features in [
+            None,  # use the default features
+            ["organizations:performance-trace-explorer"],
+        ]:
+            response = self.do_request(
+                features=features, query={"dataset": "spans", "type": "number", "process": 1}
+            )
+            assert response.status_code == 200, response.data
+            assert response.data == [
+                {"key": "tags[bar,number]", "name": "bar"},
+                {"key": "tags[baz,number]", "name": "baz"},
+                {"key": "measurements.fcp", "name": "measurements.fcp"},
+                {"key": "tags[foo,number]", "name": "foo"},
+                {
+                    "key": "http.decoded_response_content_length",
+                    "name": "http.decoded_response_content_length",
+                },
+                {
+                    "key": "http.response_content_length",
+                    "name": "http.response_content_length",
+                },
+                {
+                    "key": "http.response_transfer_size",
+                    "name": "http.response_transfer_size",
+                },
+                {"key": "measurements.lcp", "name": "measurements.lcp"},
+                {"key": "span.duration", "name": "span.duration"},
+            ]
 
 
 class OrganizationSpansTagKeyValuesEndpointTest(BaseSpansTestCase, APITestCase):
@@ -191,7 +272,7 @@ def test_tags_keys(self):
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=timestamp,
@@ -238,7 +319,7 @@ def test_transaction_keys_autocomplete(self):
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=timestamp,
@@ -286,7 +367,7 @@ def test_transaction_keys_autocomplete_substring(self):
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=timestamp,
@@ -326,7 +407,7 @@ def test_transaction_keys_autocomplete_substring_with_asterisk(self):
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=timestamp,
@@ -366,7 +447,7 @@ def test_tags_keys_autocomplete(self):
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=timestamp,
@@ -415,7 +496,7 @@ def test_tags_keys_autocomplete_substring(self):
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=timestamp,
@@ -456,7 +537,7 @@ def test_tags_keys_autocomplete_substring_with_asterisks(self):
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=timestamp,
@@ -497,7 +578,7 @@ def test_tags_keys_autocomplete_noop(self):
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=timestamp,
@@ -652,7 +733,7 @@ def test_tags_keys_autocomplete_span_status(self):
                 self.project.id,
                 uuid4().hex,
                 uuid4().hex,
-                span_id=uuid4().hex[:15],
+                span_id=uuid4().hex[:16],
                 organization_id=self.organization.id,
                 parent_span_id=None,
                 timestamp=timestamp,
@@ -711,6 +792,54 @@ def test_tags_keys_autocomplete_span_status(self):
             },
         ]
 
+    def test_measurements_autocomplete(self):
+        keys = [
+            "measurements.app_start_cold",
+            "measurements.app_start_warm",
+            "measurements.frames_frozen",
+            "measurements.frames_frozen_rate",
+            "measurements.frames_slow",
+            "measurements.frames_slow_rate",
+            "measurements.frames_total",
+            "measurements.time_to_initial_display",
+            "measurements.time_to_full_display",
+            "measurements.stall_count",
+            "measurements.stall_percentage",
+            "measurements.stall_stall_longest_time",
+            "measurements.stall_stall_total_time",
+            "measurements.cls",
+            "measurements.fcp",
+            "measurements.fid",
+            "measurements.fp",
+            "measurements.inp",
+            "measurements.lcp",
+            "measurements.ttfb",
+            "measurements.ttfb.requesttime",
+            "measurements.score.cls",
+            "measurements.score.fcp",
+            "measurements.score.fid",
+            "measurements.score.inp",
+            "measurements.score.lcp",
+            "measurements.score.ttfb",
+            "measurements.score.total",
+            "measurements.score.weight.cls",
+            "measurements.score.weight.fcp",
+            "measurements.score.weight.fid",
+            "measurements.score.weight.inp",
+            "measurements.score.weight.lcp",
+            "measurements.score.weight.ttfb",
+            "measurements.cache.item_size",
+            "measurements.messaging.message.body.size",
+            "measurements.messaging.message.receive.latency",
+            "measurements.messaging.message.retry.count",
+            "measurements.http.response_content_length",
+        ]
+        self.project
+        for key in keys:
+            response = self.do_request(key)
+            assert response.status_code == 200, response.data
+            assert response.data == []
+
 
 class OrganizationEAPSpansTagKeyValuesEndpointTest(OrganizationSpansTagKeyValuesEndpointTest):
     is_eap = True
@@ -719,8 +848,6 @@ def do_request(self, key: str, query=None, features=None, **kwargs):
         if features is None:
             features = ["organizations:performance-trace-explorer"]
 
-        features.append("organizations:visibility-explore-dataset")
-
         if query is None:
             query = {}
         query["dataset"] = "spans"
diff --git a/tests/sentry/api/endpoints/test_organization_traces.py b/tests/sentry/api/endpoints/test_organization_traces.py
index 84c1522ba5b559..1dbb69c357bef0 100644
--- a/tests/sentry/api/endpoints/test_organization_traces.py
+++ b/tests/sentry/api/endpoints/test_organization_traces.py
@@ -7,7 +7,6 @@
 from rest_framework.exceptions import ErrorDetail
 
 from sentry.api.endpoints.organization_traces import process_breakdowns
-from sentry.snuba.metrics.naming_layer.mri import SpanMRI, TransactionMRI
 from sentry.testutils.cases import APITestCase, BaseSpansTestCase
 from sentry.testutils.helpers import parse_link_header
 from sentry.testutils.helpers.datetime import before_now
@@ -33,6 +32,12 @@ def double_write_segment(
         duration,
         **kwargs,
     ):
+        kwargs.setdefault("measurements", {})
+        if "lcp" not in kwargs["measurements"]:
+            kwargs["measurements"]["lcp"] = duration
+        if "client_sample_rate" not in kwargs["measurements"]:
+            kwargs["measurements"]["client_sample_rate"] = 0.1
+
         # first write to the transactions dataset
         end_timestamp = timestamp + timedelta(microseconds=duration * 1000)
         data = load_data(
@@ -44,7 +49,10 @@ def double_write_segment(
             spans=[],
             event_id=transaction_id,
         )
-        data["measurements"] = {"lcp": {"value": duration}}
+
+        for measurement, value in kwargs.get("measurements", {}).items():
+            data["measurements"][measurement] = {"value": value}
+
         if tags := kwargs.get("tags", {}):
             data["tags"] = [[key, val] for key, val in tags.items()]
 
@@ -209,17 +217,6 @@ def create_mock_traces(self):
                     ]
                 )
             },
-            store_metrics_summary={
-                "d:custom/value@millisecond": [
-                    {
-                        "min": 40_000,
-                        "max": 40_000,
-                        "sum": 40_000,
-                        "count": 1,
-                        "tags": {"foo": "qux"},
-                    }
-                ]
-            },
             sdk_name="sentry.javascript.remix",
         )
 
@@ -278,7 +275,10 @@ class OrganizationTracesEndpointTest(OrganizationTracesEndpointTestBase):
 
     def do_request(self, query, features=None, **kwargs):
         if features is None:
-            features = ["organizations:performance-trace-explorer", "organizations:global-views"]
+            features = [
+                "organizations:performance-trace-explorer",
+                "organizations:global-views",
+            ]
 
         if self.is_eap:
             if query is None:
@@ -287,7 +287,10 @@ def do_request(self, query, features=None, **kwargs):
 
         with self.feature(features):
             return self.client.get(
-                reverse(self.view, kwargs={"organization_id_or_slug": self.organization.slug}),
+                reverse(
+                    self.view,
+                    kwargs={"organization_id_or_slug": self.organization.slug},
+                ),
                 query,
                 format="json",
                 **kwargs,
@@ -316,22 +319,6 @@ def test_bad_params_too_many_per_page(self):
             ),
         }
 
-    def test_unsupported_mri(self):
-        query = {
-            "project": [self.project.id],
-            "field": ["id"],
-            "maxSpansPerTrace": 1,
-            "mri": "d:spans/made_up@none",
-        }
-
-        response = self.do_request(query)
-        assert response.status_code == 400, response.data
-        assert response.data == {
-            "detail": ErrorDetail(
-                string="Unsupported MRI: d:spans/made_up@none", code="parse_error"
-            ),
-        }
-
     def test_no_traces(self):
         query = {
             "project": [self.project.id],
@@ -436,7 +423,8 @@ def test_process_breakdown_error(self, mock_process_breakdowns, mock_capture_exc
         ]
 
         mock_capture_exception.assert_called_with(
-            exception, contexts={"bad_traces": {"traces": list(sorted([trace_id_1, trace_id_2]))}}
+            exception,
+            contexts={"bad_traces": {"traces": list(sorted([trace_id_1, trace_id_2]))}},
         )
 
     def test_use_first_span_for_name(self):
@@ -816,138 +804,16 @@ def test_matching_tag(self):
                     },
                 ]
 
-    def test_matching_tag_metrics(self):
-        (
-            project_1,
-            _,
-            _,
-            _,
-            trace_id_3,
-            timestamps,
-            span_ids,
-        ) = self.create_mock_traces()
-
-        for mri, op in [
-            (TransactionMRI.DURATION.value, "count"),
-            ("d:transactions/measurements.lcp@millisecond", "max"),
-            (SpanMRI.DURATION.value, "min"),
-            (SpanMRI.SELF_TIME.value, "avg"),
-            ("d:spans/webvital.score.total@ratio", "count"),
-            ("d:spans/webvital.score.inp@ratio", "max"),
-            ("d:spans/webvital.score.weight.inp@ratio", "min"),
-            ("d:spans/http.response_content_length@byte", "avg"),
-            ("d:spans/http.decoded_response_content_length@byte", "count"),
-            ("d:spans/http.response_transfer_size@byte", "max"),
-            ("d:custom/value@millisecond", "min"),
-        ]:
-            for user_query in ["foo:qux", None]:
-                query = {
-                    "mri": mri,
-                    "metricsMin": 30_000,
-                    "metricsMax": 50_000,
-                    "metricsOp": op,
-                    "metricsQuery": ["foo:qux"],
-                    "project": [],
-                    "field": ["id", "parent_span", "span.duration"],
-                    "maxSpansPerTrace": 3,
-                    "per_page": 1,
-                }
-                if user_query:
-                    query["query"] = user_query
-
-                response = self.do_request(query)
-                assert response.status_code == 200, (mri, response.data)
-
-                result_data = sorted(response.data["data"], key=lambda trace: trace["trace"])
-
-                assert result_data == [
-                    {
-                        "trace": trace_id_3,
-                        "numErrors": 0,
-                        "numOccurrences": 0,
-                        "numSpans": 2,
-                        "matchingSpans": 1 if user_query else 2,
-                        "project": project_1.slug,
-                        "name": "qux",
-                        "duration": 40_000,
-                        "start": timestamps[10],
-                        "end": timestamps[10] + 40_000,
-                        "rootDuration": 40_000,
-                        "breakdowns": [
-                            {
-                                "project": project_1.slug,
-                                "sdkName": "sentry.javascript.remix",
-                                "isRoot": False,
-                                "start": timestamps[10],
-                                "end": timestamps[10] + 40_000,
-                                "sliceStart": 0,
-                                "sliceEnd": 40,
-                                "sliceWidth": 40,
-                                "kind": "project",
-                                "duration": 40_000,
-                            },
-                            {
-                                "project": project_1.slug,
-                                "sdkName": "sentry.javascript.node",
-                                "isRoot": False,
-                                "start": timestamps[11],
-                                "end": timestamps[11] + 10_000,
-                                "sliceStart": 10,
-                                "sliceEnd": 20,
-                                "sliceWidth": 10,
-                                "kind": "project",
-                                "duration": 10_000,
-                            },
-                        ],
-                    },
-                ], (mri, user_query)
-
-    def test_matching_tag_metrics_but_no_matching_spans(self):
-        for mri in [
-            TransactionMRI.DURATION.value,
-            "d:transactions/measurements.lcp@millisecond",
-            SpanMRI.DURATION.value,
-            SpanMRI.SELF_TIME.value,
-            "d:spans/webvital.score.total@ratio",
-            "d:spans/webvital.score.inp@ratio",
-            "d:spans/webvital.score.weight.inp@ratio",
-            "d:spans/http.response_content_length@byte",
-            "d:spans/http.decoded_response_content_length@byte",
-            "d:spans/http.response_transfer_size@byte",
-            "d:custom/value@millisecond",
-        ]:
-            for user_query in ["foo:qux", None]:
-                query = {
-                    "mri": mri,
-                    "metricsQuery": ["foo:qux"],
-                    "project": [self.project.id],
-                    "field": ["id", "parent_span", "span.duration"],
-                    "query": "foo:foobar",
-                    "maxSpansPerTrace": 3,
-                }
-
-                response = self.do_request(query)
-                assert response.status_code == 200, (mri, response.data)
-                assert response.data == {
-                    "data": [],
-                    "meta": {
-                        "dataset": "unknown",
-                        "datasetReason": "unchanged",
-                        "fields": {},
-                        "isMetricsData": False,
-                        "isMetricsExtractedData": False,
-                        "tips": {},
-                        "units": {},
-                    },
-                }
-
 
 class OrganizationTraceSpansEndpointTest(OrganizationTracesEndpointTestBase):
     view = "sentry-api-0-organization-trace-spans"
 
     def do_request(self, trace_id, query, features=None, **kwargs):
         if features is None:
-            features = ["organizations:performance-trace-explorer", "organizations:global-views"]
+            features = [
+                "organizations:performance-trace-explorer",
+                "organizations:global-views",
+            ]
 
         if self.is_eap:
             if query is None:
@@ -1064,68 +930,16 @@ def test_get_spans_for_trace_matching_tags(self):
             }
             assert response.data["data"] == [{"id": span_id} for span_id in sorted(span_ids[1:4])]
 
-    def test_get_spans_for_trace_matching_tags_metrics(self):
-        (
-            project_1,
-            project_2,
-            _,
-            _,
-            trace_id,
-            timestamps,
-            span_ids,
-        ) = self.create_mock_traces()
-
-        for mri, op in [
-            (TransactionMRI.DURATION.value, "count"),
-            ("d:transactions/measurements.lcp@millisecond", "max"),
-            (SpanMRI.DURATION.value, "min"),
-            (SpanMRI.SELF_TIME.value, "avg"),
-            ("d:spans/webvital.score.total@ratio", "count"),
-            ("d:spans/webvital.score.inp@ratio", "max"),
-            ("d:spans/webvital.score.weight.inp@ratio", "min"),
-            ("d:spans/http.response_content_length@byte", "avg"),
-            ("d:spans/http.decoded_response_content_length@byte", "count"),
-            ("d:spans/http.response_transfer_size@byte", "max"),
-            ("d:custom/value@millisecond", "min"),
-        ]:
-            for user_query in ["foo:qux", None]:
-                query = {
-                    "mri": mri,
-                    "metricsMin": 30_000,
-                    "metricsMax": 50_000,
-                    "metricsOp": op,
-                    "metricsQuery": ["foo:qux"],
-                    "project": [],
-                    "field": ["id"],
-                    "sort": "id",
-                }
-                if user_query:
-                    query["query"] = user_query
-
-                response = self.do_request(trace_id, query)
-                assert response.status_code == 200, response.data
-                assert response.data["meta"] == {
-                    "dataset": "unknown",
-                    "datasetReason": "unchanged",
-                    "fields": {
-                        "id": "string",
-                    },
-                    "isMetricsData": False,
-                    "isMetricsExtractedData": False,
-                    "tips": {},
-                    "units": {
-                        "id": None,
-                    },
-                }
-                assert response.data["data"] == [{"id": span_ids[10]}]
-
 
 class OrganizationTracesStatsEndpointTest(OrganizationTracesEndpointTestBase):
     view = "sentry-api-0-organization-traces-stats"
 
     def do_request(self, query, features=None, **kwargs):
         if features is None:
-            features = ["organizations:performance-trace-explorer", "organizations:global-views"]
+            features = [
+                "organizations:performance-trace-explorer",
+                "organizations:global-views",
+            ]
 
         if self.is_eap:
             if query is None:
@@ -1134,7 +948,10 @@ def do_request(self, query, features=None, **kwargs):
 
         with self.feature(features):
             return self.client.get(
-                reverse(self.view, kwargs={"organization_id_or_slug": self.organization.slug}),
+                reverse(
+                    self.view,
+                    kwargs={"organization_id_or_slug": self.organization.slug},
+                ),
                 query,
                 format="json",
                 **kwargs,
@@ -1231,7 +1048,11 @@ def test_stats(self):
             response = self.do_request(query)
             assert response.status_code == 200, response.data
 
-        assert sum(bucket[0]["count"] for _, bucket in response.data["data"]) == 2
+        if self.is_eap:
+            # When using EAP, this is extrapolated
+            assert sum(bucket[0]["count"] for _, bucket in response.data["data"]) == 20
+        else:
+            assert sum(bucket[0]["count"] for _, bucket in response.data["data"]) == 2
 
 
 @pytest.mark.parametrize(
@@ -2569,10 +2390,6 @@ def test_build_breakdown_error(mock_new_trace_interval, mock_capture_exception):
 class OrganizationTracesEAPEndpointTest(OrganizationTracesEndpointTest):
     is_eap: bool = True
 
-    @pytest.mark.skip(reason="no support for metrics so not back porting this feature")
-    def test_matching_tag_metrics(self):
-        pass
-
     def test_invalid_sort(self):
         for sort in ["foo", "-foo"]:
             query = {
diff --git a/tests/sentry/api/endpoints/test_organization_transaction_anomaly_detection.py b/tests/sentry/api/endpoints/test_organization_transaction_anomaly_detection.py
deleted file mode 100644
index 7785c3e139be6c..00000000000000
--- a/tests/sentry/api/endpoints/test_organization_transaction_anomaly_detection.py
+++ /dev/null
@@ -1,163 +0,0 @@
-from collections import namedtuple
-from datetime import datetime, timezone
-from unittest import mock
-
-from django.http import HttpResponse
-from django.urls import reverse
-
-from sentry.api.endpoints.organization_transaction_anomaly_detection import get_time_params
-from sentry.testutils.cases import APITestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import freeze_time
-
-
-@freeze_time("2022-02-21")
-class OrganizationTransactionAnomalyDetectionEndpointTest(APITestCase, SnubaTestCase):
-    endpoint = "sentry-api-0-organization-transaction-anomaly-detection"
-
-    def setUp(self):
-        super().setUp()
-        self.project = self.create_project(organization=self.organization)
-        self.login_as(user=self.user)
-        self.features = {}
-        self.snuba_raw_data = [(0, 0), (3, 0), (0, 0)]
-
-    def do_request(self, data, url=None, features=None):
-        self.url = reverse(
-            "sentry-api-0-organization-transaction-anomaly-detection",
-            kwargs={"organization_id_or_slug": self.project.organization.slug},
-        )
-
-        if features is None:
-            features = {
-                "organizations:discover-basic": True,
-                "organizations:performance-anomaly-detection-ui": True,
-            }
-        features.update(self.features)
-        with self.feature(features):
-            return self.client.get(self.url if url is None else url, data=data, format="json")
-
-    def test_without_feature(self):
-        self.url = reverse(
-            "sentry-api-0-organization-transaction-anomaly-detection",
-            kwargs={"organization_id_or_slug": self.project.organization.slug},
-        )
-
-        response = self.client.get(self.url, data={}, format="json")
-        self.assertEqual(response.status_code, 404)
-
-    @mock.patch("sentry.api.endpoints.organization_transaction_anomaly_detection.timeseries_query")
-    @mock.patch("sentry.api.endpoints.organization_transaction_anomaly_detection.get_anomalies")
-    def test_get_start_end(self, mock_get_anomalies, mock_timeseries_query):
-        SnubaTSResult = namedtuple("SnubaTSResult", "data")
-        mock_timeseries_query.return_value = SnubaTSResult(
-            data={"data": self.snuba_raw_data},
-        )
-        mock_get_anomalies.return_value = HttpResponse({"key": "value"})
-        request = {
-            "project": self.project.id,
-            "query": "transaction.duration:>5s",
-            "start": "2022-02-01",
-            "end": "2022-02-02",
-        }
-
-        expected_snuba_io = {
-            "query": "transaction.duration:>5s event.type:transaction",
-            "data": self.snuba_raw_data,
-            "granularity": 600,
-            "start": "2022-02-01 00:00:00",
-            "end": "2022-02-02 00:00:00",
-        }
-        self.do_request(data=request)
-
-        mock_get_anomalies.assert_called_once_with(expected_snuba_io)
-
-    @freeze_time("2022-02-11 03:21:34")
-    @mock.patch("sentry.api.endpoints.organization_transaction_anomaly_detection.timeseries_query")
-    @mock.patch("sentry.api.endpoints.organization_transaction_anomaly_detection.get_anomalies")
-    def test_get_stats_period(self, mock_get_anomalies, mock_timeseries_query):
-        SnubaTSResult = namedtuple("SnubaTSResult", "data")
-        mock_timeseries_query.return_value = SnubaTSResult(
-            data={"data": self.snuba_raw_data},
-        )
-        mock_get_anomalies.return_value = HttpResponse({"key": "value"})
-        request = {
-            "project": self.project.id,
-            "query": "transaction.duration:>5s",
-            "statsPeriod": "13h",
-        }
-
-        expected_snuba_io = {
-            "query": "transaction.duration:>5s event.type:transaction",
-            "data": self.snuba_raw_data,
-            "granularity": 600,
-            "start": "2022-02-10 14:21:34",
-            "end": "2022-02-11 03:21:34",
-        }
-        self.do_request(data=request)
-
-        mock_get_anomalies.assert_called_once_with(expected_snuba_io)
-
-    @mock.patch("sentry.api.endpoints.organization_transaction_anomaly_detection.timeseries_query")
-    @mock.patch("sentry.api.endpoints.organization_transaction_anomaly_detection.get_anomalies")
-    def test_get_no_query(self, mock_get_anomalies, mock_timeseries_query):
-        SnubaTSResult = namedtuple("SnubaTSResult", "data")
-        mock_timeseries_query.return_value = SnubaTSResult(
-            data={"data": self.snuba_raw_data},
-        )
-        mock_get_anomalies.return_value = HttpResponse({"key": "value"})
-        request = {
-            "project": self.project.id,
-            "start": "2022-01-01",
-            "end": "2022-01-05",
-        }
-
-        expected_snuba_io = {
-            "query": "event.type:transaction",
-            "data": self.snuba_raw_data,
-            "granularity": 1200,
-            "start": "2022-01-01 00:00:00",
-            "end": "2022-01-05 00:00:00",
-        }
-        self.do_request(data=request)
-
-        mock_get_anomalies.assert_called_once_with(expected_snuba_io)
-
-    @staticmethod
-    def test_get_time_params_600_granularity():
-        expected_tuple = (
-            datetime(2021, 12, 25, 12, 0, tzinfo=timezone.utc),
-            datetime(2022, 1, 8, 12, 0, tzinfo=timezone.utc),
-            600,
-        )
-        returned_tuple = get_time_params(
-            datetime(2022, 1, 1, 0, 0, tzinfo=timezone.utc),
-            datetime(2022, 1, 2, 0, 0, tzinfo=timezone.utc),
-        )
-        assert returned_tuple == expected_tuple
-
-    @staticmethod
-    def test_get_time_params_1200_granularity():
-        expected_tuple = (
-            datetime(2021, 12, 20, 0, 0, tzinfo=timezone.utc),
-            datetime(2022, 1, 17, 0, 0, tzinfo=timezone.utc),
-            1200,
-        )
-        returned_tuple = get_time_params(
-            datetime(2022, 1, 1, 0, 0, tzinfo=timezone.utc),
-            datetime(2022, 1, 5, 0, 0, tzinfo=timezone.utc),
-        )
-        assert returned_tuple == expected_tuple
-
-    @staticmethod
-    @freeze_time("2022-02-11 00:00:00")
-    def test_get_time_params_3600_granularity():
-        expected_tuple = (
-            datetime(2021, 11, 13, 0, 0, tzinfo=timezone.utc),
-            datetime(2022, 2, 11, 0, 0, tzinfo=timezone.utc),
-            3600,
-        )
-        returned_tuple = get_time_params(
-            datetime(2022, 1, 1, 0, 0, tzinfo=timezone.utc),
-            datetime(2022, 2, 5, 0, 0, tzinfo=timezone.utc),
-        )
-        assert returned_tuple == expected_tuple
diff --git a/tests/sentry/api/endpoints/test_organization_unsubscribe.py b/tests/sentry/api/endpoints/test_organization_unsubscribe.py
index ff17b8414e7e4f..3714487a7cf223 100644
--- a/tests/sentry/api/endpoints/test_organization_unsubscribe.py
+++ b/tests/sentry/api/endpoints/test_organization_unsubscribe.py
@@ -1,7 +1,7 @@
 from django.urls import reverse
 
 from sentry.models.groupsubscription import GroupSubscription
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import assume_test_silo_mode
diff --git a/tests/sentry/api/endpoints/test_project_autofix_codebase_index_status.py b/tests/sentry/api/endpoints/test_project_autofix_codebase_index_status.py
deleted file mode 100644
index 44991e8209de8c..00000000000000
--- a/tests/sentry/api/endpoints/test_project_autofix_codebase_index_status.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from unittest.mock import patch
-
-from django.urls import reverse
-from rest_framework import status
-
-from sentry.testutils.cases import APITestCase
-
-
-class TestProjectAutofixCodebaseIndexStatus(APITestCase):
-    endpoint = "sentry-api-0-project-autofix-codebase-index-status"
-
-    def setUp(self):
-        super().setUp()
-        self.login_as(user=self.user)
-        self.url = reverse(
-            self.endpoint,
-            kwargs={
-                "organization_id_or_slug": self.project.organization.slug,
-                "project_id_or_slug": self.project.slug,
-            },
-        )
-
-    @patch(
-        "sentry.api.endpoints.project_autofix_codebase_index_status.get_project_codebase_indexing_status",
-        return_value="up_to_date",
-    )
-    def test_autofix_codebase_status_up_to_date(self, mock_get_project_codebase_indexing_status):
-        response = self.client.get(
-            self.url,
-            format="json",
-        )
-
-        assert response.status_code == status.HTTP_200_OK
-        assert response.data == {"status": "up_to_date"}
-
-    @patch(
-        "sentry.api.endpoints.project_autofix_codebase_index_status.get_project_codebase_indexing_status",
-        return_value="indexing",
-    )
-    def test_autofix_codebase_status_indexing(self, mock_get_project_codebase_indexing_status):
-        response = self.client.get(
-            self.url,
-            format="json",
-        )
-
-        assert response.status_code == status.HTTP_200_OK
-        assert response.data == {"status": "indexing"}
diff --git a/tests/sentry/api/endpoints/test_project_autofix_create_codebase_index.py b/tests/sentry/api/endpoints/test_project_autofix_create_codebase_index.py
deleted file mode 100644
index 38d02c1774571a..00000000000000
--- a/tests/sentry/api/endpoints/test_project_autofix_create_codebase_index.py
+++ /dev/null
@@ -1,120 +0,0 @@
-from unittest.mock import call, patch
-
-import orjson
-from django.conf import settings
-from django.urls import reverse
-from rest_framework import status
-
-from sentry.testutils.cases import APITestCase
-
-
-class TestProjectAutofixCodebaseIndexCreate(APITestCase):
-    endpoint = "sentry-api-0-project-autofix-codebase-index-create"
-
-    def setUp(self):
-        super().setUp()
-        self.login_as(user=self.user)
-        self.project = self.create_project()
-        self.url = reverse(
-            self.endpoint,
-            kwargs={
-                "organization_id_or_slug": self.project.organization.slug,
-                "project_id_or_slug": self.project.slug,
-            },
-        )
-
-    @patch("sentry.api.endpoints.project_autofix_create_codebase_index.requests.post")
-    def test_autofix_create_successful(self, mock_post):
-        mock_post.return_value.status_code = 200
-        mock_post.return_value.json.return_value = {}
-
-        repo = self.create_repo(
-            name="getsentry/sentry", provider="integrations:github", external_id="123"
-        )
-        self.create_code_mapping(project=self.project, repo=repo)
-
-        response = self.client.post(
-            self.url,
-            format="json",
-        )
-
-        assert response.status_code == status.HTTP_202_ACCEPTED
-        mock_post.assert_called_once_with(
-            f"{settings.SEER_AUTOFIX_URL}/v1/automation/codebase/index/create",
-            data=orjson.dumps(
-                {
-                    "organization_id": self.project.organization.id,
-                    "project_id": self.project.id,
-                    "repo": {
-                        "provider": "integrations:github",
-                        "owner": "getsentry",
-                        "name": "sentry",
-                        "external_id": "123",
-                    },
-                }
-            ),
-            headers={"content-type": "application/json;charset=utf-8"},
-        )
-
-    @patch("sentry.api.endpoints.project_autofix_create_codebase_index.requests.post")
-    def test_autofix_create_multiple_repos_successful(self, mock_post):
-        # Setup multiple repositories
-        repo1 = self.create_repo(
-            name="getsentry/sentry", provider="integrations:github", external_id="123"
-        )
-        repo2 = self.create_repo(
-            name="getsentry/relay", provider="integrations:github", external_id="234"
-        )
-        self.create_code_mapping(project=self.project, repo=repo1, stack_root="/path1")
-        self.create_code_mapping(project=self.project, repo=repo2, stack_root="/path2")
-
-        # Mock the POST request to return successful status
-        mock_post.return_value.status_code = 200
-        mock_post.return_value.json.return_value = {}
-
-        # Perform the POST request
-        response = self.client.post(
-            self.url,
-            format="json",
-        )
-
-        # Assertions
-        assert response.status_code == status.HTTP_202_ACCEPTED
-        assert (
-            mock_post.call_count == 2
-        )  # Ensure that the endpoint was called twice, once for each repo
-        calls = [
-            call(
-                f"{settings.SEER_AUTOFIX_URL}/v1/automation/codebase/index/create",
-                data=orjson.dumps(
-                    {
-                        "organization_id": self.project.organization.id,
-                        "project_id": self.project.id,
-                        "repo": {
-                            "provider": "integrations:github",
-                            "owner": "getsentry",
-                            "name": "sentry",
-                            "external_id": "123",
-                        },
-                    }
-                ),
-                headers={"content-type": "application/json;charset=utf-8"},
-            ),
-            call(
-                f"{settings.SEER_AUTOFIX_URL}/v1/automation/codebase/index/create",
-                data=orjson.dumps(
-                    {
-                        "organization_id": self.project.organization.id,
-                        "project_id": self.project.id,
-                        "repo": {
-                            "provider": "integrations:github",
-                            "owner": "getsentry",
-                            "name": "relay",
-                            "external_id": "234",
-                        },
-                    }
-                ),
-                headers={"content-type": "application/json;charset=utf-8"},
-            ),
-        ]
-        mock_post.assert_has_calls(calls, any_order=True)
diff --git a/tests/sentry/api/endpoints/test_project_rule_actions.py b/tests/sentry/api/endpoints/test_project_rule_actions.py
index 5b02685bfacd14..db155a78d9029a 100644
--- a/tests/sentry/api/endpoints/test_project_rule_actions.py
+++ b/tests/sentry/api/endpoints/test_project_rule_actions.py
@@ -7,7 +7,6 @@
 from sentry.shared_integrations.exceptions import IntegrationFormError
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase
-from sentry.testutils.helpers import with_feature
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.testutils.skips import requires_snuba
 
@@ -35,11 +34,6 @@ def test_actions(self, action):
 
     @mock.patch.object(JiraIntegration, "create_issue")
     @mock.patch.object(sentry_sdk, "capture_exception")
-    @with_feature(
-        {
-            "projects:verbose-test-alert-reporting": True,
-        }
-    )
     def test_sample_event_raises_exceptions(self, mock_sdk_capture, mock_create_issue):
         with assume_test_silo_mode(SiloMode.CONTROL):
             self.jira_integration = self.create_provider_integration(
@@ -74,38 +68,6 @@ def test_sample_event_raises_exceptions(self, mock_sdk_capture, mock_create_issu
         assert actions is not None
         assert actions == ["An unexpected error occurred. Error ID: 'abc-1234'"]
 
-    @mock.patch.object(JiraIntegration, "create_issue")
-    def test_success_response_when_client_raises(self, mock_create_issue):
-        with assume_test_silo_mode(SiloMode.CONTROL):
-            self.jira_integration = self.create_provider_integration(
-                provider="jira", name="Jira", external_id="jira:1"
-            )
-            self.jira_integration.add_organization(self.organization, self.user)
-
-        mock_create_issue.side_effect = IntegrationFormError({"broken": "something went wrong"})
-        action_data = [
-            {
-                "id": "sentry.integrations.jira.notify_action.JiraCreateTicketAction",
-                "dynamic_form_fields": {
-                    "fake_field": "fake_value",
-                },
-            }
-        ]
-
-        response = self.get_success_response(
-            self.organization.slug, self.project.slug, actions=action_data
-        )
-        assert mock_create_issue.call_count == 1
-        assert response.data is None
-
-        # With error propagation option enabled
-        with self.options({"ecosystem:enable_integration_form_error_raise": True}):
-            response = self.get_success_response(
-                self.organization.slug, self.project.slug, actions=action_data
-            )
-            assert mock_create_issue.call_count == 2
-            assert response.data is None
-
     def test_no_events(self):
         response = self.get_response(self.organization.slug, self.project.slug)
         assert response.status_code == 400
diff --git a/tests/sentry/api/endpoints/test_project_rule_details.py b/tests/sentry/api/endpoints/test_project_rule_details.py
index febb6e9ca7cfbc..62ff26ac8acd89 100644
--- a/tests/sentry/api/endpoints/test_project_rule_details.py
+++ b/tests/sentry/api/endpoints/test_project_rule_details.py
@@ -700,8 +700,8 @@ def test_remove_conditions(self):
         """Test that you can edit an alert rule to have no conditions (aka fire on every event)"""
         rule = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=self.first_seen_condition,
+            action_data=self.notify_issue_owners_action,
+            condition_data=self.first_seen_condition,
             name="no conditions",
         )
         payload = {
@@ -729,8 +729,8 @@ def test_update_duplicate_rule(self):
         ]
         rule = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=conditions,
+            action_data=self.notify_issue_owners_action,
+            condition_data=conditions,
         )
         conditions.append(
             {
@@ -742,8 +742,8 @@ def test_update_duplicate_rule(self):
         )
         rule2 = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=conditions,
+            action_data=self.notify_issue_owners_action,
+            condition_data=conditions,
         )
         conditions.pop(1)
         payload = {
@@ -769,13 +769,13 @@ def test_duplicate_rule_environment(self):
         that does have one set, we consider this when determining if it's a duplicate"""
         self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=self.first_seen_condition,
+            action_data=self.notify_issue_owners_action,
+            condition_data=self.first_seen_condition,
         )
         env_rule = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=self.first_seen_condition,
+            action_data=self.notify_issue_owners_action,
+            condition_data=self.first_seen_condition,
         )
         payload = {
             "name": "hello world",
@@ -812,15 +812,15 @@ def test_duplicate_rule_both_have_environments(self):
         """
         rule = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=self.first_seen_condition,
+            action_data=self.notify_issue_owners_action,
+            condition_data=self.first_seen_condition,
             name="rule_with_env",
             environment_id=self.environment.id,
         )
         rule2 = self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=self.first_seen_condition,
+            action_data=self.notify_issue_owners_action,
+            condition_data=self.first_seen_condition,
             name="rule_wo_env",
         )
         payload = {
@@ -890,8 +890,8 @@ def test_edit_rule(self):
         ]
         self.create_project_rule(
             project=self.project,
-            action_match=self.notify_issue_owners_action,
-            condition_match=conditions,
+            action_data=self.notify_issue_owners_action,
+            condition_data=conditions,
         )
         conditions.append(
             {
diff --git a/tests/sentry/api/endpoints/test_project_rule_enable.py b/tests/sentry/api/endpoints/test_project_rule_enable.py
index 031eb23c37ec85..7f51436780fe1b 100644
--- a/tests/sentry/api/endpoints/test_project_rule_enable.py
+++ b/tests/sentry/api/endpoints/test_project_rule_enable.py
@@ -72,11 +72,11 @@ def test_duplicate_rule(self):
             }
         ]
         rule = self.create_project_rule(
-            project=self.project, action_match=actions, condition_match=conditions
+            project=self.project, action_data=actions, condition_data=conditions
         )
 
         rule2 = self.create_project_rule(
-            project=self.project, action_match=actions, condition_match=conditions
+            project=self.project, action_data=actions, condition_data=conditions
         )
         rule2.status = ObjectStatus.DISABLED
         rule2.save()
@@ -114,15 +114,15 @@ def test_duplicate_rule_diff_env(self):
         )
         self.create_project_rule(
             project=self.project,
-            action_match=actions,
-            condition_match=conditions,
+            action_data=actions,
+            condition_data=conditions,
             environment_id=dev_env.id,
         )
 
         rule2 = self.create_project_rule(
             project=self.project,
-            action_match=actions,
-            condition_match=conditions,
+            action_data=actions,
+            condition_data=conditions,
             environment_id=prod_env.id,
         )
         rule2.status = ObjectStatus.DISABLED
@@ -154,15 +154,15 @@ def test_duplicate_rule_one_env_one_not(self):
         dev_env = self.create_environment(self.project, name="dev", organization=self.organization)
         self.create_project_rule(
             project=self.project,
-            action_match=actions,
-            condition_match=conditions,
+            action_data=actions,
+            condition_data=conditions,
             environment_id=dev_env.id,
         )
 
         rule2 = self.create_project_rule(
             project=self.project,
-            action_match=actions,
-            condition_match=conditions,
+            action_data=actions,
+            condition_data=conditions,
         )
         rule2.status = ObjectStatus.DISABLED
         rule2.save()
diff --git a/tests/sentry/api/endpoints/test_project_rules.py b/tests/sentry/api/endpoints/test_project_rules.py
index f5de673c48527f..3f3772445a2018 100644
--- a/tests/sentry/api/endpoints/test_project_rules.py
+++ b/tests/sentry/api/endpoints/test_project_rules.py
@@ -822,7 +822,7 @@ def test_comparison_condition(self):
             "interval": "1h",
             "value": 50,
         }
-        actions = [
+        actions: list[dict[str, object]] = [
             {"id": "sentry.rules.actions.notify_event.NotifyEventAction", "uuid": str(uuid4())}
         ]
         self.run_test(
diff --git a/tests/sentry/api/endpoints/test_project_team_details.py b/tests/sentry/api/endpoints/test_project_team_details.py
index 220957e75fd38c..ee95e4fe84848c 100644
--- a/tests/sentry/api/endpoints/test_project_team_details.py
+++ b/tests/sentry/api/endpoints/test_project_team_details.py
@@ -137,7 +137,7 @@ def test_remove_team(self):
         ar1.refresh_from_db()
         ar2.refresh_from_db()
 
-        assert r1.owner_team == ar1.team is None
+        assert (r1.owner_team, ar1.team) == (None, None)
         assert r2.owner_team == ar2.team == team
 
         self.get_success_response(
@@ -152,7 +152,7 @@ def test_remove_team(self):
         ar1.refresh_from_db()
         ar2.refresh_from_db()
 
-        assert r1.owner_team == r2.owner_team == ar1.team == ar2.team is None
+        assert (r1.owner_team, r2.owner_team, ar1.team, ar2.team) == (None, None, None, None)
 
         self.get_success_response(
             another_project.organization.slug,
diff --git a/tests/sentry/api/endpoints/test_team_projects.py b/tests/sentry/api/endpoints/test_team_projects.py
index a2348cfbe947a9..b3faf33b47481b 100644
--- a/tests/sentry/api/endpoints/test_team_projects.py
+++ b/tests/sentry/api/endpoints/test_team_projects.py
@@ -284,3 +284,44 @@ def test_similarity_project_option_invalid(self):
             )
             is None
         )
+
+    def test_builtin_symbol_sources_electron(self):
+        """
+        Test that project option for builtin symbol sources contains ["electron"] when creating
+        an Electron project, but uses defaults for other platforms.
+        """
+        # Test Electron project
+        response = self.get_success_response(
+            self.organization.slug,
+            self.team.slug,
+            name="electron-app",
+            slug="electron-app",
+            platform="electron",
+            status_code=201,
+        )
+
+        electron_project = Project.objects.get(id=response.data["id"])
+        assert electron_project.platform == "electron"
+        symbol_sources = ProjectOption.objects.get_value(
+            project=electron_project, key="sentry:builtin_symbol_sources"
+        )
+        assert symbol_sources == ["ios", "microsoft", "electron"]
+
+    def test_builtin_symbol_sources_not_electron(self):
+        # Test non-Electron project (e.g. Python)
+        response = self.get_success_response(
+            self.organization.slug,
+            self.team.slug,
+            name="python-app",
+            slug="python-app",
+            platform="python",
+            status_code=201,
+        )
+
+        python_project = Project.objects.get(id=response.data["id"])
+        assert python_project.platform == "python"
+        # Should use default value, not ["electron"]
+        symbol_sources = ProjectOption.objects.get_value(
+            project=python_project, key="sentry:builtin_symbol_sources"
+        )
+        assert "electron" not in symbol_sources
diff --git a/tests/sentry/api/endpoints/test_user_notification_settings_options.py b/tests/sentry/api/endpoints/test_user_notification_settings_options.py
index dc29e872c174f0..97344553d10fef 100644
--- a/tests/sentry/api/endpoints/test_user_notification_settings_options.py
+++ b/tests/sentry/api/endpoints/test_user_notification_settings_options.py
@@ -1,6 +1,6 @@
 from rest_framework import status
 
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import (
     NotificationScopeEnum,
     NotificationSettingEnum,
diff --git a/tests/sentry/api/endpoints/test_user_notification_settings_options_details.py b/tests/sentry/api/endpoints/test_user_notification_settings_options_details.py
index ff9dc10158df1c..1ad3989b9b81e1 100644
--- a/tests/sentry/api/endpoints/test_user_notification_settings_options_details.py
+++ b/tests/sentry/api/endpoints/test_user_notification_settings_options_details.py
@@ -1,6 +1,6 @@
 from rest_framework import status
 
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import (
     NotificationScopeEnum,
     NotificationSettingEnum,
diff --git a/tests/sentry/api/endpoints/test_user_notification_settings_providers.py b/tests/sentry/api/endpoints/test_user_notification_settings_providers.py
index 7a4acbc2e746dd..b7c331a1058970 100644
--- a/tests/sentry/api/endpoints/test_user_notification_settings_providers.py
+++ b/tests/sentry/api/endpoints/test_user_notification_settings_providers.py
@@ -1,7 +1,7 @@
 from rest_framework import status
 
 from sentry.integrations.types import ExternalProviderEnum
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.types import (
     NotificationScopeEnum,
     NotificationSettingEnum,
diff --git a/tests/sentry/api/helpers/test_autofix.py b/tests/sentry/api/helpers/test_autofix.py
deleted file mode 100644
index ca05a651050c96..00000000000000
--- a/tests/sentry/api/helpers/test_autofix.py
+++ /dev/null
@@ -1,228 +0,0 @@
-from unittest import mock
-from unittest.mock import call, patch
-
-import orjson
-from django.conf import settings
-
-from sentry.api.helpers.autofix import get_project_codebase_indexing_status
-from sentry.testutils.cases import TestCase
-
-
-class TestGetProjectCodebaseIndexingStatus(TestCase):
-    def setUp(self):
-        super().setUp()
-        self.project = self.create_project()
-
-    @patch("sentry.api.helpers.autofix.requests.post")
-    def test_autofix_codebase_status_successful(self, mock_post):
-        mock_post.return_value.status_code = 200
-        mock_post.return_value.json.return_value = {"status": "up_to_date"}
-
-        repo = self.create_repo(
-            name="getsentry/sentry", provider="integrations:github", external_id="123"
-        )
-        self.create_code_mapping(project=self.project, repo=repo)
-
-        status = get_project_codebase_indexing_status(self.project)
-
-        assert status == "up_to_date"
-        mock_post.assert_called_once_with(
-            f"{settings.SEER_AUTOFIX_URL}/v1/automation/codebase/index/status",
-            data=orjson.dumps(
-                {
-                    "organization_id": self.project.organization.id,
-                    "project_id": self.project.id,
-                    "repo": {
-                        "provider": "integrations:github",
-                        "owner": "getsentry",
-                        "name": "sentry",
-                        "external_id": "123",
-                    },
-                }
-            ),
-            headers={"content-type": "application/json;charset=utf-8"},
-        )
-
-    @patch("sentry.api.helpers.autofix.requests.post")
-    def test_autofix_codebase_status_multiple_repos_one_in_progress(self, mock_post):
-        # Setup multiple repositories
-        repo1 = self.create_repo(
-            name="getsentry/sentry", provider="integrations:github", external_id="123"
-        )
-        repo2 = self.create_repo(
-            name="getsentry/relay", provider="integrations:github", external_id="234"
-        )
-        self.create_code_mapping(project=self.project, repo=repo1, stack_root="/path1")
-        self.create_code_mapping(project=self.project, repo=repo2, stack_root="/path2")
-
-        # Mock the POST request to return successful status
-        mock_post.side_effect = [
-            mock.Mock(status_code=200, json=mock.Mock(return_value={"status": "up_to_date"})),
-            mock.Mock(status_code=200, json=mock.Mock(return_value={"status": "indexing"})),
-        ]
-
-        status = get_project_codebase_indexing_status(self.project)
-
-        # Assertions
-        assert (
-            mock_post.call_count == 2
-        )  # Ensure that the endpoint was called twice, once for each repo
-        assert status == "indexing"
-        calls = [
-            call(
-                f"{settings.SEER_AUTOFIX_URL}/v1/automation/codebase/index/status",
-                data=orjson.dumps(
-                    {
-                        "organization_id": self.project.organization.id,
-                        "project_id": self.project.id,
-                        "repo": {
-                            "provider": "integrations:github",
-                            "owner": "getsentry",
-                            "name": "sentry",
-                            "external_id": "123",
-                        },
-                    }
-                ),
-                headers={"content-type": "application/json;charset=utf-8"},
-            ),
-            call(
-                f"{settings.SEER_AUTOFIX_URL}/v1/automation/codebase/index/status",
-                data=orjson.dumps(
-                    {
-                        "organization_id": self.project.organization.id,
-                        "project_id": self.project.id,
-                        "repo": {
-                            "provider": "integrations:github",
-                            "owner": "getsentry",
-                            "name": "relay",
-                            "external_id": "234",
-                        },
-                    }
-                ),
-                headers={"content-type": "application/json;charset=utf-8"},
-            ),
-        ]
-        mock_post.assert_has_calls(calls, any_order=True)
-
-    @patch("sentry.api.helpers.autofix.requests.post")
-    def test_autofix_codebase_status_multiple_repos_both_done(self, mock_post):
-        # Setup multiple repositories
-        repo1 = self.create_repo(
-            name="getsentry/sentry", provider="integrations:github", external_id="123"
-        )
-        repo2 = self.create_repo(
-            name="getsentry/relay", provider="integrations:github", external_id="234"
-        )
-        self.create_code_mapping(project=self.project, repo=repo1, stack_root="/path1")
-        self.create_code_mapping(project=self.project, repo=repo2, stack_root="/path2")
-
-        # Mock the POST request to return successful status
-        mock_post.side_effect = [
-            mock.Mock(status_code=200, json=mock.Mock(return_value={"status": "up_to_date"})),
-            mock.Mock(status_code=200, json=mock.Mock(return_value={"status": "up_to_date"})),
-        ]
-
-        status = get_project_codebase_indexing_status(self.project)
-
-        # Assertions
-        assert (
-            mock_post.call_count == 2
-        )  # Ensure that the endpoint was called twice, once for each repo
-        assert status == "up_to_date"
-        calls = [
-            call(
-                f"{settings.SEER_AUTOFIX_URL}/v1/automation/codebase/index/status",
-                data=orjson.dumps(
-                    {
-                        "organization_id": self.project.organization.id,
-                        "project_id": self.project.id,
-                        "repo": {
-                            "provider": "integrations:github",
-                            "owner": "getsentry",
-                            "name": "sentry",
-                            "external_id": "123",
-                        },
-                    }
-                ),
-                headers={"content-type": "application/json;charset=utf-8"},
-            ),
-            call(
-                f"{settings.SEER_AUTOFIX_URL}/v1/automation/codebase/index/status",
-                data=orjson.dumps(
-                    {
-                        "organization_id": self.project.organization.id,
-                        "project_id": self.project.id,
-                        "repo": {
-                            "provider": "integrations:github",
-                            "owner": "getsentry",
-                            "name": "relay",
-                            "external_id": "234",
-                        },
-                    }
-                ),
-                headers={"content-type": "application/json;charset=utf-8"},
-            ),
-        ]
-        mock_post.assert_has_calls(calls, any_order=True)
-
-    @patch("sentry.api.helpers.autofix.requests.post")
-    def test_autofix_codebase_status_multiple_repos_one_not_indexed(self, mock_post):
-        # Setup multiple repositories
-        repo1 = self.create_repo(
-            name="getsentry/sentry", provider="integrations:github", external_id="123"
-        )
-        repo2 = self.create_repo(
-            name="getsentry/relay", provider="integrations:github", external_id="234"
-        )
-        self.create_code_mapping(project=self.project, repo=repo1, stack_root="/path1")
-        self.create_code_mapping(project=self.project, repo=repo2, stack_root="/path2")
-
-        # Mock the POST request to return successful status
-        mock_post.side_effect = [
-            mock.Mock(status_code=200, json=mock.Mock(return_value={"status": "up_to_date"})),
-            mock.Mock(status_code=200, json=mock.Mock(return_value={"status": "not_indexed"})),
-        ]
-
-        # Perform the POST request
-        status = get_project_codebase_indexing_status(self.project)
-
-        # Assertions
-        assert (
-            mock_post.call_count == 2
-        )  # Ensure that the endpoint was called twice, once for each repo
-        assert status == "not_indexed"
-        calls = [
-            call(
-                f"{settings.SEER_AUTOFIX_URL}/v1/automation/codebase/index/status",
-                data=orjson.dumps(
-                    {
-                        "organization_id": self.project.organization.id,
-                        "project_id": self.project.id,
-                        "repo": {
-                            "provider": "integrations:github",
-                            "owner": "getsentry",
-                            "name": "sentry",
-                            "external_id": "123",
-                        },
-                    }
-                ),
-                headers={"content-type": "application/json;charset=utf-8"},
-            ),
-            call(
-                f"{settings.SEER_AUTOFIX_URL}/v1/automation/codebase/index/status",
-                data=orjson.dumps(
-                    {
-                        "organization_id": self.project.organization.id,
-                        "project_id": self.project.id,
-                        "repo": {
-                            "provider": "integrations:github",
-                            "owner": "getsentry",
-                            "name": "relay",
-                            "external_id": "234",
-                        },
-                    }
-                ),
-                headers={"content-type": "application/json;charset=utf-8"},
-            ),
-        ]
-        mock_post.assert_has_calls(calls, any_order=True)
diff --git a/tests/sentry/api/helpers/test_group_index.py b/tests/sentry/api/helpers/test_group_index.py
index 010caa15e989e6..0a0a8d50e24985 100644
--- a/tests/sentry/api/helpers/test_group_index.py
+++ b/tests/sentry/api/helpers/test_group_index.py
@@ -323,8 +323,57 @@ def test_multiple_projects(self, mock_handle_merge: MagicMock):
         )
 
         assert response.data == {"detail": "Merging across multiple projects is not supported"}
+        assert response.status_code == 400
         assert mock_handle_merge.call_count == 0
 
+    @patch("sentry.api.helpers.group_index.update.handle_merge")
+    def test_multiple_groups_same_project(self, mock_handle_merge: MagicMock):
+        """Even if the UI calls with multiple projects, if the groups belong to the same project, we should merge them."""
+        projects = [self.create_project(), self.create_project()]
+        proj1 = projects[0]
+        groups = [self.create_group(proj1), self.create_group(proj1)]
+        group_ids = [g.id for g in groups]
+        project_ids = [p.id for p in projects]
+
+        request = self.make_request(method="PUT")
+        request.user = self.user
+        request.data = {"merge": 1}
+        # The two groups belong to the same project, so we should be able to merge them, even though
+        # we're passing multiple project ids
+        request.GET = {"id": group_ids, "project": project_ids}
+
+        update_groups(request, group_ids, projects, self.organization.id)
+
+        call_args = mock_handle_merge.call_args.args
+
+        assert len(call_args) == 3
+        # Have to convert to ids because first argument is a queryset
+        assert [group.id for group in call_args[0]] == group_ids
+        assert call_args[1] == {proj1.id: proj1}
+        assert call_args[2] == self.user
+
+    @patch("sentry.api.helpers.group_index.update.handle_merge")
+    def test_no_project_ids_passed(self, mock_handle_merge: MagicMock):
+        """If 'All Projects' is selected in the issue stream, the UI doesn't send project ids, but
+        we should be able to derive them from the given group ids."""
+        group_ids = [self.create_group().id, self.create_group().id]
+        project = self.project
+
+        request = self.make_request(method="PUT")
+        request.user = self.user
+        request.data = {"merge": 1}
+        request.GET = {"id": group_ids}
+
+        update_groups(request, group_ids, [project], self.organization.id, search_fn=Mock())
+
+        call_args = mock_handle_merge.call_args.args
+
+        assert len(call_args) == 3
+        # Have to convert to ids because first argument is a queryset
+        assert [group.id for group in call_args[0]] == group_ids
+        assert call_args[1] == {project.id: project}
+        assert call_args[2] == self.user
+
     def test_metrics(self):
         for referer, expected_referer_tag in [
             ("https://sentry.io/organizations/dogsaregreat/issues/", "issue stream"),
@@ -412,7 +461,7 @@ def setUp(self) -> None:
         self.project_lookup = {self.group.project_id: self.group.project}
 
     def test_is_bookmarked(self) -> None:
-        handle_is_bookmarked(True, self.group_list, self.group_ids, self.project_lookup, self.user)
+        handle_is_bookmarked(True, self.group_list, self.project_lookup, self.user)
 
         assert GroupBookmark.objects.filter(group=self.group, user_id=self.user.id).exists()
         assert GroupSubscription.objects.filter(
@@ -429,7 +478,7 @@ def test_not_is_bookmarked(self) -> None:
             user_id=self.user.id,
             reason=GroupSubscriptionReason.bookmark,
         )
-        handle_is_bookmarked(False, self.group_list, self.group_ids, self.project_lookup, self.user)
+        handle_is_bookmarked(False, self.group_list, self.project_lookup, self.user)
 
         assert not GroupBookmark.objects.filter(group=self.group, user_id=self.user.id).exists()
         assert not GroupSubscription.objects.filter(group=self.group, user_id=self.user.id).exists()
@@ -439,13 +488,10 @@ class TestHandleHasSeen(TestCase):
     def setUp(self) -> None:
         self.group = self.create_group()
         self.group_list = [self.group]
-        self.group_ids = [self.group]
         self.project_lookup = {self.group.project_id: self.group.project}
 
     def test_has_seen(self) -> None:
-        handle_has_seen(
-            True, self.group_list, self.group_ids, self.project_lookup, [self.project], self.user
-        )
+        handle_has_seen(True, self.group_list, self.project_lookup, [self.project], self.user)
 
         assert GroupSeen.objects.filter(group=self.group, user_id=self.user.id).exists()
 
@@ -454,9 +500,7 @@ def test_not_has_seen(self) -> None:
             group=self.group, user_id=self.user.id, project_id=self.group.project_id
         )
 
-        handle_has_seen(
-            False, self.group_list, self.group_ids, self.project_lookup, [self.project], self.user
-        )
+        handle_has_seen(False, self.group_list, self.project_lookup, [self.project], self.user)
 
         assert not GroupSeen.objects.filter(group=self.group, user_id=self.user.id).exists()
 
@@ -474,6 +518,10 @@ def test_is_public(self) -> None:
         assert Activity.objects.filter(
             group=self.group, type=ActivityType.SET_PUBLIC.value
         ).exists()
+        assert not Activity.objects.filter(
+            group=self.group, type=ActivityType.SET_PRIVATE.value
+        ).exists()
+
         assert share_id == new_share.uuid
 
     def test_is_public_existing_shares(self) -> None:
diff --git a/tests/sentry/api/serializers/test_group.py b/tests/sentry/api/serializers/test_group.py
index 7a9d62441bde59..3250b97ba5006f 100644
--- a/tests/sentry/api/serializers/test_group.py
+++ b/tests/sentry/api/serializers/test_group.py
@@ -10,8 +10,8 @@
 from sentry.models.groupresolution import GroupResolution
 from sentry.models.groupsnooze import GroupSnooze
 from sentry.models.groupsubscription import GroupSubscription
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.types import (
     NotificationScopeEnum,
     NotificationSettingEnum,
diff --git a/tests/sentry/api/serializers/test_group_tombstone.py b/tests/sentry/api/serializers/test_group_tombstone.py
index a83f2f40986b30..e8c7cd071c53f4 100644
--- a/tests/sentry/api/serializers/test_group_tombstone.py
+++ b/tests/sentry/api/serializers/test_group_tombstone.py
@@ -8,9 +8,9 @@
 class GroupTombstoneSerializerTest(TestCase):
     def test_simple(self):
         user = self.create_user("foo@example.com")
-        self.user = user_service.get_many(filter={"user_ids": [user.id]})[0]
+        rpc_user = user_service.get_many(filter={"user_ids": [user.id]})[0]
         self.login_as(user=user)
-        org = self.create_organization(owner=self.user)
+        org = self.create_organization(owner=rpc_user)
         project = self.create_project(organization=org, name="CoolProj")
         group = self.create_group(project=project)
         tombstone = GroupTombstone.objects.create(
@@ -19,13 +19,13 @@ def test_simple(self):
             message=group.message,
             culprit=group.culprit,
             data=group.data,
-            actor_id=self.user.id,
+            actor_id=rpc_user.id,
             previous_group_id=group.id,
         )
         GroupHash.objects.create(
             project=group.project, hash="x" * 32, group=group, group_tombstone_id=tombstone.id
         )
-        result = serialize(tombstone, self.user)
+        result = serialize(tombstone, rpc_user)
 
         assert result["message"] == group.message
         assert result["culprit"] == group.culprit
diff --git a/tests/sentry/api/serializers/test_incident_activity.py b/tests/sentry/api/serializers/test_incident_activity.py
index 10b81a64efe3a6..b8a4707cd69684 100644
--- a/tests/sentry/api/serializers/test_incident_activity.py
+++ b/tests/sentry/api/serializers/test_incident_activity.py
@@ -8,47 +8,21 @@
 from sentry.incidents.models.incident import IncidentActivityType
 from sentry.testutils.cases import SnubaTestCase, TestCase
 from sentry.testutils.helpers.datetime import before_now, freeze_time
-from sentry.users.services.user.service import user_service
 
 
 class IncidentActivitySerializerTest(TestCase, SnubaTestCase):
     def test_simple(self):
         activity = create_incident_activity(
             incident=self.create_incident(),
-            activity_type=IncidentActivityType.COMMENT,
-            user=self.user,
-            comment="hello",
+            activity_type=IncidentActivityType.CREATED,
         )
         result = serialize(activity)
 
         assert result["id"] == str(activity.id)
         assert result["incidentIdentifier"] == str(activity.incident.identifier)
-        assert (
-            result["user"]
-            == user_service.serialize_many(filter=dict(user_ids=[activity.user_id]))[0]
-        )
-        assert result["type"] == activity.type
-        assert result["value"] is None
-        assert result["previousValue"] is None
-        assert result["comment"] == activity.comment
-        assert result["dateCreated"] == activity.date_added
-
-    def test_no_user(self):
-        activity = create_incident_activity(
-            incident=self.create_incident(),
-            activity_type=IncidentActivityType.COMMENT,
-            user=None,
-            comment="hello",
-        )
-        result = serialize(activity)
-
-        assert result["id"] == str(activity.id)
-        assert result["incidentIdentifier"] == str(activity.incident.identifier)
-        assert result["user"] is None
         assert result["type"] == activity.type
         assert result["value"] is None
         assert result["previousValue"] is None
-        assert result["comment"] == activity.comment
         assert result["dateCreated"] == activity.date_added
 
     def test_event_stats(self):
@@ -68,20 +42,13 @@ def test_event_stats(self):
             )
             activity = create_incident_activity(
                 incident=incident,
-                activity_type=IncidentActivityType.COMMENT,
-                user=self.user,
-                comment="hello",
+                activity_type=IncidentActivityType.CREATED,
             )
             result = serialize(activity)
 
             assert result["id"] == str(activity.id)
             assert result["incidentIdentifier"] == str(activity.incident.identifier)
-            assert (
-                result["user"]
-                == user_service.serialize_many(filter=dict(user_ids=[activity.user_id]))[0]
-            )
             assert result["type"] == activity.type
             assert result["value"] is None
             assert result["previousValue"] is None
-            assert result["comment"] == activity.comment
             assert result["dateCreated"] == activity.date_added
diff --git a/tests/sentry/api/test_authentication.py b/tests/sentry/api/test_authentication.py
index 1fe2a73db99403..dfdb9ce919cc5c 100644
--- a/tests/sentry/api/test_authentication.py
+++ b/tests/sentry/api/test_authentication.py
@@ -210,6 +210,72 @@ def test_no_match(self):
             self.auth.authenticate(request)
 
 
+@control_silo_test
+class TestOrgScopedAppTokenAuthentication(TestCase):
+    def setUp(self):
+        super().setUp()
+
+        self.auth = UserAuthTokenAuthentication()
+        self.org = self.create_organization(owner=self.user)
+        self.another_org = self.create_organization(owner=self.user)
+        self.api_token = ApiToken.objects.create(
+            token_type=AuthTokenType.USER,
+            user=self.user,
+            scoping_organization_id=self.org.id,
+        )
+        self.token = self.api_token.plaintext_token
+
+    def test_authenticate_correct_org(self):
+        request = HttpRequest()
+        request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
+        request.path_info = f"/api/0/organizations/{self.org.slug}/projects/"
+
+        result = self.auth.authenticate(request)
+        assert result is not None
+
+        user, auth = result
+        assert user.is_anonymous is False
+        assert user.id == self.user.id
+        assert AuthenticatedToken.from_token(auth) == AuthenticatedToken.from_token(self.api_token)
+
+    def test_authenticate_incorrect_org(self):
+        request = HttpRequest()
+        request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
+        request.path_info = f"/api/0/organizations/{self.another_org}/projects/"
+
+        with pytest.raises(AuthenticationFailed):
+            self.auth.authenticate(request)
+
+    def test_authenticate_user_level_endpoints(self):
+        request = HttpRequest()
+        request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
+        request.path_info = "/api/0/projects/"
+
+        with pytest.raises(AuthenticationFailed):
+            self.auth.authenticate(request)
+
+    def test_authenticate_allowlist_endpoint(self):
+        request = HttpRequest()
+        request.META["HTTP_AUTHORIZATION"] = f"Bearer {self.token}"
+        request.path_info = "/api/0/organizations/"
+
+        result = self.auth.authenticate(request)
+        assert result is not None
+
+        user, auth = result
+        assert user.is_anonymous is False
+        assert user.id == self.user.id
+        assert AuthenticatedToken.from_token(auth) == AuthenticatedToken.from_token(self.api_token)
+
+    def test_no_match(self):
+        request = HttpRequest()
+        request.META["HTTP_AUTHORIZATION"] = "Bearer abc"
+        request.path_info = f"/api/0/organizations/{self.another_org}/projects/"
+
+        with pytest.raises(AuthenticationFailed):
+            self.auth.authenticate(request)
+
+
 @django_db_all
 @pytest.mark.parametrize("internal", [True, False])
 def test_registered_relay(internal):
diff --git a/tests/sentry/api/test_base.py b/tests/sentry/api/test_base.py
index 5423734119b40f..2189019e8300a3 100644
--- a/tests/sentry/api/test_base.py
+++ b/tests/sentry/api/test_base.py
@@ -68,7 +68,7 @@ def __init__(
     ):
         # The error which will be thrown when a GET request is made
         self.error = error
-        # The argumets which will be passed on to `Endpoint.handle_exception` via `super`
+        # The argumets which will be passed on to `Endpoint.handle_exception_with_details` via `super`
         self.handler_context_arg = handler_context_arg
         self.scope_arg = scope_arg
 
@@ -77,8 +77,10 @@ def __init__(
     def get(self, request):
         raise self.error
 
-    def handle_exception(self, request, exc, handler_context=None, scope=None):
-        return super().handle_exception(request, exc, self.handler_context_arg, self.scope_arg)
+    def handle_exception_with_details(self, request, exc, handler_context=None, scope=None):
+        return super().handle_exception_with_details(
+            request, exc, self.handler_context_arg, self.scope_arg
+        )
 
 
 class DummyPaginationEndpoint(Endpoint):
@@ -339,7 +341,7 @@ def test_handle_exception_when_super_returns_response(
         mock_endpoint = DummyErroringEndpoint.as_view(error=Exception("nope"))
         response = mock_endpoint(self.make_request(method="GET"))
 
-        # The endpoint should pass along the response generated by `APIView.handle_exception`
+        # The endpoint should pass along the response generated by `APIView.handle_exception_with_details`
         assert response == mock_super_handle_exception.return_value
 
     @mock.patch("rest_framework.views.APIView.handle_exception", new=reraise)
diff --git a/tests/sentry/api/test_utils.py b/tests/sentry/api/test_utils.py
index df2b98a91ca0cb..6b296ad8c02203 100644
--- a/tests/sentry/api/test_utils.py
+++ b/tests/sentry/api/test_utils.py
@@ -9,6 +9,7 @@
 
 from sentry.api.utils import (
     MAX_STATS_PERIOD,
+    clamp_date_range,
     get_date_range_from_params,
     handle_query_errors,
     print_and_capture_handler_exception,
@@ -196,3 +197,36 @@ def test_handle_query_errors(self, mock_parse_error):
                     raise ex
             except Exception as e:
                 assert isinstance(e, (FooBarError, APIException))
+
+
+class ClampDateRangeTest(unittest.TestCase):
+    def test_no_clamp_if_range_under_max(self):
+        start = datetime.datetime(2024, 1, 1)
+        end = datetime.datetime(2024, 1, 2)
+        max_timedelta = datetime.timedelta(days=7)
+
+        assert clamp_date_range((start, end), max_timedelta) == (start, end)
+
+    def test_no_clamp_for_negative_range(self):
+        start = datetime.datetime(2024, 1, 1)
+        end = datetime.datetime(2023, 1, 2)
+        max_timedelta = datetime.timedelta(hours=1)
+
+        assert clamp_date_range((start, end), max_timedelta) == (start, end)
+
+    def test_clamps_even_to_zero(self):
+        start = datetime.datetime(2024, 1, 1)
+        end = datetime.datetime(2024, 1, 2)
+        max_timedelta = datetime.timedelta(0)
+
+        assert clamp_date_range((start, end), max_timedelta) == (end, end)
+
+    def test_clamps_to_end(self):
+        start = datetime.datetime(2024, 1, 1)
+        end = datetime.datetime(2024, 1, 14)
+        max_timedelta = datetime.timedelta(days=1)
+
+        assert clamp_date_range((start, end), max_timedelta) == (
+            datetime.datetime(2024, 1, 13),
+            end,
+        )
diff --git a/tests/sentry/backup/snapshots/SanitizationExhaustiveTests/test_clean_pks.pysnap b/tests/sentry/backup/snapshots/SanitizationExhaustiveTests/test_clean_pks.pysnap
index 3cdb0b1b55e1dd..a31e4219cfddae 100644
--- a/tests/sentry/backup/snapshots/SanitizationExhaustiveTests/test_clean_pks.pysnap
+++ b/tests/sentry/backup/snapshots/SanitizationExhaustiveTests/test_clean_pks.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2024-11-06T18:15:33.745643+00:00'
+created: '2024-12-03T21:15:16.898342+00:00'
 creator: sentry
 source: tests/sentry/backup/test_sanitize.py
 ---
@@ -227,33 +227,6 @@ source: tests/sentry/backup/test_sanitize.py
   sanitized_fields:
   - date_added
   - date_updated
-- model_name: workflow_engine.detector
-  ordinal: 1
-  sanitized_fields:
-  - date_added
-  - date_updated
-  - name
-- model_name: workflow_engine.workflow
-  ordinal: 1
-  sanitized_fields:
-  - date_added
-  - date_updated
-  - name
-- model_name: workflow_engine.workflowdataconditiongroup
-  ordinal: 1
-  sanitized_fields:
-  - date_added
-  - date_updated
-- model_name: workflow_engine.detectorworkflow
-  ordinal: 1
-  sanitized_fields:
-  - date_added
-  - date_updated
-- model_name: workflow_engine.datasourcedetector
-  ordinal: 1
-  sanitized_fields:
-  - date_added
-  - date_updated
 - model_name: workflow_engine.datacondition
   ordinal: 1
   sanitized_fields:
@@ -292,12 +265,6 @@ source: tests/sentry/backup/test_sanitize.py
   - date_added
   - name
   - slug
-- model_name: sentry.project
-  ordinal: 4
-  sanitized_fields:
-  - date_added
-  - name
-  - slug
 - model_name: sentry.orgauthtoken
   ordinal: 1
   sanitized_fields:
@@ -484,6 +451,23 @@ source: tests/sentry/backup/test_sanitize.py
   - client_secret
   - date_added
   - name
+- model_name: workflow_engine.workflow
+  ordinal: 1
+  sanitized_fields:
+  - date_added
+  - date_updated
+  - name
+- model_name: workflow_engine.detector
+  ordinal: 1
+  sanitized_fields:
+  - date_added
+  - date_updated
+  - name
+- model_name: workflow_engine.datasourcedetector
+  ordinal: 1
+  sanitized_fields:
+  - date_added
+  - date_updated
 - model_name: sentry.useroption
   ordinal: 1
   sanitized_fields: []
@@ -609,9 +593,6 @@ source: tests/sentry/backup/test_sanitize.py
 - model_name: sentry.projectteam
   ordinal: 1
   sanitized_fields: []
-- model_name: sentry.projectteam
-  ordinal: 2
-  sanitized_fields: []
 - model_name: sentry.projectredirect
   ordinal: 1
   sanitized_fields:
@@ -630,9 +611,6 @@ source: tests/sentry/backup/test_sanitize.py
 - model_name: sentry.projectoption
   ordinal: 3
   sanitized_fields: []
-- model_name: sentry.projectoption
-  ordinal: 4
-  sanitized_fields: []
 - model_name: sentry.projectkey
   ordinal: 1
   sanitized_fields:
@@ -648,11 +626,6 @@ source: tests/sentry/backup/test_sanitize.py
   sanitized_fields:
   - date_added
   - secret_key
-- model_name: sentry.projectkey
-  ordinal: 4
-  sanitized_fields:
-  - date_added
-  - secret_key
 - model_name: sentry.projectintegration
   ordinal: 1
   sanitized_fields:
@@ -686,6 +659,11 @@ source: tests/sentry/backup/test_sanitize.py
 - model_name: sentry.dashboardpermissions
   ordinal: 1
   sanitized_fields: []
+- model_name: sentry.dashboardfavoriteuser
+  ordinal: 1
+  sanitized_fields:
+  - date_added
+  - date_updated
 - model_name: sentry.customdynamicsamplingruleproject
   ordinal: 1
   sanitized_fields: []
@@ -750,6 +728,16 @@ source: tests/sentry/backup/test_sanitize.py
   - date_added
   - date_modified
   - name
+- model_name: workflow_engine.workflowdataconditiongroup
+  ordinal: 1
+  sanitized_fields:
+  - date_added
+  - date_updated
+- model_name: workflow_engine.detectorworkflow
+  ordinal: 1
+  sanitized_fields:
+  - date_added
+  - date_updated
 - model_name: sentry.snubaqueryeventtype
   ordinal: 1
   sanitized_fields: []
@@ -814,10 +802,6 @@ source: tests/sentry/backup/test_sanitize.py
   ordinal: 3
   sanitized_fields:
   - date_added
-- model_name: sentry.alertruleexcludedprojects
-  ordinal: 1
-  sanitized_fields:
-  - date_added
 - model_name: sentry.alertruleactivity
   ordinal: 1
   sanitized_fields:
@@ -860,10 +844,6 @@ source: tests/sentry/backup/test_sanitize.py
   sanitized_fields:
   - date_added
   - date_modified
-- model_name: sentry.alertruletriggerexclusion
-  ordinal: 1
-  sanitized_fields:
-  - date_added
 - model_name: sentry.alertruletriggeraction
   ordinal: 1
   sanitized_fields:
@@ -888,10 +868,6 @@ source: tests/sentry/backup/test_sanitize.py
   sanitized_fields:
   - date_added
   - date_modified
-- model_name: sentry.incidentsubscription
-  ordinal: 1
-  sanitized_fields:
-  - date_added
 - model_name: sentry.incidentsnapshot
   ordinal: 1
   sanitized_fields:
diff --git a/tests/sentry/backup/snapshots/test_comparators/test_default_comparators.pysnap b/tests/sentry/backup/snapshots/test_comparators/test_default_comparators.pysnap
index 9bb31584ddc27e..579421b19e7a02 100644
--- a/tests/sentry/backup/snapshots/test_comparators/test_default_comparators.pysnap
+++ b/tests/sentry/backup/snapshots/test_comparators/test_default_comparators.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2024-11-06T23:32:46.290200+00:00'
+created: '2024-12-03T19:31:11.333104+00:00'
 creator: sentry
 source: tests/sentry/backup/test_comparators.py
 ---
@@ -15,6 +15,12 @@ source: tests/sentry/backup/test_comparators.py
     fields:
     - organization_id
   model_name: flags.flagauditlogmodel
+- comparators:
+  - class: ForeignKeyComparator
+    fields:
+    - created_by
+    - organization
+  model_name: flags.flagwebhooksigningsecretmodel
 - comparators:
   - class: ForeignKeyComparator
     fields:
@@ -27,6 +33,7 @@ source: tests/sentry/backup/test_comparators.py
     - apitoken_id
     - application_id
     - organization
+    - scoping_organization_id
     - user_id
   model_name: hybridcloud.apitokenreplica
 - comparators:
@@ -113,12 +120,6 @@ source: tests/sentry/backup/test_comparators.py
     - previous_alert_rule
     - user_id
   model_name: sentry.alertruleactivity
-- comparators:
-  - class: ForeignKeyComparator
-    fields:
-    - alert_rule
-    - project
-  model_name: sentry.alertruleexcludedprojects
 - comparators:
   - class: ForeignKeyComparator
     fields:
@@ -137,12 +138,6 @@ source: tests/sentry/backup/test_comparators.py
     - integration_id
     - sentry_app_id
   model_name: sentry.alertruletriggeraction
-- comparators:
-  - class: ForeignKeyComparator
-    fields:
-    - alert_rule_trigger
-    - query_subscription
-  model_name: sentry.alertruletriggerexclusion
 - comparators:
   - class: HashObfuscatingComparator
     fields:
@@ -358,6 +353,16 @@ source: tests/sentry/backup/test_comparators.py
     - created_by_id
     - organization
   model_name: sentry.dashboard
+- comparators:
+  - class: DateUpdatedComparator
+    fields:
+    - date_added
+    - date_updated
+  - class: ForeignKeyComparator
+    fields:
+    - dashboard
+    - user_id
+  model_name: sentry.dashboardfavoriteuser
 - comparators:
   - class: ForeignKeyComparator
     fields:
@@ -752,24 +757,12 @@ source: tests/sentry/backup/test_comparators.py
     - incident
     - project
   model_name: sentry.incidentproject
-- comparators:
-  - class: ForeignKeyComparator
-    fields:
-    - incident
-    - user_id
-  model_name: sentry.incidentseen
 - comparators:
   - class: ForeignKeyComparator
     fields:
     - event_stats_snapshot
     - incident
   model_name: sentry.incidentsnapshot
-- comparators:
-  - class: ForeignKeyComparator
-    fields:
-    - incident
-    - user_id
-  model_name: sentry.incidentsubscription
 - comparators:
   - class: DateUpdatedComparator
     fields:
@@ -1712,9 +1705,11 @@ source: tests/sentry/backup/test_comparators.py
     - date_updated
   - class: ForeignKeyComparator
     fields:
+    - created_by_id
     - organization
     - owner_team
     - owner_user_id
+    - project
     - workflow_condition_group
   model_name: workflow_engine.detector
 - comparators:
@@ -1743,7 +1738,11 @@ source: tests/sentry/backup/test_comparators.py
     - date_updated
   - class: ForeignKeyComparator
     fields:
+    - created_by_id
+    - environment
     - organization
+    - owner_team
+    - owner_user_id
     - when_condition_group
   model_name: workflow_engine.workflow
 - comparators:
diff --git a/tests/sentry/backup/test_exhaustive.py b/tests/sentry/backup/test_exhaustive.py
index 7628303a198e7a..b6e901825c9db5 100644
--- a/tests/sentry/backup/test_exhaustive.py
+++ b/tests/sentry/backup/test_exhaustive.py
@@ -29,12 +29,6 @@ class ExhaustiveTests(BackupTransactionTestCase):
     Ensure that a database with all exportable models filled out still works.
     """
 
-    def export_to_tmp_file_and_clear_database(self, tmp_dir, reset_pks) -> Path:
-        tmp_path = Path(tmp_dir).joinpath(f"{self._testMethodName}.expect.json")
-        export_to_file(tmp_path, ExportScope.Global)
-        clear_database(reset_pks=reset_pks)
-        return tmp_path
-
     # Note: the "clean_pks" version of this test lives in
     # `test_sanitize.py::SanitizationExhaustiveTests`. Because these tests are slow, we want to
     # reduce duplication, so we only use that one in that particular location.
diff --git a/tests/sentry/backup/test_exports.py b/tests/sentry/backup/test_exports.py
index bbfbed37c1168f..aa2ca071a23e37 100644
--- a/tests/sentry/backup/test_exports.py
+++ b/tests/sentry/backup/test_exports.py
@@ -1,21 +1,37 @@
 from __future__ import annotations
 
 from copy import deepcopy
+from io import BytesIO
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Any
 
+from orjson import JSONDecodeError, dumps
+
+from sentry.backup.crypto import (
+    DecryptionError,
+    EncryptorDecryptorPair,
+    LocalFileDecryptor,
+    LocalFileEncryptor,
+    create_encrypted_export_tarball,
+    decrypt_encrypted_tarball,
+)
 from sentry.backup.dependencies import NormalizedModelName, get_model, get_model_name
+from sentry.backup.exports import ExportCheckpointer, ExportCheckpointerError
+from sentry.backup.helpers import Printer
 from sentry.backup.scopes import ExportScope
+from sentry.backup.services.import_export.model import RpcExportOk
 from sentry.db import models
 from sentry.models.options.option import Option
 from sentry.models.organization import Organization
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.orgauthtoken import OrgAuthToken
 from sentry.testutils.helpers.backups import (
+    NOOP_PRINTER,
     BackupTransactionTestCase,
     export_to_encrypted_tarball,
     export_to_file,
+    generate_rsa_key_pair,
 )
 from sentry.testutils.helpers.datetime import freeze_time
 from sentry.users.models.email import Email
@@ -26,6 +42,65 @@
 from tests.sentry.backup import get_matching_exportable_models
 
 
+class FakeExportCheckpointer(ExportCheckpointer):
+    cache_hits: int = 0
+    cache_misses: int = 0
+    cache_writes: int = 0
+
+    def __init__(
+        self,
+        crypto: EncryptorDecryptorPair | None,
+        printer: Printer,
+        tmp_dir: str,
+        test_method_name: str,
+    ):
+        self.__crypto = crypto
+        self.__printer = printer
+        self.__tmp_dir = tmp_dir
+        self.__test_method_name = test_method_name
+
+    def _get_file_name(self, model_name: NormalizedModelName) -> Path:
+        if self.__crypto is None:
+            return Path(self.__tmp_dir).joinpath(
+                f"_{self.__test_method_name}.checkpoint.{str(model_name)}.json"
+            )
+        else:
+            return Path(self.__tmp_dir).joinpath(
+                f"_{self.__test_method_name}.checkpoint.{str(model_name)}.enc.tar"
+            )
+
+    def get(self, model_name: NormalizedModelName) -> RpcExportOk | None:
+        file_name = self._get_file_name(model_name)
+        try:
+            with open(file_name, "rb") as fp:
+                json_data = (
+                    decrypt_encrypted_tarball(fp, self.__crypto.decryptor)
+                    if self.__crypto is not None
+                    else fp.read()
+                )
+                parsed_json = self._parse_cached_json(json_data)
+                if parsed_json is None:
+                    self.cache_misses += 1
+                else:
+                    self.cache_hits += 1
+
+                return parsed_json
+        except (FileNotFoundError, DecryptionError, JSONDecodeError, ExportCheckpointerError):
+            self.cache_misses += 1
+            return None
+
+    def add(self, model_name: NormalizedModelName, json_export: Any) -> None:
+        file_name = self._get_file_name(model_name)
+        with open(file_name, "wb") as fp:
+            out_bytes = (
+                create_encrypted_export_tarball(json_export, self.__crypto.encryptor).getvalue()
+                if self.__crypto is not None
+                else dumps(json_export)
+            )
+            fp.write(out_bytes)
+            self.cache_writes += 1
+
+
 class ExportTestCase(BackupTransactionTestCase):
     @staticmethod
     def count(data: Any, model: type[models.base.BaseModel]) -> int:
@@ -48,23 +123,32 @@ def exists(
 
     def export(
         self,
-        tmp_dir,
+        tmp_dir: str,
         *,
         scope: ExportScope,
         filter_by: set[str] | None = None,
+        checkpointer: ExportCheckpointer | None = None,
     ) -> Any:
         tmp_path = Path(tmp_dir).joinpath(f"{self._testMethodName}.json")
-        return export_to_file(tmp_path, scope=scope, filter_by=filter_by)
+        return export_to_file(tmp_path, scope=scope, filter_by=filter_by, checkpointer=checkpointer)
 
     def export_and_encrypt(
         self,
-        tmp_dir,
+        tmp_dir: str,
         *,
         scope: ExportScope,
+        rsa_key_pair: tuple[bytes, bytes],
         filter_by: set[str] | None = None,
+        checkpointer: ExportCheckpointer | None = None,
     ) -> Any:
         tmp_path = Path(tmp_dir).joinpath(f"{self._testMethodName}.enc.tar")
-        return export_to_encrypted_tarball(tmp_path, scope=scope, filter_by=filter_by)
+        return export_to_encrypted_tarball(
+            tmp_path,
+            scope=scope,
+            filter_by=filter_by,
+            checkpointer=checkpointer,
+            rsa_key_pair=rsa_key_pair,
+        )
 
 
 class ScopingTests(ExportTestCase):
@@ -101,17 +185,131 @@ def verify_model_inclusion(data: Any, scope: ExportScope) -> None:
     def test_user_export_scoping(self):
         self.create_exhaustive_instance(is_superadmin=True)
         with TemporaryDirectory() as tmp_dir:
-            unencrypted = self.export(tmp_dir, scope=ExportScope.User)
+            unencrypted_checkpointer = FakeExportCheckpointer(
+                crypto=None,
+                printer=NOOP_PRINTER,
+                tmp_dir=tmp_dir,
+                test_method_name=self._testMethodName,
+            )
+            unencrypted = self.export(
+                tmp_dir, scope=ExportScope.User, checkpointer=unencrypted_checkpointer
+            )
             self.verify_model_inclusion(unencrypted, ExportScope.User)
-            assert unencrypted == self.export_and_encrypt(tmp_dir, scope=ExportScope.User)
+
+            first_pass_cache_writes = unencrypted_checkpointer.cache_writes
+            assert unencrypted_checkpointer.cache_hits == 0
+            assert unencrypted_checkpointer.cache_misses > 0
+            assert unencrypted_checkpointer.cache_misses == first_pass_cache_writes
+
+            # The following re-run of `self.export` should only use the checkpoint cache. After
+            # completion, we should have no new writes, and no new misses; only hits should be
+            # incremented.
+            self.export(tmp_dir, scope=ExportScope.User, checkpointer=unencrypted_checkpointer)
+            assert unencrypted_checkpointer.cache_hits == first_pass_cache_writes
+            assert unencrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert unencrypted_checkpointer.cache_writes == first_pass_cache_writes
+
+            rsa_key_pair = generate_rsa_key_pair()
+            (private_key_pem, public_key_pem) = rsa_key_pair
+            encrypted_checkpointer = FakeExportCheckpointer(
+                crypto=EncryptorDecryptorPair(
+                    encryptor=LocalFileEncryptor(BytesIO(public_key_pem)),
+                    decryptor=LocalFileDecryptor(BytesIO(private_key_pem)),
+                ),
+                printer=NOOP_PRINTER,
+                tmp_dir=tmp_dir,
+                test_method_name=self._testMethodName,
+            )
+            encrypted = self.export_and_encrypt(
+                tmp_dir,
+                scope=ExportScope.User,
+                rsa_key_pair=rsa_key_pair,
+                checkpointer=encrypted_checkpointer,
+            )
+            assert unencrypted == encrypted
+
+            assert encrypted_checkpointer.cache_hits == 0
+            assert encrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_writes == first_pass_cache_writes
+
+            # The following re-run of `self.export_and_encrypt` should only use the checkpoint
+            # cache. After completion, we should have no new writes, and no new misses; only hits
+            # should be incremented.
+            self.export_and_encrypt(
+                tmp_dir,
+                scope=ExportScope.User,
+                rsa_key_pair=rsa_key_pair,
+                checkpointer=encrypted_checkpointer,
+            )
+            assert encrypted_checkpointer.cache_hits == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_writes == first_pass_cache_writes
 
     @freeze_time("2023-10-11 18:00:00")
     def test_organization_export_scoping(self):
         self.create_exhaustive_instance(is_superadmin=True)
         with TemporaryDirectory() as tmp_dir:
-            unencrypted = self.export(tmp_dir, scope=ExportScope.Organization)
+            unencrypted_checkpointer = FakeExportCheckpointer(
+                crypto=None,
+                printer=NOOP_PRINTER,
+                tmp_dir=tmp_dir,
+                test_method_name=self._testMethodName,
+            )
+            unencrypted = self.export(
+                tmp_dir, scope=ExportScope.Organization, checkpointer=unencrypted_checkpointer
+            )
             self.verify_model_inclusion(unencrypted, ExportScope.Organization)
-            assert unencrypted == self.export_and_encrypt(tmp_dir, scope=ExportScope.Organization)
+
+            first_pass_cache_writes = unencrypted_checkpointer.cache_writes
+            assert unencrypted_checkpointer.cache_hits == 0
+            assert unencrypted_checkpointer.cache_misses > 0
+            assert unencrypted_checkpointer.cache_misses == first_pass_cache_writes
+
+            # The following re-run of `self.export` should only use the checkpoint cache. After
+            # completion, we should have no new writes, and no new misses; only hits should be
+            # incremented.
+            self.export(
+                tmp_dir, scope=ExportScope.Organization, checkpointer=unencrypted_checkpointer
+            )
+            assert unencrypted_checkpointer.cache_hits == first_pass_cache_writes
+            assert unencrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert unencrypted_checkpointer.cache_writes == first_pass_cache_writes
+
+            rsa_key_pair = generate_rsa_key_pair()
+            (private_key_pem, public_key_pem) = rsa_key_pair
+            encrypted_checkpointer = FakeExportCheckpointer(
+                crypto=EncryptorDecryptorPair(
+                    encryptor=LocalFileEncryptor(BytesIO(public_key_pem)),
+                    decryptor=LocalFileDecryptor(BytesIO(private_key_pem)),
+                ),
+                printer=NOOP_PRINTER,
+                tmp_dir=tmp_dir,
+                test_method_name=self._testMethodName,
+            )
+            encrypted = self.export_and_encrypt(
+                tmp_dir,
+                scope=ExportScope.Organization,
+                rsa_key_pair=rsa_key_pair,
+                checkpointer=encrypted_checkpointer,
+            )
+            assert unencrypted == encrypted
+
+            assert encrypted_checkpointer.cache_hits == 0
+            assert encrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_writes == first_pass_cache_writes
+
+            # The following re-run of `self.export_and_encrypt` should only use the checkpoint
+            # cache. After completion, we should have no new writes, and no new misses; only hits
+            # should be incremented.
+            self.export_and_encrypt(
+                tmp_dir,
+                scope=ExportScope.Organization,
+                rsa_key_pair=rsa_key_pair,
+                checkpointer=encrypted_checkpointer,
+            )
+            assert encrypted_checkpointer.cache_hits == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_writes == first_pass_cache_writes
 
     @freeze_time("2023-10-11 18:00:00")
     def test_config_export_scoping(self):
@@ -123,17 +321,129 @@ def test_config_export_scoping(self):
         self.create_exhaustive_api_keys_for_user(staff)
         self.create_exhaustive_api_keys_for_user(superuser)
         with TemporaryDirectory() as tmp_dir:
-            unencrypted = self.export(tmp_dir, scope=ExportScope.Config)
+            unencrypted_checkpointer = FakeExportCheckpointer(
+                crypto=None,
+                printer=NOOP_PRINTER,
+                tmp_dir=tmp_dir,
+                test_method_name=self._testMethodName,
+            )
+            unencrypted = self.export(
+                tmp_dir, scope=ExportScope.Config, checkpointer=unencrypted_checkpointer
+            )
             self.verify_model_inclusion(unencrypted, ExportScope.Config)
-            assert unencrypted == self.export_and_encrypt(tmp_dir, scope=ExportScope.Config)
+
+            first_pass_cache_writes = unencrypted_checkpointer.cache_writes
+            assert unencrypted_checkpointer.cache_hits == 0
+            assert unencrypted_checkpointer.cache_misses > 0
+            assert unencrypted_checkpointer.cache_misses == first_pass_cache_writes
+
+            # The following re-run of `self.export` should only use the checkpoint cache. After
+            # completion, we should have no new writes, and no new misses; only hits should be
+            # incremented.
+            self.export(tmp_dir, scope=ExportScope.Config, checkpointer=unencrypted_checkpointer)
+            assert unencrypted_checkpointer.cache_hits == first_pass_cache_writes
+            assert unencrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert unencrypted_checkpointer.cache_writes == first_pass_cache_writes
+
+            rsa_key_pair = generate_rsa_key_pair()
+            (private_key_pem, public_key_pem) = rsa_key_pair
+            encrypted_checkpointer = FakeExportCheckpointer(
+                crypto=EncryptorDecryptorPair(
+                    encryptor=LocalFileEncryptor(BytesIO(public_key_pem)),
+                    decryptor=LocalFileDecryptor(BytesIO(private_key_pem)),
+                ),
+                printer=NOOP_PRINTER,
+                tmp_dir=tmp_dir,
+                test_method_name=self._testMethodName,
+            )
+            encrypted = self.export_and_encrypt(
+                tmp_dir,
+                scope=ExportScope.Config,
+                rsa_key_pair=rsa_key_pair,
+                checkpointer=encrypted_checkpointer,
+            )
+            assert unencrypted == encrypted
+
+            assert encrypted_checkpointer.cache_hits == 0
+            assert encrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_writes == first_pass_cache_writes
+
+            # The following re-run of `self.export_and_encrypt` should only use the checkpoint
+            # cache. After completion, we should have no new writes, and no new misses; only hits
+            # should be incremented.
+            self.export_and_encrypt(
+                tmp_dir,
+                scope=ExportScope.Config,
+                rsa_key_pair=rsa_key_pair,
+                checkpointer=encrypted_checkpointer,
+            )
+            assert encrypted_checkpointer.cache_hits == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_writes == first_pass_cache_writes
 
     @freeze_time("2023-10-11 18:00:00")
     def test_global_export_scoping(self):
         self.create_exhaustive_instance(is_superadmin=True)
         with TemporaryDirectory() as tmp_dir:
-            unencrypted = self.export(tmp_dir, scope=ExportScope.Global)
+            unencrypted_checkpointer = FakeExportCheckpointer(
+                crypto=None,
+                printer=NOOP_PRINTER,
+                tmp_dir=tmp_dir,
+                test_method_name=self._testMethodName,
+            )
+            unencrypted = self.export(
+                tmp_dir, scope=ExportScope.Global, checkpointer=unencrypted_checkpointer
+            )
             self.verify_model_inclusion(unencrypted, ExportScope.Global)
-            assert unencrypted == self.export_and_encrypt(tmp_dir, scope=ExportScope.Global)
+
+            first_pass_cache_writes = unencrypted_checkpointer.cache_writes
+            assert unencrypted_checkpointer.cache_hits == 0
+            assert unencrypted_checkpointer.cache_misses > 0
+            assert unencrypted_checkpointer.cache_misses == first_pass_cache_writes
+
+            # The following re-run of `self.export` should only use the checkpoint cache. After
+            # completion, we should have no new writes, and no new misses; only hits should be
+            # incremented.
+            self.export(tmp_dir, scope=ExportScope.Global, checkpointer=unencrypted_checkpointer)
+            assert unencrypted_checkpointer.cache_hits == first_pass_cache_writes
+            assert unencrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert unencrypted_checkpointer.cache_writes == first_pass_cache_writes
+
+            rsa_key_pair = generate_rsa_key_pair()
+            (private_key_pem, public_key_pem) = rsa_key_pair
+            encrypted_checkpointer = FakeExportCheckpointer(
+                crypto=EncryptorDecryptorPair(
+                    encryptor=LocalFileEncryptor(BytesIO(public_key_pem)),
+                    decryptor=LocalFileDecryptor(BytesIO(private_key_pem)),
+                ),
+                printer=NOOP_PRINTER,
+                tmp_dir=tmp_dir,
+                test_method_name=self._testMethodName,
+            )
+            encrypted = self.export_and_encrypt(
+                tmp_dir,
+                scope=ExportScope.Global,
+                rsa_key_pair=rsa_key_pair,
+                checkpointer=encrypted_checkpointer,
+            )
+            assert unencrypted == encrypted
+
+            assert encrypted_checkpointer.cache_hits == 0
+            assert encrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_writes == first_pass_cache_writes
+
+            # The following re-run of `self.export_and_encrypt` should only use the checkpoint
+            # cache. After completion, we should have no new writes, and no new misses; only hits
+            # should be incremented.
+            self.export_and_encrypt(
+                tmp_dir,
+                scope=ExportScope.Global,
+                rsa_key_pair=rsa_key_pair,
+                checkpointer=encrypted_checkpointer,
+            )
+            assert encrypted_checkpointer.cache_hits == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_misses == first_pass_cache_writes
+            assert encrypted_checkpointer.cache_writes == first_pass_cache_writes
 
 
 # Filters should work identically in both silo and monolith modes, so no need to repeat the tests
diff --git a/tests/sentry/backup/test_imports.py b/tests/sentry/backup/test_imports.py
index 429ef600d77eb4..7d4e8c065676c9 100644
--- a/tests/sentry/backup/test_imports.py
+++ b/tests/sentry/backup/test_imports.py
@@ -687,13 +687,12 @@ def test_import_signaling_organization(self):
 
         assert OrganizationMember.objects.count() == 3
 
-        # The exhaustive org has 2 projects which automatically get 1 key and 3 options each.
-        assert Project.objects.count() == 2
+        # The exhaustive org has 1 project which automatically gets 1 key and 3 options.
+        assert Project.objects.count() == 1
         assert Project.objects.filter(name="project-some-org").exists()
-        assert Project.objects.filter(name="other-project-some-org").exists()
 
-        assert ProjectKey.objects.count() == 2
-        assert ProjectOption.objects.count() == 2
+        assert ProjectKey.objects.count() == 1
+        assert ProjectOption.objects.count() == 1
         assert ProjectOption.objects.filter(key="sentry:option-epoch").exists()
 
         with assume_test_silo_mode(SiloMode.CONTROL):
@@ -1514,7 +1513,7 @@ def test_colliding_project_key(self, expected_models: list[type[Model]]):
             with open(tmp_path, "rb") as tmp_file:
                 import_in_organization_scope(tmp_file, printer=NOOP_PRINTER)
 
-            assert ProjectKey.objects.count() == 4
+            assert ProjectKey.objects.count() == 3
             assert ProjectKey.objects.filter(public_key=colliding.public_key).count() == 1
             assert ProjectKey.objects.filter(secret_key=colliding.secret_key).count() == 1
 
diff --git a/tests/sentry/backup/test_models.py b/tests/sentry/backup/test_models.py
index d1ba7bceaf02eb..6a04fead8872e4 100644
--- a/tests/sentry/backup/test_models.py
+++ b/tests/sentry/backup/test_models.py
@@ -11,7 +11,10 @@
 from sentry.models.apiapplication import ApiApplication
 from sentry.models.apiauthorization import ApiAuthorization
 from sentry.models.apitoken import ApiToken
-from sentry.models.notificationaction import NotificationAction, NotificationActionProject
+from sentry.notifications.models.notificationaction import (
+    NotificationAction,
+    NotificationActionProject,
+)
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TransactionTestCase
 from sentry.testutils.helpers.backups import export_to_file
diff --git a/tests/sentry/consumers/test_run.py b/tests/sentry/consumers/test_run.py
index 9b48e119cf382f..18f6629c2225dd 100644
--- a/tests/sentry/consumers/test_run.py
+++ b/tests/sentry/consumers/test_run.py
@@ -31,6 +31,7 @@ def test_dlq(consumer_def) -> None:
         "transactions-subscription-results",
         "generic-metrics-subscription-results",
         "metrics-subscription-results",
+        "eap-spans-subscription-results",
     ]
     consumers_that_should_have_dlq_but_dont = [
         "process-spans",
diff --git a/tests/sentry/db/models/test_base.py b/tests/sentry/db/models/test_base.py
index f2057752424e50..54b82730a103fa 100644
--- a/tests/sentry/db/models/test_base.py
+++ b/tests/sentry/db/models/test_base.py
@@ -10,9 +10,6 @@
     ControlImportChunkReplica,
     RegionImportChunk,
 )
-from sentry.models.notificationsettingbase import NotificationSettingBase
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.projecttemplate import ProjectTemplate
 from sentry.models.relocation import (
     Relocation,
@@ -24,6 +21,9 @@
     ProjectTransactionThreshold,
     ProjectTransactionThresholdOverride,
 )
+from sentry.notifications.models.notificationsettingbase import NotificationSettingBase
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.sentry_apps.models import SentryAppInstallationForProvider
 from sentry.uptime.models import ProjectUptimeSubscription, UptimeSubscription
 
diff --git a/tests/sentry/db/postgres/schema/safe_migrations/integration/test_migrations.py b/tests/sentry/db/postgres/schema/safe_migrations/integration/test_migrations.py
index 635bb8dde09536..23e5077acf28cc 100644
--- a/tests/sentry/db/postgres/schema/safe_migrations/integration/test_migrations.py
+++ b/tests/sentry/db/postgres/schema/safe_migrations/integration/test_migrations.py
@@ -1,4 +1,5 @@
 import pytest
+from django.core.exceptions import FieldDoesNotExist
 from django.db import connection
 from django.db.migrations.executor import MigrationExecutor
 from django.test import override_settings
@@ -37,22 +38,24 @@ def run_migration(self):
         self._run_migration(self.app, self.migrate_from)
         self._run_migration(self.app, self.migrate_to)
 
-    def _run_migration(self, app, migration):
+    def _run_migration(self, app, migration_name):
         with override_settings(
             INSTALLED_APPS=(f"{self.BASE_PATH}.{self.app}",), MIGRATION_MODULES={}
         ):
             executor = MigrationExecutor(connection)
+            migration = executor.loader.get_migration_by_prefix(app, migration_name)
             executor.loader.build_graph()
-            target = [(app, migration)]
+            target = [(migration.app_label, migration.name)]
             executor.loader.project_state(target).apps
             executor.migrate(target)
 
-    def sql_migrate(self, app_label, migration_name):
+    def sql_migrate(self, app, migration_name):
         with override_settings(
             INSTALLED_APPS=(f"{self.BASE_PATH}.{self.app}",), MIGRATION_MODULES={}
         ):
-            target = (app_label, migration_name)
             executor = MigrationExecutor(connection)
+            migration = executor.loader.get_migration_by_prefix(app, migration_name)
+            target = (app, migration.name)
             plan = [(executor.loader.graph.nodes[target], None)]
             sql_statements = executor.loader.collect_sql(plan)  # type: ignore[attr-defined]
             return "\n".join(sql_statements)
@@ -66,7 +69,8 @@ class AddColWithDefaultTest(BaseSafeMigrationTest):
     def test(self):
         with pytest.raises(
             UnsafeOperationException,
-            match="Adding TestTable.field as column with a default is safe, but you need to take additional steps.",
+            match="Adding TestTable.field as a not null column with no default is unsafe. "
+            "Provide a default using db_default.",
         ):
             self.run_migration()
 
@@ -79,11 +83,20 @@ class AddColWithNotNullDefaultTest(BaseSafeMigrationTest):
     def test(self):
         with pytest.raises(
             UnsafeOperationException,
-            match="Adding TestTable.field as column with a default is safe, but you need to take additional steps.",
+            match="Adding TestTable.field as a not null column with no default is unsafe. Provide a default using db_default.",
         ):
             self.run_migration()
 
 
+class AddColWithNotNullDbDefaultTest(BaseSafeMigrationTest):
+    app = "good_flow_add_column_with_notnull_db_default_app"
+    migrate_from = "0001_initial"
+    migrate_to = "0002_add_field_notnull_db_default"
+
+    def test(self):
+        self.run_migration()
+
+
 class AddColWithNotNullTest(BaseSafeMigrationTest):
     app = "bad_flow_add_column_with_notnull_app"
     migrate_from = "0001_initial"
@@ -91,7 +104,8 @@ class AddColWithNotNullTest(BaseSafeMigrationTest):
 
     def test(self):
         with pytest.raises(
-            UnsafeOperationException, match="Adding TestTable.field as a not null column is unsafe."
+            UnsafeOperationException,
+            match="Adding TestTable.field as a not null column with no default is unsafe. Provide a default using db_default",
         ):
             self.run_migration()
 
@@ -173,6 +187,28 @@ def test(self):
             self.run_migration()
 
 
+class RunSqlDisabledTest(BaseSafeMigrationTest):
+    app = "bad_flow_run_sql_disabled_app"
+    migrate_from = "0001_initial"
+    migrate_to = "0001_initial"
+
+    def test(self):
+        with pytest.raises(
+            UnsafeOperationException,
+            match="Using RunSQL is unsafe because our migrations safety framework can't detect problems with the migration.",
+        ):
+            self.run_migration()
+
+
+class RunSqlEnabledTest(BaseSafeMigrationTest):
+    app = "good_flow_run_sql_enabled_app"
+    migrate_from = "0001_initial"
+    migrate_to = "0001_initial"
+
+    def test(self):
+        self.run_migration()
+
+
 class DeleteModelCorrectTest(BaseSafeMigrationTest):
     app = "good_flow_delete_model_state_app"
     migrate_from = "0001_initial"
@@ -219,3 +255,213 @@ def test(self):
                 "SET statement_timeout TO '0ms';",
                 "SET lock_timeout TO '0ms';",
             ]
+
+
+class DeletionModelBadDeleteWithoutPendingTest(BaseSafeMigrationTest):
+    app = "bad_flow_delete_model_without_pending_app"
+    migrate_from = "0001"
+    migrate_to = "0002"
+
+    def test(self):
+        with pytest.raises(
+            UnsafeOperationException,
+            match="Model must be in the pending deletion state before full deletion",
+        ):
+            self.run_migration()
+
+
+class DeletionModelBadDeleteDoublePendingTest(BaseSafeMigrationTest):
+    app = "bad_flow_delete_model_double_pending_app"
+    migrate_from = "0001"
+    migrate_to = "0003"
+
+    def test(self):
+        with pytest.raises(
+            LookupError,
+            match="App 'bad_flow_delete_model_double_pending_app' doesn't have a 'TestTable' model",
+        ):
+            self.run_migration()
+
+
+class DeletionModelBadDeletePendingWithFKConstraints(BaseSafeMigrationTest):
+    app = "bad_flow_delete_pending_with_fk_constraints_app"
+    migrate_from = "0001"
+    migrate_to = "0002"
+
+    def test(self):
+        with pytest.raises(
+            UnsafeOperationException,
+            match="Foreign key db constraints must be removed before dropping "
+            "bad_flow_delete_pending_with_fk_constraints_app.TestTable. "
+            "Fields with constraints: \\['fk_table'\\]",
+        ):
+            self.run_migration()
+
+
+class DeletionModelGoodDeleteRemoveFKConstraints(BaseSafeMigrationTest):
+    app = "good_flow_delete_pending_with_fk_constraints_app"
+    migrate_from = "0001"
+    migrate_to = "0003"
+
+    def test(self):
+
+        self._run_migration(self.app, "0001_initial")
+        assert f"{self.app}_testtable" in connection.introspection.table_names()
+        self._run_migration(self.app, "0002_remove_constraints_and_pending")
+        assert f"{self.app}_testtable" in connection.introspection.table_names()
+        self._run_migration(self.app, "0003_delete")
+        assert f"{self.app}_testtable" not in connection.introspection.table_names()
+
+
+class DeletionModelGoodDeleteSimple(BaseSafeMigrationTest):
+    app = "good_flow_delete_simple_app"
+    migrate_from = "0001"
+    migrate_to = "0003"
+
+    def test(self):
+        self._run_migration(self.app, "0001_initial")
+        assert f"{self.app}_testtable" in connection.introspection.table_names()
+        self._run_migration(self.app, "0002_set_pending")
+        assert f"{self.app}_testtable" in connection.introspection.table_names()
+        self._run_migration(self.app, "0003_delete")
+        assert f"{self.app}_testtable" not in connection.introspection.table_names()
+
+
+class DeletionFieldBadDeleteWithoutPendingTest(BaseSafeMigrationTest):
+    app = "bad_flow_delete_field_without_pending_app"
+    migrate_from = "0001"
+    migrate_to = "0002"
+
+    def test(self):
+        with pytest.raises(
+            UnsafeOperationException,
+            match="Field must be in the pending deletion state before full deletion",
+        ):
+            self.run_migration()
+
+
+class DeletionFieldBadDeleteDoublePendingTest(BaseSafeMigrationTest):
+    app = "bad_flow_delete_field_double_pending_app"
+    migrate_from = "0001"
+    migrate_to = "0003"
+
+    def test(self):
+        with pytest.raises(
+            FieldDoesNotExist,
+            match="TestTable has no field named 'field'",
+        ):
+            self.run_migration()
+
+
+class DeletionFieldBadDeletePendingWithFKConstraint(BaseSafeMigrationTest):
+    app = "bad_flow_delete_field_pending_with_fk_constraint_app"
+    migrate_from = "0001"
+    migrate_to = "0002"
+
+    def test(self):
+        with pytest.raises(
+            UnsafeOperationException,
+            match="Foreign key db constraint must be removed before dropping "
+            "bad_flow_delete_field_pending_with_fk_constraint_app.testtable.fk_table",
+        ):
+            self.run_migration()
+
+
+class DeletionFieldBadDeletePendingWithNotNull(BaseSafeMigrationTest):
+    app = "bad_flow_delete_field_pending_with_not_null_app"
+    migrate_from = "0001"
+    migrate_to = "0002"
+
+    def test(self):
+        with pytest.raises(
+            UnsafeOperationException,
+            match="Field bad_flow_delete_field_pending_with_not_null_app.testtable.field "
+            "must either be nullable or have a db_default before dropping",
+        ):
+            self.run_migration()
+
+
+class DeletionFieldGoodDeletePendingWithNotNullM2M(BaseSafeMigrationTest):
+    app = "good_flow_delete_field_pending_with_not_null_m2m_app"
+    migrate_from = "0001"
+    migrate_to = "0002"
+
+    def test(self):
+        self.run_migration()
+
+
+class ColExistsMixin:
+    app = ""
+
+    def col_exists(self, col_name):
+        with connection.cursor() as cursor:
+            table_name = f"{self.app}_testtable"
+            columns = connection.introspection.get_table_description(cursor, table_name)
+            return any(c for c in columns if c.name == col_name)
+
+
+class DeletionFieldGoodDeletePendingWithFKConstraint(BaseSafeMigrationTest, ColExistsMixin):
+    app = "good_flow_delete_field_pending_with_fk_constraint_app"
+    migrate_from = "0001"
+    migrate_to = "0003"
+
+    def test(self):
+        self._run_migration(self.app, "0001_initial")
+        assert self.col_exists("fk_table_id")
+        self._run_migration(self.app, "0002_remove_constraints_and_pending")
+        assert self.col_exists("fk_table_id")
+        self._run_migration(self.app, "0003_delete")
+        assert not self.col_exists("fk_table_id")
+
+
+class DeletionFieldGoodDeletePendingWithNotNull(BaseSafeMigrationTest, ColExistsMixin):
+    app = "good_flow_delete_field_pending_with_not_null_app"
+    migrate_from = "0001"
+    migrate_to = "0003"
+
+    def test(self):
+        self._run_migration(self.app, "0001_initial")
+        assert self.col_exists("field")
+        self._run_migration(self.app, "0002_remove_not_null_and_pending")
+        assert self.col_exists("field")
+        self._run_migration(self.app, "0003_delete")
+        assert not self.col_exists("field")
+
+
+class DeletionFieldGoodDeleteSimple(BaseSafeMigrationTest, ColExistsMixin):
+    app = "good_flow_delete_field_simple_app"
+    migrate_from = "0001"
+    migrate_to = "0003"
+
+    def test(self):
+        self._run_migration(self.app, "0001_initial")
+        assert self.col_exists("field")
+        self._run_migration(self.app, "0002_set_pending")
+        assert self.col_exists("field")
+        self._run_migration(self.app, "0003_delete")
+        assert not self.col_exists("field")
+
+
+class DeletionFieldGoodDeleteSimpleLockTimeoutTest(BaseSafeMigrationTest):
+    app = "good_flow_delete_field_simple_app"
+    migrate_from = "0001"
+    migrate_to = "0003"
+
+    def test(self):
+        with override_settings(
+            ZERO_DOWNTIME_MIGRATIONS_LOCK_TIMEOUT="5s",
+            ZERO_DOWNTIME_MIGRATIONS_STATEMENT_TIMEOUT="5s",
+        ):
+            self._run_migration(self.app, "0001_initial")
+            migration_sql = self.sql_migrate(self.app, "0002_set_pending")
+            assert split_sql_queries(migration_sql) == []
+            self._run_migration(self.app, "0002_set_pending")
+            migration_sql = self.sql_migrate(self.app, "0003_delete")
+            # This should set both the lock and statement timeouts
+            assert split_sql_queries(migration_sql) == [
+                "SET statement_timeout TO '5s';",
+                "SET lock_timeout TO '5s';",
+                'ALTER TABLE "good_flow_delete_field_simple_app_testtable" DROP COLUMN "field" CASCADE;',
+                "SET statement_timeout TO '0ms';",
+                "SET lock_timeout TO '0ms';",
+            ]
diff --git a/tests/sentry/deletions/test_alert_rule_trigger_action.py b/tests/sentry/deletions/test_alert_rule_trigger_action.py
index 471151a466ecda..2c92d51bf72e87 100644
--- a/tests/sentry/deletions/test_alert_rule_trigger_action.py
+++ b/tests/sentry/deletions/test_alert_rule_trigger_action.py
@@ -1,6 +1,6 @@
 from sentry.deletions.tasks.scheduled import run_scheduled_deletions
 from sentry.incidents.models.alert_rule import AlertRuleTriggerAction
-from sentry.models.notificationmessage import NotificationMessage
+from sentry.notifications.models.notificationmessage import NotificationMessage
 from sentry.testutils.cases import TestCase
 from sentry.testutils.hybrid_cloud import HybridCloudTestMixin
 
diff --git a/tests/sentry/deletions/test_organization.py b/tests/sentry/deletions/test_organization.py
index cf3bfc26a71073..9ae277973402d0 100644
--- a/tests/sentry/deletions/test_organization.py
+++ b/tests/sentry/deletions/test_organization.py
@@ -316,6 +316,8 @@ def test_delete_org_after_project_transfer(self):
 
         alert_rule.refresh_from_db()
         assert AlertRule.objects.fetch_for_project(project).count() == 1
+        assert alert_rule.snuba_query is not None
+        assert alert_rule.snuba_query.environment is not None
         assert alert_rule.snuba_query.environment.id != environment.id
         assert (
             alert_rule.snuba_query.environment.name
diff --git a/tests/sentry/deletions/test_rulefirehistory.py b/tests/sentry/deletions/test_rulefirehistory.py
index 99c84759e04694..86dc89add57852 100644
--- a/tests/sentry/deletions/test_rulefirehistory.py
+++ b/tests/sentry/deletions/test_rulefirehistory.py
@@ -1,7 +1,7 @@
 from sentry.deletions.tasks.scheduled import run_scheduled_deletions
-from sentry.models.notificationmessage import NotificationMessage
 from sentry.models.rule import Rule
 from sentry.models.rulefirehistory import RuleFireHistory
+from sentry.notifications.models.notificationmessage import NotificationMessage
 from sentry.testutils.cases import TestCase
 from sentry.testutils.hybrid_cloud import HybridCloudTestMixin
 
diff --git a/tests/sentry/discover/test_dataset_split.py b/tests/sentry/discover/test_dataset_split.py
index 59e6d2402503b5..632892717b31c2 100644
--- a/tests/sentry/discover/test_dataset_split.py
+++ b/tests/sentry/discover/test_dataset_split.py
@@ -656,12 +656,12 @@ def setUp(self):
 
 
 @pytest.fixture
-def owner() -> None:
+def owner() -> User:
     return Factories.create_user()
 
 
 @pytest.fixture
-def organization(owner: User) -> None:
+def organization(owner: User) -> Organization:
     return Factories.create_organization(owner=owner)
 
 
diff --git a/tests/sentry/dynamic_sampling/tasks/helpers/test_recalibrate_orgs.py b/tests/sentry/dynamic_sampling/tasks/helpers/test_recalibrate_orgs.py
index d322b7840b9ef1..9de3c153963770 100644
--- a/tests/sentry/dynamic_sampling/tasks/helpers/test_recalibrate_orgs.py
+++ b/tests/sentry/dynamic_sampling/tasks/helpers/test_recalibrate_orgs.py
@@ -10,6 +10,8 @@
         (1.0, 0.1, 0.036, 0.35999999999999993),  # emulate sentry
         (0.35999999999999993, 0.036, 0.036, 0.35999999999999993),  # emulate sentry
         (1.0, 0.25, 0.5, 2.0),
+        (1.0, 0, 0.5, None),
+        (0.0, 0.25, 0.5, None),
     ],
 )
 def test_adjusted_factor(prev_factor, actual_rate, desired_sample_rate, expected_adj_factor):
diff --git a/tests/sentry/dynamic_sampling/tasks/test_boost_low_volume_projects.py b/tests/sentry/dynamic_sampling/tasks/test_boost_low_volume_projects.py
index 58526a076e5a6c..2453ba9a97b72c 100644
--- a/tests/sentry/dynamic_sampling/tasks/test_boost_low_volume_projects.py
+++ b/tests/sentry/dynamic_sampling/tasks/test_boost_low_volume_projects.py
@@ -1,5 +1,6 @@
 from datetime import timedelta
 from typing import cast
+from unittest.mock import patch
 
 from django.utils import timezone
 
@@ -183,6 +184,22 @@ def test_project_mode_sampling_with_query(self):
 
         assert get_guarded_project_sample_rate(org1, p1) == 0.2
 
+    @with_feature(["organizations:dynamic-sampling", "organizations:dynamic-sampling-custom"])
+    def test_project_mode_sampling_with_query_zero_metrics(self):
+        organization = self.create_organization("test-org")
+        project = self.create_project(organization=organization)
+
+        organization.update_option("sentry:sampling_mode", DynamicSamplingMode.PROJECT)
+        project.update_option("sentry:target_sample_rate", 0.2)
+
+        # make sure that no rebalancing is actually run
+        with patch(
+            "sentry.dynamic_sampling.models.projects_rebalancing.ProjectsRebalancingModel._run"
+        ) as mock_run:
+            with self.tasks():
+                boost_low_volume_projects.delay()
+            assert not mock_run.called
+
     def test_complex(self):
         context = TaskContext("rebalancing", 20)
         org1 = self.create_organization("test-org1")
diff --git a/tests/sentry/event_manager/grouping/test_seer_grouping.py b/tests/sentry/event_manager/grouping/test_seer_grouping.py
index 450348204c6428..ccdfc9b7c3c8b2 100644
--- a/tests/sentry/event_manager/grouping/test_seer_grouping.py
+++ b/tests/sentry/event_manager/grouping/test_seer_grouping.py
@@ -17,6 +17,29 @@
 class SeerEventManagerGroupingTest(TestCase):
     """Test whether Seer is called during ingest and if so, how the results are used"""
 
+    def setUp(self) -> None:
+        self.event_data = {
+            "title": "FailedToFetchError('Charlie didn't bring the ball back')",
+            "exception": {
+                "values": [
+                    {
+                        "type": "FailedToFetchError",
+                        "value": "Charlie didn't bring the ball back",
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "function": "play_fetch",
+                                    "filename": "dogpark.py",
+                                    "context_line": "raise FailedToFetchError('Charlie didn't bring the ball back')",
+                                }
+                            ]
+                        },
+                    }
+                ]
+            },
+            "platform": "python",
+        }
+
     def test_obeys_seer_similarity_flags(self):
         existing_event = save_new_event({"message": "Dogs are great!"}, self.project)
         seer_result_data = SeerSimilarIssueData(
@@ -65,7 +88,14 @@ def test_obeys_seer_similarity_flags(self):
 
             # Project option set
             self.project.update_option("sentry:similarity_backfill_completed", int(time()))
-            new_event = save_new_event({"message": "Maisey is silly"}, self.project)
+            new_event = save_new_event(
+                {
+                    "exception": {
+                        "values": [{"type": "DogsAreNeverAnError", "value": "Dogs are great!"}],
+                    },
+                },
+                self.project,
+            )
             expected_metadata = {
                 "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
                 "results": [asdict(seer_result_data)],
@@ -130,7 +160,7 @@ def assert_correct_seer_metadata(
             "sentry.grouping.ingest.seer.get_similarity_data_from_seer",
             return_value=[],
         ) as mock_get_similarity_data_from_seer:
-            existing_event = save_new_event({"message": "Dogs are great!"}, self.project)
+            existing_event = save_new_event(self.event_data, self.project)
 
             existing_event_grouphash = GroupHash.objects.filter(
                 hash=existing_event.get_primary_hash(), project_id=self.project.id
@@ -159,12 +189,33 @@ def assert_correct_seer_metadata(
             stacktrace_distance=0.01,
             should_group=True,
         )
+        new_event_data = {
+            "title": "FailedToFetchError('Kenji didn't bring the ball back')",
+            "exception": {
+                "values": [
+                    {
+                        "type": "FailedToFetchError",
+                        "value": "Kenji didn't bring the ball back",
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "function": "play_fetch",
+                                    "filename": "dogpark.py",
+                                    "context_line": "raise FailedToFetchError('Kenji didn't bring the ball back')",
+                                }
+                            ]
+                        },
+                    }
+                ]
+            },
+            "platform": "python",
+        }
 
         with patch(
             "sentry.grouping.ingest.seer.get_similarity_data_from_seer",
             return_value=[seer_result_data],
         ) as mock_get_similarity_data_from_seer:
-            new_event = save_new_event({"message": "Adopt don't shop"}, self.project)
+            new_event = save_new_event(new_event_data, self.project)
 
             assert new_event.group_id == existing_event.group_id
 
@@ -216,7 +267,7 @@ def test_assigns_event_to_neighbor_group_if_found(self, _):
             "sentry.grouping.ingest.seer.get_similarity_data_from_seer",
             return_value=[seer_result_data],
         ) as mock_get_similarity_data:
-            new_event = save_new_event({"message": "Adopt don't shop"}, self.project)
+            new_event = save_new_event(self.event_data, self.project)
 
             assert mock_get_similarity_data.call_count == 1
             assert existing_event.group_id == new_event.group_id
@@ -228,7 +279,7 @@ def test_creates_new_group_if_no_neighbor_found(self, _):
         with patch(
             "sentry.grouping.ingest.seer.get_similarity_data_from_seer", return_value=[]
         ) as mock_get_similarity_data:
-            new_event = save_new_event({"message": "Adopt don't shop"}, self.project)
+            new_event = save_new_event(self.event_data, self.project)
 
             assert mock_get_similarity_data.call_count == 1
             assert existing_event.group_id != new_event.group_id
diff --git a/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_browser.pysnap b/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_browser.pysnap
new file mode 100644
index 00000000000000..09edad848bd6b1
--- /dev/null
+++ b/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_browser.pysnap
@@ -0,0 +1,15 @@
+---
+source: tests/sentry/event_manager/interfaces/test_contexts.py
+---
+errors: null
+tags:
+- - browser
+  - Chrome 132.0.6834.0
+- - browser.name
+  - Chrome
+to_json:
+  browser:
+    browser: Chrome 132.0.6834.0
+    name: Chrome
+    type: browser
+    version: 132.0.6834.0
diff --git a/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_os.pysnap b/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_os.pysnap
index 1ca5e1f67b8652..6f84239afce595 100644
--- a/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_os.pysnap
+++ b/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_os.pysnap
@@ -1,6 +1,4 @@
 ---
-created: '2019-03-14T17:12:34.895867Z'
-creator: sentry
 source: tests/sentry/event_manager/interfaces/test_contexts.py
 ---
 errors: null
@@ -14,6 +12,7 @@ tags:
 to_json:
   os:
     name: Windows
+    os: Windows 95
     rooted: true
     type: os
     version: '95'
diff --git a/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_os_normalization.pysnap b/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_os_normalization.pysnap
index 5a1dbd91d8d3c4..8c309763fb7599 100644
--- a/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_os_normalization.pysnap
+++ b/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_os_normalization.pysnap
@@ -1,6 +1,4 @@
 ---
-created: '2022-04-19T12:13:12.606509Z'
-creator: sentry
 source: tests/sentry/event_manager/interfaces/test_contexts.py
 ---
 errors: null
@@ -13,6 +11,7 @@ to_json:
   os:
     build: '7601'
     name: Windows
+    os: Windows 7
     raw_description: Microsoft Windows 6.1.7601 S
     type: os
     version: '7'
diff --git a/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_runtime.pysnap b/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_runtime.pysnap
index a7f5ed1cb2f8b9..edf4422385bea3 100644
--- a/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_runtime.pysnap
+++ b/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_runtime.pysnap
@@ -1,6 +1,4 @@
 ---
-created: '2019-03-14T17:12:34.943424Z'
-creator: sentry
 source: tests/sentry/event_manager/interfaces/test_contexts.py
 ---
 errors: null
@@ -13,5 +11,6 @@ to_json:
   runtime:
     build: BLAH
     name: Java
+    runtime: Java 1.2.3
     type: runtime
     version: 1.2.3
diff --git a/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_runtime_normalization.pysnap b/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_runtime_normalization.pysnap
index 96ae3f56f1f90b..bdf8710337d6b5 100644
--- a/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_runtime_normalization.pysnap
+++ b/tests/sentry/event_manager/interfaces/snapshots/test_contexts/test_runtime_normalization.pysnap
@@ -1,6 +1,4 @@
 ---
-created: '2019-03-14T17:12:34.953209Z'
-creator: sentry
 source: tests/sentry/event_manager/interfaces/test_contexts.py
 ---
 errors: null
@@ -14,5 +12,6 @@ to_json:
     build: '461808'
     name: .NET Framework
     raw_description: .NET Framework 4.0.30319.42000
+    runtime: .NET Framework 4.7.2
     type: runtime
     version: 4.7.2
diff --git a/tests/sentry/event_manager/interfaces/test_contexts.py b/tests/sentry/event_manager/interfaces/test_contexts.py
index 2fc78f4213ef68..ccad8bd66b7b15 100644
--- a/tests/sentry/event_manager/interfaces/test_contexts.py
+++ b/tests/sentry/event_manager/interfaces/test_contexts.py
@@ -24,7 +24,9 @@ def inner(data):
 
 
 def test_os(make_ctx_snapshot):
-    make_ctx_snapshot({"os": {"name": "Windows", "version": "95", "rooted": True}})
+    make_ctx_snapshot(
+        {"os": {"os": "Windows 95", "name": "Windows", "version": "95", "rooted": True}}
+    )
 
 
 def test_null_values(make_ctx_snapshot):
@@ -43,8 +45,10 @@ def test_os_normalization(make_ctx_snapshot):
     make_ctx_snapshot({"os": {"raw_description": "Microsoft Windows 6.1.7601 S"}})
 
 
-def test_runtime(make_ctx_snapshot, insta_snapshot):
-    make_ctx_snapshot({"runtime": {"name": "Java", "version": "1.2.3", "build": "BLAH"}})
+def test_runtime(make_ctx_snapshot):
+    make_ctx_snapshot(
+        {"runtime": {"runtime": "Java 1.2.3", "name": "Java", "version": "1.2.3", "build": "BLAH"}}
+    )
 
 
 def test_runtime_normalization(make_ctx_snapshot):
@@ -53,6 +57,12 @@ def test_runtime_normalization(make_ctx_snapshot):
     )
 
 
+def test_browser(make_ctx_snapshot):
+    make_ctx_snapshot(
+        {"browser": {"browser": "Chrome 132.0.6834.0", "name": "Chrome", "version": "132.0.6834.0"}}
+    )
+
+
 def test_device(make_ctx_snapshot):
     make_ctx_snapshot(
         {
diff --git a/tests/sentry/event_manager/test_event_manager.py b/tests/sentry/event_manager/test_event_manager.py
index 73a49881143ba7..b853640d746036 100644
--- a/tests/sentry/event_manager/test_event_manager.py
+++ b/tests/sentry/event_manager/test_event_manager.py
@@ -49,6 +49,7 @@
 from sentry.grouping.api import load_grouping_config
 from sentry.grouping.utils import hash_from_values
 from sentry.ingest.inbound_filters import FilterStatKeys
+from sentry.ingest.transaction_clusterer import ClustererNamespace
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.models.integration import Integration
 from sentry.issues.grouptype import (
@@ -1540,6 +1541,140 @@ def test_transaction_event_span_grouping(self) -> None:
         # the basic strategy is to simply use the description
         assert spans == [{"hash": hash_values([span["description"]])} for span in data["spans"]]
 
+    @override_options({"transactions.do_post_process_in_save": 1.0})
+    def test_transaction_sampler_and_receive(self) -> None:
+        # make sure with the option on we don't get any errors
+        manager = EventManager(
+            make_event(
+                **{
+                    "transaction": "wait",
+                    "contexts": {
+                        "trace": {
+                            "parent_span_id": "bce14471e0e9654d",
+                            "op": "foobar",
+                            "trace_id": "a0fa8803753e40fd8124b21eeb2986b5",
+                            "span_id": "bf5be759039ede9a",
+                        }
+                    },
+                    "spans": [
+                        {
+                            "trace_id": "a0fa8803753e40fd8124b21eeb2986b5",
+                            "parent_span_id": "bf5be759039ede9a",
+                            "span_id": "a" * 16,
+                            "start_timestamp": 0,
+                            "timestamp": 1,
+                            "same_process_as_parent": True,
+                            "op": "default",
+                            "description": "span a",
+                        },
+                        {
+                            "trace_id": "a0fa8803753e40fd8124b21eeb2986b5",
+                            "parent_span_id": "bf5be759039ede9a",
+                            "span_id": "b" * 16,
+                            "start_timestamp": 0,
+                            "timestamp": 1,
+                            "same_process_as_parent": True,
+                            "op": "default",
+                            "description": "span a",
+                        },
+                        {
+                            "trace_id": "a0fa8803753e40fd8124b21eeb2986b5",
+                            "parent_span_id": "bf5be759039ede9a",
+                            "span_id": "c" * 16,
+                            "start_timestamp": 0,
+                            "timestamp": 1,
+                            "same_process_as_parent": True,
+                            "op": "default",
+                            "description": "span b",
+                        },
+                    ],
+                    "timestamp": "2019-06-14T14:01:40Z",
+                    "start_timestamp": "2019-06-14T14:01:40Z",
+                    "type": "transaction",
+                    "transaction_info": {
+                        "source": "url",
+                    },
+                }
+            )
+        )
+        manager.normalize()
+        manager.save(self.project.id)
+
+    @override_options({"transactions.do_post_process_in_save": 1.0})
+    @patch("sentry.event_manager.record_event_processed")
+    @patch("sentry.event_manager.record_user_context_received")
+    @patch("sentry.event_manager.record_release_received")
+    @patch("sentry.ingest.transaction_clusterer.datasource.redis._record_sample")
+    def test_transaction_sampler_and_receive_mock_called(
+        self,
+        mock_record_sample: mock.MagicMock,
+        mock_record_release: mock.MagicMock,
+        mock_record_user: mock.MagicMock,
+        mock_record_event: mock.MagicMock,
+    ) -> None:
+        manager = EventManager(
+            make_event(
+                **{
+                    "transaction": "wait",
+                    "contexts": {
+                        "trace": {
+                            "parent_span_id": "bce14471e0e9654d",
+                            "op": "foobar",
+                            "trace_id": "a0fa8803753e40fd8124b21eeb2986b5",
+                            "span_id": "bf5be759039ede9a",
+                        }
+                    },
+                    "spans": [
+                        {
+                            "trace_id": "a0fa8803753e40fd8124b21eeb2986b5",
+                            "parent_span_id": "bf5be759039ede9a",
+                            "span_id": "a" * 16,
+                            "start_timestamp": 0,
+                            "timestamp": 1,
+                            "same_process_as_parent": True,
+                            "op": "default",
+                            "description": "span a",
+                        },
+                        {
+                            "trace_id": "a0fa8803753e40fd8124b21eeb2986b5",
+                            "parent_span_id": "bf5be759039ede9a",
+                            "span_id": "b" * 16,
+                            "start_timestamp": 0,
+                            "timestamp": 1,
+                            "same_process_as_parent": True,
+                            "op": "default",
+                            "description": "span a",
+                        },
+                        {
+                            "trace_id": "a0fa8803753e40fd8124b21eeb2986b5",
+                            "parent_span_id": "bf5be759039ede9a",
+                            "span_id": "c" * 16,
+                            "start_timestamp": 0,
+                            "timestamp": 1,
+                            "same_process_as_parent": True,
+                            "op": "default",
+                            "description": "span b",
+                        },
+                    ],
+                    "timestamp": "2019-06-14T14:01:40Z",
+                    "start_timestamp": "2019-06-14T14:01:40Z",
+                    "type": "transaction",
+                    "transaction_info": {
+                        "source": "url",
+                    },
+                }
+            )
+        )
+        manager.normalize()
+        event = manager.save(self.project.id)
+
+        mock_record_event.assert_called_once_with(self.project, event)
+        mock_record_user.assert_called_once_with(self.project, event)
+        mock_record_release.assert_called_once_with(self.project, event)
+        assert mock_record_sample.mock_calls == [
+            mock.call(ClustererNamespace.TRANSACTIONS, self.project, "wait")
+        ]
+
     def test_sdk(self) -> None:
         manager = EventManager(make_event(**{"sdk": {"name": "sentry-unity", "version": "1.0"}}))
         manager.normalize()
@@ -1912,6 +2047,7 @@ def test_transaction_outcome_accepted(self) -> None:
         with Sentry installations that do not have a metrics pipeline.
         """
 
+        timestamp = before_now(minutes=5).isoformat()
         manager = EventManager(
             make_event(
                 transaction="wait",
@@ -1924,8 +2060,8 @@ def test_transaction_outcome_accepted(self) -> None:
                     }
                 },
                 spans=[],
-                timestamp=before_now(minutes=5).isoformat(),
-                start_timestamp=before_now(minutes=5).isoformat(),
+                timestamp=timestamp,
+                start_timestamp=timestamp,
                 type="transaction",
                 platform="python",
             )
@@ -1949,6 +2085,7 @@ def test_transaction_indexed_outcome_accepted(self) -> None:
         ``billing_metrics_consumer``.
         """
 
+        timestamp = before_now(minutes=5).isoformat()
         manager = EventManager(
             make_event(
                 transaction="wait",
@@ -1961,8 +2098,8 @@ def test_transaction_indexed_outcome_accepted(self) -> None:
                     }
                 },
                 spans=[],
-                timestamp=before_now(minutes=5).isoformat(),
-                start_timestamp=before_now(minutes=5).isoformat(),
+                timestamp=timestamp,
+                start_timestamp=timestamp,
                 type="transaction",
                 platform="python",
             )
@@ -2012,6 +2149,7 @@ def test_legacy_attributes_moved(self) -> None:
 
     @freeze_time()
     def test_save_issueless_event(self) -> None:
+        timestamp = before_now(minutes=5).isoformat()
         manager = EventManager(
             make_event(
                 transaction="wait",
@@ -2024,8 +2162,8 @@ def test_save_issueless_event(self) -> None:
                     }
                 },
                 spans=[],
-                timestamp=before_now(minutes=5).isoformat(),
-                start_timestamp=before_now(minutes=5).isoformat(),
+                timestamp=timestamp,
+                start_timestamp=timestamp,
                 type="transaction",
                 platform="python",
             )
diff --git a/tests/sentry/event_manager/test_severity.py b/tests/sentry/event_manager/test_severity.py
index 943e9289d3eb12..0b6445abacefd2 100644
--- a/tests/sentry/event_manager/test_severity.py
+++ b/tests/sentry/event_manager/test_severity.py
@@ -10,7 +10,6 @@
 from urllib3 import HTTPResponse
 from urllib3.exceptions import ConnectTimeoutError, MaxRetryError
 
-from sentry import options
 from sentry.constants import PLACEHOLDER_EVENT_TITLES
 from sentry.event_manager import (
     SEER_ERROR_COUNT_KEY,
@@ -425,15 +424,15 @@ def test_score_not_clobbered_by_second_event(self, mock_get_severity_score: Magi
 
     @patch("sentry.event_manager._get_severity_score")
     def test_killswitch_on(self, mock_get_severity_score: MagicMock):
-        options.set("issues.severity.skip-seer-requests", [self.project.id])
-        event = EventManager(
-            make_event(
-                exception={"values": [{"type": "NopeError", "value": "Nopey McNopeface"}]},
-                platform="python",
-            )
-        ).save(self.project.id)
+        with override_options({"issues.severity.skip-seer-requests": [self.project.id]}):
+            event = EventManager(
+                make_event(
+                    exception={"values": [{"type": "NopeError", "value": "Nopey McNopeface"}]},
+                    platform="python",
+                )
+            ).save(self.project.id)
 
-        assert event.group
-        assert "severity" not in event.group.get_event_metadata()
-        assert cache.get(SEER_ERROR_COUNT_KEY) is None
-        assert mock_get_severity_score.call_count == 0
+            assert event.group
+            assert "severity" not in event.group.get_event_metadata()
+            assert cache.get(SEER_ERROR_COUNT_KEY) is None
+            assert mock_get_severity_score.call_count == 0
diff --git a/tests/sentry/flags/endpoints/test_hooks.py b/tests/sentry/flags/endpoints/test_hooks.py
index dc5707ea82272c..782ac9a19b81c8 100644
--- a/tests/sentry/flags/endpoints/test_hooks.py
+++ b/tests/sentry/flags/endpoints/test_hooks.py
@@ -1,15 +1,14 @@
-from urllib.parse import quote
-
 from django.urls import reverse
 
-from sentry.flags.endpoints.hooks import is_valid_token
-from sentry.flags.models import ACTION_MAP, CREATED_BY_TYPE_MAP, FlagAuditLogModel
-from sentry.models.orgauthtoken import OrgAuthToken
-from sentry.silo.base import SiloMode
+from sentry.flags.models import (
+    ACTION_MAP,
+    CREATED_BY_TYPE_MAP,
+    FlagAuditLogModel,
+    FlagWebHookSigningSecretModel,
+)
+from sentry.flags.providers import hmac_sha256_hex_digest
 from sentry.testutils.cases import APITestCase
-from sentry.testutils.pytest.fixtures import django_db_all
-from sentry.testutils.silo import assume_test_silo_mode
-from sentry.utils.security.orgauthtoken_token import hash_token
+from sentry.utils import json
 
 
 class OrganizationFlagsHooksEndpointTestCase(APITestCase):
@@ -17,164 +16,31 @@ class OrganizationFlagsHooksEndpointTestCase(APITestCase):
 
     def setUp(self):
         super().setUp()
-        token_str = "sntrys+_abc123_xy/3_*z"
-        self.token = quote(token_str)
-        self.create_org_auth_token(
-            name="Test Token 1",
-            token_hashed=hash_token(token_str),
-            organization_id=self.organization.id,
-            token_last_characters="xyz",
-            scope_list=["org:ci"],
-            date_last_used=None,
-        )
-        self.url = reverse(self.endpoint, args=(self.organization.slug, "launchdarkly", self.token))
+        self.url = reverse(self.endpoint, args=(self.organization.slug, "launchdarkly"))
 
     @property
     def features(self):
         return {"organizations:feature-flag-audit-log": True}
 
     def test_launchdarkly_post_create(self):
-        request_data = {
-            "_links": {
-                "canonical": {
-                    "href": "/api/v2/flags/default/test-flag",
-                    "type": "application/json",
-                },
-                "parent": {"href": "/api/v2/auditlog", "type": "application/json"},
-                "self": {
-                    "href": "/api/v2/auditlog/1234",
-                    "type": "application/json",
-                },
-                "site": {"href": "/default/~/features/test-flag", "type": "text/html"},
-            },
-            "_id": "1234",
-            "_accountId": "1234",
-            "date": 1729123465221,
-            "accesses": [
-                {"action": "createFlag", "resource": "proj/default:env/test:flag/test-flag"},
-                {"action": "createFlag", "resource": "proj/default:env/production:flag/test-flag"},
-            ],
-            "kind": "flag",
-            "name": "test flag",
-            "description": "flag was created",
-            "shortDescription": "",
-            "member": {
-                "_links": {
-                    "parent": {"href": "/api/v2/members", "type": "application/json"},
-                    "self": {
-                        "href": "/api/v2/members/1234",
-                        "type": "application/json",
-                    },
-                },
-                "_id": "1234",
-                "email": "michelle@example.com",
-                "firstName": "Michelle",
-                "lastName": "Doe",
-            },
-            "titleVerb": "created the flag",
-            "title": "Michelle created the flag [test flag](https://app.launchdarkly.com/default/~/features/test-flag)",
-            "target": {
-                "_links": {
-                    "canonical": {
-                        "href": "/api/v2/flags/default/test-flag",
-                        "type": "application/json",
-                    },
-                    "site": {"href": "/default/~/features/test-flag", "type": "text/html"},
-                },
-                "name": "test flag",
-                "resources": [
-                    "proj/default:env/test:flag/test-flag",
-                    "proj/default:env/production:flag/test-flag",
-                ],
-            },
-            "currentVersion": {
-                "name": "test flag",
-                "kind": "boolean",
-                "description": "testing a feature flag",
-                "key": "test-flag",
-                "_version": 1,
-                "creationDate": 1729123465176,
-                "includeInSnippet": False,
-                "clientSideAvailability": {"usingMobileKey": False, "usingEnvironmentId": False},
-                "variations": [
-                    {"_id": "d883033e-fa8b-41d4-a4be-112d9a59278e", "value": True, "name": "on"},
-                    {"_id": "73aaa33f-c9ca-4bdc-8c97-01a20567aa3f", "value": False, "name": "off"},
-                ],
-                "temporary": False,
-                "tags": [],
-                "_links": {
-                    "parent": {"href": "/api/v2/flags/default", "type": "application/json"},
-                    "self": {"href": "/api/v2/flags/default/test-flag", "type": "application/json"},
-                },
-                "maintainerId": "1234",
-                "_maintainer": {
-                    "_links": {
-                        "self": {
-                            "href": "/api/v2/members/1234",
-                            "type": "application/json",
-                        }
-                    },
-                    "_id": "1234",
-                    "firstName": "Michelle",
-                    "lastName": "Doe",
-                    "role": "owner",
-                    "email": "michelle@example.com",
-                },
-                "goalIds": [],
-                "experiments": {"baselineIdx": 0, "items": []},
-                "customProperties": {},
-                "archived": False,
-                "deprecated": False,
-                "defaults": {"onVariation": 0, "offVariation": 1},
-                "environments": {
-                    "production": {
-                        "on": False,
-                        "archived": False,
-                        "salt": "1234",
-                        "sel": "1234",
-                        "lastModified": 1729123465190,
-                        "version": 1,
-                        "targets": [],
-                        "contextTargets": [],
-                        "rules": [],
-                        "fallthrough": {"variation": 0},
-                        "offVariation": 1,
-                        "prerequisites": [],
-                        "_site": {
-                            "href": "/default/production/features/test-flag",
-                            "type": "text/html",
-                        },
-                        "_environmentName": "Production",
-                        "trackEvents": False,
-                        "trackEventsFallthrough": False,
-                    },
-                    "test": {
-                        "on": False,
-                        "archived": False,
-                        "salt": "7495d3dcf72f43aaa075012fad947d0d",
-                        "sel": "61b4861e6ed54135bc244bb120e9e2da",
-                        "lastModified": 1729123465190,
-                        "version": 1,
-                        "targets": [],
-                        "contextTargets": [],
-                        "rules": [],
-                        "fallthrough": {"variation": 0},
-                        "offVariation": 1,
-                        "prerequisites": [],
-                        "_site": {"href": "/default/test/features/test-flag", "type": "text/html"},
-                        "_environmentName": "Test",
-                        "trackEvents": False,
-                        "trackEventsFallthrough": False,
-                    },
-                },
-            },
-        }
+        request_data = LD_REQUEST
+        signature = hmac_sha256_hex_digest(key="456", message=json.dumps(request_data).encode())
+
+        # Test multiple secrets exist for the provider, org pair.
+        FlagWebHookSigningSecretModel.objects.create(
+            organization=self.organization, provider="launchdarkly", secret="123"
+        )
+        FlagWebHookSigningSecretModel.objects.create(
+            organization=self.organization, provider="launchdarkly", secret="456"
+        )
 
         with self.feature(self.features):
-            response = self.client.post(self.url, request_data)
+            response = self.client.post(
+                self.url, request_data, headers={"X-LD-Signature": signature}
+            )
 
         assert response.status_code == 200
-        assert FlagAuditLogModel.objects.count() == 2
+        assert FlagAuditLogModel.objects.count() == 1
         flag = FlagAuditLogModel.objects.first()
         assert flag is not None
         assert flag.action == ACTION_MAP["created"]
@@ -185,63 +51,167 @@ def test_launchdarkly_post_create(self):
         assert flag.tags is not None
         assert flag.tags["description"] == "flag was created"
 
+    def test_launchdarkly_post_create_invalid_signature(self):
+        with self.feature(self.features):
+            sig = hmac_sha256_hex_digest(key="123", message=b"456")
+            response = self.client.post(self.url, LD_REQUEST, headers={"X-LD-Signature": sig})
+            assert response.status_code == 401
+
     def test_post_launchdarkly_deserialization_failed(self):
+        signature = hmac_sha256_hex_digest(key="123", message=json.dumps({}).encode())
+        FlagWebHookSigningSecretModel.objects.create(
+            organization=self.organization, provider="launchdarkly", secret="123"
+        )
+
         with self.feature(self.features):
-            response = self.client.post(self.url, {})
+            response = self.client.post(self.url, {}, headers={"X-LD-Signature": signature})
             assert response.status_code == 200
             assert FlagAuditLogModel.objects.count() == 0
 
     def test_post_invalid_provider(self):
-        url = reverse(self.endpoint, args=(self.organization.slug, "test", self.token))
+        url = reverse(self.endpoint, args=(self.organization.slug, "test"))
         with self.feature(self.features):
             response = self.client.post(url, {})
             assert response.status_code == 404
 
-    def test_post_invalid_token(self):
-        url = reverse(self.endpoint, args=(self.organization.slug, "launchdarkly", "wrong"))
-        with self.feature(self.features):
-            response = self.client.post(url, {})
-            assert response.status_code == 403
-
-    def test_post_cross_org_token(self):
-        other_org = self.create_organization()
-        self.create_org_auth_token(
-            name="Test Token 1",
-            token_hashed=hash_token("abc"),
-            organization_id=other_org.id,
-            token_last_characters="xyz",
-            scope_list=["org:ci"],
-            date_last_used=None,
-        )
-
-        url = reverse(self.endpoint, args=(self.organization.slug, "launchdarkly", "abc"))
-        with self.feature(self.features):
-            response = self.client.post(url, {})
-            assert response.status_code == 403
-
     def test_post_disabled(self):
         response = self.client.post(self.url, data={})
         assert response.status_code == 404
         assert response.content == b'"Not enabled."'
 
 
-@django_db_all
-@assume_test_silo_mode(SiloMode.CONTROL)
-def test_is_valid_token():
-    token_str = "sntrys+_abc123_xyz"
-    token_encoded = quote(token_str)
-    OrgAuthToken.objects.create(
-        name="Test Token 1",
-        token_hashed=hash_token(token_str),
-        organization_id=1234,
-        token_last_characters="xyz",
-        scope_list=["org:ci"],
-        date_last_used=None,
-    )
-    assert is_valid_token(1234, token_encoded) is True
-
-
-@django_db_all
-@assume_test_silo_mode(SiloMode.CONTROL)
-def test_is_valid_token_invalid_token():
-    assert is_valid_token(1234, quote("sntrys+_abc123_xyz")) is False
+LD_REQUEST = {
+    "_links": {
+        "canonical": {
+            "href": "/api/v2/flags/default/test-flag",
+            "type": "application/json",
+        },
+        "parent": {"href": "/api/v2/auditlog", "type": "application/json"},
+        "self": {
+            "href": "/api/v2/auditlog/1234",
+            "type": "application/json",
+        },
+        "site": {"href": "/default/~/features/test-flag", "type": "text/html"},
+    },
+    "_id": "1234",
+    "_accountId": "1234",
+    "date": 1729123465221,
+    "accesses": [
+        {"action": "createFlag", "resource": "proj/default:env/test:flag/test-flag"},
+        {"action": "createFlag", "resource": "proj/default:env/production:flag/test-flag"},
+    ],
+    "kind": "flag",
+    "name": "test flag",
+    "description": "flag was created",
+    "shortDescription": "",
+    "member": {
+        "_links": {
+            "parent": {"href": "/api/v2/members", "type": "application/json"},
+            "self": {
+                "href": "/api/v2/members/1234",
+                "type": "application/json",
+            },
+        },
+        "_id": "1234",
+        "email": "michelle@example.com",
+        "firstName": "Michelle",
+        "lastName": "Doe",
+    },
+    "titleVerb": "created the flag",
+    "title": "Michelle created the flag [test flag](https://app.launchdarkly.com/default/~/features/test-flag)",
+    "target": {
+        "_links": {
+            "canonical": {
+                "href": "/api/v2/flags/default/test-flag",
+                "type": "application/json",
+            },
+            "site": {"href": "/default/~/features/test-flag", "type": "text/html"},
+        },
+        "name": "test flag",
+        "resources": [
+            "proj/default:env/test:flag/test-flag",
+            "proj/default:env/production:flag/test-flag",
+        ],
+    },
+    "currentVersion": {
+        "name": "test flag",
+        "kind": "boolean",
+        "description": "testing a feature flag",
+        "key": "test-flag",
+        "_version": 1,
+        "creationDate": 1729123465176,
+        "includeInSnippet": False,
+        "clientSideAvailability": {"usingMobileKey": False, "usingEnvironmentId": False},
+        "variations": [
+            {"_id": "d883033e-fa8b-41d4-a4be-112d9a59278e", "value": True, "name": "on"},
+            {"_id": "73aaa33f-c9ca-4bdc-8c97-01a20567aa3f", "value": False, "name": "off"},
+        ],
+        "temporary": False,
+        "tags": [],
+        "_links": {
+            "parent": {"href": "/api/v2/flags/default", "type": "application/json"},
+            "self": {"href": "/api/v2/flags/default/test-flag", "type": "application/json"},
+        },
+        "maintainerId": "1234",
+        "_maintainer": {
+            "_links": {
+                "self": {
+                    "href": "/api/v2/members/1234",
+                    "type": "application/json",
+                }
+            },
+            "_id": "1234",
+            "firstName": "Michelle",
+            "lastName": "Doe",
+            "role": "owner",
+            "email": "michelle@example.com",
+        },
+        "goalIds": [],
+        "experiments": {"baselineIdx": 0, "items": []},
+        "customProperties": {},
+        "archived": False,
+        "deprecated": False,
+        "defaults": {"onVariation": 0, "offVariation": 1},
+        "environments": {
+            "production": {
+                "on": False,
+                "archived": False,
+                "salt": "1234",
+                "sel": "1234",
+                "lastModified": 1729123465190,
+                "version": 1,
+                "targets": [],
+                "contextTargets": [],
+                "rules": [],
+                "fallthrough": {"variation": 0},
+                "offVariation": 1,
+                "prerequisites": [],
+                "_site": {
+                    "href": "/default/production/features/test-flag",
+                    "type": "text/html",
+                },
+                "_environmentName": "Production",
+                "trackEvents": False,
+                "trackEventsFallthrough": False,
+            },
+            "test": {
+                "on": False,
+                "archived": False,
+                "salt": "7495d3dcf72f43aaa075012fad947d0d",
+                "sel": "61b4861e6ed54135bc244bb120e9e2da",
+                "lastModified": 1729123465190,
+                "version": 1,
+                "targets": [],
+                "contextTargets": [],
+                "rules": [],
+                "fallthrough": {"variation": 0},
+                "offVariation": 1,
+                "prerequisites": [],
+                "_site": {"href": "/default/test/features/test-flag", "type": "text/html"},
+                "_environmentName": "Test",
+                "trackEvents": False,
+                "trackEventsFallthrough": False,
+            },
+        },
+    },
+}
diff --git a/tests/sentry/flags/endpoints/test_logs.py b/tests/sentry/flags/endpoints/test_logs.py
index 5781fb90d40166..beaf3d03787963 100644
--- a/tests/sentry/flags/endpoints/test_logs.py
+++ b/tests/sentry/flags/endpoints/test_logs.py
@@ -16,7 +16,7 @@ def setUp(self):
 
     @property
     def features(self):
-        return {"organizations:feature-flag-ui": True}
+        return {}
 
     def test_get(self):
         model = FlagAuditLogModel(
@@ -80,10 +80,6 @@ def test_get_unauthorized_organization(self):
             response = self.client.get(url)
             assert response.status_code == 403
 
-    # def test_get_feature_disabled(self):
-    #     response = self.client.get(self.url)
-    #     assert response.status_code == 404
-
     def test_get_stats_period(self):
         model = FlagAuditLogModel(
             action=0,
@@ -145,7 +141,7 @@ def setUp(self):
 
     @property
     def features(self):
-        return {"organizations:feature-flag-ui": True}
+        return {}
 
     def test_get(self):
         with self.feature(self.features):
@@ -172,7 +168,3 @@ def test_get_no_flag(self):
         with self.feature(self.features):
             response = self.client.get(reverse(self.endpoint, args=(self.organization.id, 123)))
             assert response.status_code == 404
-
-    # def test_get_feature_disabled(self):
-    #     response = self.client.get(self.url)
-    #     assert response.status_code == 404
diff --git a/tests/sentry/flags/endpoints/test_secrets.py b/tests/sentry/flags/endpoints/test_secrets.py
new file mode 100644
index 00000000000000..3acf2f3c238ff6
--- /dev/null
+++ b/tests/sentry/flags/endpoints/test_secrets.py
@@ -0,0 +1,136 @@
+from django.urls import reverse
+
+from sentry.flags.models import FlagWebHookSigningSecretModel
+from sentry.testutils.cases import APITestCase
+
+
+class OrganizationFlagsWebHookSigningSecretsEndpointTestCase(APITestCase):
+    endpoint = "sentry-api-0-organization-flag-hooks-signing-secrets"
+
+    def setUp(self):
+        super().setUp()
+        self.login_as(user=self.user)
+        self.obj = FlagWebHookSigningSecretModel.objects.create(
+            created_by=self.user.id,
+            organization=self.organization,
+            provider="launchdarkly",
+            secret="123456123456",
+        )
+        self.url = reverse(self.endpoint, args=(self.organization.id,))
+
+    @property
+    def features(self):
+        return {"organizations:feature-flag-audit-log": True}
+
+    def test_browse(self):
+        org = self.create_organization()
+        FlagWebHookSigningSecretModel.objects.create(
+            created_by=self.user.id,
+            organization=org,
+            provider="launchdarkly",
+            secret="123456123456",
+        )
+
+        with self.feature(self.features):
+            response = self.client.get(self.url)
+            assert response.status_code == 200
+
+            response_json = response.json()
+            assert len(response_json["data"]) == 1
+            assert response_json == {
+                "data": [
+                    {
+                        "createdAt": self.obj.date_added.isoformat(),
+                        "createdBy": self.obj.created_by,
+                        "id": self.obj.id,
+                        "provider": self.obj.provider,
+                        "secret": "123456******",
+                    }
+                ]
+            }
+
+    def test_browse_disabled(self):
+        response = self.client.get(self.url)
+        assert response.status_code == 404
+
+    def test_post(self):
+        with self.feature(self.features):
+            response = self.client.post(
+                self.url,
+                data={"secret": "41271af8b9804cd99a4c787a28274991", "provider": "launchdarkly"},
+            )
+            assert response.status_code == 201, response.content
+
+        models = FlagWebHookSigningSecretModel.objects.all()
+        assert len(models) == 1
+        assert models[0].secret == "41271af8b9804cd99a4c787a28274991"
+
+    def test_post_disabled(self):
+        response = self.client.post(self.url, data={})
+        assert response.status_code == 404, response.content
+
+    def test_post_invalid(self):
+        with self.feature(self.features):
+            url = reverse(self.endpoint, args=(self.organization.id,))
+            response = self.client.post(url, data={"secret": "123", "provider": "other"})
+            assert response.status_code == 400, response.content
+            assert response.json()["provider"] == ['"other" is not a valid choice.']
+            assert response.json()["secret"] == ["Ensure this field has at least 32 characters."]
+
+    def test_post_empty_request(self):
+        with self.feature(self.features):
+            response = self.client.post(self.url, data={})
+            assert response.status_code == 400, response.content
+            assert response.json()["provider"] == ["This field is required."]
+            assert response.json()["secret"] == ["This field is required."]
+
+    def test_post_other_organization(self):
+        org = self.create_organization()
+        url = reverse(self.endpoint, args=(org.id,))
+
+        with self.feature(self.features):
+            response = self.client.post(url, data={})
+            assert response.status_code == 403, response.content
+
+
+class OrganizationFlagsWebHookSigningSecretEndpointTestCase(APITestCase):
+    endpoint = "sentry-api-0-organization-flag-hooks-signing-secret"
+
+    def setUp(self):
+        super().setUp()
+        self.login_as(user=self.user)
+        self.obj = FlagWebHookSigningSecretModel.objects.create(
+            created_by=self.user.id,
+            organization=self.organization,
+            provider="launchdarkly",
+            secret="123456123456",
+        )
+        self.url = reverse(self.endpoint, args=(self.organization.id, self.obj.id))
+
+    @property
+    def features(self):
+        return {"organizations:feature-flag-audit-log": True}
+
+    def test_delete(self):
+        with self.feature(self.features):
+            response = self.client.delete(self.url)
+            assert response.status_code == 204
+
+    def test_delete_disabled(self):
+        response = self.client.delete(self.url)
+        assert response.status_code == 404
+
+    def test_delete_other_organization(self):
+        """Attempt to delete a secret outside your organization."""
+        org = self.create_organization()
+        obj = FlagWebHookSigningSecretModel.objects.create(
+            created_by=self.user.id,
+            organization=org,
+            provider="launchdarkly",
+            secret="123456123456",
+        )
+        url = reverse(self.endpoint, args=(self.organization.id, obj.id))
+
+        with self.feature(self.features):
+            response = self.client.delete(url)
+            assert response.status_code == 404
diff --git a/tests/sentry/flags/providers/test_launchdarkly.py b/tests/sentry/flags/providers/test_launchdarkly.py
index b40c5e2d1e064c..13dd00e70bae11 100644
--- a/tests/sentry/flags/providers/test_launchdarkly.py
+++ b/tests/sentry/flags/providers/test_launchdarkly.py
@@ -356,10 +356,7 @@ def test_launchdarkly_delete_and_update():
         "_id": "1234",
         "_accountId": "1234",
         "date": 1729123867537,
-        "accesses": [
-            {"action": "deleteFlag", "resource": "proj/default:env/test:flag/test-flag"},
-            {"action": "updateRules", "resource": "proj/default:env/test:flag/test-flag"},
-        ],
+        "accesses": [{"action": "deleteFlag", "resource": "proj/default:env/test:flag/test-flag"}],
         "kind": "flag",
         "name": "test flag",
         "description": "deleted the flag",
@@ -383,11 +380,9 @@ def test_launchdarkly_delete_and_update():
     }
 
     res = handle_provider_event("launchdarkly", request_data, 123)
-    assert len(res) == 2
+    assert len(res) == 1
     flag_row_delete = res[0]
-    flag_row_update = res[1]
     assert flag_row_delete["action"] == ACTION_MAP["deleted"]
-    assert flag_row_update["action"] == ACTION_MAP["updated"]
 
 
 def test_launchdarkly_no_valid_action():
diff --git a/tests/sentry/grouping/__init__.py b/tests/sentry/grouping/__init__.py
index 6bd09adfc05389..ce80912cae9f45 100644
--- a/tests/sentry/grouping/__init__.py
+++ b/tests/sentry/grouping/__init__.py
@@ -18,7 +18,7 @@
     get_default_grouping_config_dict,
     load_grouping_config,
 )
-from sentry.grouping.component import GroupingComponent
+from sentry.grouping.component import BaseGroupingComponent
 from sentry.grouping.enhancer import Enhancements
 from sentry.grouping.fingerprinting import FingerprintingRules
 from sentry.grouping.strategies.configurations import CONFIGURATIONS
@@ -181,7 +181,7 @@ def dump_variant(
     if lines is None:
         lines = []
 
-    def _dump_component(component: GroupingComponent, indent: int) -> None:
+    def _dump_component(component: BaseGroupingComponent, indent: int) -> None:
         if not component.hint and not component.values:
             return
         if component.contributes or include_non_contributing:
@@ -195,7 +195,7 @@ def _dump_component(component: GroupingComponent, indent: int) -> None:
                 )
             )
             for value in component.values:
-                if isinstance(value, GroupingComponent):
+                if isinstance(value, BaseGroupingComponent):
                     _dump_component(value, indent + 1)
                 else:
                     lines.append("{}{}".format("  " * (indent + 1), to_json(value)))
@@ -203,7 +203,7 @@ def _dump_component(component: GroupingComponent, indent: int) -> None:
     lines.append("{}hash: {}".format("  " * indent, to_json(variant.get_hash())))
 
     for key, value in sorted(variant.__dict__.items()):
-        if isinstance(value, GroupingComponent):
+        if isinstance(value, BaseGroupingComponent):
             lines.append("{}{}:".format("  " * indent, key))
             _dump_component(value, indent + 1)
         elif key in ["config", "hash"]:
diff --git a/tests/sentry/grouping/grouping_inputs/csp-script-src-unsafe-eval.json b/tests/sentry/grouping/grouping_inputs/csp-script-src-unsafe-eval.json
new file mode 100644
index 00000000000000..b6be847b0f2986
--- /dev/null
+++ b/tests/sentry/grouping/grouping_inputs/csp-script-src-unsafe-eval.json
@@ -0,0 +1,11 @@
+{
+  "csp": {
+    "TODO": "Remove 'unsafe-eval' from `original_policy`, `violated_directive`, and `culprit` and change `blocked_uri` to 'eval' once https://github.com/getsentry/relay/issues/4323 and https://github.com/getsentry/sentry/issues/81531 are fixed",
+    "effective_directive": "script-src",
+    "blocked_uri": "",
+    "original_policy": "default-src 'self'; script-src 'unsafe-eval' 'self'; report-uri https://o1121.ingest.us.sentry.io/api/1231/security/?sentry_key=09082013112120121231201204152013; report-to csp-endpoint",
+    "violated_directive": "script-src 'unsafe-eval' 'self'"
+  },
+  "culprit": "script-src 'unsafe-eval' 'self'",
+  "message": "Blocked unsafe eval() 'script'"
+}
diff --git a/tests/sentry/grouping/grouping_inputs/csp-script-src-unsafe-inline.json b/tests/sentry/grouping/grouping_inputs/csp-script-src-unsafe-inline.json
new file mode 100644
index 00000000000000..114530ddcc8013
--- /dev/null
+++ b/tests/sentry/grouping/grouping_inputs/csp-script-src-unsafe-inline.json
@@ -0,0 +1,11 @@
+{
+  "csp": {
+    "TODO": "Remove 'unsafe-inline' from `original_policy`, `violated_directive`, and `culprit` and change `blocked_uri` to 'inline' once https://github.com/getsentry/relay/issues/4323 and https://github.com/getsentry/sentry/issues/81531 are fixed",
+    "effective_directive": "script-src",
+    "blocked_uri": "",
+    "original_policy": "default-src 'self'; script-src 'unsafe-inline' 'self'; report-uri https://o1121.ingest.us.sentry.io/api/1231/security/?sentry_key=09082013112120121231201204152013; report-to csp-endpoint",
+    "violated_directive": "script-src 'unsafe-inline' 'self'"
+  },
+  "culprit": "script-src 'unsafe-inline' 'self'",
+  "message": "Blocked unsafe inline 'script'"
+}
diff --git a/tests/sentry/grouping/grouping_inputs/empty.out b/tests/sentry/grouping/grouping_inputs/empty.out
deleted file mode 100644
index cd1f2fcc859c44..00000000000000
--- a/tests/sentry/grouping/grouping_inputs/empty.out
+++ /dev/null
@@ -1,2 +0,0 @@
-fallback:
-  hash: 'd41d8cd98f00b204e9800998ecf8427e'
diff --git a/tests/sentry/grouping/grouping_inputs/exception-comput-hashes.json b/tests/sentry/grouping/grouping_inputs/exception-comput-hashes.json
deleted file mode 100644
index dc3568cd0de9aa..00000000000000
--- a/tests/sentry/grouping/grouping_inputs/exception-comput-hashes.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "exception": {
-    "type": "ValueError",
-    "module": "foo.bar",
-    "value": "hello world"
-  }
-}
diff --git a/tests/sentry/grouping/grouping_inputs/exception-compute-hashes.json b/tests/sentry/grouping/grouping_inputs/exception-compute-hashes.json
index 7928d7e2bbefc2..dc3568cd0de9aa 100644
--- a/tests/sentry/grouping/grouping_inputs/exception-compute-hashes.json
+++ b/tests/sentry/grouping/grouping_inputs/exception-compute-hashes.json
@@ -1,15 +1,5 @@
 {
   "exception": {
-    "stacktrace": {
-      "frames": [
-        {
-          "abs_path": "foo/baz.py",
-          "filename": "foo/baz.py",
-          "lineno": 1,
-          "in_app": true
-        }
-      ]
-    },
     "type": "ValueError",
     "module": "foo.bar",
     "value": "hello world"
diff --git a/tests/sentry/grouping/grouping_inputs/exception-groups-two-exceptions-with-frames.json b/tests/sentry/grouping/grouping_inputs/exception-groups-two-exceptions-with-frames.json
new file mode 100644
index 00000000000000..2cd15f57cca5ea
--- /dev/null
+++ b/tests/sentry/grouping/grouping_inputs/exception-groups-two-exceptions-with-frames.json
@@ -0,0 +1,70 @@
+{
+  "exception": {
+    "values": [
+      {
+        "type": "DoOtherStuffException",
+        "value": "Can't do the other stuff",
+        "mechanism": {
+          "type": "chained",
+          "handled": true,
+          "source": "InnerExceptions[0]",
+          "exception_id": 2,
+          "parent_id": 0
+        },
+        "stacktrace": {
+          "frames": [
+            {
+              "function": "do_other_stuff",
+              "module": "dostuff",
+              "context_line": "do_some_other_stuff()",
+              "in_app": true
+            },
+            {
+              "function": "do_other_stuff",
+              "module": "dostuff",
+              "context_line": "do_some_other_different_stuff()",
+              "in_app": true
+            }
+          ]
+        }
+      },
+      {
+        "type": "DoStuffException",
+        "value": "Can't do the stuff",
+        "mechanism": {
+          "type": "chained",
+          "handled": true,
+          "source": "InnerExceptions[0]",
+          "exception_id": 1,
+          "parent_id": 0
+        },
+        "stacktrace": {
+          "frames": [
+            {
+              "function": "do_stuff",
+              "module": "dostuff",
+              "context_line": "do_some_stuff()",
+              "in_app": true
+            },
+            {
+              "function": "do_different_stuff",
+              "module": "dostuff",
+              "context_line": "do_some_different_stuff()",
+              "in_app": true
+            }
+          ]
+        }
+      },
+      {
+        "type": "System.AggregateException",
+        "value": "One or more errors occurred.",
+        "mechanism": {
+          "type": "AppDomain.UnhandledException",
+          "handled": false,
+          "is_exception_group": true,
+          "exception_id": 0
+        }
+      }
+    ]
+  }
+}
diff --git a/tests/sentry/grouping/grouping_inputs/frame-comput-hashes-ignores-ENHANCED-clojure-classes.json b/tests/sentry/grouping/grouping_inputs/frame-compute-hashes-ignores-ENHANCED-clojure-classes.json
similarity index 100%
rename from tests/sentry/grouping/grouping_inputs/frame-comput-hashes-ignores-ENHANCED-clojure-classes.json
rename to tests/sentry/grouping/grouping_inputs/frame-compute-hashes-ignores-ENHANCED-clojure-classes.json
diff --git a/tests/sentry/grouping/grouping_inputs/javascript_regression_tree_labels.json b/tests/sentry/grouping/grouping_inputs/javascript_regression_tree_labels.json
deleted file mode 100644
index 821759cc395450..00000000000000
--- a/tests/sentry/grouping/grouping_inputs/javascript_regression_tree_labels.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-  "platform": "javascript",
-  "exception": {
-    "values": [
-      {
-        "mechanism": {
-          "handled": true,
-          "type": "generic"
-        },
-        "raw_stacktrace": {
-          "frames": [
-            {
-              "abs_path": "https://s1.sentry-cdn.com/_static/dist/sentry/chunks/app_actionCreators_tags_tsx-app_actions_savedSearchesActions_tsx-app_components_forms_apiForm-0c4c6a.6e2d643981bbe16ce67b.js",
-              "colno": 60702,
-              "context_line": "{snip} ),a.setExtra(\"code\",r.detail.code),s.Tb(new Error(e))})):s.$e((a=>{a.setExtra(\"status\",t.status),a.setExtra(\"detail\",r.detail),s.Tb(new Erro {snip}",
-              "filename": "/_static/dist/sentry/chunks/app_actionCreators_tags_tsx-app_actions_savedSearchesActions_tsx-app_components_forms_apiForm-0c4c6a.6e2d643981bbe16ce67b.js",
-              "lineno": 1,
-              "post_context": [
-                "//# sourceMappingURL=../sourcemaps/app_actionCreators_tags_tsx-app_actions_savedSearchesActions_tsx-app_components_forms_apiForm-0c4c6a.1054 {snip}"
-              ]
-            },
-            {
-              "abs_path": "https://s1.sentry-cdn.com/_static/dist/sentry/chunks/vendors-node_modules_sentry_minimal_esm_index_js.9747c9fc1b116cf91afd.js",
-              "colno": 7337,
-              "context_line": "{snip} i(\"setTag\",t,e)}function _(t){i(\"setUser\",t)}function y(t){i(\"withScope\",t)}function g(t,e){return i(\"startTransaction\",(0,o.pi)({},t),e)}}, {snip}",
-              "filename": "/_static/dist/sentry/chunks/vendors-node_modules_sentry_minimal_esm_index_js.9747c9fc1b116cf91afd.js",
-              "function": "Object.y",
-              "lineno": 1,
-              "post_context": [
-                "//# sourceMappingURL=../sourcemaps/vendors-node_modules_sentry_minimal_esm_index_js.4aaf96781da16f5906bab6ced49c1a24.js.map"
-              ]
-            },
-            {
-              "abs_path": "https://s1.sentry-cdn.com/_static/dist/sentry/chunks/vendors-node_modules_sentry_minimal_esm_index_js.9747c9fc1b116cf91afd.js",
-              "colno": 6508,
-              "context_line": "{snip} [n-1]=arguments[n];var i=(0,r.Gd)();if(i&&i[t])return i[t].apply(i,(0,o.fl)(e));throw new Error(\"No hub defined or \"+t+\" was not found on th {snip}",
-              "filename": "/_static/dist/sentry/chunks/vendors-node_modules_sentry_minimal_esm_index_js.9747c9fc1b116cf91afd.js",
-              "function": "i",
-              "lineno": 1,
-              "post_context": [
-                "//# sourceMappingURL=../sourcemaps/vendors-node_modules_sentry_minimal_esm_index_js.4aaf96781da16f5906bab6ced49c1a24.js.map"
-              ]
-            },
-            {
-              "abs_path": "https://s1.sentry-cdn.com/_static/dist/sentry/chunks/vendors-node_modules_sentry_minimal_esm_index_js.9747c9fc1b116cf91afd.js",
-              "colno": 1257,
-              "context_line": "{snip} prototype.withScope=function(t){var e=this.pushScope();try{t(e)}finally{this.popScope()}},t.prototype.getClient=function(){return this.getSt {snip}",
-              "filename": "/_static/dist/sentry/chunks/vendors-node_modules_sentry_minimal_esm_index_js.9747c9fc1b116cf91afd.js",
-              "function": "t.withScope",
-              "lineno": 1,
-              "post_context": [
-                "//# sourceMappingURL=../sourcemaps/vendors-node_modules_sentry_minimal_esm_index_js.4aaf96781da16f5906bab6ced49c1a24.js.map"
-              ]
-            },
-            {
-              "abs_path": "https://s1.sentry-cdn.com/_static/dist/sentry/chunks/app_actionCreators_tags_tsx-app_actions_savedSearchesActions_tsx-app_components_forms_apiForm-0c4c6a.6e2d643981bbe16ce67b.js",
-              "colno": 60775,
-              "context_line": "{snip} xtra(\"status\",t.status),a.setExtra(\"detail\",r.detail),s.Tb(new Error(e))}))}}},\"./app/utils/withGlobalSelection.tsx\":(e,t,r)=>{r.d(t,{Z:()=> {snip}",
-              "filename": "/_static/dist/sentry/chunks/app_actionCreators_tags_tsx-app_actions_savedSearchesActions_tsx-app_components_forms_apiForm-0c4c6a.6e2d643981bbe16ce67b.js",
-              "lineno": 1,
-              "post_context": [
-                "//# sourceMappingURL=../sourcemaps/app_actionCreators_tags_tsx-app_actions_savedSearchesActions_tsx-app_components_forms_apiForm-0c4c6a.1054 {snip}"
-              ]
-            }
-          ]
-        },
-        "stacktrace": {
-          "frames": [
-            {
-              "abs_path": "webpack:///./app/utils/handleXhrErrorResponse.tsx",
-              "colno": 7,
-              "context_line": "      Sentry.withScope(scope => {",
-              "data": {
-                "sourcemap": "https://s1.sentry-cdn.com/_static/dist/sentry/sourcemaps/app_actionCreators_tags_tsx-app_actions_savedSearchesActions_tsx-app_components_forms_apiF..."
-              },
-              "filename": "./app/utils/handleXhrErrorResponse.tsx",
-              "lineno": 18,
-              "module": "app/utils/handleXhrErrorResponse",
-              "post_context": [
-                "        scope.setExtra('status', resp.status);",
-                "        scope.setExtra('detail', responseJSON.detail);",
-                "        Sentry.captureException(new Error(message));",
-                "      });",
-                "      return;"
-              ],
-              "pre_context": [
-                "",
-                "    const {responseJSON} = resp;",
-                "",
-                "    // If this is a string then just capture it as error",
-                "    if (typeof responseJSON.detail === 'string') {"
-              ]
-            },
-            {
-              "abs_path": "webpack:///../node_modules/@sentry/minimal/esm/index.js",
-              "colno": 5,
-              "context_line": "    callOnHub('withScope', callback);",
-              "data": {
-                "sourcemap": "https://s1.sentry-cdn.com/_static/dist/sentry/sourcemaps/vendors-node_modules_sentry_minimal_esm_index_js.4aaf96781da16f5906bab6ced49c1a24.js.map"
-              },
-              "filename": "../node_modules/@sentry/minimal/esm/index.js",
-              "function": "Sentry",
-              "lineno": 154,
-              "module": "@sentry/minimal/esm/index",
-              "post_context": [
-                "}",
-                "/**",
-                " * Calls a function on the latest client. Use this with caution, it's meant as",
-                " * in \"internal\" helper so we don't need to expose every possible function in",
-                " * the shim. It is not guaranteed that the client actually implements the"
-              ],
-              "pre_context": [
-                " *     popScope();",
-                " *",
-                " * @param callback that will be enclosed into push/popScope.",
-                " */",
-                "export function withScope(callback) {"
-              ]
-            },
-            {
-              "abs_path": "webpack:///../node_modules/@sentry/minimal/esm/index.js",
-              "colno": 28,
-              "context_line": "        return hub[method].apply(hub, __spread(args));",
-              "data": {
-                "sourcemap": "https://s1.sentry-cdn.com/_static/dist/sentry/sourcemaps/vendors-node_modules_sentry_minimal_esm_index_js.4aaf96781da16f5906bab6ced49c1a24.js.map"
-              },
-              "filename": "../node_modules/@sentry/minimal/esm/index.js",
-              "function": "callOnHub",
-              "lineno": 17,
-              "module": "@sentry/minimal/esm/index",
-              "post_context": [
-                "    }",
-                "    throw new Error(\"No hub defined or \" + method + \" was not found on the hub, please open a bug report.\");",
-                "}",
-                "/**",
-                " * Captures an exception event and sends it to Sentry."
-              ],
-              "pre_context": [
-                "        args[_i - 1] = arguments[_i];",
-                "    }",
-                "    var hub = getCurrentHub();",
-                "    if (hub && hub[method]) {",
-                "        // eslint-disable-next-line @typescript-eslint/no-explicit-any"
-              ]
-            },
-            {
-              "abs_path": "webpack:///../node_modules/@sentry/hub/esm/hub.js",
-              "colno": 13,
-              "context_line": "            callback(scope);",
-              "data": {
-                "sourcemap": "https://s1.sentry-cdn.com/_static/dist/sentry/sourcemaps/vendors-node_modules_sentry_minimal_esm_index_js.4aaf96781da16f5906bab6ced49c1a24.js.map"
-              },
-              "filename": "../node_modules/@sentry/hub/esm/hub.js",
-              "function": "apply",
-              "lineno": 86,
-              "module": "@sentry/hub/esm/hub",
-              "post_context": [
-                "        }",
-                "        finally {",
-                "            this.popScope();",
-                "        }",
-                "    };"
-              ],
-              "pre_context": [
-                "     * @inheritDoc",
-                "     */",
-                "    Hub.prototype.withScope = function (callback) {",
-                "        var scope = this.pushScope();",
-                "        try {"
-              ]
-            },
-            {
-              "abs_path": "webpack:///./app/utils/handleXhrErrorResponse.tsx",
-              "colno": 33,
-              "context_line": "        Sentry.captureException(new Error(message));",
-              "data": {
-                "sourcemap": "https://s1.sentry-cdn.com/_static/dist/sentry/sourcemaps/app_actionCreators_tags_tsx-app_actions_savedSearchesActions_tsx-app_components_forms_apiF..."
-              },
-              "filename": "./app/utils/handleXhrErrorResponse.tsx",
-              "function": "callback",
-              "lineno": 21,
-              "module": "app/utils/handleXhrErrorResponse",
-              "post_context": [
-                "      });",
-                "      return;",
-                "    }",
-                "",
-                "    // Ignore sudo-required errors"
-              ],
-              "pre_context": [
-                "    // If this is a string then just capture it as error",
-                "    if (typeof responseJSON.detail === 'string') {",
-                "      Sentry.withScope(scope => {",
-                "        scope.setExtra('status', resp.status);",
-                "        scope.setExtra('detail', responseJSON.detail);"
-              ]
-            }
-          ]
-        },
-        "type": "Error",
-        "value": "Unable to save a recent search"
-      }
-    ]
-  }
-}
diff --git a/tests/sentry/grouping/grouping_inputs/template-compute-hashes.json b/tests/sentry/grouping/grouping_inputs/template-compute-hashes.json
index fc8c410e8dde05..dd33048484a920 100644
--- a/tests/sentry/grouping/grouping_inputs/template-compute-hashes.json
+++ b/tests/sentry/grouping/grouping_inputs/template-compute-hashes.json
@@ -1,7 +1,7 @@
 {
   "template": {
     "lineno": 1,
-    "context_line": "hello world",
+    "context_line": "{% invalid template tag %}",
     "filename": "foo.html"
   }
 }
diff --git a/tests/sentry/grouping/ingest/test_seer.py b/tests/sentry/grouping/ingest/test_seer.py
index bf6520a1dea7d0..f46f5713b6e962 100644
--- a/tests/sentry/grouping/ingest/test_seer.py
+++ b/tests/sentry/grouping/ingest/test_seer.py
@@ -1,12 +1,18 @@
 from dataclasses import asdict
 from time import time
-from unittest.mock import MagicMock, patch
+from unittest.mock import ANY, MagicMock, Mock, call, patch
 
+from sentry import options
 from sentry.conf.server import SEER_SIMILARITY_MODEL_VERSION
 from sentry.eventstore.models import Event
-from sentry.grouping.ingest.seer import get_seer_similar_issues, should_call_seer_for_grouping
+from sentry.grouping.ingest.seer import (
+    get_seer_similar_issues,
+    maybe_check_seer_for_matching_grouphash,
+    should_call_seer_for_grouping,
+)
 from sentry.models.grouphash import GroupHash
 from sentry.seer.similarity.types import SeerSimilarIssueData
+from sentry.seer.similarity.utils import MAX_FRAME_COUNT
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.eventprocessing import save_new_event
 from sentry.testutils.helpers.options import override_options
@@ -147,7 +153,14 @@ def test_obeys_customized_fingerprint_check(self) -> None:
             data={
                 **self.event_data,
                 "fingerprint": ["failedtofetcherror"],
-                "_fingerprint_info": {"matched_rule": {"is_builtin": True}},
+                "_fingerprint_info": {
+                    "matched_rule": {
+                        "is_builtin": True,
+                        "matchers": [["type", "FailedToFetchError"]],
+                        "fingerprint": ["failedtofetcherror"],
+                        "text": 'type:"FailedToFetchError" -> "failedtofetcherror"',
+                    }
+                },
             },
         )
 
@@ -163,6 +176,43 @@ def test_obeys_customized_fingerprint_check(self) -> None:
                 is expected_result
             ), f'Case with fingerprint {event.data["fingerprint"]} failed.'
 
+    @patch("sentry.grouping.ingest.seer.metrics")
+    def test_obeys_empty_stacktrace_string_check(self, mock_metrics: Mock) -> None:
+        self.project.update_option("sentry:similarity_backfill_completed", int(time()))
+        new_event = Event(
+            project_id=self.project.id,
+            event_id="12312012112120120908201304152013",
+            data={
+                "title": "title",
+                "platform": "python",
+                "stacktrace": {"frames": [{}]},
+            },
+        )
+
+        assert should_call_seer_for_grouping(new_event, new_event.get_grouping_variants()) is False
+        sample_rate = options.get("seer.similarity.metrics_sample_rate")
+        mock_metrics.incr.assert_any_call(
+            "grouping.similarity.did_call_seer",
+            sample_rate=sample_rate,
+            tags={
+                "call_made": False,
+                "blocker": "empty-stacktrace-string",
+            },
+        )
+
+    @patch("sentry.grouping.ingest.seer.get_similarity_data_from_seer", return_value=[])
+    def test_stacktrace_string_not_saved_in_event(
+        self, mock_get_similarity_data: MagicMock
+    ) -> None:
+        self.project.update_option("sentry:similarity_backfill_completed", 1)
+        event = save_new_event(self.event_data, self.project)
+        assert mock_get_similarity_data.call_count == 1
+        assert "raise FailedToFetchError('Charlie didn't bring the ball back')" in (
+            mock_get_similarity_data.call_args.args[0]["stacktrace"]
+        )
+
+        assert event.data.get("stacktrace_string") is None
+
 
 class GetSeerSimilarIssuesTest(TestCase):
     def setUp(self) -> None:
@@ -237,7 +287,7 @@ def test_returns_metadata_and_grouphash_if_sufficiently_close_group_found(self)
             "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
             "results": [asdict(seer_result_data)],
         }
-
+        self.new_event.data["stacktrace_string"] = "stacktrace"
         with patch(
             "sentry.grouping.ingest.seer.get_similarity_data_from_seer",
             return_value=[seer_result_data],
@@ -252,7 +302,7 @@ def test_returns_no_grouphash_and_empty_metadata_if_no_similar_group_found(self)
             "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
             "results": [],
         }
-
+        self.new_event.data["stacktrace_string"] = "stacktrace"
         with patch(
             "sentry.grouping.ingest.seer.get_similarity_data_from_seer",
             return_value=[],
@@ -261,3 +311,315 @@ def test_returns_no_grouphash_and_empty_metadata_if_no_similar_group_found(self)
                 expected_metadata,
                 None,
             )
+
+    @patch("sentry.grouping.ingest.seer.logger")
+    def test_returns_no_grouphash_and_empty_metadata_if_empty_stacktrace(
+        self, mock_logger: MagicMock
+    ) -> None:
+        expected_metadata = {
+            "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
+            "results": [],
+        }
+
+        for stacktrace in ["", None]:
+            self.new_event.data["stacktrace_string"] = ""
+            with patch(
+                "sentry.grouping.ingest.seer.get_similarity_data_from_seer",
+                return_value=[],
+            ):
+                assert get_seer_similar_issues(self.new_event, self.variants) == (
+                    expected_metadata,
+                    None,
+                )
+            mock_logger.info.assert_called_with(
+                "get_seer_similar_issues.empty_stacktrace",
+                extra={
+                    "event_id": self.new_event.event_id,
+                    "project_id": self.new_event.project.id,
+                    "stacktrace_string": "",
+                },
+            )
+
+    @patch("sentry.seer.similarity.utils.metrics")
+    def test_too_many_only_system_frames(self, mock_metrics: Mock) -> None:
+        type = "FailedToFetchError"
+        value = "Charlie didn't bring the ball back"
+        context_line = f"raise {type}('{value}')"
+        new_event = Event(
+            project_id=self.project.id,
+            event_id="22312012112120120908201304152013",
+            data={
+                "title": f"{type}('{value}')",
+                "exception": {
+                    "values": [
+                        {
+                            "type": type,
+                            "value": value,
+                            "stacktrace": {
+                                "frames": [
+                                    {
+                                        "function": f"play_fetch_{i}",
+                                        "filename": f"dogpark{i}.py",
+                                        "context_line": context_line,
+                                    }
+                                    for i in range(MAX_FRAME_COUNT + 1)
+                                ]
+                            },
+                        }
+                    ]
+                },
+                "platform": "java",
+            },
+        )
+        expected_metadata = {
+            "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
+            "results": [],
+        }
+        assert get_seer_similar_issues(new_event, new_event.get_grouping_variants()) == (
+            expected_metadata,
+            None,
+        )
+
+        sample_rate = options.get("seer.similarity.metrics_sample_rate")
+        mock_metrics.incr.assert_any_call(
+            "grouping.similarity.over_threshold_only_system_frames",
+            sample_rate=sample_rate,
+            tags={"platform": "java", "referrer": "ingest"},
+        )
+        mock_metrics.incr.assert_any_call(
+            "grouping.similarity.did_call_seer",
+            sample_rate=1.0,
+            tags={
+                "call_made": False,
+                "blocker": "over-threshold-only-system-frames",
+            },
+        )
+
+    @patch("sentry.seer.similarity.utils.metrics")
+    def test_too_many_only_system_frames_invalid_platform(self, mock_metrics: Mock) -> None:
+        type = "FailedToFetchError"
+        value = "Charlie didn't bring the ball back"
+        context_line = f"raise {type}('{value}')"
+        new_event = Event(
+            project_id=self.project.id,
+            event_id="22312012112120120908201304152013",
+            data={
+                "title": f"{type}('{value}')",
+                "exception": {
+                    "values": [
+                        {
+                            "type": type,
+                            "value": value,
+                            "stacktrace": {
+                                "frames": [
+                                    {
+                                        "function": f"play_fetch_{i}",
+                                        "filename": f"dogpark{i}.py",
+                                        "context_line": context_line,
+                                    }
+                                    for i in range(MAX_FRAME_COUNT + 1)
+                                ]
+                            },
+                        }
+                    ]
+                },
+                "platform": "python",
+            },
+        )
+        expected_metadata = {
+            "similarity_model_version": SEER_SIMILARITY_MODEL_VERSION,
+            "results": [],
+        }
+        assert get_seer_similar_issues(new_event, new_event.get_grouping_variants()) == (
+            expected_metadata,
+            None,
+        )
+
+        assert (
+            call(
+                "grouping.similarity.did_call_seer",
+                sample_rate=1.0,
+                tags={
+                    "call_made": False,
+                    "blocker": "over-threshold-only-system-frames",
+                },
+            )
+            not in mock_metrics.incr.call_args_list
+        )
+
+
+class TestMaybeCheckSeerForMatchingGroupHash(TestCase):
+
+    @patch("sentry.grouping.ingest.seer.get_similarity_data_from_seer", return_value=[])
+    def test_valid_maybe_check_seer_for_matching_group_hash(
+        self, mock_get_similarity_data: MagicMock
+    ) -> None:
+        self.project.update_option("sentry:similarity_backfill_completed", int(time()))
+
+        type = "FailedToFetchError"
+        value = "Charlie didn't bring the ball back"
+        context_line = f"raise {type}('{value}')"
+        new_event = Event(
+            project_id=self.project.id,
+            event_id="12312012112120120908201304152013",
+            data={
+                "title": f"{type}('{value}')",
+                "exception": {
+                    "values": [
+                        {
+                            "type": type,
+                            "value": value,
+                            "stacktrace": {
+                                "frames": [
+                                    {
+                                        "function": "play_fetch",
+                                        "filename": "dogpark.py",
+                                        "context_line": context_line,
+                                    }
+                                ]
+                            },
+                        }
+                    ]
+                },
+                "platform": "python",
+            },
+        )
+        GroupHash.objects.create(
+            project=self.project, group=new_event.group, hash=new_event.get_primary_hash()
+        )
+        group_hashes = list(GroupHash.objects.filter(project_id=self.project.id))
+        maybe_check_seer_for_matching_grouphash(
+            new_event, new_event.get_grouping_variants(), group_hashes
+        )
+
+        mock_get_similarity_data.assert_called_with(
+            {
+                "event_id": new_event.event_id,
+                "hash": new_event.get_primary_hash(),
+                "project_id": self.project.id,
+                "stacktrace": f'{type}: {value}\n  File "dogpark.py", function play_fetch\n    {context_line}',
+                "exception_type": "FailedToFetchError",
+                "k": 1,
+                "referrer": "ingest",
+                "use_reranking": True,
+            }
+        )
+
+    @patch("sentry.grouping.ingest.seer.get_seer_similar_issues")
+    @patch("sentry.seer.similarity.utils.metrics")
+    def test_too_many_only_system_frames_maybe_check_seer_for_matching_group_hash(
+        self, mock_metrics: MagicMock, mock_get_similar_issues: MagicMock
+    ) -> None:
+        self.project.update_option("sentry:similarity_backfill_completed", int(time()))
+
+        type = "FailedToFetchError"
+        value = "Charlie didn't bring the ball back"
+        context_line = f"raise {type}('{value}')"
+        new_event = Event(
+            project_id=self.project.id,
+            event_id="22312012112120120908201304152013",
+            data={
+                "title": f"{type}('{value}')",
+                "exception": {
+                    "values": [
+                        {
+                            "type": type,
+                            "value": value,
+                            "stacktrace": {
+                                "frames": [
+                                    {
+                                        "function": f"play_fetch_{i}",
+                                        "filename": f"dogpark{i}.py",
+                                        "context_line": context_line,
+                                    }
+                                    for i in range(MAX_FRAME_COUNT + 1)
+                                ]
+                            },
+                        }
+                    ]
+                },
+                "platform": "java",
+            },
+        )
+
+        GroupHash.objects.create(
+            project=self.project, group=new_event.group, hash=new_event.get_primary_hash()
+        )
+        group_hashes = list(GroupHash.objects.filter(project_id=self.project.id))
+        maybe_check_seer_for_matching_grouphash(
+            new_event, new_event.get_grouping_variants(), group_hashes
+        )
+
+        sample_rate = options.get("seer.similarity.metrics_sample_rate")
+        mock_metrics.incr.assert_any_call(
+            "grouping.similarity.over_threshold_only_system_frames",
+            sample_rate=sample_rate,
+            tags={"platform": "java", "referrer": "ingest"},
+        )
+        mock_metrics.incr.assert_any_call(
+            "grouping.similarity.did_call_seer",
+            sample_rate=1.0,
+            tags={
+                "call_made": False,
+                "blocker": "over-threshold-only-system-frames",
+            },
+        )
+
+        mock_get_similar_issues.assert_not_called()
+
+    @patch("sentry.grouping.ingest.seer.get_similarity_data_from_seer", return_value=[])
+    def test_too_many_only_system_frames_maybe_check_seer_for_matching_group_hash_invalid_platform(
+        self, mock_get_similarity_data: MagicMock
+    ) -> None:
+        self.project.update_option("sentry:similarity_backfill_completed", int(time()))
+
+        type = "FailedToFetchError"
+        value = "Charlie didn't bring the ball back"
+        context_line = f"raise {type}('{value}')"
+        new_event = Event(
+            project_id=self.project.id,
+            event_id="22312012112120120908201304152013",
+            data={
+                "title": f"{type}('{value}')",
+                "exception": {
+                    "values": [
+                        {
+                            "type": type,
+                            "value": value,
+                            "stacktrace": {
+                                "frames": [
+                                    {
+                                        "function": f"play_fetch_{i}",
+                                        "filename": f"dogpark{i}.py",
+                                        "context_line": context_line,
+                                    }
+                                    for i in range(MAX_FRAME_COUNT + 1)
+                                ]
+                            },
+                        }
+                    ]
+                },
+                "platform": "python",
+            },
+        )
+
+        GroupHash.objects.create(
+            project=self.project, group=new_event.group, hash=new_event.get_primary_hash()
+        )
+        group_hashes = list(GroupHash.objects.filter(project_id=self.project.id))
+        maybe_check_seer_for_matching_grouphash(
+            new_event, new_event.get_grouping_variants(), group_hashes
+        )
+
+        mock_get_similarity_data.assert_called_with(
+            {
+                "event_id": new_event.event_id,
+                "hash": new_event.get_primary_hash(),
+                "project_id": self.project.id,
+                "stacktrace": ANY,
+                "exception_type": "FailedToFetchError",
+                "k": 1,
+                "referrer": "ingest",
+                "use_reranking": True,
+            }
+        )
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/actix.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/actix.pysnap
index 009671580aaaaf..d66f445b191eb1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/actix.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/actix.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.633593+00:00'
+created: '2024-11-20T21:26:09.279390+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/android_anr.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/android_anr.pysnap
index 020e7075615c29..22b0137915886b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/android_anr.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/android_anr.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.697072+00:00'
+created: '2024-11-20T21:26:09.350010+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/aspnetcore.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/aspnetcore.pysnap
index 35e2fe0971cc41..162c235442c86f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/aspnetcore.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/aspnetcore.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.745401+00:00'
+created: '2024-11-20T21:26:09.670094+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/block_invoke.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/block_invoke.pysnap
index e4a1dea8ce00f6..dbaa2a71cbb485 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/block_invoke.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/block_invoke.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:48.793864+00:00'
+created: '2024-11-20T21:26:09.726063+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/bugly.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/bugly.pysnap
index e22822a6fc21f8..941b6db3f2a6e6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/bugly.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/bugly.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:48.849379+00:00'
+created: '2024-11-20T21:26:09.779592+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/built_in_fingerprint_chunkload_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/built_in_fingerprint_chunkload_error.pysnap
index 7297b9358de193..9b12e756d9ee5c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/built_in_fingerprint_chunkload_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/built_in_fingerprint_chunkload_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.952459+00:00'
+created: '2024-11-20T21:26:09.913406+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
index 7e872f56ee737c..757f65c13b8585 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
@@ -1,9 +1,30 @@
 ---
-created: '2024-10-28T14:02:48.902714+00:00'
+created: '2024-11-20T21:26:09.851999+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/callee_guaranteed.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/callee_guaranteed.pysnap
index 1075fabb1cd8fa..db98bb788a4203 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/callee_guaranteed.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/callee_guaranteed.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:49.008010+00:00'
+created: '2024-11-20T21:26:09.967337+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_no_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_no_regex_match.pysnap
index 32921fa922329b..1127f4385dbc68 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_no_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_no_regex_match.pysnap
@@ -1,9 +1,20 @@
 ---
-created: '2024-11-08T19:38:50.201117+00:00'
+created: '2024-11-20T21:26:10.059041+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "de46d023e69b171b90ccf3ebca7aede4",
+  "raw_checksum": "not a legit checksum"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_no_regex_match_long.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_no_regex_match_long.pysnap
index a535555730890c..a6b382be661d1d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_no_regex_match_long.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_no_regex_match_long.pysnap
@@ -1,9 +1,20 @@
 ---
-created: '2024-11-08T19:38:50.016718+00:00'
+created: '2024-11-20T21:26:10.009466+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "2c2e85a6e73109222f131228ed06a7af",
+  "raw_checksum": "not a legit checksum and also too long a string"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   hashed_checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_regex_match.pysnap
index aefcceab151da8..9ee116c9f34a45 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/checksum_regex_match.pysnap
@@ -1,9 +1,19 @@
 ---
-created: '2024-10-28T14:02:49.154533+00:00'
+created: '2024-11-20T21:26:10.104534+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "11212012123120120415201309082013"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/cocoa_dispatch_client_callout.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/cocoa_dispatch_client_callout.pysnap
index dd1acd2a07472b..dfd7569435b962 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/cocoa_dispatch_client_callout.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/cocoa_dispatch_client_callout.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:49.298330+00:00'
+created: '2024-11-20T21:26:10.171098+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/connection_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/connection_error.pysnap
index cad863e03387ec..8d7dabaffd5684 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/connection_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/connection_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:49.361527+00:00'
+created: '2024-11-20T21:26:10.226022+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp.pysnap
index f1d9612de74fbb..d4609b76013f75 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:49.652372+00:00'
+created: '2024-11-20T21:26:10.668432+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "YYY",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_img_src.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_img_src.pysnap
index f8b384b90fe134..5acade7f28330d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_img_src.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_img_src.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:49.403162+00:00'
+created: '2024-11-20T21:26:10.292677+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "ftp://example.com",
+  "csp_directive": "img-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_no_blocked_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_no_blocked_uri.pysnap
index 974e9627ece5a9..90170ac2b9066d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_no_blocked_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_no_blocked_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:49.449901+00:00'
+created: '2024-11-20T21:26:10.364292+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_data_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_data_uri.pysnap
index b9209a393a5ddf..d7eda2d2dcb081 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_data_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_data_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:49.508808+00:00'
+created: '2024-11-20T21:26:10.480219+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "data:",
+  "csp_directive": "img-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_src_unsafe_eval.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_src_unsafe_eval.pysnap
new file mode 100644
index 00000000000000..702fefe7fddb1c
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_src_unsafe_eval.pysnap
@@ -0,0 +1,33 @@
+---
+created: '2024-12-02T22:04:01.043471+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "csp_script_violation": "unsafe-eval",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
+---
+contributing variants:
+  default*
+    hash: "56c6520f35bce2f89ed2c4e725ccef65"
+    component:
+      default*
+        csp*
+          salt* (a static salt)
+            "script-src"
+          violation*
+            "'unsafe-eval'"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_src_unsafe_inline.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_src_unsafe_inline.pysnap
new file mode 100644
index 00000000000000..95771e21f31058
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_src_unsafe_inline.pysnap
@@ -0,0 +1,33 @@
+---
+created: '2024-12-02T22:04:02.308585+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "csp_script_violation": "unsafe-inline",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
+---
+contributing variants:
+  default*
+    hash: "d346ee37d19a2be6587e609075ca2d57"
+    component:
+      default*
+        csp*
+          salt* (a static salt)
+            "script-src"
+          violation*
+            "'unsafe-inline'"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_src_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_src_uri.pysnap
index 6f2910c9d6cd4d..5a8144edba98f5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_src_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_script_src_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:49.557480+00:00'
+created: '2024-11-20T21:26:10.552853+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_style_src_elem.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_style_src_elem.pysnap
index ca0de7245fbf47..f3cee1225ba319 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_style_src_elem.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/csp_style_src_elem.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:49.603735+00:00'
+created: '2024-11-20T21:26:10.608021+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "use.fontawesome.com",
+  "csp_directive": "style-src-elem",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_client.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_client.pysnap
index 99798310960589..2fa1934f68b77e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_client.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_client.pysnap
@@ -1,9 +1,25 @@
 ---
-created: '2024-11-08T19:38:51.920957+00:00'
+created: '2024-11-20T21:26:10.770176+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": false
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "client"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_client_and_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_client_and_server_rule.pysnap
index a5b0c8c6eb6565..205c311b74d16e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_client_and_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_client_and_server_rule.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-11-08T19:38:51.829940+00:00'
+created: '2024-11-20T21:26:10.718106+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_server_rule.pysnap
index 5157657599bc23..486b8cd9d1f629 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/custom_fingerprint_server_rule.pysnap
@@ -1,9 +1,25 @@
 ---
-created: '2024-11-08T19:38:52.048179+00:00'
+created: '2024-11-20T21:26:10.823056+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/empty.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/empty.pysnap
index 376d9fd64e92b2..c576338ace1879 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/empty.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/empty.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:49.913489+00:00'
+created: '2024-11-20T21:26:10.870864+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_cocoa_nserror.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_cocoa_nserror.pysnap
index 38dccea7fb1779..9b04f70dbe9d83 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_cocoa_nserror.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_cocoa_nserror.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:49.964416+00:00'
+created: '2024-11-20T21:26:10.922384+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_comput_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_comput_hashes.pysnap
deleted file mode 100644
index 756a6e08f3d4d5..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_comput_hashes.pysnap
+++ /dev/null
@@ -1,17 +0,0 @@
----
-created: '2024-10-28T14:02:50.009334+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: message
----
-contributing variants:
-  system*
-    hash: "b23ee1963904c2ca87b145febf94b66c"
-    component:
-      system*
-        exception*
-          type*
-            "ValueError"
-          value*
-            "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes.pysnap
index af6cecd7b3775d..5f56a820032c93 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes.pysnap
@@ -1,21 +1,32 @@
 ---
-created: '2024-10-28T14:02:50.154488+00:00'
+created: '2024-12-03T22:10:04.491433+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
-hash_basis: stacktrace
+hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
-    hash: "baf0bfa8bb312627cd5ef4171aec9f4e"
+    hash: "b23ee1963904c2ca87b145febf94b66c"
     component:
       system*
         exception*
-          stacktrace*
-            frame*
-              filename*
-                "foo/baz.py"
-              lineno*
-                1
           type*
             "ValueError"
+          value*
+            "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes_2.pysnap
index 49d61e1c34e1e3..46c82e482f1802 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:50.053150+00:00'
+created: '2024-11-20T21:26:11.012692+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes_3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes_3.pysnap
index 31ab0da80410d5..e9f133ee8d0a3e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_compute_hashes_3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:50.102239+00:00'
+created: '2024-11-20T21:26:11.064090+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 2,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_duplicate_id.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_duplicate_id.pysnap
index 531c4df59f33f3..ad6b0f36c338a2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_duplicate_id.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_duplicate_id.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.199099+00:00'
+created: '2024-11-20T21:26:11.159452+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_missing_parent.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_missing_parent.pysnap
index a7e096db4e3813..7bf04a02faa169 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_missing_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_missing_parent.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.245930+00:00'
+created: '2024-11-20T21:26:11.215124+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_out_of_sequence.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_out_of_sequence.pysnap
index afcf87fe3e0cd0..f9e52e48380c3d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_out_of_sequence.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_out_of_sequence.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.293771+00:00'
+created: '2024-11-20T21:26:11.269222+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_parent_with_parent.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_parent_with_parent.pysnap
index e081cb37475bc4..e11cfaeffe8dba 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_parent_with_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_parent_with_parent.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.350845+00:00'
+created: '2024-11-20T21:26:11.325986+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_with_cycle.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_with_cycle.pysnap
index 8f3ed68a509a54..141205e8f57609 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_with_cycle.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_bad_with_cycle.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.399271+00:00'
+created: '2024-11-20T21:26:11.399791+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_exception.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_exception.pysnap
index d1ab24a7028eb5..8b37b05d0cab71 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_exception.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_exception.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.449361+00:00'
+created: '2024-11-20T21:26:11.451207+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_under_nested_groups.pysnap
index bd13658f965da4..fb6ff1d83bb6f3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_under_nested_groups.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.498937+00:00'
+created: '2024-11-20T21:26:11.515775+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_different_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_different_values.pysnap
index 996ad02ab40452..ee99e9ec1e13b7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_different_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_different_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.551889+00:00'
+created: '2024-11-20T21:26:11.558469+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_similar_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_similar_values.pysnap
index d153d5f0df4162..34c40336dfcc4e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_similar_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_similar_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.651464+00:00'
+created: '2024-11-20T21:26:11.740400+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_similar_values_and_children.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_similar_values_and_children.pysnap
index 06154dc88c6307..99acd0e5691085 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_similar_values_and_children.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_one_type_with_similar_values_and_children.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.603473+00:00'
+created: '2024-11-20T21:26:11.609707+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_exceptions_with_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_exceptions_with_frames.pysnap
new file mode 100644
index 00000000000000..fd43d232698278
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_exceptions_with_frames.pysnap
@@ -0,0 +1,53 @@
+---
+created: '2024-12-02T21:58:31.995290+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 3,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
+---
+contributing variants:
+  system*
+    hash: "b8e05ed0c06d6bc6c6052bb9dae6d6eb"
+    component:
+      system*
+        chained-exception*
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                context-line*
+                  "do_some_other_stuff()"
+            type*
+              "DoOtherStuffException"
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                context-line*
+                  "do_some_stuff()"
+              frame*
+                module*
+                  "dostuff"
+                context-line*
+                  "do_some_different_stuff()"
+            type*
+              "DoStuffException"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_types.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_types.pysnap
index 6eb3d8ccb46b72..32e3f68ebdcf05 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_types.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_types.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.750070+00:00'
+created: '2024-11-20T21:26:11.856138+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_types_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_types_under_nested_groups.pysnap
index 68167fa0e9e21e..80fbafe8255623 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_types_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_groups_two_types_under_nested_groups.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.707335+00:00'
+created: '2024-11-20T21:26:11.800334+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_javascript_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_javascript_no_in_app.pysnap
index ec26f47077acc1..ed690cde500ef2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_javascript_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_javascript_no_in_app.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:50.817772+00:00'
+created: '2024-11-20T21:26:11.916418+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_without_type.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_without_type.pysnap
index e4b1f5b952ec67..648911c458a011 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_without_type.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_without_type.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.884376+00:00'
+created: '2024-11-20T21:26:11.961449+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_without_value.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_without_value.pysnap
index 3a8d466354fdab..8e500c9333d8f7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_without_value.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/exception_without_value.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:50.942176+00:00'
+created: '2024-11-20T21:26:12.005131+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/expectct.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/expectct.pysnap
index b7a020bf30c3cf..38c20a218b9da6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/expectct.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/expectct.pysnap
@@ -1,9 +1,23 @@
 ---
-created: '2024-10-28T14:02:50.994266+00:00'
+created: '2024-11-20T21:26:12.320017+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "security_report_type": "expect-ct"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "expect-ct"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/fallback_prefix_level_1.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/fallback_prefix_level_1.pysnap
index 39c8c52caf02d5..827ee830bcbc0a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/fallback_prefix_level_1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/fallback_prefix_level_1.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:51.044805+00:00'
+created: '2024-11-20T21:26:12.361445+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
deleted file mode 100644
index 53056fbcad1d9e..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
+++ /dev/null
@@ -1,18 +0,0 @@
----
-created: '2024-10-28T14:02:51.093560+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: stacktrace
----
-contributing variants:
-  system*
-    hash: "526b64456c48836a46ec1a89544fd412"
-    component:
-      system*
-        stacktrace*
-          frame*
-            module* (removed codegen marker)
-              "sentry_clojure_example.core$_main$fn__<auto>"
-            function*
-              "invoke"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
new file mode 100644
index 00000000000000..2a4d7728dd5215
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
@@ -0,0 +1,35 @@
+---
+created: '2024-12-03T22:10:04.537204+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
+---
+contributing variants:
+  system*
+    hash: "526b64456c48836a46ec1a89544fd412"
+    component:
+      system*
+        stacktrace*
+          frame*
+            module* (removed codegen marker)
+              "sentry_clojure_example.core$_main$fn__<auto>"
+            function*
+              "invoke"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_empty_list.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_empty_list.pysnap
index f83908c67bde69..540336c7c798ef 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_empty_list.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_empty_list.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:51.144421+00:00'
+created: '2024-11-20T21:26:12.452693+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
index c26aebb77c6fc8..7dd8b528d1d1ae 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.194867+00:00'
+created: '2024-11-20T21:26:12.511595+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_fast_class_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
index 118dc898b1cfa5..70f42c44a4c4e5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.245069+00:00'
+created: '2024-11-20T21:26:12.560929+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_spring_classes.pysnap
index 3c73eb3fb13782..6e8753cea829c3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_ENHANCED_spring_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.295236+00:00'
+created: '2024-11-20T21:26:12.608337+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_dartlang_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_dartlang_sdk.pysnap
index eb24fef823a38e..9220c4060460cd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_dartlang_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_dartlang_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.350087+00:00'
+created: '2024-11-20T21:26:12.665547+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
index a7b5f0bb7fc963..7acfeb284774d2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.393912+00:00'
+created: '2024-11-20T21:26:12.720832+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
index f319b38cd6fabd..c8180ed722c429 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.442348+00:00'
+created: '2024-11-20T21:26:12.765075+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_spring_classes.pysnap
index 21115eb6c596da..5d0078e982882e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_extra_ENHANCED_spring_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.492086+00:00'
+created: '2024-11-20T21:26:12.828788+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_from_url_origin_corner_cases.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_from_url_origin_corner_cases.pysnap
index 32f829ee1abc6e..695125527a2d0a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_from_url_origin_corner_cases.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_from_url_origin_corner_cases.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.541509+00:00'
+created: '2024-11-20T21:26:12.878724+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_abs_path_is_http.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_abs_path_is_http.pysnap
index 657d9a4dfeb359..c9fcf73034398b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_abs_path_is_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_abs_path_is_http.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.587193+00:00'
+created: '2024-11-20T21:26:12.929450+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_blob.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_blob.pysnap
index fed6fb027532be..a8416b2b048640 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_blob.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_blob.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:51.638452+00:00'
+created: '2024-11-20T21:26:12.977302+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_http.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_http.pysnap
index 4e0c307914ed34..88941c73831079 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_http.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.685270+00:00'
+created: '2024-11-20T21:26:13.032451+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_https.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_https.pysnap
index a1c57ffed28547..0e2ebb948d30f0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_https.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_filename_if_https.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.740704+00:00'
+created: '2024-11-20T21:26:13.076989+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_flutter_sdk.pysnap
index 89bf81be4307f5..a6a002feab6166 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_flutter_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.781042+00:00'
+created: '2024-11-20T21:26:13.175268+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_hibernate_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_hibernate_classes.pysnap
index 9ef3827372a323..3951179ec9823a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_hibernate_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_hibernate_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.843213+00:00'
+created: '2024-11-20T21:26:13.247919+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_java8_lambda_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_java8_lambda_function.pysnap
index b2bf704b4569c6..0bb60ad84f4e1f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_java8_lambda_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_java8_lambda_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.878887+00:00'
+created: '2024-11-20T21:26:13.410839+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
@@ -14,6 +31,5 @@ contributing variants:
           frame*
             module*
               "foo.bar.Baz"
-            function*
-              salt* (normalized lambda function name)
-                "<function>"
+            function* (normalized lambda function name)
+              "<function>"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_java8_lambda_module.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_java8_lambda_module.pysnap
index 2c750ee204792b..c203d18f523abc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_java8_lambda_module.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_java8_lambda_module.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.939165+00:00'
+created: '2024-11-20T21:26:13.489826+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
@@ -12,8 +29,7 @@ contributing variants:
       system*
         stacktrace*
           frame*
-            module* (ignored module)
-              salt* (normalized generated module name)
-                "<module>"
+            module* (normalized generated module name)
+              "<module>"
             function*
               "call"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist.pysnap
index c0b1d97a67e175..f22111875641a3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.076076+00:00'
+created: '2024-11-20T21:26:13.650849+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist_2.pysnap
index d65f3fcbc29837..a9aa6fd65955de 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:51.986962+00:00'
+created: '2024-11-20T21:26:13.547945+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist_3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist_3.pysnap
index e880eea3f12156..6449dc0cbf6115 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_javassist_3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.031146+00:00'
+created: '2024-11-20T21:26:13.597602+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_module_if_page_url.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_module_if_page_url.pysnap
index 2b10f21eb3bf8c..7ae255b96b2596 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_module_if_page_url.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_module_if_page_url.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:52.170531+00:00'
+created: '2024-11-20T21:26:13.743321+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_module_if_page_url_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_module_if_page_url_2.pysnap
index 25bca5f99d24ec..6e32b92887ea23 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_module_if_page_url_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_module_if_page_url_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.122282+00:00'
+created: '2024-11-20T21:26:13.694114+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
@@ -12,8 +29,7 @@ contributing variants:
       system*
         stacktrace*
           frame*
-            module* (ignored module)
-              salt* (normalized generated module name)
-                "<module>"
+            module* (normalized generated module name)
+              "<module>"
             function*
               "a"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_safari_native_code.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_safari_native_code.pysnap
index 89bc60367ad4d5..1fcbf731814376 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_safari_native_code.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_safari_native_code.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:52.225360+00:00'
+created: '2024-11-20T21:26:13.787049+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_dart_packages.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_dart_packages.pysnap
index 3b3bd8eabcb513..852119f4805dcc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_dart_packages.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_dart_packages.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.272920+00:00'
+created: '2024-11-20T21:26:13.840821+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_dart_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_dart_sdk.pysnap
index 29a422f0a8d402..59131b9295dc89 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_dart_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_dart_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.320064+00:00'
+created: '2024-11-20T21:26:13.888371+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_flutter_sdk.pysnap
index d4d2ae370e184f..476a1b19bbea48 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sentry_flutter_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.370758+00:00'
+created: '2024-11-20T21:26:13.940903+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors.pysnap
index 252f67ed19baf8..f49c7684ad72ab 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.466673+00:00'
+created: '2024-11-20T21:26:14.038157+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors_2.pysnap
index 06558284344d34..a29d783f90373e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_constructors_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.420619+00:00'
+created: '2024-11-20T21:26:13.985763+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_methods.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_methods.pysnap
index 0aad1d6e039814..57abce1b0f304a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_methods.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_ignores_sun_java_generated_methods.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.518602+00:00'
+created: '2024-11-20T21:26:14.084653+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_block_functions.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_block_functions.pysnap
index 969d96c933155e..c50228741e26c6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_block_functions.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_block_functions.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.563488+00:00'
+created: '2024-11-20T21:26:14.128991+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_erb_templates.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_erb_templates.pysnap
index 09226803aa1ad9..932e38bfde2b0f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_erb_templates.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_erb_templates.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.606801+00:00'
+created: '2024-11-20T21:26:14.175652+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_versioned_filenames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_versioned_filenames.pysnap
index 983435f704cbcd..22c65b270bf0a7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_versioned_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_versioned_filenames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.700507+00:00'
+created: '2024-11-20T21:26:14.273360+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_versioned_filenames_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_versioned_filenames_2.pysnap
index 4b1f088c54da2f..c61fb890944ea2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_versioned_filenames_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_sanitizes_versioned_filenames_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.648293+00:00'
+created: '2024-11-20T21:26:14.226170+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_skips_symbol_if_unknown.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_skips_symbol_if_unknown.pysnap
index 7da1dd439c894e..5d03808ce8f4ae 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_skips_symbol_if_unknown.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_skips_symbol_if_unknown.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.748437+00:00'
+created: '2024-11-20T21:26:14.324975+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_context_line_over_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_context_line_over_function.pysnap
index 09c6b95b8be6e2..c28bf8ec773915 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_context_line_over_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_context_line_over_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.798648+00:00'
+created: '2024-11-20T21:26:14.369809+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_function_over_lineno.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_function_over_lineno.pysnap
index 4193a7ae768d5b..41d36fdce10ecd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_function_over_lineno.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_function_over_lineno.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.848667+00:00'
+created: '2024-11-20T21:26:14.490365+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_module_over_filename.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_module_over_filename.pysnap
index dc94fa3c74323c..a7d72dda9d661d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_module_over_filename.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_module_over_filename.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.903709+00:00'
+created: '2024-11-20T21:26:14.556938+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_symbol_instead_of_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_symbol_instead_of_function.pysnap
index 91ea1dd69926da..ac3866cbb542c8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_symbol_instead_of_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_uses_symbol_instead_of_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:52.953924+00:00'
+created: '2024-11-20T21:26:14.601833+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_with_only_required_vars.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_with_only_required_vars.pysnap
index 01625d2b068201..661141368e0e38 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_with_only_required_vars.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/frame_with_only_required_vars.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:53.001738+00:00'
+created: '2024-11-20T21:26:14.647870+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/go_pkg_mod.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/go_pkg_mod.pysnap
index e7a14f9563b55c..625445bd33a2ac 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/go_pkg_mod.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/go_pkg_mod.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:53.049452+00:00'
+created: '2024-11-20T21:26:14.692409+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_125_event_126.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_125_event_126.pysnap
index 0a89e49701acc1..a6884a2c125a5f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_125_event_126.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_125_event_126.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:53.103249+00:00'
+created: '2024-11-20T21:26:14.749234+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_200_event_200.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_200_event_200.pysnap
index af092c97fc5fa4..1b7cdbc28408cd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_200_event_200.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_200_event_200.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:53.155183+00:00'
+created: '2024-11-20T21:26:14.803221+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_275_event_275.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_275_event_275.pysnap
index 344255adaaecbc..0ef2cab3bc5edd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_275_event_275.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_275_event_275.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:53.344760+00:00'
+created: '2024-11-20T21:26:14.858065+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_289_event_312.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_289_event_312.pysnap
index f89a80f4b935dc..21ab983f71d70c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_289_event_312.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_289_event_312.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:53.441496+00:00'
+created: '2024-11-20T21:26:14.911704+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_294_event_294.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_294_event_294.pysnap
index d0a4b7eeadeb67..03629a63fb9a46 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_294_event_294.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_294_event_294.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:53.510628+00:00'
+created: '2024-11-20T21:26:14.967768+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_294_event_329.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_294_event_329.pysnap
index 85e0540ab593df..104a4b3a73b27d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_294_event_329.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_294_event_329.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:53.561489+00:00'
+created: '2024-11-20T21:26:15.022203+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_307_event_307.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_307_event_307.pysnap
index ff13c2e13103ad..47f9d7e3c2be3b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_307_event_307.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_307_event_307.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:53.631928+00:00'
+created: '2024-11-20T21:26:15.069536+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_307_event_657.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_307_event_657.pysnap
index 9d66db964af1f1..6fd2e6429f0a6e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_307_event_657.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_307_event_657.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:53.685667+00:00'
+created: '2024-11-20T21:26:15.122596+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_313_event_313.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_313_event_313.pysnap
index 60e593dab974c3..90c3431477f4a6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_313_event_313.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_313_event_313.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:53.747381+00:00'
+created: '2024-11-20T21:26:15.184288+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_313_event_333.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_313_event_333.pysnap
index 44e241514b07bb..4d97646cb64eba 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_313_event_333.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_313_event_333.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:53.809946+00:00'
+created: '2024-11-20T21:26:15.243374+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_319_event_321.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_319_event_321.pysnap
index a76e4017961a37..c5cae962e7a54e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_319_event_321.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_319_event_321.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:53.866892+00:00'
+created: '2024-11-20T21:26:15.308903+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_389_event_389.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_389_event_389.pysnap
index 455e1d7364892a..997a3d56154e99 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_389_event_389.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_389_event_389.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:53.909165+00:00'
+created: '2024-11-20T21:26:15.360180+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_432_event_432.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_432_event_432.pysnap
index 2c249c39fad029..b17424d8c38beb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_432_event_432.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_432_event_432.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:53.965144+00:00'
+created: '2024-11-20T21:26:15.417567+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_432_event_453.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_432_event_453.pysnap
index 5c84770afd5092..dd1880b1516fab 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_432_event_453.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_432_event_453.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:54.015918+00:00'
+created: '2024-11-20T21:26:15.470941+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_445_event_445.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_445_event_445.pysnap
index 7cff31cca35963..f56ef83305adac 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_445_event_445.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/group_445_event_445.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:54.067430+00:00'
+created: '2024-11-20T21:26:15.527902+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hpkp.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hpkp.pysnap
index d202985ac37247..6a279f3c9fac22 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hpkp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hpkp.pysnap
@@ -1,9 +1,23 @@
 ---
-created: '2024-10-28T14:02:54.108482+00:00'
+created: '2024-11-20T21:26:15.573366+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "security_report_type": "hpkp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "hpkp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_base.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_base.pysnap
index 6ef5f90a5752b1..de1c0697d7af33 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_base.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:02:54.147286+00:00'
+created: '2024-11-20T21:26:15.617154+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_custom_client_hybrid_server.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_custom_client_hybrid_server.pysnap
index 2f773268f47702..214651d1ecdcf4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_custom_client_hybrid_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_custom_client_hybrid_server.pysnap
@@ -1,9 +1,31 @@
 ---
-created: '2024-10-28T14:02:54.203549+00:00'
+created: '2024-11-20T21:26:15.665726+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['{{ default }}', 'soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": true,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"{{ default }}soft-timelimit-exceeded\"",
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_hybrid_client_custom_server.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_hybrid_client_custom_server.pysnap
index cfa62062ca87aa..916dd24e9865d7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_hybrid_client_custom_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_hybrid_client_custom_server.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-11-08T19:39:01.703766+00:00'
+created: '2024-11-20T21:26:15.715419+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_same_default_different_extra.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_same_default_different_extra.pysnap
index af937d03f7fb84..e6bb9c62666474 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_same_default_different_extra.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_same_default_different_extra.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:02:54.299557+00:00'
+created: '2024-11-20T21:26:15.761176+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', \"adopt don't shop\"]",
+  "fingerprint": "['{{ default }}', \"adopt don't shop\"]",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_same_extra_different_default.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_same_extra_different_default.pysnap
index 8d72cf1b5a55c4..e97c5c3afa245e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_same_extra_different_default.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/hybrid_fingerprint_same_extra_different_default.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:02:54.343833+00:00'
+created: '2024-11-20T21:26:15.809046+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/in_app_in_ui.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/in_app_in_ui.pysnap
index 990ee0af2e8389..115317314310b2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/in_app_in_ui.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/in_app_in_ui.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:54.399665+00:00'
+created: '2024-11-20T21:26:15.869032+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/java_chained.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/java_chained.pysnap
index 3d66991c25ff38..3b9ad8aeba5434 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/java_chained.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/java_chained.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:54.452240+00:00'
+created: '2024-11-20T21:26:15.983114+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 3,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/java_minimal.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/java_minimal.pysnap
index e66184d1203350..226b963ef6600b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/java_minimal.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/java_minimal.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:54.510294+00:00'
+created: '2024-11-20T21:26:16.067258+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_fallback_to_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_fallback_to_message.pysnap
index 9dd4c9d4bdaa01..7ffbc70e0c4b56 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_fallback_to_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_fallback_to_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:54.600240+00:00'
+created: '2024-11-20T21:26:16.176294+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_fallback_to_message_whistles.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_fallback_to_message_whistles.pysnap
index 7a45f560867b8f..9675d00df149a3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_fallback_to_message_whistles.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_fallback_to_message_whistles.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:54.553120+00:00'
+created: '2024-11-20T21:26:16.117971+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_no_in_app.pysnap
index 49321af32d94d5..9250f7f1b43241 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_exception_no_in_app.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:54.647645+00:00'
+created: '2024-11-20T21:26:16.280410+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_message.pysnap
index 082de3d05acc62..d94327bbb1ce1c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:54.736255+00:00'
+created: '2024-11-20T21:26:16.403420+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_message_parameterization.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_message_parameterization.pysnap
index 4634465dc6f3f4..a68096ca692179 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_message_parameterization.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_message_parameterization.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:54.692159+00:00'
+created: '2024-11-20T21:26:16.353013+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_polyfills.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_polyfills.pysnap
index 4325a4a88a54b7..2084df65ad537a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_polyfills.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_polyfills.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:54.790628+00:00'
+created: '2024-11-20T21:26:16.456102+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_regression_tree_labels.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_regression_tree_labels.pysnap
deleted file mode 100644
index 91dce33c8d5735..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_regression_tree_labels.pysnap
+++ /dev/null
@@ -1,41 +0,0 @@
----
-created: '2024-10-28T14:02:55.406652+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: stacktrace
----
-contributing variants:
-  system*
-    hash: "0edbd7ed5321de5d698621b306f6b8e2"
-    component:
-      system*
-        exception*
-          stacktrace*
-            frame*
-              module*
-                "app/utils/handleXhrErrorResponse"
-              context-line*
-                "      Sentry.withScope(scope => {"
-            frame*
-              module*
-                "@sentry/minimal/esm/index"
-              context-line*
-                "    callOnHub('withScope', callback);"
-            frame*
-              module*
-                "@sentry/minimal/esm/index"
-              context-line*
-                "        return hub[method].apply(hub, __spread(args));"
-            frame*
-              module*
-                "@sentry/hub/esm/hub"
-              context-line*
-                "            callback(scope);"
-            frame*
-              module*
-                "app/utils/handleXhrErrorResponse"
-              context-line*
-                "        Sentry.captureException(new Error(message));"
-          type*
-            "Error"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_unpkg.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_unpkg.pysnap
index 37f2dc7c2fd995..fd5806cfc4c4fd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_unpkg.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_unpkg.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:54.834244+00:00'
+created: '2024-11-20T21:26:16.507210+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_chrome.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_chrome.pysnap
index 7b14e0cf5b31b3..3842a1d202d052 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_chrome.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:54.895266+00:00'
+created: '2024-11-20T21:26:16.559845+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_edge.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_edge.pysnap
index 62d65fdf387ecb..b881b959772670 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_edge.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:54.937885+00:00'
+created: '2024-11-20T21:26:16.614494+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_firefox.pysnap
index 6d42e8f62c85d7..ddaf55fd2cf8cc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_firefox.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:54.987891+00:00'
+created: '2024-11-20T21:26:16.664732+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_chrome.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_chrome.pysnap
index 0422aa18b64108..4b31b53ab3e7a3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_chrome.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:55.028919+00:00'
+created: '2024-11-20T21:26:16.718059+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_edge.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_edge.pysnap
index 43802f1fdcb8c1..59156314be6543 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_edge.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:55.078531+00:00'
+created: '2024-11-20T21:26:16.764265+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_firefox.pysnap
index b039063e24afb6..6e082f3de32c6b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:55.124919+00:00'
+created: '2024-11-20T21:26:16.817334+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_safari.pysnap
index 91266fdbfe61b9..51611f54f7aa52 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_http_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:55.171870+00:00'
+created: '2024-11-20T21:26:16.866322+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_safari.pysnap
index de89324eac91ba..d0e9e50496a4f2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_safari.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:55.222390+00:00'
+created: '2024-11-20T21:26:16.917676+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_sentryui_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_sentryui_firefox.pysnap
index ad5ac0b6e14a25..eb2ef774eb30b1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_sentryui_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_sentryui_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:55.322622+00:00'
+created: '2024-11-20T21:26:16.979130+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_sentryui_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_sentryui_safari.pysnap
index ebf2e26758d882..fdf91e62f95963 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_sentryui_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/javascript_xbrowser_sentryui_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:55.362239+00:00'
+created: '2024-11-20T21:26:17.045171+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/laravel.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/laravel.pysnap
index ab1c44673d0392..9f55875e832045 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/laravel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/laravel.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:55.515869+00:00'
+created: '2024-11-20T21:26:17.240716+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/laravel_anonymous.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/laravel_anonymous.pysnap
index 3ba047963436c6..9d621e378cf337 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/laravel_anonymous.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/laravel_anonymous.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:55.453440+00:00'
+created: '2024-11-20T21:26:17.159806+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/logentry_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/logentry_prefers_message.pysnap
index 87abd91a048b5a..af718a754f7518 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/logentry_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/logentry_prefers_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:55.556660+00:00'
+created: '2024-11-20T21:26:17.290076+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/logentry_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/logentry_uses_formatted.pysnap
index 868e2fadb67eb4..5e9f9502ce7905 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/logentry_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/logentry_uses_formatted.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:55.599514+00:00'
+created: '2024-11-20T21:26:17.349782+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/macos_amd_driver.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/macos_amd_driver.pysnap
index b460f0cfbdef04..e027bcabe62ceb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/macos_amd_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/macos_amd_driver.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:55.661054+00:00'
+created: '2024-11-20T21:26:17.406959+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/macos_intel_driver.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/macos_intel_driver.pysnap
index 9c9e82e8b0d7e9..ede059cdce2115 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/macos_intel_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/macos_intel_driver.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:55.711693+00:00'
+created: '2024-11-20T21:26:17.472796+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/malloc_sentinel.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/malloc_sentinel.pysnap
index 6115a5b3102579..8ec9f55990ab39 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/malloc_sentinel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/malloc_sentinel.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:55.756204+00:00'
+created: '2024-11-20T21:26:17.527495+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_prefers_message.pysnap
index 2d4879ab3f27b0..b6af435eab9afd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_prefers_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:55.809512+00:00'
+created: '2024-11-20T21:26:17.573401+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_uses_formatted.pysnap
index efa417b9f1922e..83c4ea24e79a38 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_uses_formatted.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:55.868053+00:00'
+created: '2024-11-20T21:26:17.618482+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_with_key_pair_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_with_key_pair_values.pysnap
index 95b854363b2f9b..4cf9887ba8bfec 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_with_key_pair_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/message_with_key_pair_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:55.929280+00:00'
+created: '2024-11-20T21:26:17.672393+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/minified_javascript.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/minified_javascript.pysnap
index eaec26d9e99f7b..1fad2335cec3bb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/minified_javascript.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/minified_javascript.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:55.992865+00:00'
+created: '2024-11-20T21:26:17.724158+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_complex_function_names.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_complex_function_names.pysnap
index 83267a7688368c..d4fb369fa2aa67 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_complex_function_names.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_complex_function_names.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:56.050793+00:00'
+created: '2024-11-20T21:26:17.773901+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash1.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash1.pysnap
index 9c2a99f1bbad3c..ffd2dec69a69cd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash1.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:56.109097+00:00'
+created: '2024-11-20T21:26:17.827934+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash2.pysnap
index 2bda54d7686b9f..8c198d4391af49 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash2.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:56.162564+00:00'
+created: '2024-11-20T21:26:17.875274+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash3.pysnap
index 9b24a640454f2a..dec9893b016d3c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_driver_crash3.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:56.222937+00:00'
+created: '2024-11-20T21:26:17.923246+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_limit_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_limit_frames.pysnap
index 60ccb381b9a474..61f614a4cb3451 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_limit_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_limit_frames.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:56.293916+00:00'
+created: '2024-11-20T21:26:17.975496+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_malloc_chain.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_malloc_chain.pysnap
index 246133b42089c2..3450f5663e2ab1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_malloc_chain.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_malloc_chain.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:56.361346+00:00'
+created: '2024-11-20T21:26:18.025859+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_no_filenames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_no_filenames.pysnap
index 7de82539e9fa16..695678b72af3c3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_no_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_no_filenames.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:56.405030+00:00'
+created: '2024-11-20T21:26:18.076719+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_unlimited_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_unlimited_frames.pysnap
index d0529d738d3300..f809c3a01c33d7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_unlimited_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_unlimited_frames.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:56.504743+00:00'
+created: '2024-11-20T21:26:18.127562+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_windows_anon_namespace.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_windows_anon_namespace.pysnap
index d816086ffe53d5..df6c9c66457653 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_windows_anon_namespace.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_windows_anon_namespace.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:56.544765+00:00'
+created: '2024-11-20T21:26:18.176107+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_with_function_name.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_with_function_name.pysnap
index ed8df55a2358b0..1560efa34da188 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_with_function_name.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/native_with_function_name.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:56.588266+00:00'
+created: '2024-11-20T21:26:18.229583+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/node_exception_weird.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/node_exception_weird.pysnap
index bb8f858e5486c4..e6f9005d1c7136 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/node_exception_weird.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/node_exception_weird.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:56.637919+00:00'
+created: '2024-11-20T21:26:18.281193+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/node_low_level_async.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/node_low_level_async.pysnap
index 8d1c7906c457df..3ead2d192dd208 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/node_low_level_async.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/node_low_level_async.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:56.686163+00:00'
+created: '2024-11-20T21:26:18.368399+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_exception_base.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_exception_base.pysnap
index 6fc0d82e4b9618..f31ac009449402 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_exception_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_exception_base.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:56.737211+00:00'
+created: '2024-11-20T21:26:18.415154+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 2,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_grouping_enhancer_away_from_crash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_grouping_enhancer_away_from_crash.pysnap
index 83c7e8d8426d7d..11f98e82998905 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_grouping_enhancer_away_from_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_grouping_enhancer_away_from_crash.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:56.787243+00:00'
+created: '2024-11-20T21:26:18.470784+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_grouping_enhancer_towards_crash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_grouping_enhancer_towards_crash.pysnap
index 546f3dc6f7b4d7..80de65e7efbd71 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_grouping_enhancer_towards_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_grouping_enhancer_towards_crash.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:56.838718+00:00'
+created: '2024-11-20T21:26:18.522809+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_http_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_http_error.pysnap
index 874469c619085b..2eb7a72c15bc6d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_http_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/python_http_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:56.884810+00:00'
+created: '2024-11-20T21:26:18.577396+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/react_native.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/react_native.pysnap
index dc1e4649d3caea..d439f36837811b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/react_native.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/react_native.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:56.938349+00:00'
+created: '2024-11-20T21:26:18.637716+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_cocoa.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_cocoa.pysnap
index 5f0c2c2fd4d372..02d07c96238939 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_cocoa.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_cocoa.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:56.982087+00:00'
+created: '2024-11-20T21:26:18.689883+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_collapse_recursion.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_collapse_recursion.pysnap
index b6c74ec0ee7706..a1e0bf58009915 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_collapse_recursion.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_collapse_recursion.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:57.028244+00:00'
+created: '2024-11-20T21:26:18.743390+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_compute_hashes.pysnap
index d53b038c5add85..7e57b2306451a3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_compute_hashes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:57.072437+00:00'
+created: '2024-11-20T21:26:18.794699+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_discards_seemingly_useless_stack.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_discards_seemingly_useless_stack.pysnap
index 0ec4469944f783..200bee4cf8fb22 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_discards_seemingly_useless_stack.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_discards_seemingly_useless_stack.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:57.116590+00:00'
+created: '2024-11-20T21:26:18.945940+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_does_not_discard_non_urls.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_does_not_discard_non_urls.pysnap
index 5c1a4bcdedfab4..e4bd6d3ba60e26 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_does_not_discard_non_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_does_not_discard_non_urls.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:57.168045+00:00'
+created: '2024-11-20T21:26:18.996191+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_does_not_group_different_js_errors.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_does_not_group_different_js_errors.pysnap
index 5f0293e114e0b7..7793a5ccd0aaf3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_does_not_group_different_js_errors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_does_not_group_different_js_errors.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:57.213922+00:00'
+created: '2024-11-20T21:26:19.050906+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_enforce_min_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_enforce_min_frames.pysnap
index 60edfb7c24e871..b90fb41c415f5c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_enforce_min_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_enforce_min_frames.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:57.260939+00:00'
+created: '2024-11-20T21:26:19.107720+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_excludes_single_frame_urls.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_excludes_single_frame_urls.pysnap
index 531cfe161f6a60..8f44d17c144a17 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_excludes_single_frame_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_excludes_single_frame_urls.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:57.308271+00:00'
+created: '2024-11-20T21:26:19.207115+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_hash_without_system_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_hash_without_system_frames.pysnap
index 8148d55d71cd41..7bfb9750a31739 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_hash_without_system_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_hash_without_system_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:57.351210+00:00'
+created: '2024-11-20T21:26:19.269102+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_ignores_singular_anonymous_frame.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_ignores_singular_anonymous_frame.pysnap
index 8966f029df02d6..8cadb9e2b419e3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_ignores_singular_anonymous_frame.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_ignores_singular_anonymous_frame.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:57.405621+00:00'
+created: '2024-11-20T21:26:19.329304+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_negated_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_negated_match.pysnap
index 912c2677be1c03..c8936c1274e67a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_negated_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_negated_match.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:57.454206+00:00'
+created: '2024-11-20T21:26:19.386878+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_rust.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_rust.pysnap
index fa4315fb15574b..ada0a3146120ee 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_rust.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_rust.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:57.494191+00:00'
+created: '2024-11-20T21:26:19.445595+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_rust2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_rust2.pysnap
index 1dc2d9f61a3236..bd39fdb8352cf1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_rust2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_rust2.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:57.547094+00:00'
+created: '2024-11-20T21:26:19.505056+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_with_minimal_app_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_with_minimal_app_frames.pysnap
index da546592f7cd11..967b8545ec6bed 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_with_minimal_app_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/stacktrace_with_minimal_app_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:57.595540+00:00'
+created: '2024-11-20T21:26:19.556148+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/template_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/template_compute_hashes.pysnap
index 695622efa4e906..0f02a2d5c5f948 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/template_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/template_compute_hashes.pysnap
@@ -1,17 +1,28 @@
 ---
-created: '2024-10-28T14:02:57.641441+00:00'
+created: '2024-12-03T22:10:04.627914+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: template
+hashing_metadata: {
+  "template_context_line": "{% invalid template tag %}",
+  "template_name": "foo.html"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "template",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   default*
-    hash: "826f66ef602835f68030c04c634df320"
+    hash: "1f5bdebe3c9f414c7dbb4296a8353245"
     component:
       default*
         template*
           filename*
             "foo.html"
           context-line*
-            "hello world"
+            "{% invalid template tag %}"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/threads_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/threads_compute_hashes.pysnap
index ea431391dcafb2..495ca7e00f6b2a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/threads_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/threads_compute_hashes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:57.688865+00:00'
+created: '2024-11-20T21:26:19.655377+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "thread",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "thread",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/threads_no_hash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/threads_no_hash.pysnap
index 1eed63457431a6..dfb050c00f3483 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/threads_no_hash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/threads_no_hash.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:57.736289+00:00'
+created: '2024-11-20T21:26:19.703129+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unity.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unity.pysnap
index a7105c6061b94c..7abc40362eb414 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unity.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unity.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:57.790047+00:00'
+created: '2024-11-20T21:26:19.865616+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unknown_variant.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unknown_variant.pysnap
index cc28934dec55a2..be9e6e1d6ef61d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unknown_variant.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unknown_variant.pysnap
@@ -1,9 +1,16 @@
 ---
-created: '2024-10-28T14:39:39.138332+00:00'
+created: '2024-11-20T21:26:04.097039+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: unknown
+hashing_metadata: {}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "unknown"
+  }
+}
 ---
 contributing variants:
   dogs*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/actix.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/actix.pysnap
index 565078326aee7c..461b9b3d4f627f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/actix.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/actix.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.851079+00:00'
+created: '2024-11-20T21:26:19.932365+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/android_anr.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/android_anr.pysnap
index 6b42ba3f8246de..78ee24ec69f87b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/android_anr.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/android_anr.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.920499+00:00'
+created: '2024-11-20T21:26:19.988421+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/aspnetcore.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/aspnetcore.pysnap
index ca149c99234950..386c7867a86ffd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/aspnetcore.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/aspnetcore.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.971070+00:00'
+created: '2024-11-20T21:26:20.046019+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/block_invoke.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/block_invoke.pysnap
index a200018e1cc159..0899e594c2e2ee 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/block_invoke.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/block_invoke.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:39.018723+00:00'
+created: '2024-11-20T21:26:20.094923+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "thread",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "thread",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/bugly.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/bugly.pysnap
index 122279fc159283..51ff8584122a59 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/bugly.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/bugly.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:39.113328+00:00'
+created: '2024-11-20T21:26:20.149179+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/built_in_fingerprint_chunkload_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/built_in_fingerprint_chunkload_error.pysnap
index eb3cf3944a183e..9f7a8a3824d81b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/built_in_fingerprint_chunkload_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/built_in_fingerprint_chunkload_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:39.210230+00:00'
+created: '2024-11-20T21:26:20.342224+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
index c0bab36827643d..6426e6e9cac830 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
@@ -1,9 +1,30 @@
 ---
-created: '2024-10-28T14:02:39.152687+00:00'
+created: '2024-11-20T21:26:20.194943+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/callee_guaranteed.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/callee_guaranteed.pysnap
index f72bec276acf43..04d3ce577c48ca 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/callee_guaranteed.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/callee_guaranteed.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:39.261941+00:00'
+created: '2024-11-20T21:26:20.402062+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_no_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_no_regex_match.pysnap
index eac4311ef72052..a3ebe9c4628f49 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_no_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_no_regex_match.pysnap
@@ -1,9 +1,20 @@
 ---
-created: '2024-11-08T19:39:12.509223+00:00'
+created: '2024-11-20T21:26:20.499036+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "de46d023e69b171b90ccf3ebca7aede4",
+  "raw_checksum": "not a legit checksum"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_no_regex_match_long.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_no_regex_match_long.pysnap
index 34d05a15f295d4..8c6dd04a698b9d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_no_regex_match_long.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_no_regex_match_long.pysnap
@@ -1,9 +1,20 @@
 ---
-created: '2024-11-08T19:39:12.336490+00:00'
+created: '2024-11-20T21:26:20.451487+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "2c2e85a6e73109222f131228ed06a7af",
+  "raw_checksum": "not a legit checksum and also too long a string"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   hashed_checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_regex_match.pysnap
index 1861f79e9937e9..1eb5a9c25112bb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/checksum_regex_match.pysnap
@@ -1,9 +1,19 @@
 ---
-created: '2024-10-28T14:02:39.421021+00:00'
+created: '2024-11-20T21:26:20.550722+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "11212012123120120415201309082013"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/cocoa_dispatch_client_callout.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/cocoa_dispatch_client_callout.pysnap
index c74b59f04ed098..32bbb4e453e061 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/cocoa_dispatch_client_callout.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/cocoa_dispatch_client_callout.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:39.477388+00:00'
+created: '2024-11-20T21:26:20.602343+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "thread",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "thread",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/connection_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/connection_error.pysnap
index e61479c089fcbd..f20c5844fb1a75 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/connection_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/connection_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:39.533291+00:00'
+created: '2024-11-20T21:26:20.653381+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp.pysnap
index ceef4ad569491d..0483bf9d601050 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:39.835768+00:00'
+created: '2024-11-20T21:26:20.932153+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "YYY",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_img_src.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_img_src.pysnap
index c9886ce15fedb9..3e7acf61fb45b7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_img_src.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_img_src.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:39.582535+00:00'
+created: '2024-11-20T21:26:20.697148+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "ftp://example.com",
+  "csp_directive": "img-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_no_blocked_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_no_blocked_uri.pysnap
index 06e48081cfdd64..9161e992f6ba3d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_no_blocked_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_no_blocked_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:39.633261+00:00'
+created: '2024-11-20T21:26:20.744606+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_data_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_data_uri.pysnap
index ca45ab117dcba8..fd6cc7199fd147 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_data_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_data_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:39.682509+00:00'
+created: '2024-11-20T21:26:20.792786+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "data:",
+  "csp_directive": "img-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_src_unsafe_eval.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_src_unsafe_eval.pysnap
new file mode 100644
index 00000000000000..0421c183fa54e0
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_src_unsafe_eval.pysnap
@@ -0,0 +1,33 @@
+---
+created: '2024-12-02T22:04:08.965328+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "csp_script_violation": "unsafe-eval",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
+---
+contributing variants:
+  default*
+    hash: "56c6520f35bce2f89ed2c4e725ccef65"
+    component:
+      default*
+        csp*
+          salt* (a static salt)
+            "script-src"
+          violation*
+            "'unsafe-eval'"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_src_unsafe_inline.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_src_unsafe_inline.pysnap
new file mode 100644
index 00000000000000..8ce8174b43f8dd
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_src_unsafe_inline.pysnap
@@ -0,0 +1,33 @@
+---
+created: '2024-12-02T22:04:10.035038+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "csp_script_violation": "unsafe-inline",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
+---
+contributing variants:
+  default*
+    hash: "d346ee37d19a2be6587e609075ca2d57"
+    component:
+      default*
+        csp*
+          salt* (a static salt)
+            "script-src"
+          violation*
+            "'unsafe-inline'"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_src_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_src_uri.pysnap
index b13ab7a3ae8d10..8bdc417f49c713 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_src_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_script_src_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:39.734195+00:00'
+created: '2024-11-20T21:26:20.842912+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_style_src_elem.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_style_src_elem.pysnap
index 2ce15d8e696902..ef8d8d2d11505d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_style_src_elem.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/csp_style_src_elem.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:39.787966+00:00'
+created: '2024-11-20T21:26:20.888586+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "use.fontawesome.com",
+  "csp_directive": "style-src-elem",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_client.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_client.pysnap
index 71f080b025fded..f4a71e95c82ae6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_client.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_client.pysnap
@@ -1,9 +1,25 @@
 ---
-created: '2024-11-08T19:39:13.721167+00:00'
+created: '2024-11-20T21:26:21.035311+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": false
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "client"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_client_and_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_client_and_server_rule.pysnap
index 2b1f301ec0d7e0..85b34538e5f147 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_client_and_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_client_and_server_rule.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-11-08T19:39:13.608994+00:00'
+created: '2024-11-20T21:26:20.979317+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_server_rule.pysnap
index 79b3101080f930..546f451d148be2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/custom_fingerprint_server_rule.pysnap
@@ -1,9 +1,25 @@
 ---
-created: '2024-11-08T19:39:13.819005+00:00'
+created: '2024-11-20T21:26:21.088061+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/empty.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/empty.pysnap
index bf1882ceff175b..85511a19e4b17f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/empty.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/empty.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:40.029900+00:00'
+created: '2024-11-20T21:26:21.132327+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_cocoa_nserror.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_cocoa_nserror.pysnap
index 92d27d27f456bc..0775b402ea6dfb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_cocoa_nserror.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_cocoa_nserror.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:40.092585+00:00'
+created: '2024-11-20T21:26:21.188449+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_comput_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_comput_hashes.pysnap
deleted file mode 100644
index 183c13dd61a021..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_comput_hashes.pysnap
+++ /dev/null
@@ -1,17 +0,0 @@
----
-created: '2024-10-28T14:02:40.137126+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: message
----
-contributing variants:
-  app*
-    hash: "b23ee1963904c2ca87b145febf94b66c"
-    component:
-      app*
-        exception*
-          type*
-            "ValueError"
-          value*
-            "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes.pysnap
index ef2facdd3ad5e5..bc3c7df7bcfd49 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes.pysnap
@@ -1,19 +1,32 @@
 ---
-created: '2024-10-28T14:02:40.284578+00:00'
+created: '2024-12-03T22:10:04.830319+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
-hash_basis: stacktrace
+hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
-  system*
-    hash: "9509e122c6175606d52862fa4f64853c"
+  app*
+    hash: "b23ee1963904c2ca87b145febf94b66c"
     component:
-      system*
+      app*
         exception*
-          stacktrace*
-            frame*
-              filename*
-                "baz.py"
           type*
             "ValueError"
+          value*
+            "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes_2.pysnap
index c31490e1be34dc..56a41e8571a398 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:40.185268+00:00'
+created: '2024-11-20T21:26:21.276433+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes_3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes_3.pysnap
index bd25ce1f4b3832..e384b0e276d3bf 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_compute_hashes_3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:40.234809+00:00'
+created: '2024-11-20T21:26:21.331408+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 2,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_duplicate_id.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_duplicate_id.pysnap
index 7cf6cb79049ea4..539e8e8e24d23b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_duplicate_id.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_duplicate_id.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:40.344878+00:00'
+created: '2024-11-20T21:26:21.426996+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_missing_parent.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_missing_parent.pysnap
index e02288f1d2ef77..a85a75a4c83fc6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_missing_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_missing_parent.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:40.393792+00:00'
+created: '2024-11-20T21:26:21.476691+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_out_of_sequence.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_out_of_sequence.pysnap
index c411f37bba1025..1ac574142e9fb5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_out_of_sequence.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_out_of_sequence.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:40.457675+00:00'
+created: '2024-11-20T21:26:21.524512+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_parent_with_parent.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_parent_with_parent.pysnap
index 74de33d6749127..070f5872d70ca4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_parent_with_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_parent_with_parent.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:40.523324+00:00'
+created: '2024-11-20T21:26:21.572584+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_with_cycle.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_with_cycle.pysnap
index 2c104576ce3b78..98c4a7ccb4cfdd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_with_cycle.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_bad_with_cycle.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:40.586067+00:00'
+created: '2024-11-20T21:26:21.616835+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_exception.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_exception.pysnap
index 96fc7fdd6c5f79..772589154303a3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_exception.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_exception.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:40.658912+00:00'
+created: '2024-11-20T21:26:21.666478+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_under_nested_groups.pysnap
index 0b63a869aa2399..061d8c047c30f8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_under_nested_groups.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:40.723874+00:00'
+created: '2024-11-20T21:26:21.713474+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_different_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_different_values.pysnap
index 15308d44c329a8..c0ae7417848d27 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_different_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_different_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:40.803783+00:00'
+created: '2024-11-20T21:26:21.764213+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_similar_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_similar_values.pysnap
index b1e327f60267c0..d46f1f20fb9b39 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_similar_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_similar_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:41.016697+00:00'
+created: '2024-11-20T21:26:21.861291+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_similar_values_and_children.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_similar_values_and_children.pysnap
index 1ab39fad188baf..2a797f61a4855f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_similar_values_and_children.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_one_type_with_similar_values_and_children.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:40.929424+00:00'
+created: '2024-11-20T21:26:21.810584+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_exceptions_with_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_exceptions_with_frames.pysnap
new file mode 100644
index 00000000000000..4d9aeb4541432c
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_exceptions_with_frames.pysnap
@@ -0,0 +1,86 @@
+---
+created: '2024-12-02T21:57:59.770060+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 3,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
+---
+contributing variants:
+  app*
+    hash: "d505dfb9059ac63c11955233323a9100"
+    component:
+      app*
+        chained-exception*
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_stuff"
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_different_stuff"
+            type*
+              "DoStuffException"
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_other_stuff"
+            type*
+              "DoOtherStuffException"
+          exception*
+            type*
+              "System.AggregateException"
+            value*
+              "One or more errors occurred."
+  system*
+    hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+    component:
+      system*
+        chained-exception*
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_stuff"
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_different_stuff"
+            type*
+              "DoStuffException"
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_other_stuff"
+            type*
+              "DoOtherStuffException"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_types.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_types.pysnap
index e3b5f5deb951cc..05db22091c29a6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_types.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_types.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:41.172968+00:00'
+created: '2024-11-20T21:26:21.956569+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_types_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_types_under_nested_groups.pysnap
index 2a5aa183a4ef31..6ca29e5fa8fd91 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_types_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_groups_two_types_under_nested_groups.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:41.095428+00:00'
+created: '2024-11-20T21:26:21.909626+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_javascript_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_javascript_no_in_app.pysnap
index 5038e3ad79f6fd..98160a93561a8f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_javascript_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_javascript_no_in_app.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:41.254367+00:00'
+created: '2024-11-20T21:26:22.060482+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_without_type.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_without_type.pysnap
index 6249e3a4740028..65cc4ff12986c9 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_without_type.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_without_type.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:41.400659+00:00'
+created: '2024-11-20T21:26:22.122105+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_without_value.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_without_value.pysnap
index 3b7505527fd299..27b7dc2e6b6ca5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_without_value.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/exception_without_value.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:41.486312+00:00'
+created: '2024-11-20T21:26:22.181393+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/expectct.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/expectct.pysnap
index a5f217533d106f..4cbfa7cb3c69f5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/expectct.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/expectct.pysnap
@@ -1,9 +1,23 @@
 ---
-created: '2024-10-28T14:02:41.557830+00:00'
+created: '2024-11-20T21:26:22.227064+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "security_report_type": "expect-ct"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "expect-ct"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/fallback_prefix_level_1.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/fallback_prefix_level_1.pysnap
index e4d9b98ef6a52d..45a861de05e20d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/fallback_prefix_level_1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/fallback_prefix_level_1.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:41.626178+00:00'
+created: '2024-11-20T21:26:22.276434+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
deleted file mode 100644
index a4f3cc5fb02e01..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
+++ /dev/null
@@ -1,18 +0,0 @@
----
-created: '2024-10-28T14:02:41.670232+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: stacktrace
----
-contributing variants:
-  system*
-    hash: "526b64456c48836a46ec1a89544fd412"
-    component:
-      system*
-        stacktrace*
-          frame*
-            module* (removed codegen marker)
-              "sentry_clojure_example.core$_main$fn__<auto>"
-            function*
-              "invoke"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
new file mode 100644
index 00000000000000..26b044fefc0da5
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
@@ -0,0 +1,35 @@
+---
+created: '2024-12-03T22:10:04.875280+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
+---
+contributing variants:
+  system*
+    hash: "526b64456c48836a46ec1a89544fd412"
+    component:
+      system*
+        stacktrace*
+          frame*
+            module* (removed codegen marker)
+              "sentry_clojure_example.core$_main$fn__<auto>"
+            function*
+              "invoke"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_empty_list.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_empty_list.pysnap
index 3c17650205060f..958f59e0bd93a3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_empty_list.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_empty_list.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:41.720759+00:00'
+created: '2024-11-20T21:26:22.370427+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
index 1d1f650c6d12e2..e6f522e6321652 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:41.776315+00:00'
+created: '2024-11-20T21:26:22.420241+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_fast_class_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
index 8380d7db79b6da..c8631b00d84410 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:41.835358+00:00'
+created: '2024-11-20T21:26:22.475777+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_spring_classes.pysnap
index 09a592ed5f80a9..3493ad51e102b3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_ENHANCED_spring_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:41.882032+00:00'
+created: '2024-11-20T21:26:22.540351+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_dartlang_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_dartlang_sdk.pysnap
index 0c11967a5cedf7..6c77f859811142 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_dartlang_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_dartlang_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:41.931737+00:00'
+created: '2024-11-20T21:26:22.621198+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
index 909a7807cc6e81..7d46560c8c6651 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:41.984253+00:00'
+created: '2024-11-20T21:26:22.699666+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
index 6ed6215878bfeb..aa428cc53d4659 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.029270+00:00'
+created: '2024-11-20T21:26:22.762476+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_spring_classes.pysnap
index 88b3735b524352..9aef578f87d54c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_extra_ENHANCED_spring_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.076317+00:00'
+created: '2024-11-20T21:26:22.869937+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_from_url_origin_corner_cases.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_from_url_origin_corner_cases.pysnap
index 81bb2dcf3efc12..b75d05a4c37f5b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_from_url_origin_corner_cases.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_from_url_origin_corner_cases.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.127805+00:00'
+created: '2024-11-20T21:26:22.953431+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_abs_path_is_http.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_abs_path_is_http.pysnap
index 11dffe451ae8dd..b5053828df5a2b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_abs_path_is_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_abs_path_is_http.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.173555+00:00'
+created: '2024-11-20T21:26:23.029477+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_blob.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_blob.pysnap
index 60ac14c7e5720d..2f905fe97723fc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_blob.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_blob.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:42.221076+00:00'
+created: '2024-11-20T21:26:23.101312+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_http.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_http.pysnap
index eb183d13263a4f..ca719a0eebdd6f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_http.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.269063+00:00'
+created: '2024-11-20T21:26:23.167079+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_https.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_https.pysnap
index 6cff797d8cf15d..482936bba97ff8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_https.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_filename_if_https.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.319429+00:00'
+created: '2024-11-20T21:26:23.232223+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_flutter_sdk.pysnap
index af31f2d2b555b4..a39a6c9aab8ef7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_flutter_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.375110+00:00'
+created: '2024-11-20T21:26:23.309634+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_hibernate_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_hibernate_classes.pysnap
index b891c4300afd6c..96cd9231ac4cb4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_hibernate_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_hibernate_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.418148+00:00'
+created: '2024-11-20T21:26:23.385135+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_java8_lambda_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_java8_lambda_function.pysnap
index 28b29ae622b61a..aebbee5952486f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_java8_lambda_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_java8_lambda_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.467249+00:00'
+created: '2024-11-20T21:26:23.447567+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_java8_lambda_module.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_java8_lambda_module.pysnap
index edaf66b9e22c0d..be62bf762d1df1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_java8_lambda_module.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_java8_lambda_module.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.513722+00:00'
+created: '2024-11-20T21:26:23.522445+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist.pysnap
index 57407b705831a0..cd651817ce7ddc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.650547+00:00'
+created: '2024-11-20T21:26:23.680523+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist_2.pysnap
index 49bca3af70b090..dbaddd4f31f6c7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.556130+00:00'
+created: '2024-11-20T21:26:23.577307+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist_3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist_3.pysnap
index 08d9690bc98dee..ee7e74f4b22816 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_javassist_3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.604675+00:00'
+created: '2024-11-20T21:26:23.626729+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_module_if_page_url.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_module_if_page_url.pysnap
index ea1eb2180c0097..5eedb5646d624e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_module_if_page_url.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_module_if_page_url.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:42.749557+00:00'
+created: '2024-11-20T21:26:23.785010+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_module_if_page_url_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_module_if_page_url_2.pysnap
index d3cb2659a0d291..4a6e76164a92b7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_module_if_page_url_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_module_if_page_url_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.698461+00:00'
+created: '2024-11-20T21:26:23.733948+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_safari_native_code.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_safari_native_code.pysnap
index fd51b27cb4286f..9ba3781f145410 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_safari_native_code.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_safari_native_code.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.799715+00:00'
+created: '2024-11-20T21:26:23.848508+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_dart_packages.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_dart_packages.pysnap
index a35de7fab3a668..8f3f1dcc7231a6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_dart_packages.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_dart_packages.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.858415+00:00'
+created: '2024-11-20T21:26:23.927453+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_dart_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_dart_sdk.pysnap
index 361300a5240711..e5e94528cf4ba8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_dart_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_dart_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.901338+00:00'
+created: '2024-11-20T21:26:24.002276+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_flutter_sdk.pysnap
index 738113c58b3079..8784c064e63035 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sentry_flutter_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.949971+00:00'
+created: '2024-11-20T21:26:24.087117+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors.pysnap
index aa298bb86aa8fd..22071083b3c6c5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.039678+00:00'
+created: '2024-11-20T21:26:24.207832+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors_2.pysnap
index a47e2fea4fe308..42d879ca04ff1d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_constructors_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:42.993081+00:00'
+created: '2024-11-20T21:26:24.151980+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_methods.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_methods.pysnap
index a1d1d3f35783c6..47b95e5e165e39 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_methods.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_ignores_sun_java_generated_methods.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.079985+00:00'
+created: '2024-11-20T21:26:24.268681+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_block_functions.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_block_functions.pysnap
index c8d94b13d06586..352a36b355b9ae 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_block_functions.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_block_functions.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.129515+00:00'
+created: '2024-11-20T21:26:24.318573+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_erb_templates.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_erb_templates.pysnap
index 25837fa8d4e22e..353aeb79245cd2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_erb_templates.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_erb_templates.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.173071+00:00'
+created: '2024-11-20T21:26:24.376056+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_versioned_filenames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_versioned_filenames.pysnap
index e709042300e588..357646ead3c0c8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_versioned_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_versioned_filenames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.271589+00:00'
+created: '2024-11-20T21:26:24.478548+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_versioned_filenames_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_versioned_filenames_2.pysnap
index 4c130b7ce3138c..99eb9e30314164 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_versioned_filenames_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_sanitizes_versioned_filenames_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.216080+00:00'
+created: '2024-11-20T21:26:24.427841+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_skips_symbol_if_unknown.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_skips_symbol_if_unknown.pysnap
index cd753a7e98c371..e6c79945d7e9d4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_skips_symbol_if_unknown.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_skips_symbol_if_unknown.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.325694+00:00'
+created: '2024-11-20T21:26:24.528463+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_context_line_over_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_context_line_over_function.pysnap
index 9a8b2fa8fe9d96..cc3df41a4559d3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_context_line_over_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_context_line_over_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.371771+00:00'
+created: '2024-11-20T21:26:24.584707+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_function_over_lineno.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_function_over_lineno.pysnap
index 12ec8192f52e3f..193716dc1501f9 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_function_over_lineno.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_function_over_lineno.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.418960+00:00'
+created: '2024-11-20T21:26:24.637307+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_module_over_filename.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_module_over_filename.pysnap
index 84249882005ce1..2c678495a7f42f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_module_over_filename.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_module_over_filename.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.467124+00:00'
+created: '2024-11-20T21:26:24.674344+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_symbol_instead_of_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_symbol_instead_of_function.pysnap
index 276d114a990a7f..3219b3a65de9a7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_symbol_instead_of_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_uses_symbol_instead_of_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.512445+00:00'
+created: '2024-11-20T21:26:24.719578+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_with_only_required_vars.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_with_only_required_vars.pysnap
index 6833bafee3fbe1..d81db504e93455 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_with_only_required_vars.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/frame_with_only_required_vars.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.555561+00:00'
+created: '2024-11-20T21:26:24.774823+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/go_pkg_mod.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/go_pkg_mod.pysnap
index 311c25b837762e..e81f6aa47e9f1f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/go_pkg_mod.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/go_pkg_mod.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.597788+00:00'
+created: '2024-11-20T21:26:24.839685+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_125_event_126.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_125_event_126.pysnap
index e89d4cde4f2fe9..1de910bdc8e4ad 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_125_event_126.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_125_event_126.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.665050+00:00'
+created: '2024-11-20T21:26:24.959188+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_200_event_200.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_200_event_200.pysnap
index 3eaccfb34c006b..c7e2e34794c42a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_200_event_200.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_200_event_200.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.712316+00:00'
+created: '2024-11-20T21:26:25.022973+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_275_event_275.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_275_event_275.pysnap
index a4bb793c18c463..8a72300523db85 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_275_event_275.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_275_event_275.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.766318+00:00'
+created: '2024-11-20T21:26:25.073201+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_289_event_312.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_289_event_312.pysnap
index 902a36b062b079..c4dc56ae439164 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_289_event_312.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_289_event_312.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.823341+00:00'
+created: '2024-11-20T21:26:25.142117+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_294_event_294.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_294_event_294.pysnap
index dccff2f26f2ea8..9100c943763c9d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_294_event_294.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_294_event_294.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.879691+00:00'
+created: '2024-11-20T21:26:25.205452+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_294_event_329.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_294_event_329.pysnap
index 3591de1b09b6b3..0d4579b3dcc424 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_294_event_329.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_294_event_329.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.937972+00:00'
+created: '2024-11-20T21:26:25.268554+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_307_event_307.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_307_event_307.pysnap
index 69e8e154a1bbf1..d8745979021498 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_307_event_307.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_307_event_307.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:43.986658+00:00'
+created: '2024-11-20T21:26:25.319414+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_307_event_657.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_307_event_657.pysnap
index c035d154e5c98a..71f7dc46cfd966 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_307_event_657.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_307_event_657.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.032941+00:00'
+created: '2024-11-20T21:26:25.371760+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_313_event_313.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_313_event_313.pysnap
index 4e67f4253250b9..36a5265f1daea3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_313_event_313.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_313_event_313.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.092066+00:00'
+created: '2024-11-20T21:26:25.422141+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_313_event_333.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_313_event_333.pysnap
index d53bd608459570..71e9d38fb00850 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_313_event_333.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_313_event_333.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.151172+00:00'
+created: '2024-11-20T21:26:25.481265+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_319_event_321.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_319_event_321.pysnap
index a3eec4133f3e43..f99af1b5d0d17d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_319_event_321.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_319_event_321.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.208055+00:00'
+created: '2024-11-20T21:26:25.548878+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_389_event_389.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_389_event_389.pysnap
index 67a4de8b037882..c4703321e39f6c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_389_event_389.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_389_event_389.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.252129+00:00'
+created: '2024-11-20T21:26:25.596322+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_432_event_432.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_432_event_432.pysnap
index 1bc1ae9aee7bdd..be0541693028e9 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_432_event_432.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_432_event_432.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.354892+00:00'
+created: '2024-11-20T21:26:26.099774+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_432_event_453.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_432_event_453.pysnap
index bc120be887c95b..579ad4690a943a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_432_event_453.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_432_event_453.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.405193+00:00'
+created: '2024-11-20T21:26:26.165742+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_445_event_445.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_445_event_445.pysnap
index cacb7c8f04beb2..33693c2a0b0040 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_445_event_445.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/group_445_event_445.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.474342+00:00'
+created: '2024-11-20T21:26:26.240988+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hpkp.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hpkp.pysnap
index 15764d4c5d4cf4..ec2ee40037b24c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hpkp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hpkp.pysnap
@@ -1,9 +1,23 @@
 ---
-created: '2024-10-28T14:02:44.512670+00:00'
+created: '2024-11-20T21:26:26.280313+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "security_report_type": "hpkp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "hpkp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_base.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_base.pysnap
index 2160485e6e2c25..badb268f2661bc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_base.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:02:44.559737+00:00'
+created: '2024-11-20T21:26:26.329365+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_custom_client_hybrid_server.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_custom_client_hybrid_server.pysnap
index 4bcc9f14bdc3f3..14b04542949582 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_custom_client_hybrid_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_custom_client_hybrid_server.pysnap
@@ -1,9 +1,31 @@
 ---
-created: '2024-10-28T14:02:44.620174+00:00'
+created: '2024-11-20T21:26:26.373857+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['{{ default }}', 'soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": true,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"{{ default }}soft-timelimit-exceeded\"",
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_hybrid_client_custom_server.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_hybrid_client_custom_server.pysnap
index d0ecc0b7130e1d..cf9935e0d2670c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_hybrid_client_custom_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_hybrid_client_custom_server.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-11-08T19:39:21.183635+00:00'
+created: '2024-11-20T21:26:26.413967+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_same_default_different_extra.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_same_default_different_extra.pysnap
index 71dbf375335859..2532a2daf9a066 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_same_default_different_extra.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_same_default_different_extra.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:02:44.718007+00:00'
+created: '2024-11-20T21:26:26.446531+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', \"adopt don't shop\"]",
+  "fingerprint": "['{{ default }}', \"adopt don't shop\"]",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_same_extra_different_default.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_same_extra_different_default.pysnap
index 6e44ddfc38f0bc..324fead6a58f49 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_same_extra_different_default.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/hybrid_fingerprint_same_extra_different_default.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:02:44.764340+00:00'
+created: '2024-11-20T21:26:26.587514+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/in_app_in_ui.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/in_app_in_ui.pysnap
index 18b0194a18d4bb..62a9df86d830dc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/in_app_in_ui.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/in_app_in_ui.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.829894+00:00'
+created: '2024-11-20T21:26:26.650583+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/java_chained.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/java_chained.pysnap
index f34ca6a48928df..d9de2a01d693ec 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/java_chained.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/java_chained.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.898196+00:00'
+created: '2024-11-20T21:26:26.713127+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 3,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/java_minimal.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/java_minimal.pysnap
index 6864f6aa6a3824..3214b13c082c35 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/java_minimal.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/java_minimal.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:44.953924+00:00'
+created: '2024-11-20T21:26:26.771501+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_fallback_to_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_fallback_to_message.pysnap
index c40d08b717c1f3..3b900deac8baeb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_fallback_to_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_fallback_to_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:45.053926+00:00'
+created: '2024-11-20T21:26:26.881694+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_fallback_to_message_whistles.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_fallback_to_message_whistles.pysnap
index f45b295e6b4dea..e1dc059288ecf1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_fallback_to_message_whistles.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_fallback_to_message_whistles.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:45.006089+00:00'
+created: '2024-11-20T21:26:26.822964+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_no_in_app.pysnap
index 9e27a798f8af2e..1d4c547cd60967 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_exception_no_in_app.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.112847+00:00'
+created: '2024-11-20T21:26:27.267671+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_message.pysnap
index 739ad14c24561a..838764a9532c7d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:45.208867+00:00'
+created: '2024-11-20T21:26:27.355355+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_message_parameterization.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_message_parameterization.pysnap
index da55f47ab74eb4..132a080d278fc0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_message_parameterization.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_message_parameterization.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:45.161115+00:00'
+created: '2024-11-20T21:26:27.309045+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_polyfills.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_polyfills.pysnap
index 57774fb698361d..616dee006f46bb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_polyfills.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_polyfills.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.264092+00:00'
+created: '2024-11-20T21:26:27.401458+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_regression_tree_labels.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_regression_tree_labels.pysnap
deleted file mode 100644
index fb05bb31aa1e50..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_regression_tree_labels.pysnap
+++ /dev/null
@@ -1,41 +0,0 @@
----
-created: '2024-10-28T14:02:45.971087+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: stacktrace
----
-contributing variants:
-  system*
-    hash: "8fb2eda9663c3c026c23475d6da30363"
-    component:
-      system*
-        exception*
-          stacktrace*
-            frame*
-              module*
-                "app/utils/handleXhrErrorResponse"
-              context-line*
-                "Sentry.withScope(scope => {"
-            frame*
-              module*
-                "@sentry/minimal/esm/index"
-              context-line*
-                "callOnHub('withScope', callback);"
-            frame*
-              module*
-                "@sentry/minimal/esm/index"
-              context-line*
-                "return hub[method].apply(hub, __spread(args));"
-            frame*
-              module*
-                "@sentry/hub/esm/hub"
-              context-line*
-                "callback(scope);"
-            frame*
-              module*
-                "app/utils/handleXhrErrorResponse"
-              context-line*
-                "Sentry.captureException(new Error(message));"
-          type*
-            "Error"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_unpkg.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_unpkg.pysnap
index 120fe3805d25bd..c2bdaf37c424fe 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_unpkg.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_unpkg.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.327056+00:00'
+created: '2024-11-20T21:26:27.517172+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_chrome.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_chrome.pysnap
index d8b39c55c6899f..4281c3c6a1821b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_chrome.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.378956+00:00'
+created: '2024-11-20T21:26:27.571656+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_edge.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_edge.pysnap
index 746d0e3640e88f..e72f34702947eb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_edge.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.429163+00:00'
+created: '2024-11-20T21:26:27.629710+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_firefox.pysnap
index 22b10f26a25661..278d80aa62463a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.482761+00:00'
+created: '2024-11-20T21:26:27.684164+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_chrome.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_chrome.pysnap
index 3ec4cead1fc72b..ccd9fce10bb787 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_chrome.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.553784+00:00'
+created: '2024-11-20T21:26:27.800535+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_edge.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_edge.pysnap
index cad06610832bd1..fb3b8687134357 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_edge.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.595155+00:00'
+created: '2024-11-20T21:26:27.872178+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_firefox.pysnap
index 07ebc5fd2a5d6c..8e7fa70332bd80 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.660861+00:00'
+created: '2024-11-20T21:26:27.922918+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_safari.pysnap
index 907539309aadf9..626d9d4c00fb06 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_http_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.706676+00:00'
+created: '2024-11-20T21:26:27.969746+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_safari.pysnap
index b439895419404b..502dbbc79120c7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.757012+00:00'
+created: '2024-11-20T21:26:28.019366+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_sentryui_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_sentryui_firefox.pysnap
index 993cdc508f8dd1..a244f002d1ebe4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_sentryui_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_sentryui_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.834963+00:00'
+created: '2024-11-20T21:26:28.071978+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_sentryui_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_sentryui_safari.pysnap
index 930fae931ef826..dc7c29b9781bf7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_sentryui_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/javascript_xbrowser_sentryui_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:45.915169+00:00'
+created: '2024-11-20T21:26:28.134122+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/laravel.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/laravel.pysnap
index b646fbe575b9e9..0c3f4d8218f27a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/laravel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/laravel.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.086769+00:00'
+created: '2024-11-20T21:26:28.289327+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/laravel_anonymous.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/laravel_anonymous.pysnap
index 9ff8b990f6d2cf..145d1ba94508ec 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/laravel_anonymous.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/laravel_anonymous.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.026194+00:00'
+created: '2024-11-20T21:26:28.230899+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/logentry_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/logentry_prefers_message.pysnap
index 3d7a2f26c05251..9fee576db1db98 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/logentry_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/logentry_prefers_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:46.142351+00:00'
+created: '2024-11-20T21:26:28.340846+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/logentry_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/logentry_uses_formatted.pysnap
index 8fe85a00797b70..1ce33538fbf750 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/logentry_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/logentry_uses_formatted.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:46.201309+00:00'
+created: '2024-11-20T21:26:28.389162+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/macos_amd_driver.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/macos_amd_driver.pysnap
index 933593dd69a1e3..ee6a50c1a3f1c8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/macos_amd_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/macos_amd_driver.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.270225+00:00'
+created: '2024-11-20T21:26:28.468064+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/macos_intel_driver.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/macos_intel_driver.pysnap
index 6bf361f602cc2c..538177ff212398 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/macos_intel_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/macos_intel_driver.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.332460+00:00'
+created: '2024-11-20T21:26:28.542277+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/malloc_sentinel.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/malloc_sentinel.pysnap
index 461e01d520b071..cc6aa1c05c1d44 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/malloc_sentinel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/malloc_sentinel.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.378674+00:00'
+created: '2024-11-20T21:26:28.623683+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_prefers_message.pysnap
index 4cb3d48b221f2c..bd79f275d11574 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_prefers_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:46.419151+00:00'
+created: '2024-11-20T21:26:28.673119+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_uses_formatted.pysnap
index c17dfa311cead1..b189be38e4b25c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_uses_formatted.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:46.470026+00:00'
+created: '2024-11-20T21:26:28.731608+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_with_key_pair_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_with_key_pair_values.pysnap
index 773aa4b654fc0c..6f8acd62932319 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_with_key_pair_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/message_with_key_pair_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:46.525784+00:00'
+created: '2024-11-20T21:26:28.782587+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/minified_javascript.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/minified_javascript.pysnap
index 10955e110f141f..e8c5649c949c93 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/minified_javascript.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/minified_javascript.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.577913+00:00'
+created: '2024-11-20T21:26:28.850019+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_complex_function_names.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_complex_function_names.pysnap
index 7777579780bbf0..6271309f080121 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_complex_function_names.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_complex_function_names.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.626800+00:00'
+created: '2024-11-20T21:26:28.906783+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash1.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash1.pysnap
index 37ae4487d91f37..24a94d63dfcd6d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash1.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.682434+00:00'
+created: '2024-11-20T21:26:28.962732+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash2.pysnap
index f565c96081e53c..7791f16fb4c154 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.744053+00:00'
+created: '2024-11-20T21:26:29.012648+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash3.pysnap
index e1ef9cd0c750b7..5dd4252f527506 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_driver_crash3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.793949+00:00'
+created: '2024-11-20T21:26:29.066891+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_limit_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_limit_frames.pysnap
index d00c9a3a69de81..5c700fd8356b1f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_limit_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_limit_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.848515+00:00'
+created: '2024-11-20T21:26:29.115826+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_malloc_chain.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_malloc_chain.pysnap
index 5fda43c582fb29..853ee6f0385f5b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_malloc_chain.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_malloc_chain.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.899140+00:00'
+created: '2024-11-20T21:26:29.160875+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_no_filenames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_no_filenames.pysnap
index 55e4c7257399ae..c1e8cff4f81cb4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_no_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_no_filenames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.948169+00:00'
+created: '2024-11-20T21:26:29.212071+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_unlimited_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_unlimited_frames.pysnap
index b6211a9285ac7a..af138b5ce262c5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_unlimited_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_unlimited_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:46.992942+00:00'
+created: '2024-11-20T21:26:29.263528+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_windows_anon_namespace.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_windows_anon_namespace.pysnap
index 0b687acaf849dc..44778a0bd0a219 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_windows_anon_namespace.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_windows_anon_namespace.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.042132+00:00'
+created: '2024-11-20T21:26:29.310156+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_with_function_name.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_with_function_name.pysnap
index cd1b4823df91c8..947aacde1b7fbf 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_with_function_name.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/native_with_function_name.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.095128+00:00'
+created: '2024-11-20T21:26:29.359577+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/node_exception_weird.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/node_exception_weird.pysnap
index 88ea24d602d471..018c2a8a3743f6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/node_exception_weird.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/node_exception_weird.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.144700+00:00'
+created: '2024-11-20T21:26:29.415325+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/node_low_level_async.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/node_low_level_async.pysnap
index 16d46ca41e4406..f1e0f5d1156ac6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/node_low_level_async.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/node_low_level_async.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.192389+00:00'
+created: '2024-11-20T21:26:29.505869+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_exception_base.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_exception_base.pysnap
index 1921ede81dbe58..54516bc6b2e089 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_exception_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_exception_base.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.241667+00:00'
+created: '2024-11-20T21:26:29.559347+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 2,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_grouping_enhancer_away_from_crash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_grouping_enhancer_away_from_crash.pysnap
index d9e24500f07990..29531cc2b1dd8b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_grouping_enhancer_away_from_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_grouping_enhancer_away_from_crash.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.295097+00:00'
+created: '2024-11-20T21:26:29.609632+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_grouping_enhancer_towards_crash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_grouping_enhancer_towards_crash.pysnap
index 52fa3327f21317..58d630f278a081 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_grouping_enhancer_towards_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_grouping_enhancer_towards_crash.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.347672+00:00'
+created: '2024-11-20T21:26:29.654804+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_http_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_http_error.pysnap
index 95883572d3a31f..c6530c2e1667cc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_http_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/python_http_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.392314+00:00'
+created: '2024-11-20T21:26:29.710266+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/react_native.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/react_native.pysnap
index ffe4dd89002bfb..e470cf9da55b14 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/react_native.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/react_native.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.452211+00:00'
+created: '2024-11-20T21:26:29.766330+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_cocoa.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_cocoa.pysnap
index 01efc6a96c0361..d89f7d516843cb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_cocoa.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_cocoa.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.502831+00:00'
+created: '2024-11-20T21:26:29.815686+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_collapse_recursion.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_collapse_recursion.pysnap
index 37bb3887f5f438..80f10c590b31e4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_collapse_recursion.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_collapse_recursion.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.554057+00:00'
+created: '2024-11-20T21:26:29.860511+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_compute_hashes.pysnap
index dc3ef3353196be..714b48de735b4d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_compute_hashes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.605327+00:00'
+created: '2024-11-20T21:26:29.944177+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_discards_seemingly_useless_stack.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_discards_seemingly_useless_stack.pysnap
index fab2de1822b73f..8495c8c5901913 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_discards_seemingly_useless_stack.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_discards_seemingly_useless_stack.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:47.662193+00:00'
+created: '2024-11-20T21:26:29.984104+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_does_not_discard_non_urls.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_does_not_discard_non_urls.pysnap
index 651ab841c62733..28086b8cd779a7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_does_not_discard_non_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_does_not_discard_non_urls.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.721738+00:00'
+created: '2024-11-20T21:26:30.028613+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_does_not_group_different_js_errors.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_does_not_group_different_js_errors.pysnap
index 2b4fc40048f6ed..ceb2970fc5252b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_does_not_group_different_js_errors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_does_not_group_different_js_errors.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:47.796771+00:00'
+created: '2024-11-20T21:26:30.075783+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_enforce_min_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_enforce_min_frames.pysnap
index 14336ddfcf1c31..ed66355b0c0af8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_enforce_min_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_enforce_min_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.860531+00:00'
+created: '2024-11-20T21:26:30.136377+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_excludes_single_frame_urls.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_excludes_single_frame_urls.pysnap
index fce807c47c8e26..674efff763b89d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_excludes_single_frame_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_excludes_single_frame_urls.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.927776+00:00'
+created: '2024-11-20T21:26:30.187882+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_hash_without_system_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_hash_without_system_frames.pysnap
index 0a0f278ed1df57..05662c9ec6e0a1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_hash_without_system_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_hash_without_system_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:47.983981+00:00'
+created: '2024-11-20T21:26:30.236776+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_ignores_singular_anonymous_frame.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_ignores_singular_anonymous_frame.pysnap
index 4c243b472c6cb7..1bd820eb24e8e5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_ignores_singular_anonymous_frame.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_ignores_singular_anonymous_frame.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.040867+00:00'
+created: '2024-11-20T21:26:30.287223+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_negated_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_negated_match.pysnap
index 8072b98e6c2ada..b952f43b18c6b4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_negated_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_negated_match.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.117675+00:00'
+created: '2024-11-20T21:26:30.347787+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_rust.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_rust.pysnap
index e7b75a240cf522..40746f6a7dbed1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_rust.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_rust.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.187131+00:00'
+created: '2024-11-20T21:26:30.402085+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_rust2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_rust2.pysnap
index f962b6781ce4d9..a38b090f0b8e48 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_rust2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_rust2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.259017+00:00'
+created: '2024-11-20T21:26:30.453332+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_with_minimal_app_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_with_minimal_app_frames.pysnap
index c5abe189fa7a92..1e27c9c8c0bafe 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_with_minimal_app_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/stacktrace_with_minimal_app_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.335049+00:00'
+created: '2024-11-20T21:26:30.502059+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/template_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/template_compute_hashes.pysnap
index 16511375e96547..1739ce94b545b9 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/template_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/template_compute_hashes.pysnap
@@ -1,17 +1,28 @@
 ---
-created: '2024-10-28T14:02:48.400245+00:00'
+created: '2024-12-03T22:10:04.969069+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: template
+hashing_metadata: {
+  "template_context_line": "{% invalid template tag %}",
+  "template_name": "foo.html"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "template",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   default*
-    hash: "826f66ef602835f68030c04c634df320"
+    hash: "1f5bdebe3c9f414c7dbb4296a8353245"
     component:
       default*
         template*
           filename*
             "foo.html"
           context-line*
-            "hello world"
+            "{% invalid template tag %}"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/threads_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/threads_compute_hashes.pysnap
index e4a8a8542dde1a..da5c24af3842b4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/threads_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/threads_compute_hashes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.464553+00:00'
+created: '2024-11-20T21:26:30.654787+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "thread",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "thread",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/threads_no_hash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/threads_no_hash.pysnap
index 4f0df44265c0dd..1eb1fdbf7e77a1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/threads_no_hash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/threads_no_hash.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:48.518413+00:00'
+created: '2024-11-20T21:26:30.703908+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unity.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unity.pysnap
index df986c2f9101de..7496e22f389054 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unity.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unity.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:48.566976+00:00'
+created: '2024-11-20T21:26:30.774180+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unknown_variant.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unknown_variant.pysnap
index abe3cbd321c119..bb55de443e8c65 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unknown_variant.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unknown_variant.pysnap
@@ -1,9 +1,16 @@
 ---
-created: '2024-10-28T14:39:42.157067+00:00'
+created: '2024-11-20T21:26:05.628125+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: unknown
+hashing_metadata: {}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "unknown"
+  }
+}
 ---
 contributing variants:
   dogs*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/actix.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/actix.pysnap
index e007661b4ab532..3767e5da56d48f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/actix.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/actix.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:29.062191+00:00'
+created: '2024-11-20T21:26:30.849294+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/android_anr.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/android_anr.pysnap
index b4531128e49f3d..cfb6fc34b65bba 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/android_anr.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/android_anr.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:29.127398+00:00'
+created: '2024-11-20T21:26:30.906017+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/aspnetcore.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/aspnetcore.pysnap
index e771bff3997298..51a7420e68f624 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/aspnetcore.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/aspnetcore.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:29.185141+00:00'
+created: '2024-11-20T21:26:30.955367+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/block_invoke.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/block_invoke.pysnap
index 272a89cfbe9512..d1d9d82aa0eaa6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/block_invoke.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/block_invoke.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:29.230344+00:00'
+created: '2024-11-20T21:26:31.015019+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "thread",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "thread",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/bugly.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/bugly.pysnap
index 104fb232ee4079..e52748ba930143 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/bugly.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/bugly.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:29.277049+00:00'
+created: '2024-11-20T21:26:31.062575+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/built_in_fingerprint_chunkload_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/built_in_fingerprint_chunkload_error.pysnap
index 64f60eec01a026..2a391788d5d0c9 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/built_in_fingerprint_chunkload_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/built_in_fingerprint_chunkload_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:29.374644+00:00'
+created: '2024-11-20T21:26:31.197479+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
index 93ca51c1b3dd2e..4a243428eaf750 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
@@ -1,9 +1,30 @@
 ---
-created: '2024-10-28T14:02:29.326993+00:00'
+created: '2024-11-20T21:26:31.123961+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/callee_guaranteed.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/callee_guaranteed.pysnap
index 1b184082485d48..27aa6c756d27cb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/callee_guaranteed.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/callee_guaranteed.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:29.424624+00:00'
+created: '2024-11-20T21:26:31.273609+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_no_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_no_regex_match.pysnap
index d2f2bc01f47388..91d3a4b93aa439 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_no_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_no_regex_match.pysnap
@@ -1,9 +1,20 @@
 ---
-created: '2024-11-08T19:39:33.277681+00:00'
+created: '2024-11-20T21:26:31.360609+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "de46d023e69b171b90ccf3ebca7aede4",
+  "raw_checksum": "not a legit checksum"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_no_regex_match_long.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_no_regex_match_long.pysnap
index efa65a7f4913ec..c398a3e62376bd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_no_regex_match_long.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_no_regex_match_long.pysnap
@@ -1,9 +1,20 @@
 ---
-created: '2024-11-08T19:39:33.181163+00:00'
+created: '2024-11-20T21:26:31.318257+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "2c2e85a6e73109222f131228ed06a7af",
+  "raw_checksum": "not a legit checksum and also too long a string"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   hashed_checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_regex_match.pysnap
index 4857c6ed6e6830..3bae6cfe119d42 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/checksum_regex_match.pysnap
@@ -1,9 +1,19 @@
 ---
-created: '2024-10-28T14:02:29.559481+00:00'
+created: '2024-11-20T21:26:31.406781+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "11212012123120120415201309082013"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/cocoa_dispatch_client_callout.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/cocoa_dispatch_client_callout.pysnap
index 9f6d8a18704ba8..40a694a59709da 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/cocoa_dispatch_client_callout.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/cocoa_dispatch_client_callout.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:29.609891+00:00'
+created: '2024-11-20T21:26:31.457868+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "thread",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "thread",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/connection_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/connection_error.pysnap
index f3f375c36bd30d..bb31b26d0d09b3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/connection_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/connection_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:29.658776+00:00'
+created: '2024-11-20T21:26:31.510163+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp.pysnap
index bc12b6fa8ec2e5..33be40ff6229b6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:29.943890+00:00'
+created: '2024-11-20T21:26:31.789855+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "YYY",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_img_src.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_img_src.pysnap
index 50fb79a3d8f3fd..bf6a5f256d636b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_img_src.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_img_src.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:29.706271+00:00'
+created: '2024-11-20T21:26:31.559557+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "ftp://example.com",
+  "csp_directive": "img-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_no_blocked_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_no_blocked_uri.pysnap
index 2cf06b0393ff98..549bd9fcb5c942 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_no_blocked_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_no_blocked_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:29.748925+00:00'
+created: '2024-11-20T21:26:31.604719+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_data_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_data_uri.pysnap
index 270295a6a81bb3..623f9f14c50cd1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_data_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_data_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:29.799029+00:00'
+created: '2024-11-20T21:26:31.652514+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "data:",
+  "csp_directive": "img-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_src_unsafe_eval.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_src_unsafe_eval.pysnap
new file mode 100644
index 00000000000000..dda80a559b6f6e
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_src_unsafe_eval.pysnap
@@ -0,0 +1,33 @@
+---
+created: '2024-12-02T22:04:02.951839+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "csp_script_violation": "unsafe-eval",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
+---
+contributing variants:
+  default*
+    hash: "56c6520f35bce2f89ed2c4e725ccef65"
+    component:
+      default*
+        csp*
+          salt* (a static salt)
+            "script-src"
+          violation*
+            "'unsafe-eval'"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_src_unsafe_inline.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_src_unsafe_inline.pysnap
new file mode 100644
index 00000000000000..c965d845ffd181
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_src_unsafe_inline.pysnap
@@ -0,0 +1,33 @@
+---
+created: '2024-12-02T22:04:05.851532+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "csp_script_violation": "unsafe-inline",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
+---
+contributing variants:
+  default*
+    hash: "d346ee37d19a2be6587e609075ca2d57"
+    component:
+      default*
+        csp*
+          salt* (a static salt)
+            "script-src"
+          violation*
+            "'unsafe-inline'"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_src_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_src_uri.pysnap
index 82f98ac158afbe..22d4f523772196 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_src_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_script_src_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:29.848211+00:00'
+created: '2024-11-20T21:26:31.694937+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_style_src_elem.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_style_src_elem.pysnap
index d7c5a5b85070c6..3ff33e2e42dce1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_style_src_elem.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/csp_style_src_elem.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:29.894388+00:00'
+created: '2024-11-20T21:26:31.744339+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "use.fontawesome.com",
+  "csp_directive": "style-src-elem",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_client.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_client.pysnap
index 003b4cb6f39267..3b7b2ed8af07e4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_client.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_client.pysnap
@@ -1,9 +1,25 @@
 ---
-created: '2024-11-08T19:39:34.358029+00:00'
+created: '2024-11-20T21:26:31.893367+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": false
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "client"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_client_and_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_client_and_server_rule.pysnap
index 21c2e9cf346045..a21109227d864b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_client_and_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_client_and_server_rule.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-11-08T19:39:34.297377+00:00'
+created: '2024-11-20T21:26:31.846474+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_server_rule.pysnap
index 7881464120d79d..0071d3fa40deb3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/custom_fingerprint_server_rule.pysnap
@@ -1,9 +1,25 @@
 ---
-created: '2024-11-08T19:39:34.466648+00:00'
+created: '2024-11-20T21:26:31.947389+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/empty.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/empty.pysnap
index bb49b4c6f45902..1dd7090fca4677 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/empty.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/empty.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:30.147095+00:00'
+created: '2024-11-20T21:26:31.990337+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_cocoa_nserror.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_cocoa_nserror.pysnap
index e9378571e59940..02882fa3cf7bfa 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_cocoa_nserror.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_cocoa_nserror.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.204667+00:00'
+created: '2024-11-20T21:26:32.049682+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_comput_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_comput_hashes.pysnap
deleted file mode 100644
index 007f1b5b24da2a..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_comput_hashes.pysnap
+++ /dev/null
@@ -1,17 +0,0 @@
----
-created: '2024-10-28T14:02:30.250883+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: message
----
-contributing variants:
-  app*
-    hash: "b23ee1963904c2ca87b145febf94b66c"
-    component:
-      app*
-        exception*
-          type*
-            "ValueError"
-          value*
-            "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes.pysnap
index 7ac900c023f37c..98c0d66ece91f9 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes.pysnap
@@ -1,19 +1,32 @@
 ---
-created: '2024-10-28T14:02:30.410549+00:00'
+created: '2024-12-03T22:10:05.151366+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
-hash_basis: stacktrace
+hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
-  system*
-    hash: "9509e122c6175606d52862fa4f64853c"
+  app*
+    hash: "b23ee1963904c2ca87b145febf94b66c"
     component:
-      system*
+      app*
         exception*
-          stacktrace*
-            frame*
-              filename*
-                "baz.py"
           type*
             "ValueError"
+          value*
+            "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes_2.pysnap
index cdf42dfbd092b7..050c70f6e7af53 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:30.297305+00:00'
+created: '2024-11-20T21:26:32.149626+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes_3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes_3.pysnap
index 42d23f5e6a5657..4f3062fb2e8251 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_compute_hashes_3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:30.349797+00:00'
+created: '2024-11-20T21:26:32.194315+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 2,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_duplicate_id.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_duplicate_id.pysnap
index cb0f9e8bea1a38..b69add68aede54 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_duplicate_id.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_duplicate_id.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.457280+00:00'
+created: '2024-11-20T21:26:32.471166+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_missing_parent.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_missing_parent.pysnap
index 39e951f8068f38..6b8480ad034224 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_missing_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_missing_parent.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.505173+00:00'
+created: '2024-11-20T21:26:32.525570+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_out_of_sequence.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_out_of_sequence.pysnap
index 3bf731fb616c17..cece12d5c22dbc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_out_of_sequence.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_out_of_sequence.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.562203+00:00'
+created: '2024-11-20T21:26:32.585243+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_parent_with_parent.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_parent_with_parent.pysnap
index 28641a75c7ecf4..58f3a6060e55a5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_parent_with_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_parent_with_parent.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.615222+00:00'
+created: '2024-11-20T21:26:32.661187+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_with_cycle.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_with_cycle.pysnap
index 44bf8e0e474d6b..fdc3f787552a48 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_with_cycle.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_bad_with_cycle.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.661898+00:00'
+created: '2024-11-20T21:26:32.719327+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_exception.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_exception.pysnap
index c94926e2b0928c..86fa6aadb7ac8d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_exception.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_exception.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.718954+00:00'
+created: '2024-11-20T21:26:32.766339+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_under_nested_groups.pysnap
index ab8c7ab8a52a59..f3614e6add10da 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_under_nested_groups.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.780286+00:00'
+created: '2024-11-20T21:26:32.902250+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_different_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_different_values.pysnap
index a760ff31e13ef4..e3e0c3b7582113 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_different_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_different_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.846911+00:00'
+created: '2024-11-20T21:26:32.953288+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_similar_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_similar_values.pysnap
index ccf10a04259882..93ae9e5c7a093d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_similar_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_similar_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.963967+00:00'
+created: '2024-11-20T21:26:33.045089+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_similar_values_and_children.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_similar_values_and_children.pysnap
index 76ed24c20b9864..a76ec11ab59bab 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_similar_values_and_children.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_one_type_with_similar_values_and_children.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:30.904286+00:00'
+created: '2024-11-20T21:26:32.999034+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_exceptions_with_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_exceptions_with_frames.pysnap
new file mode 100644
index 00000000000000..0496631077bdf6
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_exceptions_with_frames.pysnap
@@ -0,0 +1,86 @@
+---
+created: '2024-12-02T21:58:09.985157+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 3,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
+---
+contributing variants:
+  app*
+    hash: "d505dfb9059ac63c11955233323a9100"
+    component:
+      app*
+        chained-exception*
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_stuff"
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_different_stuff"
+            type*
+              "DoStuffException"
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_other_stuff"
+            type*
+              "DoOtherStuffException"
+          exception*
+            type*
+              "System.AggregateException"
+            value*
+              "One or more errors occurred."
+  system*
+    hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+    component:
+      system*
+        chained-exception*
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_stuff"
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_different_stuff"
+            type*
+              "DoStuffException"
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_other_stuff"
+            type*
+              "DoOtherStuffException"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_types.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_types.pysnap
index 3d700a5d5c2213..92858567b589fd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_types.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_types.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:31.077560+00:00'
+created: '2024-11-20T21:26:33.134261+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_types_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_types_under_nested_groups.pysnap
index 19ac7435b8ff92..d6717a0cff34f5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_types_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_groups_two_types_under_nested_groups.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:31.017070+00:00'
+created: '2024-11-20T21:26:33.090809+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_javascript_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_javascript_no_in_app.pysnap
index 103fe9f2293f87..43e9960e154e2d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_javascript_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_javascript_no_in_app.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:31.143377+00:00'
+created: '2024-11-20T21:26:33.179847+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_without_type.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_without_type.pysnap
index 380d2ecd67e119..e34a364a4b2622 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_without_type.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_without_type.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:31.223373+00:00'
+created: '2024-11-20T21:26:33.225472+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_without_value.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_without_value.pysnap
index 0f92098836da8d..dfff3ddc19a5a6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_without_value.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/exception_without_value.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:31.308294+00:00'
+created: '2024-11-20T21:26:33.268091+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/expectct.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/expectct.pysnap
index 80a8e00435a4fc..f94081a70a6d36 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/expectct.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/expectct.pysnap
@@ -1,9 +1,23 @@
 ---
-created: '2024-10-28T14:02:31.519543+00:00'
+created: '2024-11-20T21:26:33.322607+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "security_report_type": "expect-ct"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "expect-ct"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/fallback_prefix_level_1.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/fallback_prefix_level_1.pysnap
index e2b2e7d6daaa99..cb8d7c1c9704c2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/fallback_prefix_level_1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/fallback_prefix_level_1.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:31.598075+00:00'
+created: '2024-11-20T21:26:33.459836+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
deleted file mode 100644
index 4640e949a509cc..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
+++ /dev/null
@@ -1,18 +0,0 @@
----
-created: '2024-10-28T14:02:31.668332+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: stacktrace
----
-contributing variants:
-  system*
-    hash: "526b64456c48836a46ec1a89544fd412"
-    component:
-      system*
-        stacktrace*
-          frame*
-            module* (removed codegen marker)
-              "sentry_clojure_example.core$_main$fn__<auto>"
-            function*
-              "invoke"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
new file mode 100644
index 00000000000000..109ff2387818f3
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
@@ -0,0 +1,35 @@
+---
+created: '2024-12-03T22:10:05.190151+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
+---
+contributing variants:
+  system*
+    hash: "526b64456c48836a46ec1a89544fd412"
+    component:
+      system*
+        stacktrace*
+          frame*
+            module* (removed codegen marker)
+              "sentry_clojure_example.core$_main$fn__<auto>"
+            function*
+              "invoke"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_empty_list.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_empty_list.pysnap
index df6cd5c434910d..7d7005e6dbd5ac 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_empty_list.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_empty_list.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:31.742737+00:00'
+created: '2024-11-20T21:26:33.623978+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
index 113119eadd69da..fa8d60f6e30155 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:31.807392+00:00'
+created: '2024-11-20T21:26:33.682467+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_fast_class_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
index b677e26726d62c..e26288e3e0f7ee 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:31.860346+00:00'
+created: '2024-11-20T21:26:33.741831+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_spring_classes.pysnap
index 8b4d7831dee972..cf08e188914742 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_ENHANCED_spring_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:31.919087+00:00'
+created: '2024-11-20T21:26:33.846160+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_dartlang_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_dartlang_sdk.pysnap
index 44b5fe7d51f5fb..1a9e29faed696c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_dartlang_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_dartlang_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:31.963908+00:00'
+created: '2024-11-20T21:26:33.912446+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
index 3504ce44a9d198..69b6c594b8384d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.018097+00:00'
+created: '2024-11-20T21:26:33.963099+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
index 577d0434b3b8a0..bb08978eea416b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.060353+00:00'
+created: '2024-11-20T21:26:34.006518+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_spring_classes.pysnap
index ede006bf932edb..b2b72833e58cab 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_extra_ENHANCED_spring_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.109501+00:00'
+created: '2024-11-20T21:26:34.072721+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_from_url_origin_corner_cases.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_from_url_origin_corner_cases.pysnap
index 41e4f1207d4efa..0e569ca7c8038c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_from_url_origin_corner_cases.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_from_url_origin_corner_cases.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.155244+00:00'
+created: '2024-11-20T21:26:34.134093+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_abs_path_is_http.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_abs_path_is_http.pysnap
index 1f92b88634e84d..021042f0786271 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_abs_path_is_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_abs_path_is_http.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.203222+00:00'
+created: '2024-11-20T21:26:34.186837+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_blob.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_blob.pysnap
index 6ad180af65bf1d..4d21e8fc3bdc69 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_blob.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_blob.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:32.250745+00:00'
+created: '2024-11-20T21:26:34.267313+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_http.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_http.pysnap
index 500ab71570a979..bc46825296a51b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_http.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.298049+00:00'
+created: '2024-11-20T21:26:34.373958+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_https.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_https.pysnap
index 46bc797604c0df..43bccf1b425e0c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_https.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_filename_if_https.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.356360+00:00'
+created: '2024-11-20T21:26:34.419505+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_flutter_sdk.pysnap
index cec4792d3adb3d..bc37fd7107f73d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_flutter_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.405457+00:00'
+created: '2024-11-20T21:26:34.472398+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_hibernate_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_hibernate_classes.pysnap
index 9eae937e133f6a..b47b60cfc953ce 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_hibernate_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_hibernate_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.449703+00:00'
+created: '2024-11-20T21:26:34.523632+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_java8_lambda_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_java8_lambda_function.pysnap
index 83e3ce85a19c07..98b0a42a924fef 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_java8_lambda_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_java8_lambda_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.495522+00:00'
+created: '2024-11-20T21:26:34.592075+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_java8_lambda_module.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_java8_lambda_module.pysnap
index 11e13b1bfcb952..eaea3ce53e8c12 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_java8_lambda_module.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_java8_lambda_module.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.538218+00:00'
+created: '2024-11-20T21:26:34.640474+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist.pysnap
index 86807aa4a36c24..c19e32992cf5a7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.679346+00:00'
+created: '2024-11-20T21:26:34.777669+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist_2.pysnap
index 3a03f513784d93..052ddfbec5dc18 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.584910+00:00'
+created: '2024-11-20T21:26:34.685887+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist_3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist_3.pysnap
index f45725db86f782..75fd629dda735f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_javassist_3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.633953+00:00'
+created: '2024-11-20T21:26:34.730208+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_module_if_page_url.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_module_if_page_url.pysnap
index 81415de33197ae..e4d8c72244a958 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_module_if_page_url.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_module_if_page_url.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:32.780727+00:00'
+created: '2024-11-20T21:26:34.890640+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_module_if_page_url_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_module_if_page_url_2.pysnap
index 4f3b3a1113439c..67c7e0cadb8f49 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_module_if_page_url_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_module_if_page_url_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.731350+00:00'
+created: '2024-11-20T21:26:34.837802+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_safari_native_code.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_safari_native_code.pysnap
index 3e1f2920a449cd..a34aa66a8dff70 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_safari_native_code.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_safari_native_code.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.837146+00:00'
+created: '2024-11-20T21:26:34.946766+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_dart_packages.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_dart_packages.pysnap
index c3a19b49565cde..fe67802cba2d50 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_dart_packages.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_dart_packages.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.887715+00:00'
+created: '2024-11-20T21:26:35.011870+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_dart_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_dart_sdk.pysnap
index ebf44fb3d97f2f..c7fd829d78cf22 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_dart_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_dart_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.931346+00:00'
+created: '2024-11-20T21:26:35.057039+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_flutter_sdk.pysnap
index 835d2c02133f41..90e31c04151f70 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sentry_flutter_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:32.976072+00:00'
+created: '2024-11-20T21:26:35.102683+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors.pysnap
index db7680119b8757..609139d5bb5b12 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.079267+00:00'
+created: '2024-11-20T21:26:35.210683+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors_2.pysnap
index a352b7d8013491..2e7de15587c38b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_constructors_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.019624+00:00'
+created: '2024-11-20T21:26:35.163136+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_methods.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_methods.pysnap
index 8c0e049070068b..8c5a88e4b3418e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_methods.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_ignores_sun_java_generated_methods.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.122471+00:00'
+created: '2024-11-20T21:26:35.257324+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_block_functions.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_block_functions.pysnap
index 6654b3654ba105..3488bdbf24b916 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_block_functions.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_block_functions.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.168036+00:00'
+created: '2024-11-20T21:26:35.309941+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_erb_templates.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_erb_templates.pysnap
index 8304e8492f41e0..36a8230b17c165 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_erb_templates.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_erb_templates.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.227103+00:00'
+created: '2024-11-20T21:26:35.414132+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_versioned_filenames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_versioned_filenames.pysnap
index ea330b48dcc79d..7dc23601492671 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_versioned_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_versioned_filenames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.327496+00:00'
+created: '2024-11-20T21:26:35.505400+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_versioned_filenames_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_versioned_filenames_2.pysnap
index c20a284cef67e6..812ba0c3dca113 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_versioned_filenames_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_sanitizes_versioned_filenames_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.270530+00:00'
+created: '2024-11-20T21:26:35.459465+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_skips_symbol_if_unknown.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_skips_symbol_if_unknown.pysnap
index b4d3e644fc6f85..f74dc193590878 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_skips_symbol_if_unknown.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_skips_symbol_if_unknown.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.369696+00:00'
+created: '2024-11-20T21:26:35.555098+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_context_line_over_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_context_line_over_function.pysnap
index c5e5034a009daa..45b226f8be1a5a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_context_line_over_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_context_line_over_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.424953+00:00'
+created: '2024-11-20T21:26:35.606018+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_function_over_lineno.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_function_over_lineno.pysnap
index 1a5e6851fc1625..80eeeb9108f49d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_function_over_lineno.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_function_over_lineno.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.467753+00:00'
+created: '2024-11-20T21:26:35.654634+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_module_over_filename.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_module_over_filename.pysnap
index a6c80a4688a0bf..c68b48d524f2e9 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_module_over_filename.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_module_over_filename.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.517001+00:00'
+created: '2024-11-20T21:26:35.703373+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_symbol_instead_of_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_symbol_instead_of_function.pysnap
index 88116a5249c172..4bc5716dd122c7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_symbol_instead_of_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_uses_symbol_instead_of_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.560663+00:00'
+created: '2024-11-20T21:26:35.751066+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_with_only_required_vars.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_with_only_required_vars.pysnap
index 08aa75986045d7..98cda1e4ac7c9b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_with_only_required_vars.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/frame_with_only_required_vars.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.607824+00:00'
+created: '2024-11-20T21:26:35.798170+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/go_pkg_mod.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/go_pkg_mod.pysnap
index debd029a8d3fb3..7551ce9ac9da91 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/go_pkg_mod.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/go_pkg_mod.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.659075+00:00'
+created: '2024-11-20T21:26:35.855695+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_125_event_126.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_125_event_126.pysnap
index 74d1ce060875b5..9f67f603e768d4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_125_event_126.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_125_event_126.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.730983+00:00'
+created: '2024-11-20T21:26:35.917579+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_200_event_200.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_200_event_200.pysnap
index 7bfc7f2d29c257..15df0481b96c59 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_200_event_200.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_200_event_200.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.795198+00:00'
+created: '2024-11-20T21:26:35.976386+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_275_event_275.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_275_event_275.pysnap
index 5a9cc06123868d..fd28709bc7bcd3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_275_event_275.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_275_event_275.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.855318+00:00'
+created: '2024-11-20T21:26:36.035337+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_289_event_312.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_289_event_312.pysnap
index d55f55b4650eb2..4fdcc6ffffe12a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_289_event_312.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_289_event_312.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.906584+00:00'
+created: '2024-11-20T21:26:36.088462+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_294_event_294.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_294_event_294.pysnap
index b8f0796400f8c7..622cc4732ee9d9 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_294_event_294.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_294_event_294.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:33.965616+00:00'
+created: '2024-11-20T21:26:36.148988+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_294_event_329.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_294_event_329.pysnap
index f5d93f18eade6e..2f60ace65d6dcc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_294_event_329.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_294_event_329.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.041466+00:00'
+created: '2024-11-20T21:26:36.205986+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_307_event_307.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_307_event_307.pysnap
index 925205e4cc4e82..ab1251e23ad9ae 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_307_event_307.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_307_event_307.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.092544+00:00'
+created: '2024-11-20T21:26:36.256234+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_307_event_657.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_307_event_657.pysnap
index ca61a48a3ee717..7b55f21bacd82f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_307_event_657.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_307_event_657.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.150658+00:00'
+created: '2024-11-20T21:26:36.315116+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_313_event_313.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_313_event_313.pysnap
index 8b81d0357f5cff..f93429ec7660b7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_313_event_313.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_313_event_313.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.219676+00:00'
+created: '2024-11-20T21:26:36.387806+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_313_event_333.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_313_event_333.pysnap
index c3b98d9d379b87..891ea4515c0e67 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_313_event_333.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_313_event_333.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.282914+00:00'
+created: '2024-11-20T21:26:36.454445+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_319_event_321.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_319_event_321.pysnap
index c3e864d3405eaf..693dec720e3155 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_319_event_321.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_319_event_321.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.352571+00:00'
+created: '2024-11-20T21:26:36.527932+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_389_event_389.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_389_event_389.pysnap
index cf20db0f751e5f..26a4ca38fb513c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_389_event_389.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_389_event_389.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.397459+00:00'
+created: '2024-11-20T21:26:36.635411+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_432_event_432.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_432_event_432.pysnap
index 2b2d47d38d08db..f6e716da3d9095 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_432_event_432.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_432_event_432.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.456727+00:00'
+created: '2024-11-20T21:26:36.696215+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_432_event_453.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_432_event_453.pysnap
index dc2c8937ad6fd5..c31d4631764a1e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_432_event_453.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_432_event_453.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.509430+00:00'
+created: '2024-11-20T21:26:36.750205+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_445_event_445.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_445_event_445.pysnap
index 34f6fd69a1dc20..e51d5042df9497 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_445_event_445.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/group_445_event_445.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.560478+00:00'
+created: '2024-11-20T21:26:36.809606+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hpkp.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hpkp.pysnap
index c56eb69a509142..13f67c50a09daf 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hpkp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hpkp.pysnap
@@ -1,9 +1,23 @@
 ---
-created: '2024-10-28T14:02:34.600344+00:00'
+created: '2024-11-20T21:26:36.859122+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "security_report_type": "hpkp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "hpkp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_base.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_base.pysnap
index dc4ea8317e6dda..f09614218e5b5c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_base.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:02:34.652152+00:00'
+created: '2024-11-20T21:26:36.904565+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_custom_client_hybrid_server.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_custom_client_hybrid_server.pysnap
index ce741da3c70269..ad682e9344426d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_custom_client_hybrid_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_custom_client_hybrid_server.pysnap
@@ -1,9 +1,31 @@
 ---
-created: '2024-10-28T14:02:34.712871+00:00'
+created: '2024-11-20T21:26:36.956861+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['{{ default }}', 'soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": true,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"{{ default }}soft-timelimit-exceeded\"",
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_hybrid_client_custom_server.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_hybrid_client_custom_server.pysnap
index 8ab66e3058e120..eacb305ef48b14 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_hybrid_client_custom_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_hybrid_client_custom_server.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-11-08T19:39:42.079495+00:00'
+created: '2024-11-20T21:26:37.007705+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_same_default_different_extra.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_same_default_different_extra.pysnap
index 231304578abea4..448a1829328f9d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_same_default_different_extra.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_same_default_different_extra.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:02:34.802156+00:00'
+created: '2024-11-20T21:26:37.053486+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', \"adopt don't shop\"]",
+  "fingerprint": "['{{ default }}', \"adopt don't shop\"]",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_same_extra_different_default.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_same_extra_different_default.pysnap
index 5d83083c0e029e..f85bf49c042d5b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_same_extra_different_default.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/hybrid_fingerprint_same_extra_different_default.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:02:34.855338+00:00'
+created: '2024-11-20T21:26:37.101644+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/in_app_in_ui.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/in_app_in_ui.pysnap
index bd4cf7adc4bef8..77d9718b993540 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/in_app_in_ui.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/in_app_in_ui.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.912459+00:00'
+created: '2024-11-20T21:26:37.161626+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/java_chained.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/java_chained.pysnap
index 552a44ee263503..9e62103502f0c6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/java_chained.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/java_chained.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:34.970190+00:00'
+created: '2024-11-20T21:26:37.217018+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 3,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/java_minimal.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/java_minimal.pysnap
index 6d1ee7035683fd..3caf8a50398ae7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/java_minimal.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/java_minimal.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.027912+00:00'
+created: '2024-11-20T21:26:37.329269+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_fallback_to_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_fallback_to_message.pysnap
index 3791a1482fa558..537afad797888b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_fallback_to_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_fallback_to_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:35.127911+00:00'
+created: '2024-11-20T21:26:37.443171+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_fallback_to_message_whistles.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_fallback_to_message_whistles.pysnap
index 33e19412bbf7a2..30aca82f308acd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_fallback_to_message_whistles.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_fallback_to_message_whistles.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:35.072928+00:00'
+created: '2024-11-20T21:26:37.378246+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_no_in_app.pysnap
index ccc095287972d6..18b8f80b557ce0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_exception_no_in_app.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.194475+00:00'
+created: '2024-11-20T21:26:37.537271+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_message.pysnap
index 7359e0cb83b496..21788c9665f259 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:35.278132+00:00'
+created: '2024-11-20T21:26:37.665534+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_message_parameterization.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_message_parameterization.pysnap
index 3be23843393bce..4f5636fcbdaaa6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_message_parameterization.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_message_parameterization.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:35.238497+00:00'
+created: '2024-11-20T21:26:37.605555+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_polyfills.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_polyfills.pysnap
index 887840ab7f88fa..fcea499cd88ebe 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_polyfills.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_polyfills.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.332832+00:00'
+created: '2024-11-20T21:26:37.754984+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_regression_tree_labels.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_regression_tree_labels.pysnap
deleted file mode 100644
index 9fef947ae88295..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_regression_tree_labels.pysnap
+++ /dev/null
@@ -1,41 +0,0 @@
----
-created: '2024-10-28T14:02:36.253076+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: stacktrace
----
-contributing variants:
-  system*
-    hash: "8fb2eda9663c3c026c23475d6da30363"
-    component:
-      system*
-        exception*
-          stacktrace*
-            frame*
-              module*
-                "app/utils/handleXhrErrorResponse"
-              context-line*
-                "Sentry.withScope(scope => {"
-            frame*
-              module*
-                "@sentry/minimal/esm/index"
-              context-line*
-                "callOnHub('withScope', callback);"
-            frame*
-              module*
-                "@sentry/minimal/esm/index"
-              context-line*
-                "return hub[method].apply(hub, __spread(args));"
-            frame*
-              module*
-                "@sentry/hub/esm/hub"
-              context-line*
-                "callback(scope);"
-            frame*
-              module*
-                "app/utils/handleXhrErrorResponse"
-              context-line*
-                "Sentry.captureException(new Error(message));"
-          type*
-            "Error"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_unpkg.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_unpkg.pysnap
index 40cf3b6d87ba0e..6df3b7b740f33f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_unpkg.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_unpkg.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.386458+00:00'
+created: '2024-11-20T21:26:37.846359+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_chrome.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_chrome.pysnap
index 25725b50d1d886..cf37eb696e69a0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_chrome.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.435088+00:00'
+created: '2024-11-20T21:26:37.901500+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_edge.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_edge.pysnap
index ceabd85a24e8ae..8cbac13d226b36 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_edge.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.487256+00:00'
+created: '2024-11-20T21:26:37.969630+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_firefox.pysnap
index 7e1e861e80a3f3..439d7b35d8cc4d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.535496+00:00'
+created: '2024-11-20T21:26:38.037041+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_chrome.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_chrome.pysnap
index b994ae9d7b961f..9b26b0f03ce743 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_chrome.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.727186+00:00'
+created: '2024-11-20T21:26:38.102862+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_edge.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_edge.pysnap
index efb75a3279af0b..2c245705321a69 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_edge.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.821189+00:00'
+created: '2024-11-20T21:26:38.195089+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_firefox.pysnap
index b95b1fa1e2307c..45904a96259ec3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.908438+00:00'
+created: '2024-11-20T21:26:38.312441+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_safari.pysnap
index e8815379ee19b3..0a5e5900c84265 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_http_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:35.981163+00:00'
+created: '2024-11-20T21:26:38.470929+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_safari.pysnap
index 1a9d8bc4890ec6..18df5bfea74e93 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:36.042252+00:00'
+created: '2024-11-20T21:26:38.546444+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_sentryui_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_sentryui_firefox.pysnap
index cb701649077ad7..421ea9809f0f1d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_sentryui_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_sentryui_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:36.154215+00:00'
+created: '2024-11-20T21:26:38.648731+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_sentryui_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_sentryui_safari.pysnap
index 25939358f77c24..9dbcff79c8c4b1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_sentryui_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/javascript_xbrowser_sentryui_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:36.205655+00:00'
+created: '2024-11-20T21:26:38.765694+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/laravel.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/laravel.pysnap
index 15b0a831551b4b..2f46cc7eb9de98 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/laravel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/laravel.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:36.371843+00:00'
+created: '2024-11-20T21:26:39.209980+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/laravel_anonymous.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/laravel_anonymous.pysnap
index 96e9e6855f24ad..4ee2ca659fa882 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/laravel_anonymous.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/laravel_anonymous.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:36.309806+00:00'
+created: '2024-11-20T21:26:39.019249+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/logentry_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/logentry_prefers_message.pysnap
index 9619aa5bdf7dc6..4e13a405feb9d1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/logentry_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/logentry_prefers_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:36.426777+00:00'
+created: '2024-11-20T21:26:39.335836+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/logentry_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/logentry_uses_formatted.pysnap
index 964bf5a59fdb15..8e42372949fcf7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/logentry_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/logentry_uses_formatted.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:36.477954+00:00'
+created: '2024-11-20T21:26:39.516815+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/macos_amd_driver.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/macos_amd_driver.pysnap
index 74a7401f0773dd..6ffc6ec3ec41a5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/macos_amd_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/macos_amd_driver.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:36.545263+00:00'
+created: '2024-11-20T21:26:39.612234+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/macos_intel_driver.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/macos_intel_driver.pysnap
index ee6f7fc2f95da7..ed14cbeaca6120 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/macos_intel_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/macos_intel_driver.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:36.607430+00:00'
+created: '2024-11-20T21:26:39.718570+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/malloc_sentinel.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/malloc_sentinel.pysnap
index 95fff07db8f8fc..54008b8ca316b8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/malloc_sentinel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/malloc_sentinel.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:36.664864+00:00'
+created: '2024-11-20T21:26:39.894724+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_prefers_message.pysnap
index 67ccc17029c96c..bc5f587d8fcf61 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_prefers_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:36.714076+00:00'
+created: '2024-11-20T21:26:39.989711+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_uses_formatted.pysnap
index 2f1f6be871bc42..71b3bf2b076b8d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_uses_formatted.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:36.780567+00:00'
+created: '2024-11-20T21:26:40.101691+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_with_key_pair_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_with_key_pair_values.pysnap
index 4def21215e0bf9..cd3286b96077ab 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_with_key_pair_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/message_with_key_pair_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:02:36.882279+00:00'
+created: '2024-11-20T21:26:40.201393+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/minified_javascript.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/minified_javascript.pysnap
index 34b1463b5af787..a3411c75beae8c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/minified_javascript.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/minified_javascript.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:36.936481+00:00'
+created: '2024-11-20T21:26:40.301034+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_complex_function_names.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_complex_function_names.pysnap
index 58ddee752f3bd9..f0608dc6d5ba26 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_complex_function_names.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_complex_function_names.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:36.987548+00:00'
+created: '2024-11-20T21:26:40.410450+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash1.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash1.pysnap
index 633a4b8d127d1c..d140856cbef7ad 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash1.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.041198+00:00'
+created: '2024-11-20T21:26:40.532039+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash2.pysnap
index 3bb57df4810243..b764cbe490e3bf 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.095284+00:00'
+created: '2024-11-20T21:26:40.622610+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash3.pysnap
index 8e6477855dc478..108922d6e8d4a3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_driver_crash3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.155459+00:00'
+created: '2024-11-20T21:26:40.701927+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_limit_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_limit_frames.pysnap
index 4ad306e6290a3e..b190edcbbdbb12 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_limit_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_limit_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.222471+00:00'
+created: '2024-11-20T21:26:40.812027+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_malloc_chain.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_malloc_chain.pysnap
index ad30c595d6222a..7893e354675a01 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_malloc_chain.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_malloc_chain.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.275194+00:00'
+created: '2024-11-20T21:26:40.908787+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_no_filenames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_no_filenames.pysnap
index ca538400c35a4f..b55e7dec21911c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_no_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_no_filenames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.324935+00:00'
+created: '2024-11-20T21:26:41.014776+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_unlimited_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_unlimited_frames.pysnap
index 99b42d378be3f9..fc0f54c81431f8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_unlimited_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_unlimited_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.379991+00:00'
+created: '2024-11-20T21:26:41.111184+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_windows_anon_namespace.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_windows_anon_namespace.pysnap
index 3ddfb47d44d7ba..4bb271ad1ba1cc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_windows_anon_namespace.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_windows_anon_namespace.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.430451+00:00'
+created: '2024-11-20T21:26:41.198406+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_with_function_name.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_with_function_name.pysnap
index 001c03a692e9c4..67bdc444ad7dd4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_with_function_name.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/native_with_function_name.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.497014+00:00'
+created: '2024-11-20T21:26:41.284008+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/node_exception_weird.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/node_exception_weird.pysnap
index d0202b47135409..a725346f8a3b84 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/node_exception_weird.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/node_exception_weird.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.542100+00:00'
+created: '2024-11-20T21:26:41.385616+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/node_low_level_async.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/node_low_level_async.pysnap
index 1441aa42562818..55de54bac977b2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/node_low_level_async.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/node_low_level_async.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.586315+00:00'
+created: '2024-11-20T21:26:41.463705+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_exception_base.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_exception_base.pysnap
index 6b78de6df7846f..046307a1582149 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_exception_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_exception_base.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.636420+00:00'
+created: '2024-11-20T21:26:41.555994+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 2,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_grouping_enhancer_away_from_crash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_grouping_enhancer_away_from_crash.pysnap
index 623eb816fd57c4..5526c27dc302f2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_grouping_enhancer_away_from_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_grouping_enhancer_away_from_crash.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.685886+00:00'
+created: '2024-11-20T21:26:41.644983+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_grouping_enhancer_towards_crash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_grouping_enhancer_towards_crash.pysnap
index 161b5d3af6f66d..4b877d58604533 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_grouping_enhancer_towards_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_grouping_enhancer_towards_crash.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.734703+00:00'
+created: '2024-11-20T21:26:41.731679+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_http_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_http_error.pysnap
index f6d5393f110c0d..44d6ee2409f4a5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_http_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/python_http_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.793474+00:00'
+created: '2024-11-20T21:26:41.803076+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/react_native.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/react_native.pysnap
index 59600109bf15b9..81179de3a20ac9 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/react_native.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/react_native.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.856097+00:00'
+created: '2024-11-20T21:26:41.899496+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_cocoa.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_cocoa.pysnap
index 3f5f484d801232..acf7bacc8a0286 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_cocoa.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_cocoa.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.898088+00:00'
+created: '2024-11-20T21:26:41.997079+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_collapse_recursion.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_collapse_recursion.pysnap
index 1346d791610839..c5fddfbfe79a86 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_collapse_recursion.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_collapse_recursion.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:37.960070+00:00'
+created: '2024-11-20T21:26:42.099520+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_compute_hashes.pysnap
index 567307bc1f0f22..850efd459d416a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_compute_hashes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.013119+00:00'
+created: '2024-11-20T21:26:42.167063+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_discards_seemingly_useless_stack.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_discards_seemingly_useless_stack.pysnap
index cafcd8ca6e5a90..7ad6bd03acd436 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_discards_seemingly_useless_stack.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_discards_seemingly_useless_stack.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:38.068450+00:00'
+created: '2024-11-20T21:26:42.255732+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_does_not_discard_non_urls.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_does_not_discard_non_urls.pysnap
index bba179c9d89ffe..16e93a007817e1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_does_not_discard_non_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_does_not_discard_non_urls.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.116329+00:00'
+created: '2024-11-20T21:26:42.357662+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_does_not_group_different_js_errors.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_does_not_group_different_js_errors.pysnap
index cc4ee0d0265581..61544c9b1eb529 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_does_not_group_different_js_errors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_does_not_group_different_js_errors.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:38.164049+00:00'
+created: '2024-11-20T21:26:42.436727+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_enforce_min_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_enforce_min_frames.pysnap
index 53c796d4f8da6f..082d2106dec580 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_enforce_min_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_enforce_min_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.213245+00:00'
+created: '2024-11-20T21:26:42.584110+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_excludes_single_frame_urls.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_excludes_single_frame_urls.pysnap
index 47e194f5ffcadc..df42f808cb68fe 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_excludes_single_frame_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_excludes_single_frame_urls.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.260172+00:00'
+created: '2024-11-20T21:26:42.753483+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_hash_without_system_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_hash_without_system_frames.pysnap
index 6364ca6f37235c..387f54e74e0211 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_hash_without_system_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_hash_without_system_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.318533+00:00'
+created: '2024-11-20T21:26:42.868256+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_ignores_singular_anonymous_frame.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_ignores_singular_anonymous_frame.pysnap
index 3c4f3ecf928229..ef33efa494e191 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_ignores_singular_anonymous_frame.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_ignores_singular_anonymous_frame.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.367615+00:00'
+created: '2024-11-20T21:26:42.953419+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_negated_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_negated_match.pysnap
index 8b22d9455c3097..bb892f05c4655f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_negated_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_negated_match.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.418522+00:00'
+created: '2024-11-20T21:26:43.063264+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_rust.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_rust.pysnap
index 2eafcd6bc6574d..469562c39ba95d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_rust.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_rust.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.471139+00:00'
+created: '2024-11-20T21:26:43.107734+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_rust2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_rust2.pysnap
index be87bb7c79dd7b..c31c77b5d31b2c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_rust2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_rust2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.524992+00:00'
+created: '2024-11-20T21:26:43.157397+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_with_minimal_app_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_with_minimal_app_frames.pysnap
index 8d5742ae532984..e98ee0579cca15 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_with_minimal_app_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/stacktrace_with_minimal_app_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.567455+00:00'
+created: '2024-11-20T21:26:43.211231+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/template_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/template_compute_hashes.pysnap
index 681fec84304350..2f91de0228f10c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/template_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/template_compute_hashes.pysnap
@@ -1,17 +1,28 @@
 ---
-created: '2024-10-28T14:02:38.625290+00:00'
+created: '2024-12-03T22:10:05.277287+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: template
+hashing_metadata: {
+  "template_context_line": "{% invalid template tag %}",
+  "template_name": "foo.html"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "template",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   default*
-    hash: "826f66ef602835f68030c04c634df320"
+    hash: "1f5bdebe3c9f414c7dbb4296a8353245"
     component:
       default*
         template*
           filename*
             "foo.html"
           context-line*
-            "hello world"
+            "{% invalid template tag %}"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/threads_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/threads_compute_hashes.pysnap
index 57f9794c20de41..589c453bdd9a47 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/threads_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/threads_compute_hashes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.667585+00:00'
+created: '2024-11-20T21:26:43.508299+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "thread",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "thread",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/threads_no_hash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/threads_no_hash.pysnap
index 57b33cf774f710..3dc5bb15c6c2cc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/threads_no_hash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/threads_no_hash.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:38.720494+00:00'
+created: '2024-11-20T21:26:43.654265+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/unity.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/unity.pysnap
index ff143121549ca6..3e8703f9b41508 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/unity.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/unity.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:38.774870+00:00'
+created: '2024-11-20T21:26:43.834994+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/unknown_variant.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/unknown_variant.pysnap
index 4be8fa05bd52f7..33f30d99bdf581 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/unknown_variant.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_10_29/unknown_variant.pysnap
@@ -1,9 +1,16 @@
 ---
-created: '2024-10-28T14:39:44.137158+00:00'
+created: '2024-11-20T21:26:07.343118+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: unknown
+hashing_metadata: {}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "unknown"
+  }
+}
 ---
 contributing variants:
   dogs*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/actix.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/actix.pysnap
index 40d26718dca454..b2d2fb81bf6a8b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/actix.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/actix.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:56:27.855431+00:00'
+created: '2024-11-20T21:26:44.822771+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/android_anr.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/android_anr.pysnap
index 39eae734567d6b..06854092d4910b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/android_anr.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/android_anr.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:56:30.059999+00:00'
+created: '2024-11-20T21:26:45.367713+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/aspnetcore.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/aspnetcore.pysnap
index 8775d68f78aa4d..bf31a207460ff5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/aspnetcore.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/aspnetcore.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:56:31.821810+00:00'
+created: '2024-11-20T21:26:45.472699+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/block_invoke.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/block_invoke.pysnap
index 977a16480b348b..4eb0defa61a6ea 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/block_invoke.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/block_invoke.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:56:33.557684+00:00'
+created: '2024-11-20T21:26:45.563342+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "thread",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "thread",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/bugly.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/bugly.pysnap
index df06bc3051b07d..29b813773fdf10 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/bugly.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/bugly.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:56:35.546631+00:00'
+created: '2024-11-20T21:26:45.676142+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/built_in_fingerprint_chunkload_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/built_in_fingerprint_chunkload_error.pysnap
index 64dc8e2bc6d049..1e0277c07be527 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/built_in_fingerprint_chunkload_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/built_in_fingerprint_chunkload_error.pysnap
@@ -1,9 +1,25 @@
 ---
-created: '2024-11-08T19:39:50.761360+00:00'
+created: '2024-11-20T21:26:48.752953+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "fingerprint": "['chunkloaderror']",
+  "fingerprint_source": "server_builtin_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "family:\"javascript\" type:\"ChunkLoadError\" -> \"chunkloaderror\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_builtin_rule"
+  }
+}
 ---
 contributing variants:
   built_in_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
index a6f59dee770bb7..e326e27daf7d41 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/built_in_fingerprint_chunkload_error_hybrid_fingerprint.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-11-08T19:39:50.661664+00:00'
+created: '2024-11-20T21:26:48.523813+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['chunkloaderror']",
+  "fingerprint_source": "server_builtin_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "family:\"javascript\" type:\"ChunkLoadError\" -> \"chunkloaderror\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_builtin_rule"
+  }
+}
 ---
 contributing variants:
   built_in_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/callee_guaranteed.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/callee_guaranteed.pysnap
index 166c16363c7f51..ec76ab7bd70424 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/callee_guaranteed.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/callee_guaranteed.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:56:40.740213+00:00'
+created: '2024-11-20T21:26:48.992102+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_no_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_no_regex_match.pysnap
index 88b146da29d051..a16e31c88378fd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_no_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_no_regex_match.pysnap
@@ -1,9 +1,20 @@
 ---
-created: '2024-11-08T19:39:50.976769+00:00'
+created: '2024-11-20T21:26:49.294388+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "de46d023e69b171b90ccf3ebca7aede4",
+  "raw_checksum": "not a legit checksum"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_no_regex_match_long.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_no_regex_match_long.pysnap
index de47b294232c06..9d6da06f4316d5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_no_regex_match_long.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_no_regex_match_long.pysnap
@@ -1,9 +1,20 @@
 ---
-created: '2024-11-08T19:39:50.887328+00:00'
+created: '2024-11-20T21:26:49.125966+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "2c2e85a6e73109222f131228ed06a7af",
+  "raw_checksum": "not a legit checksum and also too long a string"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   hashed_checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_regex_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_regex_match.pysnap
index 7f5554b51b4a43..5b6340264f498b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_regex_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/checksum_regex_match.pysnap
@@ -1,9 +1,19 @@
 ---
-created: '2024-10-28T13:56:45.849856+00:00'
+created: '2024-11-20T21:26:49.402371+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: checksum
+hashing_metadata: {
+  "checksum": "11212012123120120415201309082013"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "checksum",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   checksum*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/cocoa_dispatch_client_callout.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/cocoa_dispatch_client_callout.pysnap
index 36a42cd06da68a..ef6cb8772c9447 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/cocoa_dispatch_client_callout.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/cocoa_dispatch_client_callout.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:56:47.730772+00:00'
+created: '2024-11-20T21:26:49.541003+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "thread",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "thread",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/connection_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/connection_error.pysnap
index 8df700e8709c87..21571c8d3eccab 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/connection_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/connection_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:56:49.821156+00:00'
+created: '2024-11-20T21:26:49.688160+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp.pysnap
index a33fb3cc8b7375..5328feb0471dce 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:01.725768+00:00'
+created: '2024-11-20T21:26:50.633069+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "YYY",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_img_src.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_img_src.pysnap
index 8e983e75bd2fa6..d9fc0d52312c9e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_img_src.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_img_src.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:56:51.583012+00:00'
+created: '2024-11-20T21:26:50.019371+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "ftp://example.com",
+  "csp_directive": "img-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_no_blocked_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_no_blocked_uri.pysnap
index 8b4c10be471994..effffac2a33136 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_no_blocked_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_no_blocked_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:56:53.525622+00:00'
+created: '2024-11-20T21:26:50.131020+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_data_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_data_uri.pysnap
index 2c2d3b410b69ea..e18d15e4b87740 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_data_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_data_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:56:55.411873+00:00'
+created: '2024-11-20T21:26:50.283878+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "data:",
+  "csp_directive": "img-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_src_unsafe_eval.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_src_unsafe_eval.pysnap
new file mode 100644
index 00000000000000..d1e4273b9abe08
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_src_unsafe_eval.pysnap
@@ -0,0 +1,33 @@
+---
+created: '2024-12-02T22:04:06.906409+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "csp_script_violation": "unsafe-eval",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
+---
+contributing variants:
+  default*
+    hash: "56c6520f35bce2f89ed2c4e725ccef65"
+    component:
+      default*
+        csp*
+          salt* (a static salt)
+            "script-src"
+          violation*
+            "'unsafe-eval'"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_src_unsafe_inline.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_src_unsafe_inline.pysnap
new file mode 100644
index 00000000000000..bce6f2144a8af5
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_src_unsafe_inline.pysnap
@@ -0,0 +1,33 @@
+---
+created: '2024-12-02T22:04:08.131452+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "self",
+  "csp_directive": "script-src",
+  "csp_script_violation": "unsafe-inline",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
+---
+contributing variants:
+  default*
+    hash: "d346ee37d19a2be6587e609075ca2d57"
+    component:
+      default*
+        csp*
+          salt* (a static salt)
+            "script-src"
+          violation*
+            "'unsafe-inline'"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_src_uri.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_src_uri.pysnap
index 17222fc539234f..69199fefb275d7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_src_uri.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_script_src_uri.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:56:57.493712+00:00'
+created: '2024-11-20T21:26:50.398687+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "csp_directive": "script-src",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_style_src_elem.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_style_src_elem.pysnap
index 5a81905993ad0a..45373fcfd3e5e6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_style_src_elem.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/csp_style_src_elem.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:56:59.603124+00:00'
+created: '2024-11-20T21:26:50.489726+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "use.fontawesome.com",
+  "csp_directive": "style-src-elem",
+  "security_report_type": "csp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "csp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_client.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_client.pysnap
index 5d59c0dc559afa..f38a07140b1218 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_client.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_client.pysnap
@@ -1,9 +1,25 @@
 ---
-created: '2024-11-08T19:39:51.908843+00:00'
+created: '2024-11-20T21:26:50.897141+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": false
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "client"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_client_and_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_client_and_server_rule.pysnap
index d2322ce26ed5d7..a6119fa3fa25f1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_client_and_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_client_and_server_rule.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-11-08T19:39:51.815255+00:00'
+created: '2024-11-20T21:26:50.732042+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_server_rule.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_server_rule.pysnap
index ab9f1778eed129..7b1c33bdde9e22 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_server_rule.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/custom_fingerprint_server_rule.pysnap
@@ -1,9 +1,25 @@
 ---
-created: '2024-11-08T19:39:52.075996+00:00'
+created: '2024-11-20T21:26:51.042052+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/empty.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/empty.pysnap
index 3d28aefc9a7b72..7b8f9b9a0c0951 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/empty.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/empty.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T13:57:09.950377+00:00'
+created: '2024-11-20T21:26:51.148179+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_cocoa_nserror.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_cocoa_nserror.pysnap
index 5db82ca3820538..f4c51d49ba4331 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_cocoa_nserror.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_cocoa_nserror.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:12.321029+00:00'
+created: '2024-11-20T21:26:51.311554+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_comput_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_comput_hashes.pysnap
deleted file mode 100644
index 11d0cbf1cb3afb..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_comput_hashes.pysnap
+++ /dev/null
@@ -1,17 +0,0 @@
----
-created: '2024-10-28T13:57:14.279000+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: message
----
-contributing variants:
-  app*
-    hash: "b23ee1963904c2ca87b145febf94b66c"
-    component:
-      app*
-        exception*
-          type*
-            "ValueError"
-          value*
-            "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes.pysnap
index 6c6b71d9272c07..4fcc4c279c2344 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes.pysnap
@@ -1,19 +1,32 @@
 ---
-created: '2024-10-28T13:57:19.747436+00:00'
+created: '2024-12-03T22:10:05.464644+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
-hash_basis: stacktrace
+hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
-  system*
-    hash: "9509e122c6175606d52862fa4f64853c"
+  app*
+    hash: "b23ee1963904c2ca87b145febf94b66c"
     component:
-      system*
+      app*
         exception*
-          stacktrace*
-            frame*
-              filename*
-                "baz.py"
           type*
             "ValueError"
+          value*
+            "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes_2.pysnap
index 2e1ca840c88eb9..6621421398b25a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:57:16.062605+00:00'
+created: '2024-11-20T21:26:51.463977+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes_3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes_3.pysnap
index f34eeefe6a5522..7609a20a691b0e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_compute_hashes_3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:57:17.790776+00:00'
+created: '2024-11-20T21:26:51.544069+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 2,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_duplicate_id.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_duplicate_id.pysnap
index 75b2b47a109901..4a837a7cba2aab 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_duplicate_id.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_duplicate_id.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:21.440487+00:00'
+created: '2024-11-20T21:26:51.750608+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_missing_parent.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_missing_parent.pysnap
index d9b31e9b998394..caf17329c10891 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_missing_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_missing_parent.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:23.174514+00:00'
+created: '2024-11-20T21:26:51.868975+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_out_of_sequence.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_out_of_sequence.pysnap
index fe47459f198629..9908ce0627f6f8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_out_of_sequence.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_out_of_sequence.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:25.252246+00:00'
+created: '2024-11-20T21:26:52.023070+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_parent_with_parent.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_parent_with_parent.pysnap
index 851c528511f8c2..5134c47c874dd0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_parent_with_parent.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_parent_with_parent.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:27.184499+00:00'
+created: '2024-11-20T21:26:52.224594+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_with_cycle.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_with_cycle.pysnap
index 89c6b24fbb2696..1bb6d11de79828 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_with_cycle.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_bad_with_cycle.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:28.887608+00:00'
+created: '2024-11-20T21:26:52.352459+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_exception.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_exception.pysnap
index cc5626cf1e8f5b..7ddb28433b5ec3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_exception.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_exception.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:30.782803+00:00'
+created: '2024-11-20T21:26:52.468099+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_under_nested_groups.pysnap
index 97d24f0e858a1d..9549b1cf6bdda8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_under_nested_groups.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:32.606514+00:00'
+created: '2024-11-20T21:26:52.554092+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_different_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_different_values.pysnap
index c3aa44273733b7..645b0f7225f94f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_different_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_different_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:39.541903+00:00'
+created: '2024-11-20T21:26:52.781322+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_similar_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_similar_values.pysnap
index 2d24ae561ca582..5358705c8fff71 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_similar_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_similar_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:43.850886+00:00'
+created: '2024-11-20T21:26:53.025934+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_similar_values_and_children.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_similar_values_and_children.pysnap
index d82dc4e36e7b78..2876edb4ccaa20 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_similar_values_and_children.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_one_type_with_similar_values_and_children.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:42.043138+00:00'
+created: '2024-11-20T21:26:52.945951+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_exceptions_with_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_exceptions_with_frames.pysnap
new file mode 100644
index 00000000000000..a737ff87b91336
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_exceptions_with_frames.pysnap
@@ -0,0 +1,86 @@
+---
+created: '2024-12-02T21:58:19.855037+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 3,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
+---
+contributing variants:
+  app*
+    hash: "d505dfb9059ac63c11955233323a9100"
+    component:
+      app*
+        chained-exception*
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_stuff"
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_different_stuff"
+            type*
+              "DoStuffException"
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_other_stuff"
+            type*
+              "DoOtherStuffException"
+          exception*
+            type*
+              "System.AggregateException"
+            value*
+              "One or more errors occurred."
+  system*
+    hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+    component:
+      system*
+        chained-exception*
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_stuff"
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_different_stuff"
+            type*
+              "DoStuffException"
+          exception*
+            stacktrace*
+              frame*
+                module*
+                  "dostuff"
+                function*
+                  "do_other_stuff"
+            type*
+              "DoOtherStuffException"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_types.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_types.pysnap
index 427a537940dcd9..b6b72103505bbb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_types.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_types.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:50.220076+00:00'
+created: '2024-11-20T21:26:53.316463+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_types_under_nested_groups.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_types_under_nested_groups.pysnap
index 0a2c3e443058f5..21638898ab4716 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_types_under_nested_groups.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_groups_two_types_under_nested_groups.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:46.657873+00:00'
+created: '2024-11-20T21:26:53.183556+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_javascript_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_javascript_no_in_app.pysnap
index 014fb20a66ce3b..7685c93ae5411c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_javascript_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_javascript_no_in_app.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:57:54.544415+00:00'
+created: '2024-11-20T21:26:53.393226+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_without_type.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_without_type.pysnap
index 4746df46f199d8..4f0a42cb3d3483 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_without_type.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_without_type.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:57:58.384372+00:00'
+created: '2024-11-20T21:26:53.468288+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_without_value.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_without_value.pysnap
index d815faf7859c25..fe40b1f8106ec1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_without_value.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/exception_without_value.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T13:58:01.995232+00:00'
+created: '2024-11-20T21:26:53.560630+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/expectct.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/expectct.pysnap
index a4c5cd162a4cb7..291b58a65567b0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/expectct.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/expectct.pysnap
@@ -1,9 +1,23 @@
 ---
-created: '2024-10-28T13:58:04.316884+00:00'
+created: '2024-11-20T21:26:53.615998+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "security_report_type": "expect-ct"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "expect-ct"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/fallback_prefix_level_1.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/fallback_prefix_level_1.pysnap
index b0352a828dc95e..5e9ac065bd44ba 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/fallback_prefix_level_1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/fallback_prefix_level_1.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:06.480171+00:00'
+created: '2024-11-20T21:26:53.680757+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
deleted file mode 100644
index 8758986b1af432..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
+++ /dev/null
@@ -1,18 +0,0 @@
----
-created: '2024-10-28T13:58:08.987277+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: stacktrace
----
-contributing variants:
-  system*
-    hash: "526b64456c48836a46ec1a89544fd412"
-    component:
-      system*
-        stacktrace*
-          frame*
-            module* (removed codegen marker)
-              "sentry_clojure_example.core$_main$fn__<auto>"
-            function*
-              "invoke"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
new file mode 100644
index 00000000000000..1fb98cae6fc5e2
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
@@ -0,0 +1,35 @@
+---
+created: '2024-12-03T22:10:05.511276+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
+---
+contributing variants:
+  system*
+    hash: "526b64456c48836a46ec1a89544fd412"
+    component:
+      system*
+        stacktrace*
+          frame*
+            module* (removed codegen marker)
+              "sentry_clojure_example.core$_main$fn__<auto>"
+            function*
+              "invoke"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_empty_list.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_empty_list.pysnap
index 20e7a8967e3504..119b1093298a55 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_empty_list.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_empty_list.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T13:58:11.185522+00:00'
+created: '2024-11-20T21:26:53.806766+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
index 1c154664f1cda0..4eceecf094fb60 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_enhancer_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:13.380477+00:00'
+created: '2024-11-20T21:26:53.856246+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_fast_class_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
index 858c7cf0f5e59a..edc85f8c9af27d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_fast_class_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:15.557431+00:00'
+created: '2024-11-20T21:26:53.906713+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_spring_classes.pysnap
index 69bbdde47a54d1..50acbc7406c767 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_ENHANCED_spring_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:18.064582+00:00'
+created: '2024-11-20T21:26:53.960104+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_dartlang_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_dartlang_sdk.pysnap
index a9dc6d4d4d310e..f565e2241fe9ee 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_dartlang_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_dartlang_sdk.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T13:58:20.123234+00:00'
+created: '2024-11-20T21:26:54.019454+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
index 4a740b66871a36..ce485a1480cf33 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_clojure_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:22.480637+00:00'
+created: '2024-11-20T21:26:54.090529+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
index 4b1ed494926d6b..faec66ef5f7aea 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_enhancer_by_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:24.610020+00:00'
+created: '2024-11-20T21:26:54.140934+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_spring_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_spring_classes.pysnap
index 0983487216058f..a87315677be3cc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_spring_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_extra_ENHANCED_spring_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:26.887939+00:00'
+created: '2024-11-20T21:26:54.186631+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_from_url_origin_corner_cases.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_from_url_origin_corner_cases.pysnap
index 353bc74d672e5a..7bd79843d55ada 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_from_url_origin_corner_cases.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_from_url_origin_corner_cases.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:28.942000+00:00'
+created: '2024-11-20T21:26:54.225605+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_abs_path_is_http.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_abs_path_is_http.pysnap
index 76787acf44e77b..29eb4b8ecc9c0c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_abs_path_is_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_abs_path_is_http.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:31.287907+00:00'
+created: '2024-11-20T21:26:54.289844+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_blob.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_blob.pysnap
index 78b9d284352bb0..7742c6894e1078 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_blob.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_blob.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T13:58:38.433866+00:00'
+created: '2024-11-20T21:26:54.347083+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_http.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_http.pysnap
index 9d8cd1a5585ee5..43c62697496758 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_http.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_http.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:40.326564+00:00'
+created: '2024-11-20T21:26:54.397645+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_https.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_https.pysnap
index bb106a0f4d885d..40fa13cf45349f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_https.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_filename_if_https.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:42.578614+00:00'
+created: '2024-11-20T21:26:54.451609+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_flutter_sdk.pysnap
index 0d9f08c4e6867f..e5958b70baad8e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_flutter_sdk.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:44.643630+00:00'
+created: '2024-11-20T21:26:54.499729+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_hibernate_classes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_hibernate_classes.pysnap
index 4873c8873db503..88de00f8b33d06 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_hibernate_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_hibernate_classes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:46.364733+00:00'
+created: '2024-11-20T21:26:54.558084+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_java8_lambda_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_java8_lambda_function.pysnap
index 05a4e5869104f9..30e01ccdc5efac 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_java8_lambda_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_java8_lambda_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:48.171441+00:00'
+created: '2024-11-20T21:26:54.620478+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_java8_lambda_module.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_java8_lambda_module.pysnap
index 3b1599cf553710..466cec28dcccc7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_java8_lambda_module.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_java8_lambda_module.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:49.976603+00:00'
+created: '2024-11-20T21:26:54.701980+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist.pysnap
index 0f5ce454daa749..76dc97645cb73f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:55.222821+00:00'
+created: '2024-11-20T21:26:54.979229+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist_2.pysnap
index 8edfd925a00a14..324185fd4b73cc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:51.601653+00:00'
+created: '2024-11-20T21:26:54.847800+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist_3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist_3.pysnap
index 3d236f7bfbc138..7c76c4491ae729 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist_3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_javassist_3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:53.265095+00:00'
+created: '2024-11-20T21:26:54.914470+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_module_if_page_url.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_module_if_page_url.pysnap
index a347bb0c9e4491..64df5036bd7f8c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_module_if_page_url.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_module_if_page_url.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T13:58:59.163210+00:00'
+created: '2024-11-20T21:26:55.104416+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_module_if_page_url_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_module_if_page_url_2.pysnap
index 8faaa9af5e9533..eb5ab08d01fce3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_module_if_page_url_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_module_if_page_url_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:58:57.066536+00:00'
+created: '2024-11-20T21:26:55.041774+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_safari_native_code.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_safari_native_code.pysnap
index fe53d1caa07694..be43dd6877885f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_safari_native_code.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_safari_native_code.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:01.074521+00:00'
+created: '2024-11-20T21:26:55.178179+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_dart_packages.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_dart_packages.pysnap
index 9951c6dfa9f8af..1325350147a99d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_dart_packages.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_dart_packages.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T13:59:02.780594+00:00'
+created: '2024-11-20T21:26:55.253189+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_dart_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_dart_sdk.pysnap
index 9233f67ba7e88c..a3e20060dc9f19 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_dart_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_dart_sdk.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T13:59:04.545062+00:00'
+created: '2024-11-20T21:26:55.336250+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_flutter_sdk.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_flutter_sdk.pysnap
index 3568b9071ab783..cf831d3b1deb2d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_flutter_sdk.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sentry_flutter_sdk.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T13:59:06.456315+00:00'
+created: '2024-11-20T21:26:55.412754+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors.pysnap
index 65a11eda93e443..afe4cd881d5514 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:09.989507+00:00'
+created: '2024-11-20T21:26:55.548548+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors_2.pysnap
index 6ea47a091411cf..4afaafae2e53f8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_constructors_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:08.150445+00:00'
+created: '2024-11-20T21:26:55.476851+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_methods.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_methods.pysnap
index 6152a4bbf5264a..cf8b5b6af679b0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_methods.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_ignores_sun_java_generated_methods.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:11.733403+00:00'
+created: '2024-11-20T21:26:55.613856+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_block_functions.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_block_functions.pysnap
index 1a854abe1d0b29..be4fa6b9577c25 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_block_functions.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_block_functions.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:13.369732+00:00'
+created: '2024-11-20T21:26:55.678399+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_erb_templates.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_erb_templates.pysnap
index ec7b7349eb8b35..49295c7fd77c66 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_erb_templates.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_erb_templates.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:15.139332+00:00'
+created: '2024-11-20T21:26:55.747136+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_versioned_filenames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_versioned_filenames.pysnap
index 1b417f9d7e6e92..2d46bf9c93f023 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_versioned_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_versioned_filenames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:18.984490+00:00'
+created: '2024-11-20T21:26:55.851110+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_versioned_filenames_2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_versioned_filenames_2.pysnap
index 420c3b7e742e77..2bc581f4eec183 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_versioned_filenames_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_sanitizes_versioned_filenames_2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:17.061692+00:00'
+created: '2024-11-20T21:26:55.801858+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_skips_symbol_if_unknown.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_skips_symbol_if_unknown.pysnap
index 4ce9e6668d3b78..9266c05afaad35 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_skips_symbol_if_unknown.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_skips_symbol_if_unknown.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:21.241969+00:00'
+created: '2024-11-20T21:26:55.894387+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_context_line_over_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_context_line_over_function.pysnap
index 0812ac231dbb49..cbccff19e488c0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_context_line_over_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_context_line_over_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:22.933837+00:00'
+created: '2024-11-20T21:26:55.939475+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_function_over_lineno.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_function_over_lineno.pysnap
index 9b94dcb83d3708..9dd9524259123e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_function_over_lineno.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_function_over_lineno.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:24.681973+00:00'
+created: '2024-11-20T21:26:55.985224+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_module_over_filename.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_module_over_filename.pysnap
index 16470a8569abf0..671507718860b4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_module_over_filename.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_module_over_filename.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:26.451895+00:00'
+created: '2024-11-20T21:26:56.028208+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_symbol_instead_of_function.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_symbol_instead_of_function.pysnap
index 9e39bafed4a2c8..3884a2a3f8a5aa 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_symbol_instead_of_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_uses_symbol_instead_of_function.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:28.198939+00:00'
+created: '2024-11-20T21:26:56.071150+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_with_only_required_vars.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_with_only_required_vars.pysnap
index 3b1e3e5e401593..8750b3eceaa6bc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_with_only_required_vars.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/frame_with_only_required_vars.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:29.885720+00:00'
+created: '2024-11-20T21:26:56.110590+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/go_pkg_mod.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/go_pkg_mod.pysnap
index a3cbb6450a336b..79646d01e07f6c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/go_pkg_mod.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/go_pkg_mod.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:32.151617+00:00'
+created: '2024-11-20T21:26:56.157569+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_125_event_126.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_125_event_126.pysnap
index f3b9e63c4190db..8389669221dfe0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_125_event_126.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_125_event_126.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:33.933549+00:00'
+created: '2024-11-20T21:26:56.215588+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_200_event_200.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_200_event_200.pysnap
index 5d316500212021..438385cf992340 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_200_event_200.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_200_event_200.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:35.650566+00:00'
+created: '2024-11-20T21:26:56.262831+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_275_event_275.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_275_event_275.pysnap
index 99e35a875551a6..1217c0c0d04d1d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_275_event_275.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_275_event_275.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:37.466476+00:00'
+created: '2024-11-20T21:26:56.319381+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_289_event_312.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_289_event_312.pysnap
index 97297e62f949bc..1c817221c5ad29 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_289_event_312.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_289_event_312.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:39.352525+00:00'
+created: '2024-11-20T21:26:56.371910+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_294_event_294.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_294_event_294.pysnap
index 17771df2c81140..d31e2984ecec84 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_294_event_294.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_294_event_294.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:41.602552+00:00'
+created: '2024-11-20T21:26:56.424428+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_294_event_329.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_294_event_329.pysnap
index 27cf072d77ec79..de9a217c1aac4d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_294_event_329.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_294_event_329.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:43.483243+00:00'
+created: '2024-11-20T21:26:56.476472+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_307_event_307.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_307_event_307.pysnap
index b31bbeb34e782b..ee60f31e680a81 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_307_event_307.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_307_event_307.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:45.168871+00:00'
+created: '2024-11-20T21:26:56.524861+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_307_event_657.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_307_event_657.pysnap
index 777265fee39ec8..61c49eeb681972 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_307_event_657.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_307_event_657.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:47.035631+00:00'
+created: '2024-11-20T21:26:56.613261+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_313_event_313.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_313_event_313.pysnap
index 1ce6ca6d6c8632..1376e2ba92de44 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_313_event_313.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_313_event_313.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:48.837722+00:00'
+created: '2024-11-20T21:26:56.666886+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_313_event_333.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_313_event_333.pysnap
index c83c3770db1f74..3168f0a187d490 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_313_event_333.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_313_event_333.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:50.662699+00:00'
+created: '2024-11-20T21:26:56.720711+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_319_event_321.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_319_event_321.pysnap
index b6cd76fe5e65be..dbf3f82d05ed7a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_319_event_321.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_319_event_321.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:52.628733+00:00'
+created: '2024-11-20T21:26:56.775180+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_389_event_389.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_389_event_389.pysnap
index e0ad2efbfc59eb..95ff278bc7b131 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_389_event_389.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_389_event_389.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:54.393097+00:00'
+created: '2024-11-20T21:26:56.830201+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_432_event_432.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_432_event_432.pysnap
index 23ae61cde59445..23eea36f15ea36 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_432_event_432.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_432_event_432.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:56.128329+00:00'
+created: '2024-11-20T21:26:56.872599+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_432_event_453.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_432_event_453.pysnap
index 0f83b343deb264..ed7947deece1a3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_432_event_453.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_432_event_453.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:57.809653+00:00'
+created: '2024-11-20T21:26:56.923586+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_445_event_445.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_445_event_445.pysnap
index 31a30e70a6975a..5c925175d309b9 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_445_event_445.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/group_445_event_445.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T13:59:59.592583+00:00'
+created: '2024-11-20T21:26:56.978514+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hpkp.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hpkp.pysnap
index 05fedf7ddf8b66..8e23028f9e7935 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hpkp.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hpkp.pysnap
@@ -1,9 +1,23 @@
 ---
-created: '2024-10-28T14:00:01.657184+00:00'
+created: '2024-11-20T21:26:57.099292+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: violation
+hashing_metadata: {
+  "blocked_host": "example.com",
+  "security_report_type": "hpkp"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "violation",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.violation": {
+    "security_report_type": "hpkp"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_base.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_base.pysnap
index 09701a3ccb22d9..aaab44541fbf55 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_base.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:00:03.457005+00:00'
+created: '2024-11-20T21:26:57.146195+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_custom_client_hybrid_server.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_custom_client_hybrid_server.pysnap
index 16c69f5372988b..7a934d711a8689 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_custom_client_hybrid_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_custom_client_hybrid_server.pysnap
@@ -1,9 +1,31 @@
 ---
-created: '2024-10-28T14:00:05.406453+00:00'
+created: '2024-11-20T21:26:57.197218+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "client_fingerprint": "['celery', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['{{ default }}', 'soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": true,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"{{ default }}soft-timelimit-exceeded\"",
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_hybrid_client_custom_server.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_hybrid_client_custom_server.pysnap
index f4ac0ee3f39b1f..5bd1170095060d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_hybrid_client_custom_server.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_hybrid_client_custom_server.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-11-08T19:40:01.146667+00:00'
+created: '2024-11-20T21:26:57.252217+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fingerprint
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'SoftTimeLimitExceeded', 'sentry.tasks.store.process_event']",
+  "fingerprint": "['soft-timelimit-exceeded']",
+  "fingerprint_source": "server_custom_rule",
+  "is_hybrid_fingerprint": false,
+  "matched_fingerprinting_rule": "type:\"SoftTimeLimitExceeded\" -> \"soft-timelimit-exceeded\""
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fingerprint",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fingerprint": {
+    "fingerprint_source": "server_custom_rule"
+  }
+}
 ---
 contributing variants:
   custom_fingerprint*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_same_default_different_extra.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_same_default_different_extra.pysnap
index 4148ee2be13f19..1c3421d90d4eeb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_same_default_different_extra.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_same_default_different_extra.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:00:09.007906+00:00'
+created: '2024-11-20T21:26:57.297791+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', \"adopt don't shop\"]",
+  "fingerprint": "['{{ default }}', \"adopt don't shop\"]",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_same_extra_different_default.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_same_extra_different_default.pysnap
index a0b58dd807f69d..ca9dca37f16e15 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_same_extra_different_default.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/hybrid_fingerprint_same_extra_different_default.pysnap
@@ -1,9 +1,28 @@
 ---
-created: '2024-10-28T14:00:10.932310+00:00'
+created: '2024-11-20T21:26:57.351200+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "client_fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint": "['{{ default }}', 'dogs are great']",
+  "fingerprint_source": "client",
+  "is_hybrid_fingerprint": true,
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "True"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/in_app_in_ui.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/in_app_in_ui.pysnap
index 73abd48347c7ce..2cf2f862e4990b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/in_app_in_ui.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/in_app_in_ui.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:12.932188+00:00'
+created: '2024-11-20T21:26:57.404891+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/java_chained.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/java_chained.pysnap
index 0d0e078e3353d4..227d2840c22456 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/java_chained.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/java_chained.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:14.818907+00:00'
+created: '2024-11-20T21:26:57.458132+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 3,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/java_minimal.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/java_minimal.pysnap
index ee030d46eba7c6..cba22312c2fa13 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/java_minimal.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/java_minimal.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:16.797492+00:00'
+created: '2024-11-20T21:26:57.511600+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_fallback_to_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_fallback_to_message.pysnap
index 26fef21b09f03f..f36adef6f58a2e 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_fallback_to_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_fallback_to_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:00:21.320623+00:00'
+created: '2024-11-20T21:26:57.606455+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_fallback_to_message_whistles.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_fallback_to_message_whistles.pysnap
index 8934ab0b41dffd..3477476c8983dc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_fallback_to_message_whistles.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_fallback_to_message_whistles.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:00:19.243953+00:00'
+created: '2024-11-20T21:26:57.559201+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_no_in_app.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_no_in_app.pysnap
index 45c14e1df209b7..30f3460225acd6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_no_in_app.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_exception_no_in_app.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:23.052534+00:00'
+created: '2024-11-20T21:26:57.701301+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_message.pysnap
index d48bc4e9450603..5debdba8f71981 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:00:26.879031+00:00'
+created: '2024-11-20T21:26:57.803953+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_message_parameterization.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_message_parameterization.pysnap
index 919ea7dbca7a88..0caf7599af6cc2 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_message_parameterization.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_message_parameterization.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:00:24.806218+00:00'
+created: '2024-11-20T21:26:57.749228+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_polyfills.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_polyfills.pysnap
index bc3e84afe3a1c7..64400fe37c4f5b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_polyfills.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_polyfills.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:00:28.834749+00:00'
+created: '2024-11-20T21:26:57.855118+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_regression_tree_labels.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_regression_tree_labels.pysnap
deleted file mode 100644
index 2f2beedfd5b9e0..00000000000000
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_regression_tree_labels.pysnap
+++ /dev/null
@@ -1,41 +0,0 @@
----
-created: '2024-10-28T14:00:50.411400+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_grouphash_metadata.py
----
-hash_basis: stacktrace
----
-contributing variants:
-  system*
-    hash: "8fb2eda9663c3c026c23475d6da30363"
-    component:
-      system*
-        exception*
-          stacktrace*
-            frame*
-              module*
-                "app/utils/handleXhrErrorResponse"
-              context-line*
-                "Sentry.withScope(scope => {"
-            frame* (marked out of app by stack trace rule (path:**/node_modules/** -app))
-              module*
-                "@sentry/minimal/esm/index"
-              context-line*
-                "callOnHub('withScope', callback);"
-            frame* (marked out of app by stack trace rule (path:**/node_modules/** -app))
-              module*
-                "@sentry/minimal/esm/index"
-              context-line*
-                "return hub[method].apply(hub, __spread(args));"
-            frame* (marked out of app by stack trace rule (path:**/node_modules/** -app))
-              module*
-                "@sentry/hub/esm/hub"
-              context-line*
-                "callback(scope);"
-            frame*
-              module*
-                "app/utils/handleXhrErrorResponse"
-              context-line*
-                "Sentry.captureException(new Error(message));"
-          type*
-            "Error"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_unpkg.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_unpkg.pysnap
index c5646fee121053..0c5c8d2c79b6dd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_unpkg.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_unpkg.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:30.624944+00:00'
+created: '2024-11-20T21:26:57.897530+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_chrome.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_chrome.pysnap
index e24b14b66860ba..18ab07e987cbda 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_chrome.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:32.532325+00:00'
+created: '2024-11-20T21:26:57.943831+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_edge.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_edge.pysnap
index 2ca0b05a754cab..96ee6ec61d6ade 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_edge.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:34.204817+00:00'
+created: '2024-11-20T21:26:57.982326+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_firefox.pysnap
index 672ae2655a14be..ed9500dafe78d1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:35.941206+00:00'
+created: '2024-11-20T21:26:58.032833+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_chrome.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_chrome.pysnap
index 1053f55af22fd4..b688a5401c905a 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_chrome.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_chrome.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:37.674104+00:00'
+created: '2024-11-20T21:26:58.075149+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_edge.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_edge.pysnap
index 12f66a15c9164a..54ffce403f6bde 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_edge.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_edge.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:39.464107+00:00'
+created: '2024-11-20T21:26:58.117673+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_firefox.pysnap
index eb1f08e87b91e5..f61c0b1ee542e0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:41.168694+00:00'
+created: '2024-11-20T21:26:58.162381+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_safari.pysnap
index dfede3130ec9eb..87f085e573f166 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_http_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:42.872537+00:00'
+created: '2024-11-20T21:26:58.210210+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_safari.pysnap
index db180a41d57cc5..9d54df31a31cbd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:44.885420+00:00'
+created: '2024-11-20T21:26:58.257308+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_sentryui_firefox.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_sentryui_firefox.pysnap
index 88346a5d0e1d4d..081ec1248f7969 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_sentryui_firefox.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_sentryui_firefox.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:46.773947+00:00'
+created: '2024-11-20T21:26:58.367289+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_sentryui_safari.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_sentryui_safari.pysnap
index a08b522e39243a..2d85e2fc0748db 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_sentryui_safari.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/javascript_xbrowser_sentryui_safari.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:48.687767+00:00'
+created: '2024-11-20T21:26:58.418268+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/laravel.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/laravel.pysnap
index b871369f243140..0a85a66641e36d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/laravel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/laravel.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:53.883968+00:00'
+created: '2024-11-20T21:26:58.562438+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/laravel_anonymous.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/laravel_anonymous.pysnap
index 1ef4631e536e6b..778dbf721d2dcb 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/laravel_anonymous.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/laravel_anonymous.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:52.134147+00:00'
+created: '2024-11-20T21:26:58.505758+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/logentry_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/logentry_prefers_message.pysnap
index 2ab0927298ba7a..0c7c036b1d2c34 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/logentry_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/logentry_prefers_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:00:56.023263+00:00'
+created: '2024-11-20T21:26:58.602525+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/logentry_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/logentry_uses_formatted.pysnap
index 6143f7b77769ae..18f8619a72c3c0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/logentry_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/logentry_uses_formatted.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:00:58.064077+00:00'
+created: '2024-11-20T21:26:58.644313+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/macos_amd_driver.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/macos_amd_driver.pysnap
index 7fc722c9100eaf..838b2c7858d2cc 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/macos_amd_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/macos_amd_driver.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:00:59.849036+00:00'
+created: '2024-11-20T21:26:58.696739+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/macos_intel_driver.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/macos_intel_driver.pysnap
index f4ea10d9700b50..38367418108718 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/macos_intel_driver.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/macos_intel_driver.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:01.792161+00:00'
+created: '2024-11-20T21:26:58.750966+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/malloc_sentinel.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/malloc_sentinel.pysnap
index 9882d1d0c082eb..a8e9f16f4f5852 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/malloc_sentinel.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/malloc_sentinel.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:03.880792+00:00'
+created: '2024-11-20T21:26:58.847999+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_prefers_message.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_prefers_message.pysnap
index 7645d4bc050631..02ac6a5a7953e0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_prefers_message.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_prefers_message.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:01:05.649595+00:00'
+created: '2024-11-20T21:26:58.886251+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_uses_formatted.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_uses_formatted.pysnap
index 2c31f6a5e828bd..7a6c6d51e37a07 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_uses_formatted.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_uses_formatted.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:01:07.580283+00:00'
+created: '2024-11-20T21:26:58.922597+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_with_key_pair_values.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_with_key_pair_values.pysnap
index aa8e3a5a30727e..33c595f17ec827 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_with_key_pair_values.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/message_with_key_pair_values.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:01:09.216909+00:00'
+created: '2024-11-20T21:26:58.965486+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": true,
+  "message_source": "message"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "True",
+    "message_source": "message"
+  }
+}
 ---
 contributing variants:
   default*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/minified_javascript.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/minified_javascript.pysnap
index 72bc9efc6839ba..78159ba0566b7c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/minified_javascript.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/minified_javascript.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:11.574171+00:00'
+created: '2024-11-20T21:26:59.016589+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_complex_function_names.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_complex_function_names.pysnap
index 8fb8dabd76803b..0b0cf049fe4d3b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_complex_function_names.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_complex_function_names.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:13.335163+00:00'
+created: '2024-11-20T21:26:59.057468+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash1.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash1.pysnap
index 281784d610e270..97bf3082462000 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash1.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash1.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:14.938942+00:00'
+created: '2024-11-20T21:26:59.104955+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash2.pysnap
index cbb41442756cd6..f1190d871cfae7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:16.813098+00:00'
+created: '2024-11-20T21:26:59.149120+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash3.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash3.pysnap
index 4ef66d63203af9..d1988d18b0b7a6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash3.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_driver_crash3.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:18.466836+00:00'
+created: '2024-11-20T21:26:59.192799+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_limit_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_limit_frames.pysnap
index 18052be12de0f3..6ffd00a2b97c54 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_limit_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_limit_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:20.308335+00:00'
+created: '2024-11-20T21:26:59.234071+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_malloc_chain.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_malloc_chain.pysnap
index 8183e6cdade707..ee18be964b0ea8 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_malloc_chain.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_malloc_chain.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:22.264312+00:00'
+created: '2024-11-20T21:26:59.285778+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_no_filenames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_no_filenames.pysnap
index 5dd4d87338f837..85ecd5a8c1c144 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_no_filenames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_no_filenames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:24.177080+00:00'
+created: '2024-11-20T21:26:59.348565+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_unlimited_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_unlimited_frames.pysnap
index 33b56eec18936e..83313ae5479915 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_unlimited_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_unlimited_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:26.193633+00:00'
+created: '2024-11-20T21:26:59.399299+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_windows_anon_namespace.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_windows_anon_namespace.pysnap
index 50ed98a22c41c6..cfaabdf3c97fd4 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_windows_anon_namespace.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_windows_anon_namespace.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:27.983291+00:00'
+created: '2024-11-20T21:26:59.450537+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_with_function_name.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_with_function_name.pysnap
index 97d155e0cf3fef..41f966f5b4bc6d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_with_function_name.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/native_with_function_name.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:29.686840+00:00'
+created: '2024-11-20T21:26:59.503185+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/node_exception_weird.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/node_exception_weird.pysnap
index dcfb29086fb16d..582dfadc6421ff 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/node_exception_weird.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/node_exception_weird.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:31.623589+00:00'
+created: '2024-11-20T21:26:59.551998+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/node_low_level_async.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/node_low_level_async.pysnap
index 2eb07ae01643d5..96a0a532f10bff 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/node_low_level_async.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/node_low_level_async.pysnap
@@ -1,9 +1,24 @@
 ---
-created: '2024-10-28T14:01:33.533220+00:00'
+created: '2024-11-20T21:26:59.597452+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_exception_base.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_exception_base.pysnap
index 11bd1f909ef501..cb29f390b4ab83 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_exception_base.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_exception_base.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:35.397270+00:00'
+created: '2024-11-20T21:26:59.649976+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 2,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "True",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_grouping_enhancer_away_from_crash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_grouping_enhancer_away_from_crash.pysnap
index 8049fed0fcb52a..30871d77b62307 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_grouping_enhancer_away_from_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_grouping_enhancer_away_from_crash.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:37.650431+00:00'
+created: '2024-11-20T21:26:59.698423+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_grouping_enhancer_towards_crash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_grouping_enhancer_towards_crash.pysnap
index 14772ccd744834..6a15e0e440317d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_grouping_enhancer_towards_crash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_grouping_enhancer_towards_crash.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:39.527429+00:00'
+created: '2024-11-20T21:26:59.746430+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_http_error.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_http_error.pysnap
index 6af64abd4cbc55..d3d063620dfced 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_http_error.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/python_http_error.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:41.531678+00:00'
+created: '2024-11-20T21:26:59.784911+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/react_native.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/react_native.pysnap
index cb5c4090728d9a..38eb53d4a65a27 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/react_native.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/react_native.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:43.390054+00:00'
+created: '2024-11-20T21:26:59.841725+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_cocoa.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_cocoa.pysnap
index 93d468dadd4dda..4f233f08d4a26b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_cocoa.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_cocoa.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:45.165571+00:00'
+created: '2024-11-20T21:26:59.879991+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_collapse_recursion.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_collapse_recursion.pysnap
index 7cf913d5896150..d0d0248aee5205 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_collapse_recursion.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_collapse_recursion.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:46.918744+00:00'
+created: '2024-11-20T21:26:59.920207+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_compute_hashes.pysnap
index 2257959bc72f34..c03bc5f11dac7f 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_compute_hashes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:48.683387+00:00'
+created: '2024-11-20T21:26:59.962902+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_discards_seemingly_useless_stack.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_discards_seemingly_useless_stack.pysnap
index 232a54716cebdc..c8c6125a8348f5 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_discards_seemingly_useless_stack.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_discards_seemingly_useless_stack.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:01:50.411644+00:00'
+created: '2024-11-20T21:27:00.009477+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_does_not_discard_non_urls.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_does_not_discard_non_urls.pysnap
index 5b4a30e6881671..e987de68df316d 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_does_not_discard_non_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_does_not_discard_non_urls.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:52.123439+00:00'
+created: '2024-11-20T21:27:00.058732+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_does_not_group_different_js_errors.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_does_not_group_different_js_errors.pysnap
index 2236df1c6b11a3..c8edcc9be84ec7 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_does_not_group_different_js_errors.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_does_not_group_different_js_errors.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:01:53.797517+00:00'
+created: '2024-11-20T21:27:00.100463+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "no_contributing_frames"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "no_contributing_frames"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_enforce_min_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_enforce_min_frames.pysnap
index 6f8e2ffc0e3222..d6fde06a3f27cd 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_enforce_min_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_enforce_min_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:55.674202+00:00'
+created: '2024-11-20T21:27:00.149951+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_excludes_single_frame_urls.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_excludes_single_frame_urls.pysnap
index 6b3257842899d3..494f9bb72b7396 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_excludes_single_frame_urls.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_excludes_single_frame_urls.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:01:57.672908+00:00'
+created: '2024-11-20T21:27:00.187754+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_hash_without_system_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_hash_without_system_frames.pysnap
index 47c924df0eaffe..7a8fa4839b9231 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_hash_without_system_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_hash_without_system_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:04.731764+00:00'
+created: '2024-11-20T21:27:00.226303+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_ignores_singular_anonymous_frame.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_ignores_singular_anonymous_frame.pysnap
index 567d6ea1d51264..344c5a64287a2c 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_ignores_singular_anonymous_frame.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_ignores_singular_anonymous_frame.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:07.457946+00:00'
+created: '2024-11-20T21:27:00.271024+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_negated_match.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_negated_match.pysnap
index 23b32b7a83c475..66d58cbd0aced6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_negated_match.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_negated_match.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:09.179514+00:00'
+created: '2024-11-20T21:27:00.319570+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_rust.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_rust.pysnap
index a14691058e397e..5c7d08efe6025b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_rust.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_rust.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:11.147769+00:00'
+created: '2024-11-20T21:27:00.369741+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_rust2.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_rust2.pysnap
index 0a9f9dd0f47b0c..953c385ee2ca97 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_rust2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_rust2.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:13.116527+00:00'
+created: '2024-11-20T21:27:00.420945+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_with_minimal_app_frames.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_with_minimal_app_frames.pysnap
index 9da0905b5c1576..0036ce8dbe73b6 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_with_minimal_app_frames.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/stacktrace_with_minimal_app_frames.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:14.938124+00:00'
+created: '2024-11-20T21:27:00.515636+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "top-level",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "top-level",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/template_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/template_compute_hashes.pysnap
index 3a54b40431a4dd..37e9dadd200dc0 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/template_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/template_compute_hashes.pysnap
@@ -1,17 +1,28 @@
 ---
-created: '2024-10-28T14:02:16.685028+00:00'
+created: '2024-12-03T22:10:05.596686+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: template
+hashing_metadata: {
+  "template_context_line": "{% invalid template tag %}",
+  "template_name": "foo.html"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "template",
+    "is_hybrid_fingerprint": "False"
+  }
+}
 ---
 contributing variants:
   default*
-    hash: "826f66ef602835f68030c04c634df320"
+    hash: "1f5bdebe3c9f414c7dbb4296a8353245"
     component:
       default*
         template*
           filename*
             "foo.html"
           context-line*
-            "hello world"
+            "{% invalid template tag %}"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/threads_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/threads_compute_hashes.pysnap
index 5c7eb62556eacd..26b46a96f74ba3 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/threads_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/threads_compute_hashes.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:18.503155+00:00'
+created: '2024-11-20T21:27:00.622664+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "thread",
+  "stacktrace_type": "system"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "thread",
+    "stacktrace_type": "system"
+  }
+}
 ---
 contributing variants:
   system*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/threads_no_hash.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/threads_no_hash.pysnap
index 325bf87ee95c24..081b266c590b61 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/threads_no_hash.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/threads_no_hash.pysnap
@@ -1,9 +1,22 @@
 ---
-created: '2024-10-28T14:02:20.090941+00:00'
+created: '2024-11-20T21:27:00.670139+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: fallback
+hashing_metadata: {
+  "fallback_reason": "other"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "fallback",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.fallback": {
+    "fallback_reason": "other"
+  }
+}
 ---
 contributing variants:
   fallback*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unity.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unity.pysnap
index a87741300de506..a86a24614b3bb1 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unity.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unity.pysnap
@@ -1,9 +1,26 @@
 ---
-created: '2024-10-28T14:02:21.916841+00:00'
+created: '2024-11-20T21:27:00.719264+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
 ---
 contributing variants:
   app*
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unknown_variant.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unknown_variant.pysnap
index 5e9eac70f67009..80ece84c6a0d6b 100644
--- a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unknown_variant.pysnap
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unknown_variant.pysnap
@@ -1,9 +1,16 @@
 ---
-created: '2024-10-28T14:39:46.251120+00:00'
+created: '2024-11-20T21:26:09.148439+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_grouphash_metadata.py
 ---
 hash_basis: unknown
+hashing_metadata: {}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "unknown"
+  }
+}
 ---
 contributing variants:
   dogs*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_src_unsafe_eval.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_src_unsafe_eval.pysnap
new file mode 100644
index 00000000000000..b69989145a0443
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_src_unsafe_eval.pysnap
@@ -0,0 +1,18 @@
+---
+created: '2024-12-02T21:59:54.483735+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+default:
+  hash: "56c6520f35bce2f89ed2c4e725ccef65"
+  component:
+    default*
+      csp*
+        salt* (a static salt)
+          "script-src"
+        violation*
+          "'unsafe-eval'"
+        uri (violation takes precedence)
+          "'self'"
+      message (csp takes precedence)
+        "Blocked unsafe eval() 'script'"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_src_unsafe_inline.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_src_unsafe_inline.pysnap
new file mode 100644
index 00000000000000..fa901b732d6c33
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/csp_script_src_unsafe_inline.pysnap
@@ -0,0 +1,18 @@
+---
+created: '2024-12-02T21:59:54.519184+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+default:
+  hash: "d346ee37d19a2be6587e609075ca2d57"
+  component:
+    default*
+      csp*
+        salt* (a static salt)
+          "script-src"
+        violation*
+          "'unsafe-inline'"
+        uri (violation takes precedence)
+          "'self'"
+      message (csp takes precedence)
+        "Blocked unsafe inline 'script'"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_comput_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_comput_hashes.pysnap
deleted file mode 100644
index 6b78a8c57aea1d..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_comput_hashes.pysnap
+++ /dev/null
@@ -1,24 +0,0 @@
----
-created: '2020-02-26T19:54:26.534010Z'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-app:
-  hash: null
-  component:
-    app (exception of system takes precedence)
-      exception (ignored because hash matches system variant)
-        type*
-          "ValueError"
-        value*
-          "hello world"
---------------------------------------------------------------------------
-system:
-  hash: "b23ee1963904c2ca87b145febf94b66c"
-  component:
-    system*
-      exception*
-        type*
-          "ValueError"
-        value*
-          "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes.pysnap
index aedcb69c941e96..e2eb4bb15af76b 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_compute_hashes.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2021-02-15T10:11:48.660275Z'
+created: '2024-12-03T22:09:00.075675+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
@@ -8,29 +8,17 @@ app:
   component:
     app (exception of system takes precedence)
       exception (ignored because hash matches system variant)
-        stacktrace*
-          frame*
-            filename*
-              "foo/baz.py"
-            lineno*
-              1
         type*
           "ValueError"
-        value (stacktrace and type take precedence)
+        value*
           "hello world"
 --------------------------------------------------------------------------
 system:
-  hash: "baf0bfa8bb312627cd5ef4171aec9f4e"
+  hash: "b23ee1963904c2ca87b145febf94b66c"
   component:
     system*
       exception*
-        stacktrace*
-          frame*
-            filename*
-              "foo/baz.py"
-            lineno*
-              1
         type*
           "ValueError"
-        value (stacktrace and type take precedence)
+        value*
           "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_exceptions_with_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_exceptions_with_frames.pysnap
new file mode 100644
index 00000000000000..ff0ee18a483284
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/exception_groups_two_exceptions_with_frames.pysnap
@@ -0,0 +1,106 @@
+---
+created: '2024-11-19T00:26:20.128888+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+app:
+  hash: null
+  component:
+    app (exception of system takes precedence)
+      chained-exception (ignored because hash matches system variant)
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              context-line*
+                "do_some_other_stuff()"
+              function (function name is not used if context-line is available)
+                "do_other_stuff"
+            frame (ignored due to recursion)
+              module*
+                "dostuff"
+              context-line*
+                "do_some_other_different_stuff()"
+              function (function name is not used if context-line is available)
+                "do_other_stuff"
+          type*
+            "DoOtherStuffException"
+          value (stacktrace and type take precedence)
+            "Can't do the other stuff"
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              context-line*
+                "do_some_stuff()"
+              function (function name is not used if context-line is available)
+                "do_stuff"
+            frame*
+              module*
+                "dostuff"
+              context-line*
+                "do_some_different_stuff()"
+              function (function name is not used if context-line is available)
+                "do_different_stuff"
+          type*
+            "DoStuffException"
+          value (stacktrace and type take precedence)
+            "Can't do the stuff"
+        exception (exception has no stacktrace)
+          type*
+            "System.AggregateException"
+          value*
+            "One or more errors occurred."
+--------------------------------------------------------------------------
+system:
+  hash: "b8e05ed0c06d6bc6c6052bb9dae6d6eb"
+  component:
+    system*
+      chained-exception*
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              context-line*
+                "do_some_other_stuff()"
+              function (function name is not used if context-line is available)
+                "do_other_stuff"
+            frame (ignored due to recursion)
+              module*
+                "dostuff"
+              context-line*
+                "do_some_other_different_stuff()"
+              function (function name is not used if context-line is available)
+                "do_other_stuff"
+          type*
+            "DoOtherStuffException"
+          value (stacktrace and type take precedence)
+            "Can't do the other stuff"
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              context-line*
+                "do_some_stuff()"
+              function (function name is not used if context-line is available)
+                "do_stuff"
+            frame*
+              module*
+                "dostuff"
+              context-line*
+                "do_some_different_stuff()"
+              function (function name is not used if context-line is available)
+                "do_different_stuff"
+          type*
+            "DoStuffException"
+          value (stacktrace and type take precedence)
+            "Can't do the stuff"
+        exception (exception has no stacktrace)
+          type*
+            "System.AggregateException"
+          value*
+            "One or more errors occurred."
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
similarity index 94%
rename from tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
rename to tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
index 886f3df181dedc..08cb508c2dbf7f 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2020-02-26T19:54:26.672654Z'
+created: '2024-12-03T22:09:00.136553+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_java8_lambda_function.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_java8_lambda_function.pysnap
index 8e1c8055ce2e94..57be4c905585f5 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_java8_lambda_function.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_java8_lambda_function.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2020-02-26T19:54:26.823824Z'
+created: '2024-11-13T17:26:12.765496+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
@@ -11,9 +11,8 @@ app:
         frame* (frame considered in-app because no frame is in-app)
           module*
             "foo.bar.Baz"
-          function*
-            salt* (normalized lambda function name)
-              "<function>"
+          function* (normalized lambda function name)
+            "<function>"
 --------------------------------------------------------------------------
 system:
   hash: "aee9aaca552e7fd593d085ca5a2260cf"
@@ -23,6 +22,5 @@ system:
         frame*
           module*
             "foo.bar.Baz"
-          function*
-            salt* (normalized lambda function name)
-              "<function>"
+          function* (normalized lambda function name)
+            "<function>"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_java8_lambda_module.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_java8_lambda_module.pysnap
index afde35b029d064..43b4a04c2dc8ce 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_java8_lambda_module.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_java8_lambda_module.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2020-02-26T19:54:26.836720Z'
+created: '2024-11-13T17:23:54.995527+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
@@ -9,9 +9,8 @@ app:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
         frame* (frame considered in-app because no frame is in-app)
-          module* (ignored module)
-            salt* (normalized generated module name)
-              "<module>"
+          module* (normalized generated module name)
+            "<module>"
           function*
             "call"
 --------------------------------------------------------------------------
@@ -21,8 +20,7 @@ system:
     system*
       stacktrace*
         frame*
-          module* (ignored module)
-            salt* (normalized generated module name)
-              "<module>"
+          module* (normalized generated module name)
+            "<module>"
           function*
             "call"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_module_if_page_url_2.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_module_if_page_url_2.pysnap
index 4a5e2bca1a8284..db64f85ddf5b16 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_module_if_page_url_2.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/frame_ignores_module_if_page_url_2.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2020-02-26T19:54:26.918697Z'
+created: '2024-11-13T17:23:55.422554+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
@@ -9,9 +9,8 @@ app:
     app (stacktrace of system takes precedence)
       stacktrace (ignored because hash matches system variant)
         frame* (frame considered in-app because no frame is in-app)
-          module* (ignored module)
-            salt* (normalized generated module name)
-              "<module>"
+          module* (normalized generated module name)
+            "<module>"
           filename (module takes precedence)
             "foo.py"
           function*
@@ -23,9 +22,8 @@ system:
     system*
       stacktrace*
         frame*
-          module* (ignored module)
-            salt* (normalized generated module name)
-              "<module>"
+          module* (normalized generated module name)
+            "<module>"
           filename (module takes precedence)
             "foo.py"
           function*
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_regression_tree_labels.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_regression_tree_labels.pysnap
deleted file mode 100644
index 1fe52b32c96beb..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/javascript_regression_tree_labels.pysnap
+++ /dev/null
@@ -1,132 +0,0 @@
----
-created: '2021-08-27T14:37:11.614632Z'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-app:
-  hash: null
-  component:
-    app (exception of system takes precedence)
-      exception (ignored because hash matches system variant)
-        stacktrace*
-          frame* (frame considered in-app because no frame is in-app)
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "./app/utils/handleXhrErrorResponse.tsx"
-            context-line*
-              "      Sentry.withScope(scope => {"
-            lineno (line number is not used if context-line is available)
-              18
-          frame* (frame considered in-app because no frame is in-app)
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "../node_modules/@sentry/minimal/esm/index.js"
-            context-line*
-              "    callOnHub('withScope', callback);"
-            function (function name is not used if context-line is available)
-              "Sentry"
-            lineno (line number is not used if context-line is available)
-              154
-          frame* (frame considered in-app because no frame is in-app)
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "../node_modules/@sentry/minimal/esm/index.js"
-            context-line*
-              "        return hub[method].apply(hub, __spread(args));"
-            function (function name is not used if context-line is available)
-              "callOnHub"
-            lineno (line number is not used if context-line is available)
-              17
-          frame* (frame considered in-app because no frame is in-app)
-            module*
-              "@sentry/hub/esm/hub"
-            filename (module takes precedence)
-              "../node_modules/@sentry/hub/esm/hub.js"
-            context-line*
-              "            callback(scope);"
-            function (function name is not used if context-line is available)
-              "apply"
-            lineno (line number is not used if context-line is available)
-              86
-          frame* (frame considered in-app because no frame is in-app)
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "./app/utils/handleXhrErrorResponse.tsx"
-            context-line*
-              "        Sentry.captureException(new Error(message));"
-            function (function name is not used if context-line is available)
-              "callback"
-            lineno (line number is not used if context-line is available)
-              21
-        type*
-          "Error"
-        value (stacktrace and type take precedence)
-          "Unable to save a recent search"
---------------------------------------------------------------------------
-system:
-  hash: "0edbd7ed5321de5d698621b306f6b8e2"
-  component:
-    system*
-      exception*
-        stacktrace*
-          frame*
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "./app/utils/handleXhrErrorResponse.tsx"
-            context-line*
-              "      Sentry.withScope(scope => {"
-            lineno (line number is not used if context-line is available)
-              18
-          frame*
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "../node_modules/@sentry/minimal/esm/index.js"
-            context-line*
-              "    callOnHub('withScope', callback);"
-            function (function name is not used if context-line is available)
-              "Sentry"
-            lineno (line number is not used if context-line is available)
-              154
-          frame*
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "../node_modules/@sentry/minimal/esm/index.js"
-            context-line*
-              "        return hub[method].apply(hub, __spread(args));"
-            function (function name is not used if context-line is available)
-              "callOnHub"
-            lineno (line number is not used if context-line is available)
-              17
-          frame*
-            module*
-              "@sentry/hub/esm/hub"
-            filename (module takes precedence)
-              "../node_modules/@sentry/hub/esm/hub.js"
-            context-line*
-              "            callback(scope);"
-            function (function name is not used if context-line is available)
-              "apply"
-            lineno (line number is not used if context-line is available)
-              86
-          frame*
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "./app/utils/handleXhrErrorResponse.tsx"
-            context-line*
-              "        Sentry.captureException(new Error(message));"
-            function (function name is not used if context-line is available)
-              "callback"
-            lineno (line number is not used if context-line is available)
-              21
-        type*
-          "Error"
-        value (stacktrace and type take precedence)
-          "Unable to save a recent search"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/template_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/template_compute_hashes.pysnap
index 0c45b95fc1651a..17f86b18cf6c9a 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/template_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/template_compute_hashes.pysnap
@@ -1,14 +1,14 @@
 ---
-created: '2020-02-26T19:54:29.219402Z'
+created: '2024-12-03T22:09:00.262494+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
-  hash: "826f66ef602835f68030c04c634df320"
+  hash: "1f5bdebe3c9f414c7dbb4296a8353245"
   component:
     default*
       template*
         filename*
           "foo.html"
         context-line*
-          "hello world"
+          "{% invalid template tag %}"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_src_unsafe_eval.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_src_unsafe_eval.pysnap
new file mode 100644
index 00000000000000..01e01ecf7279cd
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_src_unsafe_eval.pysnap
@@ -0,0 +1,18 @@
+---
+created: '2024-12-02T21:59:39.975587+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+default:
+  hash: "56c6520f35bce2f89ed2c4e725ccef65"
+  component:
+    default*
+      csp*
+        salt* (a static salt)
+          "script-src"
+        violation*
+          "'unsafe-eval'"
+        uri (violation takes precedence)
+          "'self'"
+      message (csp takes precedence)
+        "Blocked unsafe eval() 'script'"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_src_unsafe_inline.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_src_unsafe_inline.pysnap
new file mode 100644
index 00000000000000..d99cbc26406bc7
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/csp_script_src_unsafe_inline.pysnap
@@ -0,0 +1,18 @@
+---
+created: '2024-12-02T21:59:40.046341+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+default:
+  hash: "d346ee37d19a2be6587e609075ca2d57"
+  component:
+    default*
+      csp*
+        salt* (a static salt)
+          "script-src"
+        violation*
+          "'unsafe-inline'"
+        uri (violation takes precedence)
+          "'self'"
+      message (csp takes precedence)
+        "Blocked unsafe inline 'script'"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_comput_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_comput_hashes.pysnap
deleted file mode 100644
index 9be9483f7086d6..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_comput_hashes.pysnap
+++ /dev/null
@@ -1,14 +0,0 @@
----
-created: '2021-02-12T22:47:08.913342Z'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-app:
-  hash: "b23ee1963904c2ca87b145febf94b66c"
-  component:
-    app*
-      exception*
-        type*
-          "ValueError"
-        value*
-          "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes.pysnap
index cef9fd2b484bd3..b23b11d5fa1e31 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_compute_hashes.pysnap
@@ -1,32 +1,14 @@
 ---
-created: '2021-02-15T10:11:52.210443Z'
+created: '2024-12-03T22:09:00.459963+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "b23ee1963904c2ca87b145febf94b66c"
   component:
-    app (exception of system takes precedence)
-      exception (ignored because hash matches system variant)
-        stacktrace*
-          frame*
-            filename*
-              "baz.py"
-        type*
-          "ValueError"
-        value (ignored because stacktrace takes precedence)
-          "hello world"
---------------------------------------------------------------------------
-system:
-  hash: "9509e122c6175606d52862fa4f64853c"
-  component:
-    system*
+    app*
       exception*
-        stacktrace*
-          frame*
-            filename*
-              "baz.py"
         type*
           "ValueError"
-        value (ignored because stacktrace takes precedence)
+        value*
           "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_exceptions_with_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_exceptions_with_frames.pysnap
new file mode 100644
index 00000000000000..80e614d1b72475
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/exception_groups_two_exceptions_with_frames.pysnap
@@ -0,0 +1,85 @@
+---
+created: '2024-11-19T00:26:29.960931+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+app:
+  hash: "d505dfb9059ac63c11955233323a9100"
+  component:
+    app*
+      chained-exception*
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_stuff"
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_different_stuff"
+          type*
+            "DoStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the stuff"
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+            frame (ignored due to recursion)
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+          type*
+            "DoOtherStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the other stuff"
+        exception*
+          type*
+            "System.AggregateException"
+          value*
+            "One or more errors occurred."
+--------------------------------------------------------------------------
+system:
+  hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+  component:
+    system*
+      chained-exception*
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_stuff"
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_different_stuff"
+          type*
+            "DoStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the stuff"
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+            frame (ignored due to recursion)
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+          type*
+            "DoOtherStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the other stuff"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
similarity index 94%
rename from tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
rename to tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
index 83f38a473bf936..c682db502fd948 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2024-10-24T14:18:20.552361+00:00'
+created: '2024-12-03T22:09:00.505586+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_regression_tree_labels.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_regression_tree_labels.pysnap
deleted file mode 100644
index 8d494494ecb214..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/javascript_regression_tree_labels.pysnap
+++ /dev/null
@@ -1,112 +0,0 @@
----
-created: '2024-10-24T14:22:51.755647+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-app:
-  hash: null
-  component:
-    app (exception of system takes precedence)
-      exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
-        stacktrace (ignored because it contains no in-app frames)
-          frame (non app frame)
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            context-line*
-              "Sentry.withScope(scope => {"
-          frame (non app frame)
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "Sentry"
-            context-line*
-              "callOnHub('withScope', callback);"
-          frame (non app frame)
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "callOnHub"
-            context-line*
-              "return hub[method].apply(hub, __spread(args));"
-          frame (non app frame)
-            module*
-              "@sentry/hub/esm/hub"
-            filename (module takes precedence)
-              "hub.js"
-            function (ignored because sourcemap used and context line available)
-              "apply"
-            context-line*
-              "callback(scope);"
-          frame (non app frame)
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            function (ignored because sourcemap used and context line available)
-              "callback"
-            context-line*
-              "Sentry.captureException(new Error(message));"
-        type*
-          "Error"
-        value*
-          "Unable to save a recent search"
---------------------------------------------------------------------------
-system:
-  hash: "8fb2eda9663c3c026c23475d6da30363"
-  component:
-    system*
-      exception*
-        stacktrace*
-          frame*
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            context-line*
-              "Sentry.withScope(scope => {"
-          frame*
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "Sentry"
-            context-line*
-              "callOnHub('withScope', callback);"
-          frame*
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "callOnHub"
-            context-line*
-              "return hub[method].apply(hub, __spread(args));"
-          frame*
-            module*
-              "@sentry/hub/esm/hub"
-            filename (module takes precedence)
-              "hub.js"
-            function (ignored because sourcemap used and context line available)
-              "apply"
-            context-line*
-              "callback(scope);"
-          frame*
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            function (ignored because sourcemap used and context line available)
-              "callback"
-            context-line*
-              "Sentry.captureException(new Error(message));"
-        type*
-          "Error"
-        value (ignored because stacktrace takes precedence)
-          "Unable to save a recent search"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/template_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/template_compute_hashes.pysnap
index 70555ef8acb273..83f3dc178c2314 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/template_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/template_compute_hashes.pysnap
@@ -1,14 +1,14 @@
 ---
-created: '2020-02-26T19:54:40.282910Z'
+created: '2024-12-03T22:09:00.595077+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
-  hash: "826f66ef602835f68030c04c634df320"
+  hash: "1f5bdebe3c9f414c7dbb4296a8353245"
   component:
     default*
       template*
         filename*
           "foo.html"
         context-line*
-          "hello world"
+          "{% invalid template tag %}"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_src_unsafe_eval.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_src_unsafe_eval.pysnap
new file mode 100644
index 00000000000000..1dc435ec55de9b
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_src_unsafe_eval.pysnap
@@ -0,0 +1,18 @@
+---
+created: '2024-12-02T21:59:26.090063+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+default:
+  hash: "56c6520f35bce2f89ed2c4e725ccef65"
+  component:
+    default*
+      csp*
+        salt* (a static salt)
+          "script-src"
+        violation*
+          "'unsafe-eval'"
+        uri (violation takes precedence)
+          "'self'"
+      message (csp takes precedence)
+        "Blocked unsafe eval() 'script'"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_src_unsafe_inline.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_src_unsafe_inline.pysnap
new file mode 100644
index 00000000000000..14dcbae469e2bd
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/csp_script_src_unsafe_inline.pysnap
@@ -0,0 +1,18 @@
+---
+created: '2024-12-02T21:59:26.141295+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+default:
+  hash: "d346ee37d19a2be6587e609075ca2d57"
+  component:
+    default*
+      csp*
+        salt* (a static salt)
+          "script-src"
+        violation*
+          "'unsafe-inline'"
+        uri (violation takes precedence)
+          "'self'"
+      message (csp takes precedence)
+        "Blocked unsafe inline 'script'"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_comput_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_comput_hashes.pysnap
deleted file mode 100644
index 92aff4d1214207..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_comput_hashes.pysnap
+++ /dev/null
@@ -1,14 +0,0 @@
----
-created: '2021-02-12T22:47:11.454125Z'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-app:
-  hash: "b23ee1963904c2ca87b145febf94b66c"
-  component:
-    app*
-      exception*
-        type*
-          "ValueError"
-        value*
-          "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes.pysnap
index 5d3c357da65344..771d2a0ef43ece 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_compute_hashes.pysnap
@@ -1,32 +1,14 @@
 ---
-created: '2021-02-15T10:11:55.845936Z'
+created: '2024-12-03T22:09:00.787678+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "b23ee1963904c2ca87b145febf94b66c"
   component:
-    app (exception of system takes precedence)
-      exception (ignored because hash matches system variant)
-        stacktrace*
-          frame*
-            filename*
-              "baz.py"
-        type*
-          "ValueError"
-        value (ignored because stacktrace takes precedence)
-          "hello world"
---------------------------------------------------------------------------
-system:
-  hash: "9509e122c6175606d52862fa4f64853c"
-  component:
-    system*
+    app*
       exception*
-        stacktrace*
-          frame*
-            filename*
-              "baz.py"
         type*
           "ValueError"
-        value (ignored because stacktrace takes precedence)
+        value*
           "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_exceptions_with_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_exceptions_with_frames.pysnap
new file mode 100644
index 00000000000000..76d3985ce6b9c7
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/exception_groups_two_exceptions_with_frames.pysnap
@@ -0,0 +1,85 @@
+---
+created: '2024-11-19T00:26:42.338897+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+app:
+  hash: "d505dfb9059ac63c11955233323a9100"
+  component:
+    app*
+      chained-exception*
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_stuff"
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_different_stuff"
+          type*
+            "DoStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the stuff"
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+            frame (ignored due to recursion)
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+          type*
+            "DoOtherStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the other stuff"
+        exception*
+          type*
+            "System.AggregateException"
+          value*
+            "One or more errors occurred."
+--------------------------------------------------------------------------
+system:
+  hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+  component:
+    system*
+      chained-exception*
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_stuff"
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_different_stuff"
+          type*
+            "DoStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the stuff"
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+            frame (ignored due to recursion)
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+          type*
+            "DoOtherStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the other stuff"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
similarity index 94%
rename from tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
rename to tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
index e9cd0782f5a95d..4918a8733767cc 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2024-10-24T14:22:47.122601+00:00'
+created: '2024-12-03T22:09:00.855839+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_regression_tree_labels.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_regression_tree_labels.pysnap
deleted file mode 100644
index d68871471b82d6..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/javascript_regression_tree_labels.pysnap
+++ /dev/null
@@ -1,112 +0,0 @@
----
-created: '2024-10-24T14:22:41.618630+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-app:
-  hash: null
-  component:
-    app (exception of system takes precedence)
-      exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
-        stacktrace (ignored because it contains no in-app frames)
-          frame (non app frame)
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            context-line*
-              "Sentry.withScope(scope => {"
-          frame (non app frame)
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "Sentry"
-            context-line*
-              "callOnHub('withScope', callback);"
-          frame (non app frame)
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "callOnHub"
-            context-line*
-              "return hub[method].apply(hub, __spread(args));"
-          frame (non app frame)
-            module*
-              "@sentry/hub/esm/hub"
-            filename (module takes precedence)
-              "hub.js"
-            function (ignored because sourcemap used and context line available)
-              "apply"
-            context-line*
-              "callback(scope);"
-          frame (non app frame)
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            function (ignored because sourcemap used and context line available)
-              "callback"
-            context-line*
-              "Sentry.captureException(new Error(message));"
-        type*
-          "Error"
-        value*
-          "Unable to save a recent search"
---------------------------------------------------------------------------
-system:
-  hash: "8fb2eda9663c3c026c23475d6da30363"
-  component:
-    system*
-      exception*
-        stacktrace*
-          frame*
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            context-line*
-              "Sentry.withScope(scope => {"
-          frame*
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "Sentry"
-            context-line*
-              "callOnHub('withScope', callback);"
-          frame*
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "callOnHub"
-            context-line*
-              "return hub[method].apply(hub, __spread(args));"
-          frame*
-            module*
-              "@sentry/hub/esm/hub"
-            filename (module takes precedence)
-              "hub.js"
-            function (ignored because sourcemap used and context line available)
-              "apply"
-            context-line*
-              "callback(scope);"
-          frame*
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            function (ignored because sourcemap used and context line available)
-              "callback"
-            context-line*
-              "Sentry.captureException(new Error(message));"
-        type*
-          "Error"
-        value (ignored because stacktrace takes precedence)
-          "Unable to save a recent search"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/template_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/template_compute_hashes.pysnap
index bdbdc9258d3fa1..2826ccbe8e025d 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/template_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/template_compute_hashes.pysnap
@@ -1,14 +1,14 @@
 ---
-created: '2020-02-26T19:54:43.597288Z'
+created: '2024-12-03T22:09:00.998242+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
-  hash: "826f66ef602835f68030c04c634df320"
+  hash: "1f5bdebe3c9f414c7dbb4296a8353245"
   component:
     default*
       template*
         filename*
           "foo.html"
         context-line*
-          "hello world"
+          "{% invalid template tag %}"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_src_unsafe_eval.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_src_unsafe_eval.pysnap
new file mode 100644
index 00000000000000..17a804916a98c3
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_src_unsafe_eval.pysnap
@@ -0,0 +1,18 @@
+---
+created: '2024-12-02T21:59:16.027178+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+default:
+  hash: "56c6520f35bce2f89ed2c4e725ccef65"
+  component:
+    default*
+      csp*
+        salt* (a static salt)
+          "script-src"
+        violation*
+          "'unsafe-eval'"
+        uri (violation takes precedence)
+          "'self'"
+      message (csp takes precedence)
+        "Blocked unsafe eval() 'script'"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_src_unsafe_inline.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_src_unsafe_inline.pysnap
new file mode 100644
index 00000000000000..28ff3ee3e43b84
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/csp_script_src_unsafe_inline.pysnap
@@ -0,0 +1,18 @@
+---
+created: '2024-12-02T21:59:16.088248+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+default:
+  hash: "d346ee37d19a2be6587e609075ca2d57"
+  component:
+    default*
+      csp*
+        salt* (a static salt)
+          "script-src"
+        violation*
+          "'unsafe-inline'"
+        uri (violation takes precedence)
+          "'self'"
+      message (csp takes precedence)
+        "Blocked unsafe inline 'script'"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_comput_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_comput_hashes.pysnap
deleted file mode 100644
index 812e40e210cf9e..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_comput_hashes.pysnap
+++ /dev/null
@@ -1,14 +0,0 @@
----
-created: '2023-01-11T11:41:26.702879Z'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-app:
-  hash: "b23ee1963904c2ca87b145febf94b66c"
-  component:
-    app*
-      exception*
-        type*
-          "ValueError"
-        value*
-          "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes.pysnap
index 3779226f6e83bf..53dc267a7b9cd6 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_compute_hashes.pysnap
@@ -1,32 +1,14 @@
 ---
-created: '2023-01-11T11:41:29.000759Z'
+created: '2024-12-03T22:09:01.225889+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 app:
-  hash: null
+  hash: "b23ee1963904c2ca87b145febf94b66c"
   component:
-    app (exception of system takes precedence)
-      exception (ignored because hash matches system variant)
-        stacktrace*
-          frame*
-            filename*
-              "baz.py"
-        type*
-          "ValueError"
-        value (ignored because stacktrace takes precedence)
-          "hello world"
---------------------------------------------------------------------------
-system:
-  hash: "9509e122c6175606d52862fa4f64853c"
-  component:
-    system*
+    app*
       exception*
-        stacktrace*
-          frame*
-            filename*
-              "baz.py"
         type*
           "ValueError"
-        value (ignored because stacktrace takes precedence)
+        value*
           "hello world"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_exceptions_with_frames.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_exceptions_with_frames.pysnap
new file mode 100644
index 00000000000000..bd7132b61655e6
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/exception_groups_two_exceptions_with_frames.pysnap
@@ -0,0 +1,85 @@
+---
+created: '2024-11-19T00:26:51.630033+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+app:
+  hash: "d505dfb9059ac63c11955233323a9100"
+  component:
+    app*
+      chained-exception*
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_stuff"
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_different_stuff"
+          type*
+            "DoStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the stuff"
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+            frame (ignored due to recursion)
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+          type*
+            "DoOtherStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the other stuff"
+        exception*
+          type*
+            "System.AggregateException"
+          value*
+            "One or more errors occurred."
+--------------------------------------------------------------------------
+system:
+  hash: "4f9cc6a81f4eb34f9e917374f281b9dc"
+  component:
+    system*
+      chained-exception*
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_stuff"
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_different_stuff"
+          type*
+            "DoStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the stuff"
+        exception*
+          stacktrace*
+            frame*
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+            frame (ignored due to recursion)
+              module*
+                "dostuff"
+              function*
+                "do_other_stuff"
+          type*
+            "DoOtherStuffException"
+          value (ignored because stacktrace takes precedence)
+            "Can't do the other stuff"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
similarity index 94%
rename from tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
rename to tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
index 72ca675f9ea924..55e3cb95e0e8a7 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_10_29/frame_comput_hashes_ignores_ENHANCED_clojure_classes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/frame_compute_hashes_ignores_ENHANCED_clojure_classes.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2024-10-24T14:22:36.154597+00:00'
+created: '2024-12-03T22:09:01.301429+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_regression_tree_labels.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_regression_tree_labels.pysnap
deleted file mode 100644
index 033d2308eef576..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/javascript_regression_tree_labels.pysnap
+++ /dev/null
@@ -1,112 +0,0 @@
----
-created: '2024-10-24T14:20:57.203202+00:00'
-creator: sentry
-source: tests/sentry/grouping/test_variants.py
----
-app:
-  hash: null
-  component:
-    app (exception of system takes precedence)
-      exception (ignored because this variant does not have a contributing stacktrace, but the system variant does)
-        stacktrace (ignored because it contains no in-app frames)
-          frame (non app frame)
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            context-line*
-              "Sentry.withScope(scope => {"
-          frame (marked out of app by stack trace rule (path:**/node_modules/** -app))
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "Sentry"
-            context-line*
-              "callOnHub('withScope', callback);"
-          frame (marked out of app by stack trace rule (path:**/node_modules/** -app))
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "callOnHub"
-            context-line*
-              "return hub[method].apply(hub, __spread(args));"
-          frame (marked out of app by stack trace rule (path:**/node_modules/** -app))
-            module*
-              "@sentry/hub/esm/hub"
-            filename (module takes precedence)
-              "hub.js"
-            function (ignored because sourcemap used and context line available)
-              "apply"
-            context-line*
-              "callback(scope);"
-          frame (non app frame)
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            function (ignored because sourcemap used and context line available)
-              "callback"
-            context-line*
-              "Sentry.captureException(new Error(message));"
-        type*
-          "Error"
-        value*
-          "Unable to save a recent search"
---------------------------------------------------------------------------
-system:
-  hash: "8fb2eda9663c3c026c23475d6da30363"
-  component:
-    system*
-      exception*
-        stacktrace*
-          frame*
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            context-line*
-              "Sentry.withScope(scope => {"
-          frame* (marked out of app by stack trace rule (path:**/node_modules/** -app))
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "Sentry"
-            context-line*
-              "callOnHub('withScope', callback);"
-          frame* (marked out of app by stack trace rule (path:**/node_modules/** -app))
-            module*
-              "@sentry/minimal/esm/index"
-            filename (module takes precedence)
-              "index.js"
-            function (ignored because sourcemap used and context line available)
-              "callOnHub"
-            context-line*
-              "return hub[method].apply(hub, __spread(args));"
-          frame* (marked out of app by stack trace rule (path:**/node_modules/** -app))
-            module*
-              "@sentry/hub/esm/hub"
-            filename (module takes precedence)
-              "hub.js"
-            function (ignored because sourcemap used and context line available)
-              "apply"
-            context-line*
-              "callback(scope);"
-          frame*
-            module*
-              "app/utils/handleXhrErrorResponse"
-            filename (module takes precedence)
-              "handlexhrerrorresponse.tsx"
-            function (ignored because sourcemap used and context line available)
-              "callback"
-            context-line*
-              "Sentry.captureException(new Error(message));"
-        type*
-          "Error"
-        value (ignored because stacktrace takes precedence)
-          "Unable to save a recent search"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/template_compute_hashes.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/template_compute_hashes.pysnap
index 36b81b25f68f6d..bbc9ca8179c1d9 100644
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/template_compute_hashes.pysnap
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/template_compute_hashes.pysnap
@@ -1,14 +1,14 @@
 ---
-created: '2023-01-11T11:41:28.459671Z'
+created: '2024-10-16T17:53:20.195689+00:00'
 creator: sentry
 source: tests/sentry/grouping/test_variants.py
 ---
 default:
-  hash: "826f66ef602835f68030c04c634df320"
+  hash: "1f5bdebe3c9f414c7dbb4296a8353245"
   component:
     default*
       template*
         filename*
           "foo.html"
         context-line*
-          "hello world"
+          "{% invalid template tag %}"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/similarity@2020_07_23/message_with_key_pair_values.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/similarity@2020_07_23/message_with_key_pair_values.pysnap
deleted file mode 100644
index ddf6fa0b6c722e..00000000000000
--- a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/similarity@2020_07_23/message_with_key_pair_values.pysnap
+++ /dev/null
@@ -1,9 +0,0 @@
----
-source: tests/sentry/grouping/test_variants.py
----
-default:
-  hash: "e02854e73673e108fe54768e0f19317b"
-  component:
-    default*
-      message* (stripped event-specific values)
-        "Error key1=<quoted_str> key2=<int> key3=False key4=<date> other_date=datetime.datetime(<int>, <int>, <int>, <int>, <int>, tzinfo=d..."
diff --git a/tests/sentry/grouping/test_components.py b/tests/sentry/grouping/test_components.py
new file mode 100644
index 00000000000000..3b8e9ae50b7245
--- /dev/null
+++ b/tests/sentry/grouping/test_components.py
@@ -0,0 +1,238 @@
+from collections import Counter
+from typing import Any
+
+from sentry.eventstore.models import Event
+from sentry.grouping.component import (
+    BaseGroupingComponent,
+    ChainedExceptionGroupingComponent,
+    ExceptionGroupingComponent,
+    FunctionGroupingComponent,
+    StacktraceGroupingComponent,
+)
+from sentry.testutils.cases import TestCase
+from sentry.utils.types import NonNone
+
+
+def find_given_child_component[
+    T
+](parent_component: BaseGroupingComponent[Any], child_component_type: type[T]) -> T | None:
+    """
+    Finds the first instance of the given type of child component in the parent component's `values`
+    list. Works best in cases where only one instance of the given type is expected.
+    """
+    for child_component in parent_component.values:
+        if isinstance(child_component, child_component_type):
+            return child_component
+
+    return None
+
+
+class ComponentTest(TestCase):
+    def setUp(self):
+        self.contributing_system_frame = {
+            "function": "handleRequest",
+            "filename": "/node_modules/express/router.js",
+            "context_line": "return handler(request);",
+        }
+        self.non_contributing_system_frame = {
+            "function": "runApp",
+            "filename": "/node_modules/express/app.js",
+            "context_line": "return server.serve(port);",
+        }
+        self.contributing_in_app_frame = {
+            "function": "playFetch",
+            "filename": "/dogApp/dogpark.js",
+            "context_line": "raise FailedToFetchError('Charlie didn't bring the ball back');",
+        }
+        self.non_contributing_in_app_frame = {
+            "function": "recordMetrics",
+            "filename": "/dogApp/metrics.js",
+            "context_line": "return withMetrics(handler, metricName, tags);",
+        }
+        self.exception_value = {
+            "type": "FailedToFetchError",
+            "value": "Charlie didn't bring the ball back",
+        }
+        self.event = Event(
+            event_id="12312012041520130908201311212012",
+            project_id=self.project.id,
+            data={
+                "title": "FailedToFetchError('Charlie didn't bring the ball back')",
+                "exception": {"values": [self.exception_value]},
+            },
+        )
+        self.project.update_option(
+            "sentry:grouping_enhancements",
+            "\n".join(
+                [
+                    "stack.function:runApp -app -group",
+                    "stack.function:handleRequest -app +group",
+                    "stack.function:recordMetrics +app -group",
+                    "stack.function:playFetch +app +group",
+                ]
+            ),
+        )
+
+    def test_frame_components_record_in_app(self):
+        self.event.data["exception"]["values"][0]["stacktrace"] = {
+            "frames": [
+                self.contributing_system_frame,
+                self.contributing_in_app_frame,
+            ]
+        }
+
+        # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+        variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+        for variant_name in ["app", "system"]:
+            exception_component = variants[variant_name].component.values[0]
+            assert isinstance(exception_component, ExceptionGroupingComponent)
+            stacktrace_component = find_given_child_component(
+                exception_component, StacktraceGroupingComponent
+            )
+            assert stacktrace_component
+
+            frame_components = stacktrace_component.values
+            assert [
+                NonNone(
+                    find_given_child_component(frame_component, FunctionGroupingComponent)
+                ).values[0]
+                for frame_component in frame_components
+            ] == ["handleRequest", "playFetch"]
+
+            assert [frame_component.in_app for frame_component in frame_components] == [False, True]
+
+    def test_stacktrace_component_tallies_frame_types_simple(self):
+        self.event.data["exception"]["values"][0]["stacktrace"] = {
+            "frames": (
+                [self.non_contributing_system_frame] * 11
+                + [self.contributing_system_frame] * 21
+                + [self.non_contributing_in_app_frame] * 12
+                + [self.contributing_in_app_frame] * 31
+            )
+        }
+
+        # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+        variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+        for variant_name in ["app", "system"]:
+            exception_component = variants[variant_name].component.values[0]
+            assert isinstance(exception_component, ExceptionGroupingComponent)
+            stacktrace_component = find_given_child_component(
+                exception_component, StacktraceGroupingComponent
+            )
+            assert stacktrace_component
+
+            assert stacktrace_component.frame_counts == Counter(
+                system_non_contributing_frames=11,
+                system_contributing_frames=21,
+                in_app_non_contributing_frames=12,
+                in_app_contributing_frames=31,
+            )
+
+    def test_stacktrace_component_tallies_frame_types_not_all_types_present(self):
+        self.event.data["exception"]["values"][0]["stacktrace"] = {
+            "frames": (
+                [self.contributing_system_frame] * 20 + [self.contributing_in_app_frame] * 13
+            )
+        }
+
+        # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+        variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+        for variant_name in ["app", "system"]:
+            exception_component = variants[variant_name].component.values[0]
+            assert isinstance(exception_component, ExceptionGroupingComponent)
+            stacktrace_component = find_given_child_component(
+                exception_component, StacktraceGroupingComponent
+            )
+            assert stacktrace_component
+
+            assert stacktrace_component.frame_counts == Counter(
+                system_non_contributing_frames=0,
+                system_contributing_frames=20,
+                in_app_non_contributing_frames=0,
+                in_app_contributing_frames=13,
+            )
+
+    def test_exception_component_uses_stacktrace_frame_counts(self):
+        self.event.data["exception"]["values"][0]["stacktrace"] = {
+            "frames": (
+                [self.non_contributing_system_frame] * 4
+                + [self.contributing_system_frame] * 15
+                + [self.non_contributing_in_app_frame] * 9
+                + [self.contributing_in_app_frame] * 8
+            )
+        }
+
+        # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+        variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+        for variant_name in ["app", "system"]:
+            exception_component = variants[variant_name].component.values[0]
+            assert isinstance(exception_component, ExceptionGroupingComponent)
+            stacktrace_component = find_given_child_component(
+                exception_component, StacktraceGroupingComponent
+            )
+            assert stacktrace_component
+
+            assert stacktrace_component.frame_counts == Counter(
+                system_non_contributing_frames=4,
+                system_contributing_frames=15,
+                in_app_non_contributing_frames=9,
+                in_app_contributing_frames=8,
+            )
+            assert exception_component.frame_counts == stacktrace_component.frame_counts
+
+    def test_chained_exception_component_sums_stacktrace_frame_counts(self):
+        self.event.data["exception"]["values"] = [
+            {**self.exception_value},
+            {**self.exception_value},
+        ]
+        self.event.data["exception"]["values"][0]["stacktrace"] = {
+            "frames": (
+                [self.non_contributing_system_frame] * 11
+                + [self.contributing_system_frame] * 21
+                + [self.non_contributing_in_app_frame] * 12
+                + [self.contributing_in_app_frame] * 31
+            )
+        }
+        self.event.data["exception"]["values"][1]["stacktrace"] = {
+            "frames": (
+                [self.non_contributing_system_frame] * 4
+                + [self.contributing_system_frame] * 15
+                + [self.non_contributing_in_app_frame] * 9
+                + [self.contributing_in_app_frame] * 8
+            )
+        }
+
+        # `normalize_stacktraces=True` forces the custom stacktrace enhancements to run
+        variants = self.event.get_grouping_variants(normalize_stacktraces=True)
+
+        for variant_name in ["app", "system"]:
+            chained_exception_component = variants[variant_name].component.values[0]
+            assert isinstance(chained_exception_component, ChainedExceptionGroupingComponent)
+            exception_components = chained_exception_component.values
+            assert [
+                exception_component.frame_counts for exception_component in exception_components
+            ] == [
+                Counter(
+                    system_non_contributing_frames=11,
+                    system_contributing_frames=21,
+                    in_app_non_contributing_frames=12,
+                    in_app_contributing_frames=31,
+                ),
+                Counter(
+                    system_non_contributing_frames=4,
+                    system_contributing_frames=15,
+                    in_app_non_contributing_frames=9,
+                    in_app_contributing_frames=8,
+                ),
+            ]
+
+            assert chained_exception_component.frame_counts == Counter(
+                system_non_contributing_frames=15,
+                system_contributing_frames=36,
+                in_app_non_contributing_frames=21,
+                in_app_contributing_frames=39,
+            )
diff --git a/tests/sentry/grouping/test_grouphash_metadata.py b/tests/sentry/grouping/test_grouphash_metadata.py
index f2bce3705932cd..6ea285b3702e19 100644
--- a/tests/sentry/grouping/test_grouphash_metadata.py
+++ b/tests/sentry/grouping/test_grouphash_metadata.py
@@ -6,11 +6,15 @@
 import pytest
 
 from sentry.eventstore.models import Event
-from sentry.grouping.api import get_default_grouping_config_dict
-from sentry.grouping.component import GroupingComponent
-from sentry.grouping.ingest.grouphash_metadata import _get_hash_basis
+from sentry.grouping.component import DefaultGroupingComponent, MessageGroupingComponent
+from sentry.grouping.ingest.grouphash_metadata import (
+    get_hash_basis_and_metadata,
+    record_grouphash_metadata_metrics,
+)
+from sentry.grouping.strategies.base import StrategyConfiguration
 from sentry.grouping.strategies.configurations import CONFIGURATIONS
 from sentry.grouping.variants import ComponentVariant
+from sentry.models.grouphashmetadata import GroupHashMetadata, HashBasis
 from sentry.models.project import Project
 from sentry.projectoptions.defaults import DEFAULT_GROUPING_CONFIG
 from sentry.testutils.pytest.fixtures import InstaSnapshotter, django_db_all
@@ -19,6 +23,7 @@
     GroupingInput,
     dump_variant,
     get_snapshot_path,
+    to_json,
     with_grouping_inputs,
 )
 
@@ -104,17 +109,19 @@ def test_unknown_hash_basis(
         config_name, use_full_ingest_pipeline=True, project=default_project
     )
 
-    unknown_variants = {
-        "dogs": ComponentVariant(
-            GroupingComponent(
-                id="not_a_known_component_type",
-                contributes=True,
-                values=[GroupingComponent(id="dogs_are_great", contributes=True)],
-            ),
-            get_default_grouping_config_dict(),
-        )
-    }
-    with patch.object(event, "get_grouping_variants", new=MagicMock(return_value=unknown_variants)):
+    component = DefaultGroupingComponent(
+        contributes=True, values=[MessageGroupingComponent(contributes=True)]
+    )
+
+    # Overwrite the component ids so this stops being recognizable as a known grouping type
+    component.id = "not_a_known_component_type"
+    component.values[0].id = "dogs_are_great"
+
+    with patch.object(
+        event,
+        "get_grouping_variants",
+        new=MagicMock(return_value={"dogs": ComponentVariant(component, StrategyConfiguration())}),
+    ):
         # Overrride the input filename since there isn't a real input which will generate the mock
         # variants above, but we still want the snapshot.
         _assert_and_snapshot_results(event, config_name, "unknown_variant.json", insta_snapshot)
@@ -130,8 +137,28 @@ def _assert_and_snapshot_results(
     lines: list[str] = []
     variants = event.get_grouping_variants()
 
-    hash_basis = _get_hash_basis(event, project, variants)
+    hash_basis, hashing_metadata = get_hash_basis_and_metadata(event, project, variants, {})
+
+    with patch("sentry.grouping.ingest.grouphash_metadata.metrics.incr") as mock_metrics_incr:
+        record_grouphash_metadata_metrics(
+            GroupHashMetadata(hash_basis=hash_basis, hashing_metadata=hashing_metadata)
+        )
+
+        metric_names = [call.args[0] for call in mock_metrics_incr.mock_calls]
+        tags = [call.kwargs["tags"] for call in mock_metrics_incr.mock_calls]
+        metrics_data = dict(zip(metric_names, tags))
+
+        expected_metric_names = ["grouping.grouphashmetadata.event_hash_basis"]
+        if hash_basis not in [HashBasis.CHECKSUM, HashBasis.TEMPLATE, HashBasis.UNKNOWN]:
+            expected_metric_names.append(
+                f"grouping.grouphashmetadata.event_hashing_metadata.{hash_basis}"
+            )
+        assert metric_names == expected_metric_names
+
     lines.append("hash_basis: %s" % hash_basis)
+    lines.append("hashing_metadata: %s" % to_json(hashing_metadata, pretty_print=True))
+    lines.append("-" * 3)
+    lines.append("metrics with tags: %s" % to_json(metrics_data, pretty_print=True))
     lines.append("-" * 3)
 
     lines.append("contributing variants:")
diff --git a/tests/sentry/grouping/test_variants.py b/tests/sentry/grouping/test_variants.py
index 90346f2c92663d..f62f691a3e4e20 100644
--- a/tests/sentry/grouping/test_variants.py
+++ b/tests/sentry/grouping/test_variants.py
@@ -1,9 +1,13 @@
 from __future__ import annotations
 
+from typing import cast
+
 import pytest
 
 from sentry.eventstore.models import Event
+from sentry.grouping.fingerprinting import FingerprintRuleJSON
 from sentry.grouping.strategies.configurations import CONFIGURATIONS
+from sentry.grouping.variants import CustomFingerprintVariant, expose_fingerprint_dict
 from sentry.models.project import Project
 from sentry.projectoptions.defaults import DEFAULT_GROUPING_CONFIG
 from sentry.testutils.pytest.fixtures import InstaSnapshotter, django_db_all
@@ -97,3 +101,28 @@ def _assert_and_snapshot_results(
             __file__, input_file, "test_event_hash_variant", config_name
         ),
     )
+
+
+# TODO: This can be deleted after Jan 2025, when affected events have aged out
+def test_old_event_with_no_fingerprint_rule_text():
+    variant = CustomFingerprintVariant(
+        ["dogs are great"],
+        {
+            # Cast here to compensate for missing `text` entry. (This allows us to avoid creating
+            # another place we have to remember to update when this temporary test (and the
+            # temporary fix it tests) is removed.)
+            "matched_rule": cast(
+                FingerprintRuleJSON,
+                {
+                    "attributes": {},
+                    "fingerprint": ["dogs are great"],
+                    "matchers": [["message", "*dogs*"]],
+                    # newer events have a `text` entry here
+                },
+            )
+        },
+    )
+    assert expose_fingerprint_dict(variant.values, variant.info) == {
+        "values": ["dogs are great"],
+        "matched_rule": 'message:"*dogs*" -> "dogs are great"',
+    }
diff --git a/tests/sentry/hybridcloud/test_caching.py b/tests/sentry/hybridcloud/rpc/test_caching.py
similarity index 82%
rename from tests/sentry/hybridcloud/test_caching.py
rename to tests/sentry/hybridcloud/rpc/test_caching.py
index cc4fee5aa02ebb..50f548e6c684ac 100644
--- a/tests/sentry/hybridcloud/test_caching.py
+++ b/tests/sentry/hybridcloud/rpc/test_caching.py
@@ -5,12 +5,16 @@
 
 from sentry.hybridcloud.rpc.caching import (
     back_with_silo_cache,
+    back_with_silo_cache_list,
     back_with_silo_cache_many,
     control_caching_service,
     region_caching_service,
 )
 from sentry.hybridcloud.rpc.caching.impl import CacheBackend, _consume_generator
-from sentry.organizations.services.organization.model import RpcOrganizationSummary
+from sentry.organizations.services.organization.model import (
+    RpcOrganizationMember,
+    RpcOrganizationSummary,
+)
 from sentry.organizations.services.organization.service import organization_service
 from sentry.silo.base import SiloMode
 from sentry.testutils.factories import Factories
@@ -30,7 +34,7 @@ def get_user(user_id: int) -> RpcUser:
         return user_service.get_many(filter=dict(user_ids=[user_id]))[0]
 
     users = [Factories.create_user() for _ in range(3)]
-    old: list[RpcUser] = []
+    old = []
 
     for u in users:
         next_user = get_user(u.id)
@@ -43,12 +47,12 @@ def get_user(user_id: int) -> RpcUser:
             user.update(username=user.username + "moocow")
 
     # Does not include updates
-    for u in old:
-        next_user = get_user(u.id)
-        assert next_user == u
+    for old_u in old:
+        next_user = get_user(old_u.id)
+        assert next_user == old_u
 
         region_caching_service.clear_key(
-            region_name=get_local_region().name, key=get_user.key_from(u.id)
+            region_name=get_local_region().name, key=get_user.key_from(old_u.id)
         )
 
     cached_users = [get_user.get_one(u.id) for u in users]
@@ -194,10 +198,10 @@ def get_users(user_ids: list[int]) -> list[RpcUser]:
         )
 
     cached_users = get_users(user_ids)
-    for u, cached in zip(users, cached_users):
+    for user, cached in zip(users, cached_users):
         assert cached
         assert cached.username.endswith("moo")
-        assert cached.username == u.username
+        assert cached.username == user.username
 
 
 @django_db_all(transaction=True)
@@ -279,3 +283,47 @@ def get_users(user_ids: list[int]) -> list[RpcUser]:
 
     after_clear = get_users(user_ids)
     assert len(after_clear) == 2
+
+
+@control_silo_test
+@django_db_all(transaction=True)
+def test_caching_list() -> None:
+    cache.clear()
+
+    @back_with_silo_cache_list(
+        base_key="get_owner_members", silo_mode=SiloMode.CONTROL, t=RpcOrganizationMember
+    )
+    def get_org_members(organization_id: int) -> list[RpcOrganizationMember]:
+        return organization_service.get_organization_owner_members(organization_id=organization_id)
+
+    users = [Factories.create_user() for _ in range(3)]
+
+    with assume_test_silo_mode(SiloMode.REGION):
+        org = Factories.create_organization()
+        members = [
+            Factories.create_member(organization=org, user=user, role="owner") for user in users
+        ]
+
+    wrapped_result = get_org_members(org.id)
+    direct_result = get_org_members.cb(org.id)
+
+    assert len(wrapped_result) == len(direct_result)
+    for wrapped, direct in zip(wrapped_result, direct_result):
+        assert wrapped == direct
+
+    with assume_test_silo_mode(SiloMode.REGION):
+        for member in members:
+            member.update(role="member")
+
+    # Does not include updates made to db
+    after_update_wrapped = get_org_members(org.id)
+    for member in after_update_wrapped:
+        assert member.role == "owner"
+
+        # Clear cache simulating outbox logic
+        region_caching_service.clear_key(
+            region_name=get_local_region().name, key=get_org_members.key_from(org.id)
+        )
+
+    cached_members = get_org_members(org.id)
+    assert len(cached_members) == 0, "with members updated none are owners"
diff --git a/tests/sentry/identity/test_oauth2.py b/tests/sentry/identity/test_oauth2.py
index 6bbafab53ee435..86beb3fa06e4a4 100644
--- a/tests/sentry/identity/test_oauth2.py
+++ b/tests/sentry/identity/test_oauth2.py
@@ -12,6 +12,7 @@
 from sentry.identity.pipeline import IdentityProviderPipeline
 from sentry.identity.providers.dummy import DummyProvider
 from sentry.integrations.types import EventLifecycleOutcome
+from sentry.testutils.asserts import assert_failure_metric
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import control_silo_test
 
@@ -40,12 +41,6 @@ def view(self):
             client_secret="secret-value",
         )
 
-    def assert_failure_metric(self, mock_record, error_msg):
-        (event_failures,) = (
-            call for call in mock_record.mock_calls if call.args[0] == EventLifecycleOutcome.FAILURE
-        )
-        assert event_failures.args[1]["failure_reason"] == error_msg
-
     @responses.activate
     def test_exchange_token_success(
         self,
@@ -122,7 +117,7 @@ def ssl_error(request):
         assert "error_description" in result
         assert "SSL" in result["error_description"]
 
-        self.assert_failure_metric(mock_record, "ssl_error")
+        assert_failure_metric(mock_record, "ssl_error")
 
     @responses.activate
     def test_connection_error(self, mock_record, mock_integration_const):
@@ -140,7 +135,7 @@ def connection_error(request):
         assert "connect" in result["error"]
         assert "error_description" in result
 
-        self.assert_failure_metric(mock_record, "connection_error")
+        assert_failure_metric(mock_record, "connection_error")
 
     @responses.activate
     def test_exchange_token_no_json(self, mock_record, mock_integration_const):
@@ -153,7 +148,7 @@ def test_exchange_token_no_json(self, mock_record, mock_integration_const):
         assert "error_description" in result
         assert "JSON" in result["error_description"]
 
-        self.assert_failure_metric(mock_record, "json_error")
+        assert_failure_metric(mock_record, "json_error")
 
 
 @control_silo_test
diff --git a/tests/sentry/incidents/action_handlers/test_email.py b/tests/sentry/incidents/action_handlers/test_email.py
index 3bee199a0beffa..e84b1f6cf20eb1 100644
--- a/tests/sentry/incidents/action_handlers/test_email.py
+++ b/tests/sentry/incidents/action_handlers/test_email.py
@@ -26,7 +26,7 @@
 )
 from sentry.incidents.models.incident import INCIDENT_STATUS, IncidentStatus, TriggerStatus
 from sentry.incidents.utils.types import AlertRuleActivationConditionType
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.seer.anomaly_detection.types import StoreDataResponse
 from sentry.sentry_metrics import indexer
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID
diff --git a/tests/sentry/incidents/action_handlers/test_opsgenie.py b/tests/sentry/incidents/action_handlers/test_opsgenie.py
index 59e49f07b26385..80f9a61d747988 100644
--- a/tests/sentry/incidents/action_handlers/test_opsgenie.py
+++ b/tests/sentry/incidents/action_handlers/test_opsgenie.py
@@ -172,7 +172,7 @@ def run_test(self, incident, method):
         if method == "resolve":
             responses.add(
                 responses.POST,
-                url=f"https://api.opsgenie.com/v2/alerts/{alias}/acknowledge?identifierType=alias",
+                url=f"https://api.opsgenie.com/v2/alerts/{alias}/close?identifierType=alias",
                 json={},
                 status=202,
             )
diff --git a/tests/sentry/incidents/action_handlers/test_slack.py b/tests/sentry/incidents/action_handlers/test_slack.py
index a9629ff171466b..405dbac7322e24 100644
--- a/tests/sentry/incidents/action_handlers/test_slack.py
+++ b/tests/sentry/incidents/action_handlers/test_slack.py
@@ -15,8 +15,8 @@
     SLACK_METRIC_ALERT_SUCCESS_DATADOG_METRIC,
 )
 from sentry.integrations.slack.spec import SlackMessagingSpec
-from sentry.models.notificationmessage import NotificationMessage
 from sentry.models.options.organization_option import OrganizationOption
+from sentry.notifications.models.notificationmessage import NotificationMessage
 from sentry.testutils.helpers.datetime import freeze_time
 from sentry.utils import json
 from tests.sentry.integrations.slack.utils.test_mock_slack_response import mock_slack_response
diff --git a/tests/sentry/incidents/endpoints/serializers/test_alert_rule.py b/tests/sentry/incidents/endpoints/serializers/test_alert_rule.py
index 0311eae88c9903..b132d2a8fa977a 100644
--- a/tests/sentry/incidents/endpoints/serializers/test_alert_rule.py
+++ b/tests/sentry/incidents/endpoints/serializers/test_alert_rule.py
@@ -54,7 +54,6 @@ def assert_alert_rule_serialized(
         assert result["resolution"] == alert_rule.snuba_query.resolution / 60
         assert result["thresholdPeriod"] == alert_rule.threshold_period
         assert result["projects"] == alert_rule_projects
-        assert result["includeAllProjects"] == alert_rule.include_all_projects
         if alert_rule.created_by_id:
             created_by = user_service.get_user(user_id=alert_rule.created_by_id)
             assert created_by is not None
@@ -264,7 +263,6 @@ def test_simple(self):
         result = serialize(alert_rule, serializer=DetailedAlertRuleSerializer())
         self.assert_alert_rule_serialized(alert_rule, result)
         assert sorted(result["projects"]) == sorted(p.slug for p in projects)
-        assert result["excludedProjects"] == []
         assert result["eventTypes"] == [SnubaQueryEventType.EventType.ERROR.name.lower()]
 
     def test_triggers(self):
diff --git a/tests/sentry/incidents/endpoints/serializers/test_alert_rule_trigger.py b/tests/sentry/incidents/endpoints/serializers/test_alert_rule_trigger.py
index abe144c1bb6067..e0fefe5c7184ca 100644
--- a/tests/sentry/incidents/endpoints/serializers/test_alert_rule_trigger.py
+++ b/tests/sentry/incidents/endpoints/serializers/test_alert_rule_trigger.py
@@ -1,7 +1,4 @@
 from sentry.api.serializers import serialize
-from sentry.incidents.endpoints.serializers.alert_rule_trigger import (
-    DetailedAlertRuleTriggerSerializer,
-)
 from sentry.incidents.logic import create_alert_rule_trigger
 from sentry.incidents.models.alert_rule import AlertRuleDetectionType, AlertRuleThresholdType
 from sentry.testutils.cases import TestCase
@@ -52,12 +49,3 @@ def test_comparison_below(self):
         trigger = create_alert_rule_trigger(alert_rule, "hi", 80)
         result = serialize(trigger)
         self.assert_alert_rule_trigger_serialized(trigger, result, 20)
-
-
-class DetailedAlertRuleTriggerSerializerTest(BaseAlertRuleTriggerSerializerTest, TestCase):
-    def test_simple(self):
-        alert_rule = self.create_alert_rule(resolve_threshold=200)
-        trigger = create_alert_rule_trigger(alert_rule, "hi", 1000)
-        result = serialize(trigger, serializer=DetailedAlertRuleTriggerSerializer())
-        self.assert_alert_rule_trigger_serialized(trigger, result)
-        assert result["excludedProjects"] == []
diff --git a/tests/sentry/incidents/endpoints/serializers/test_incident.py b/tests/sentry/incidents/endpoints/serializers/test_incident.py
index b99955e4660ae1..fad3ba967b7321 100644
--- a/tests/sentry/incidents/endpoints/serializers/test_incident.py
+++ b/tests/sentry/incidents/endpoints/serializers/test_incident.py
@@ -4,7 +4,6 @@
 
 from sentry.api.serializers import serialize
 from sentry.incidents.endpoints.serializers.incident import DetailedIncidentSerializer
-from sentry.incidents.logic import subscribe_to_incident
 from sentry.snuba.dataset import Dataset
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.datetime import freeze_time
@@ -31,15 +30,6 @@ def test_simple(self):
 
 
 class DetailedIncidentSerializerTest(TestCase):
-    def test_subscribed(self):
-        incident = self.create_incident(date_started=timezone.now() - timedelta(minutes=5))
-        serializer = DetailedIncidentSerializer()
-        result = serialize(incident, serializer=serializer, user=self.user)
-        assert not result["isSubscribed"]
-        subscribe_to_incident(incident, self.user.id)
-        result = serialize(incident, serializer=serializer, user=self.user)
-        assert result["isSubscribed"]
-
     def test_error_alert_rule(self):
         query = "test query"
         incident = self.create_incident(query=query)
diff --git a/tests/sentry/incidents/endpoints/test_organization_alert_rule_anomalies.py b/tests/sentry/incidents/endpoints/test_organization_alert_rule_anomalies.py
index 567881878d57d2..218f05303740a2 100644
--- a/tests/sentry/incidents/endpoints/test_organization_alert_rule_anomalies.py
+++ b/tests/sentry/incidents/endpoints/test_organization_alert_rule_anomalies.py
@@ -209,10 +209,12 @@ def test_timeout(self, mock_logger, mock_seer_request, mock_seer_store_request):
                 status_code=400,
             )
         assert mock_seer_request.call_count == 1
+        assert alert_rule.snuba_query is not None
+        assert alert_rule.organization is not None
         mock_logger.exception.assert_called_with(
             "Timeout error when hitting anomaly detection endpoint",
             extra={
-                "subscription_id": alert_rule.snuba_query.subscriptions.first().id,
+                "subscription_id": alert_rule.snuba_query.subscriptions.get().id,
                 "dataset": alert_rule.snuba_query.dataset,
                 "organization_id": alert_rule.organization.id,
                 "project_id": self.project.id,
diff --git a/tests/sentry/incidents/endpoints/test_organization_alert_rule_details.py b/tests/sentry/incidents/endpoints/test_organization_alert_rule_details.py
index 30075f849cf9ad..edf682e7591127 100644
--- a/tests/sentry/incidents/endpoints/test_organization_alert_rule_details.py
+++ b/tests/sentry/incidents/endpoints/test_organization_alert_rule_details.py
@@ -80,7 +80,7 @@ def new_alert_rule(self, mock_seer_request, data=None):
                 "organization": self.organization,
                 "access": OrganizationGlobalAccess(self.organization, settings.SENTRY_SCOPES),
                 "user": self.user,
-                "installations": app_service.get_installed_for_organization(
+                "installations": app_service.installations_for_organization(
                     organization_id=self.organization.id
                 ),
             },
@@ -195,6 +195,7 @@ def test_aggregate_translation(self):
         with self.feature("organizations:incidents"):
             resp = self.get_success_response(self.organization.slug, alert_rule.id)
             assert resp.data["aggregate"] == "count_unique(user)"
+            assert alert_rule.snuba_query is not None
             assert alert_rule.snuba_query.aggregate == "count_unique(tags[sentry:user])"
 
     def test_expand_latest_incident(self):
@@ -399,7 +400,7 @@ def test_missing_threshold(self):
                 "organization": self.organization,
                 "access": OrganizationGlobalAccess(self.organization, settings.SENTRY_SCOPES),
                 "user": self.user,
-                "installations": app_service.get_installed_for_organization(
+                "installations": app_service.installations_for_organization(
                     organization_id=self.organization.id
                 ),
             },
diff --git a/tests/sentry/incidents/endpoints/test_organization_incident_activity_index.py b/tests/sentry/incidents/endpoints/test_organization_incident_activity_index.py
deleted file mode 100644
index 01a2b9b33d5f0d..00000000000000
--- a/tests/sentry/incidents/endpoints/test_organization_incident_activity_index.py
+++ /dev/null
@@ -1,75 +0,0 @@
-from datetime import timedelta
-from functools import cached_property
-
-from django.utils import timezone
-
-from sentry.api.serializers import serialize
-from sentry.incidents.logic import create_incident_activity
-from sentry.incidents.models.incident import IncidentActivityType
-from sentry.testutils.cases import APITestCase
-
-
-class OrganizationIncidentActivityIndexTest(APITestCase):
-    endpoint = "sentry-api-0-organization-incident-activity"
-
-    def setUp(self):
-        self.create_team(organization=self.organization, members=[self.user])
-        self.login_as(self.user)
-
-    @cached_property
-    def organization(self):
-        return self.create_organization(owner=self.create_user())
-
-    @cached_property
-    def project(self):
-        return self.create_project(organization=self.organization)
-
-    @cached_property
-    def user(self):
-        return self.create_user()
-
-    def test_no_perms(self):
-        incident = self.create_incident()
-        self.login_as(self.create_user())
-        with self.feature("organizations:incidents"):
-            resp = self.get_response(incident.organization.slug, incident.id)
-        assert resp.status_code == 403
-
-    def test_no_feature(self):
-        incident = self.create_incident()
-        resp = self.get_response(incident.organization.slug, incident.id)
-        assert resp.status_code == 404
-
-    def test_simple(self):
-        incident = self.create_incident(
-            date_started=timezone.now() - timedelta(hours=2), projects=[self.project], query=""
-        )
-        activities = [
-            create_incident_activity(
-                incident=incident,
-                activity_type=IncidentActivityType.CREATED,
-                user=self.user,
-                comment="hello",
-            ),
-            create_incident_activity(
-                incident=incident,
-                activity_type=IncidentActivityType.COMMENT,
-                user=self.user,
-                comment="goodbye",
-            ),
-        ]
-
-        expected = serialize(activities, user=self.user)
-
-        with self.feature("organizations:incidents"):
-            resp = self.get_success_response(
-                incident.organization.slug, incident.identifier, desc=0
-            )
-
-        assert resp.data == expected
-
-        expected.reverse()
-        with self.feature("organizations:incidents"):
-            resp = self.get_success_response(incident.organization.slug, incident.identifier)
-
-        assert resp.data == expected
diff --git a/tests/sentry/incidents/endpoints/test_organization_incident_comment_details.py b/tests/sentry/incidents/endpoints/test_organization_incident_comment_details.py
deleted file mode 100644
index f03ec7ff51563e..00000000000000
--- a/tests/sentry/incidents/endpoints/test_organization_incident_comment_details.py
+++ /dev/null
@@ -1,146 +0,0 @@
-from functools import cached_property
-
-from sentry.incidents.models.incident import IncidentActivity, IncidentActivityType
-from sentry.silo.base import SiloMode
-from sentry.testutils.cases import APITestCase
-from sentry.testutils.silo import assume_test_silo_mode
-
-
-class BaseIncidentCommentDetailsTest(APITestCase):
-    method = "put"
-    endpoint = "sentry-api-0-organization-incident-comment-details"
-
-    def setUp(self):
-        self.create_member(
-            user=self.user, organization=self.organization, role="owner", teams=[self.team]
-        )
-        self.login_as(self.user)
-        self.activity = self.create_incident_comment(self.incident, user_id=self.user.id)
-        self.detected_activity = self.create_incident_activity(
-            self.incident, user_id=self.user.id, type=IncidentActivityType.CREATED.value
-        )
-
-        user2 = self.create_user()
-        self.user2_activity = self.create_incident_comment(
-            incident=self.incident, user_id=user2.id, comment="hello from another user"
-        )
-
-    @cached_property
-    def organization(self):
-        return self.create_organization()
-
-    @cached_property
-    def project(self):
-        return self.create_project(organization=self.organization)
-
-    @cached_property
-    def user(self):
-        return self.create_user()
-
-    @cached_property
-    def incident(self):
-        return self.create_incident()
-
-    def test_not_found(self):
-        comment = "hello"
-        with self.feature("organizations:incidents"):
-            self.get_error_response(
-                self.organization.slug,
-                self.incident.identifier,
-                123,
-                comment=comment,
-                status_code=404,
-            )
-
-    def test_non_comment_type(self):
-        comment = "hello"
-        with self.feature("organizations:incidents"):
-            self.get_error_response(
-                self.organization.slug,
-                self.incident.identifier,
-                self.detected_activity.id,
-                comment=comment,
-                status_code=404,
-            )
-
-
-class OrganizationIncidentCommentUpdateEndpointTest(BaseIncidentCommentDetailsTest):
-    method = "put"
-
-    def test_simple(self):
-        comment = "hello"
-        with self.feature("organizations:incidents"):
-            self.get_success_response(
-                self.organization.slug,
-                self.incident.identifier,
-                self.activity.id,
-                comment=comment,
-                status_code=200,
-            )
-        activity = IncidentActivity.objects.get(id=self.activity.id)
-        assert activity.type == IncidentActivityType.COMMENT.value
-        assert activity.user_id == self.user.id
-        assert activity.comment == comment
-
-    def test_cannot_edit_others_comment(self):
-        with self.feature("organizations:incidents"):
-            self.get_error_response(
-                self.organization.slug,
-                self.incident.identifier,
-                self.user2_activity.id,
-                comment="edited comment",
-                status_code=404,
-            )
-
-    def test_superuser_can_edit(self):
-        self.user.is_superuser = True
-        with assume_test_silo_mode(SiloMode.CONTROL):
-            self.user.save()
-
-        edited_comment = "this comment has been edited"
-
-        with self.feature("organizations:incidents"):
-            self.get_success_response(
-                self.organization.slug,
-                self.incident.identifier,
-                self.user2_activity.id,
-                comment=edited_comment,
-                status_code=200,
-            )
-        activity = IncidentActivity.objects.get(id=self.user2_activity.id)
-        assert activity.user_id != self.user.id
-        assert activity.comment == edited_comment
-
-
-class OrganizationIncidentCommentDeleteEndpointTest(BaseIncidentCommentDetailsTest):
-    method = "delete"
-
-    def test_simple(self):
-        with self.feature("organizations:incidents"):
-            self.get_success_response(
-                self.organization.slug, self.incident.identifier, self.activity.id, status_code=204
-            )
-        assert not IncidentActivity.objects.filter(id=self.activity.id).exists()
-
-    def test_cannot_delete_others_comments(self):
-        with self.feature("organizations:incidents"):
-            self.get_error_response(
-                self.organization.slug,
-                self.incident.identifier,
-                self.user2_activity.id,
-                status_code=404,
-            )
-
-    def test_superuser_can_delete(self):
-        self.user.is_superuser = True
-        with assume_test_silo_mode(SiloMode.CONTROL):
-            self.user.save()
-
-        with self.feature("organizations:incidents"):
-            self.get_success_response(
-                self.organization.slug,
-                self.incident.identifier,
-                self.user2_activity.id,
-                status_code=204,
-            )
-        assert not IncidentActivity.objects.filter(id=self.user2_activity.id).exists()
diff --git a/tests/sentry/incidents/endpoints/test_organization_incident_comment_index.py b/tests/sentry/incidents/endpoints/test_organization_incident_comment_index.py
deleted file mode 100644
index 6837a56bfd4d85..00000000000000
--- a/tests/sentry/incidents/endpoints/test_organization_incident_comment_index.py
+++ /dev/null
@@ -1,84 +0,0 @@
-from functools import cached_property
-
-from sentry.api.serializers import serialize
-from sentry.incidents.models.incident import (
-    IncidentActivity,
-    IncidentActivityType,
-    IncidentSubscription,
-)
-from sentry.testutils.cases import APITestCase
-
-
-class OrganizationIncidentCommentCreateEndpointTest(APITestCase):
-    endpoint = "sentry-api-0-organization-incident-comments"
-    method = "post"
-
-    @cached_property
-    def organization(self):
-        return self.create_organization()
-
-    @cached_property
-    def project(self):
-        return self.create_project(organization=self.organization)
-
-    @cached_property
-    def user(self):
-        return self.create_user()
-
-    def test_simple(self):
-        self.create_member(
-            user=self.user, organization=self.organization, role="owner", teams=[self.team]
-        )
-        self.login_as(self.user)
-        comment = "hello"
-        incident = self.create_incident()
-        with self.feature("organizations:incidents"):
-            resp = self.get_success_response(
-                self.organization.slug, incident.identifier, comment=comment, status_code=201
-            )
-        activity = IncidentActivity.objects.get(id=resp.data["id"])
-        assert activity.type == IncidentActivityType.COMMENT.value
-        assert activity.user_id == self.user.id
-        assert activity.comment == comment
-        assert resp.data == serialize([activity], self.user)[0]
-
-    def test_mentions(self):
-        self.create_member(
-            user=self.user, organization=self.organization, role="owner", teams=[self.team]
-        )
-        mentioned_member = self.create_user()
-        self.create_member(
-            user=mentioned_member, organization=self.organization, role="owner", teams=[self.team]
-        )
-        self.login_as(self.user)
-        comment = "hello **@%s**" % mentioned_member.username
-        incident = self.create_incident()
-        with self.feature("organizations:incidents"):
-            resp = self.get_success_response(
-                self.organization.slug,
-                incident.identifier,
-                comment=comment,
-                mentions=["user:%s" % mentioned_member.id],
-                status_code=201,
-            )
-        activity = IncidentActivity.objects.get(id=resp.data["id"])
-        assert activity.type == IncidentActivityType.COMMENT.value
-        assert activity.user_id == self.user.id
-        assert activity.comment == comment
-        assert resp.data == serialize([activity], self.user)[0]
-        assert IncidentSubscription.objects.filter(
-            user_id=mentioned_member.id, incident=incident
-        ).exists()
-
-    def test_access(self):
-        other_user = self.create_user()
-        self.login_as(other_user)
-        other_team = self.create_team()
-        self.create_member(
-            user=self.user, organization=self.organization, role="member", teams=[self.team]
-        )
-        other_project = self.create_project(teams=[other_team])
-        incident = self.create_incident(projects=[other_project])
-        with self.feature("organizations:incidents"):
-            resp = self.get_response(self.organization.slug, incident.identifier, comment="hi")
-            assert resp.status_code == 403
diff --git a/tests/sentry/incidents/endpoints/test_organization_incident_details.py b/tests/sentry/incidents/endpoints/test_organization_incident_details.py
index 685d7059e1d8e9..6e825d2091f32a 100644
--- a/tests/sentry/incidents/endpoints/test_organization_incident_details.py
+++ b/tests/sentry/incidents/endpoints/test_organization_incident_details.py
@@ -1,12 +1,10 @@
 from functools import cached_property
 
 from sentry.api.serializers import serialize
-from sentry.incidents.models.incident import Incident, IncidentActivity, IncidentStatus
-from sentry.silo.base import SiloMode
+from sentry.incidents.models.incident import Incident, IncidentStatus
 from sentry.testutils.abstract import Abstract
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers.datetime import freeze_time
-from sentry.testutils.silo import assume_test_silo_mode
 
 
 class BaseIncidentDetailsTest(APITestCase):
@@ -46,23 +44,18 @@ def test_no_feature(self):
 class OrganizationIncidentDetailsTest(BaseIncidentDetailsTest):
     @freeze_time()
     def test_simple(self):
-        incident = self.create_incident(seen_by=[self.user])
+        incident = self.create_incident()
         with self.feature("organizations:incidents"):
             resp = self.get_success_response(incident.organization.slug, incident.identifier)
 
         expected = serialize(incident)
 
-        with assume_test_silo_mode(SiloMode.CONTROL):
-            user_data = serialize(self.user)
-        seen_by = [user_data]
-
         assert resp.data["id"] == expected["id"]
         assert resp.data["identifier"] == expected["identifier"]
         assert resp.data["projects"] == expected["projects"]
         assert resp.data["dateDetected"] == expected["dateDetected"]
         assert resp.data["dateCreated"] == expected["dateCreated"]
         assert resp.data["projects"] == expected["projects"]
-        assert [item["id"] for item in resp.data["seenBy"]] == [item["id"] for item in seen_by]
 
 
 class OrganizationIncidentUpdateStatusTest(BaseIncidentDetailsTest):
@@ -91,22 +84,6 @@ def test_cannot_open(self):
             assert resp.status_code == 400
             assert resp.data.startswith("Status cannot be changed")
 
-    def test_comment(self):
-        incident = self.create_incident()
-        status = IncidentStatus.CLOSED.value
-        comment = "fixed"
-        with self.feature("organizations:incidents"):
-            self.get_success_response(
-                incident.organization.slug, incident.identifier, status=status, comment=comment
-            )
-
-        incident = Incident.objects.get(id=incident.id)
-        assert incident.status == status
-        activity = IncidentActivity.objects.filter(incident=incident).order_by("-id")[:1].get()
-        assert activity.value == str(status)
-        assert activity.comment == comment
-        assert activity.user_id == self.user.id
-
     def test_invalid_status(self):
         incident = self.create_incident()
         with self.feature("organizations:incidents"):
diff --git a/tests/sentry/incidents/endpoints/test_organization_incident_seen.py b/tests/sentry/incidents/endpoints/test_organization_incident_seen.py
deleted file mode 100644
index 323a2523461a72..00000000000000
--- a/tests/sentry/incidents/endpoints/test_organization_incident_seen.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from functools import cached_property
-
-from django.urls import reverse
-
-from sentry.incidents.models.incident import IncidentSeen
-from sentry.testutils.cases import APITestCase
-
-
-class OrganizationIncidentSeenTest(APITestCase):
-    method = "post"
-    endpoint = "sentry-api-0-organization-incident-seen"
-
-    def setUp(self):
-        self.create_team(organization=self.organization, members=[self.user])
-        self.login_as(self.user)
-
-    @cached_property
-    def organization(self):
-        return self.create_organization(owner=self.create_user())
-
-    @cached_property
-    def project(self):
-        return self.create_project(organization=self.organization)
-
-    @cached_property
-    def user(self):
-        return self.create_user()
-
-    def test_has_user_seen(self):
-        incident = self.create_incident()
-        with self.feature("organizations:incidents"):
-            resp = self.get_response(incident.organization.slug, incident.identifier)
-
-            assert resp.status_code == 201
-
-            # should not be seen by different user
-            new_user = self.create_user()
-            self.create_member(user=new_user, organization=self.organization, teams=[self.team])
-            self.login_as(new_user)
-
-            seen_incidents = IncidentSeen.objects.filter(incident=incident)
-            assert len(seen_incidents) == 1
-            assert seen_incidents[0].user_id == self.user.id
-
-            # mark set as seen by new_user
-            resp = self.get_response(incident.organization.slug, incident.identifier)
-            assert resp.status_code == 201
-
-            seen_incidents = IncidentSeen.objects.filter(incident=incident)
-            assert len(seen_incidents) == 2
-            assert seen_incidents[0].user_id == self.user.id
-            assert seen_incidents[1].user_id == new_user.id
-
-            url = reverse(
-                "sentry-api-0-organization-incident-details",
-                kwargs={
-                    "organization_id_or_slug": incident.organization.slug,
-                    "incident_identifier": incident.identifier,
-                },
-            )
-
-            resp = self.client.get(url, format="json")
-            assert resp.status_code == 200
-            assert resp.data["hasSeen"]
-
-            assert len(resp.data["seenBy"]) == 2
-            # seenBy is sorted by most recently seen
-            assert resp.data["seenBy"][0]["username"] == new_user.username
-            assert resp.data["seenBy"][1]["username"] == self.user.username
diff --git a/tests/sentry/incidents/endpoints/test_organization_incident_subscription_index.py b/tests/sentry/incidents/endpoints/test_organization_incident_subscription_index.py
deleted file mode 100644
index 35df013a3c84b5..00000000000000
--- a/tests/sentry/incidents/endpoints/test_organization_incident_subscription_index.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from functools import cached_property
-
-from sentry.incidents.logic import subscribe_to_incident
-from sentry.incidents.models.incident import IncidentSubscription
-from sentry.testutils.abstract import Abstract
-from sentry.testutils.cases import APITestCase
-
-
-class BaseOrganizationSubscriptionEndpointTest(APITestCase):
-    __test__ = Abstract(__module__, __qualname__)
-
-    endpoint = "sentry-api-0-organization-incident-subscription-index"
-
-    @cached_property
-    def organization(self):
-        return self.create_organization()
-
-    @cached_property
-    def project(self):
-        return self.create_project(organization=self.organization)
-
-    @cached_property
-    def user(self):
-        return self.create_user()
-
-    def test_access(self):
-        other_user = self.create_user()
-        self.login_as(other_user)
-        other_team = self.create_team()
-        self.create_member(
-            user=self.user, organization=self.organization, role="member", teams=[self.team]
-        )
-        other_project = self.create_project(teams=[other_team])
-        incident = self.create_incident(projects=[other_project])
-        with self.feature("organizations:incidents"):
-            resp = self.get_response(self.organization.slug, incident.identifier, comment="hi")
-            assert resp.status_code == 403
-
-
-class OrganizationIncidentSubscribeEndpointTest(BaseOrganizationSubscriptionEndpointTest):
-    method = "post"
-
-    def test_simple(self):
-        self.create_member(
-            user=self.user, organization=self.organization, role="owner", teams=[self.team]
-        )
-        self.login_as(self.user)
-        incident = self.create_incident()
-        with self.feature("organizations:incidents"):
-            self.get_success_response(self.organization.slug, incident.identifier, status_code=201)
-        sub = IncidentSubscription.objects.filter(incident=incident, user_id=self.user.id).get()
-        assert sub.incident == incident
-        assert sub.user_id == self.user.id
-
-
-class OrganizationIncidentUnsubscribeEndpointTest(BaseOrganizationSubscriptionEndpointTest):
-    method = "delete"
-
-    def test_simple(self):
-        self.create_member(
-            user=self.user, organization=self.organization, role="owner", teams=[self.team]
-        )
-        self.login_as(self.user)
-        incident = self.create_incident()
-        subscribe_to_incident(incident, self.user.id)
-        with self.feature("organizations:incidents"):
-            self.get_success_response(self.organization.slug, incident.identifier, status_code=200)
-        assert not IncidentSubscription.objects.filter(
-            incident=incident, user_id=self.user.id
-        ).exists()
diff --git a/tests/sentry/incidents/endpoints/test_serializers.py b/tests/sentry/incidents/endpoints/test_serializers.py
index f035b519160f87..6af03ad18e3477 100644
--- a/tests/sentry/incidents/endpoints/test_serializers.py
+++ b/tests/sentry/incidents/endpoints/test_serializers.py
@@ -120,7 +120,7 @@ def context(self):
             "organization": self.organization,
             "access": self.access,
             "user": self.user,
-            "installations": app_service.get_installed_for_organization(
+            "installations": app_service.installations_for_organization(
                 organization_id=self.organization.id
             ),
             "integrations": integration_service.get_integrations(
diff --git a/tests/sentry/incidents/models/test_alert_rule.py b/tests/sentry/incidents/models/test_alert_rule.py
index 6a2c11543599b6..5a81001be0e8c5 100644
--- a/tests/sentry/incidents/models/test_alert_rule.py
+++ b/tests/sentry/incidents/models/test_alert_rule.py
@@ -31,6 +31,7 @@
 class IncidentGetForSubscriptionTest(TestCase):
     def test(self):
         alert_rule = self.create_alert_rule()
+        assert alert_rule.snuba_query is not None
         subscription = alert_rule.snuba_query.subscriptions.get()
         # First test fetching from database
         assert cache.get(AlertRule.objects.CACHE_SUBSCRIPTION_KEY % subscription.id) is None
@@ -44,6 +45,7 @@ def test(self):
 class IncidentClearSubscriptionCacheTest(TestCase):
     def setUp(self):
         self.alert_rule = self.create_alert_rule()
+        assert self.alert_rule.snuba_query is not None
         self.subscription = self.alert_rule.snuba_query.subscriptions.get()
 
     def test_updated_subscription(self):
@@ -416,6 +418,7 @@ def test_updates_non_expired_alerts(self):
                 activation_condition=AlertRuleActivationConditionType.RELEASE_CREATION,
                 activator="testing",
             )
+            assert alert_rule.snuba_query is not None
             subscription = alert_rule.snuba_query.subscriptions.get()
             activation = alert_rule.activations.get()
             assert activation.finished_at is None
@@ -442,6 +445,7 @@ def test_cleans_expired_alerts(self):
                 activator="testing",
             )
 
+            assert alert_rule.snuba_query is not None
             subscription = alert_rule.snuba_query.subscriptions.get()
             subscription.date_added = timezone.now() - timedelta(days=21)
 
@@ -472,6 +476,7 @@ def mock_processor(_subscription, alert_rule, value):
 
     def test_update_alerts_execute_processor(self):
         alert_rule = self.create_alert_rule(monitor_type=AlertRuleMonitorTypeInt.CONTINUOUS)
+        assert alert_rule.snuba_query is not None
         subscription = alert_rule.snuba_query.subscriptions.get()
 
         callback = alert_subscription_callback_registry[AlertRuleMonitorTypeInt.CONTINUOUS]
diff --git a/tests/sentry/incidents/models/test_incidents.py b/tests/sentry/incidents/models/test_incidents.py
index 4631c70f3f5679..af479d811e4e45 100644
--- a/tests/sentry/incidents/models/test_incidents.py
+++ b/tests/sentry/incidents/models/test_incidents.py
@@ -63,7 +63,8 @@ def setUp(self):
         self.trigger = self.create_alert_rule_trigger(self.alert_rule)
 
     def test_negative_cache(self):
-        subscription = self.alert_rule.snuba_query.subscriptions.first()
+        assert self.alert_rule.snuba_query is not None
+        subscription = self.alert_rule.snuba_query.subscriptions.get()
         assert (
             cache.get(
                 Incident.objects._build_active_incident_cache_key(
@@ -98,7 +99,8 @@ def test_negative_cache(self):
         ) is False
 
     def test_cache(self):
-        subscription = self.alert_rule.snuba_query.subscriptions.first()
+        assert self.alert_rule.snuba_query is not None
+        subscription = self.alert_rule.snuba_query.subscriptions.get()
         assert (
             cache.get(
                 Incident.objects._build_active_incident_cache_key(
diff --git a/tests/sentry/incidents/test_charts.py b/tests/sentry/incidents/test_charts.py
index 7b60a3da2d9426..a61b62f88cce10 100644
--- a/tests/sentry/incidents/test_charts.py
+++ b/tests/sentry/incidents/test_charts.py
@@ -1,9 +1,13 @@
 import datetime
+from unittest.mock import patch
 
+from django.utils import timezone
 from django.utils.dateparse import parse_datetime
 
-from sentry.incidents.charts import incident_date_range
+from sentry.incidents.charts import build_metric_alert_chart, incident_date_range
+from sentry.incidents.logic import CRITICAL_TRIGGER_LABEL
 from sentry.incidents.models.incident import Incident
+from sentry.snuba.dataset import Dataset
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.datetime import freeze_time
 
@@ -62,3 +66,36 @@ def test_large_time_windows(self):
             "start": "2022-02-04T20:28:00",
             "end": now,
         }
+
+
+class BuildMetricAlertChartTest(TestCase):
+    @patch("sentry.charts.backend.generate_chart", return_value="chart-url")
+    @patch("sentry.incidents.charts.client.get")
+    def test_eap_alert(self, mock_client_get, mock_generate_chart):
+        mock_client_get.return_value.data = {"data": []}
+        alert_rule = self.create_alert_rule(
+            query="span.op:pageload", dataset=Dataset.EventsAnalyticsPlatform
+        )
+        incident = self.create_incident(
+            status=2,
+            organization=self.organization,
+            projects=[self.project],
+            alert_rule=alert_rule,
+            date_started=timezone.now() - datetime.timedelta(minutes=2),
+        )
+        trigger = self.create_alert_rule_trigger(alert_rule, CRITICAL_TRIGGER_LABEL, 100)
+        self.create_alert_rule_trigger_action(
+            alert_rule_trigger=trigger, triggered_for_incident=incident
+        )
+
+        url = build_metric_alert_chart(
+            self.organization,
+            alert_rule,
+            selected_incident=incident,
+        )
+
+        assert url == "chart-url"
+        mock_client_get.assert_called()
+        mock_generate_chart.assert_called()
+        assert mock_client_get.call_args[1]["params"]["dataset"] == "spans"
+        assert mock_client_get.call_args[1]["params"]["query"] == "span.op:pageload"
diff --git a/tests/sentry/incidents/test_logic.py b/tests/sentry/incidents/test_logic.py
index 81e93834086b01..5d6a2117555e85 100644
--- a/tests/sentry/incidents/test_logic.py
+++ b/tests/sentry/incidents/test_logic.py
@@ -21,11 +21,7 @@
 from sentry.conf.server import SEER_ANOMALY_DETECTION_STORE_DATA_URL
 from sentry.constants import ObjectStatus
 from sentry.deletions.tasks.scheduled import run_scheduled_deletions
-from sentry.incidents.events import (
-    IncidentCommentCreatedEvent,
-    IncidentCreatedEvent,
-    IncidentStatusUpdatedEvent,
-)
+from sentry.incidents.events import IncidentCreatedEvent, IncidentStatusUpdatedEvent
 from sentry.incidents.logic import (
     CRITICAL_TRIGGER_LABEL,
     DEFAULT_ALERT_RULE_RESOLUTION,
@@ -52,10 +48,8 @@
     get_alert_resolution,
     get_available_action_integrations_for_org,
     get_incident_aggregates,
-    get_incident_subscribers,
     get_triggers_for_alert_rule,
     snapshot_alert_rule,
-    subscribe_to_incident,
     translate_aggregate_field,
     update_alert_rule,
     update_alert_rule_trigger,
@@ -72,7 +66,6 @@
     AlertRuleThresholdType,
     AlertRuleTrigger,
     AlertRuleTriggerAction,
-    AlertRuleTriggerExclusion,
 )
 from sentry.incidents.models.incident import (
     Incident,
@@ -81,7 +74,6 @@
     IncidentProject,
     IncidentStatus,
     IncidentStatusMethod,
-    IncidentSubscription,
     IncidentTrigger,
     IncidentType,
     TriggerStatus,
@@ -181,16 +173,12 @@ def test_status_already_set(self):
         )
         assert incident.status == IncidentStatus.WARNING.value
 
-    def run_test(
-        self, incident, status, expected_date_closed, user=None, comment=None, date_closed=None
-    ):
+    def run_test(self, incident, status, expected_date_closed, user=None, date_closed=None):
         prev_status = incident.status
         self.record_event.reset_mock()
         update_incident_status(
             incident,
             status,
-            user=user,
-            comment=comment,
             status_method=IncidentStatusMethod.RULE_TRIGGERED,
             date_closed=date_closed,
         )
@@ -199,12 +187,8 @@ def run_test(
         assert incident.date_closed == expected_date_closed
         activity = self.get_most_recent_incident_activity(incident)
         assert activity.type == IncidentActivityType.STATUS_CHANGE.value
-        assert activity.user_id == (user.id if user else None)
-        if user:
-            assert IncidentSubscription.objects.filter(incident=incident, user_id=user.id).exists()
         assert activity.value == str(status.value)
         assert activity.previous_value == str(prev_status)
-        assert activity.comment == comment
 
         assert len(self.record_event.call_args_list) == 1
         event = self.record_event.call_args[0][0]
@@ -235,9 +219,7 @@ def test_closed_specify_date(self):
 
     def test_all_params(self):
         incident = self.create_incident()
-        self.run_test(
-            incident, IncidentStatus.CLOSED, timezone.now(), user=self.user, comment="lol"
-        )
+        self.run_test(incident, IncidentStatus.CLOSED, timezone.now(), user=self.user)
 
 
 class BaseIncidentsValidation:
@@ -349,117 +331,18 @@ def test_sessions(self):
 
 @freeze_time()
 class CreateIncidentActivityTest(TestCase, BaseIncidentsTest):
-    @pytest.fixture(autouse=True)
-    def _setup_patches(self):
-        with mock.patch(
-            "sentry.incidents.tasks.send_subscriber_notifications"
-        ) as self.send_subscriber_notifications:
-            with mock.patch("sentry.analytics.base.Analytics.record_event") as self.record_event:
-                yield
-
-    def assert_notifications_sent(self, activity):
-        self.send_subscriber_notifications.apply_async.assert_called_once_with(
-            kwargs={"activity_id": activity.id}, countdown=10
-        )
-
     def test_no_snapshot(self):
         incident = self.create_incident()
-        self.record_event.reset_mock()
         activity = create_incident_activity(
             incident,
             IncidentActivityType.STATUS_CHANGE,
-            user=self.user,
             value=str(IncidentStatus.CLOSED.value),
             previous_value=str(IncidentStatus.WARNING.value),
         )
         assert activity.incident == incident
         assert activity.type == IncidentActivityType.STATUS_CHANGE.value
-        assert activity.user_id == self.user.id
         assert activity.value == str(IncidentStatus.CLOSED.value)
         assert activity.previous_value == str(IncidentStatus.WARNING.value)
-        self.assert_notifications_sent(activity)
-        assert not self.record_event.called
-
-    def test_comment(self):
-        incident = self.create_incident()
-        comment = "hello"
-
-        assert not IncidentSubscription.objects.filter(
-            incident=incident, user_id=self.user.id
-        ).exists()
-        self.record_event.reset_mock()
-        activity = create_incident_activity(
-            incident, IncidentActivityType.COMMENT, user=self.user, comment=comment
-        )
-        assert IncidentSubscription.objects.filter(incident=incident, user_id=self.user.id).exists()
-
-        assert activity.incident == incident
-        assert activity.type == IncidentActivityType.COMMENT.value
-        assert activity.user_id == self.user.id
-        assert activity.comment == comment
-        assert activity.value is None
-        assert activity.previous_value is None
-        self.assert_notifications_sent(activity)
-        assert len(self.record_event.call_args_list) == 1
-        event = self.record_event.call_args[0][0]
-        assert isinstance(event, IncidentCommentCreatedEvent)
-        assert event.data == {
-            "organization_id": str(self.organization.id),
-            "incident_id": str(incident.id),
-            "incident_type": str(incident.type),
-            "user_id": str(self.user.id),
-            "activity_id": str(activity.id),
-        }
-
-    def test_mentioned_user_ids(self):
-        incident = self.create_incident()
-        mentioned_member = self.create_user()
-        subscribed_mentioned_member = self.create_user()
-        IncidentSubscription.objects.create(
-            incident=incident, user_id=subscribed_mentioned_member.id
-        )
-        comment = f"hello **@{mentioned_member.username}** and **@{subscribed_mentioned_member.username}**"
-
-        assert not IncidentSubscription.objects.filter(
-            incident=incident, user_id=mentioned_member.id
-        ).exists()
-        self.record_event.reset_mock()
-        activity = create_incident_activity(
-            incident,
-            IncidentActivityType.COMMENT,
-            user=self.user,
-            comment=comment,
-            mentioned_user_ids=[mentioned_member.id, subscribed_mentioned_member.id],
-        )
-        assert IncidentSubscription.objects.filter(
-            incident=incident, user_id=mentioned_member.id
-        ).exists()
-
-        assert activity.incident == incident
-        assert activity.type == IncidentActivityType.COMMENT.value
-        assert activity.user_id == self.user.id
-        assert activity.comment == comment
-        assert activity.value is None
-        assert activity.previous_value is None
-        self.assert_notifications_sent(activity)
-        assert len(self.record_event.call_args_list) == 1
-        event = self.record_event.call_args[0][0]
-        assert isinstance(event, IncidentCommentCreatedEvent)
-        assert event.data == {
-            "organization_id": str(self.organization.id),
-            "incident_id": str(incident.id),
-            "incident_type": str(incident.type),
-            "user_id": str(self.user.id),
-            "activity_id": str(activity.id),
-        }
-
-
-class GetIncidentSubscribersTest(TestCase, BaseIncidentsTest):
-    def test_simple(self):
-        incident = self.create_incident()
-        assert list(get_incident_subscribers(incident)) == []
-        subscription = subscribe_to_incident(incident, self.user.id)
-        assert list(get_incident_subscribers(incident)) == [subscription]
 
 
 class CreateAlertRuleTest(TestCase, BaseIncidentsTest):
@@ -1072,6 +955,7 @@ def test_delete_projects(self):
         with self.tasks():
             update_alert_rule(alert_rule, projects=[self.project])
         # NOTE: subscribing alert rule to projects creates a new subscription per project
+        assert alert_rule.snuba_query is not None
         subscriptions = alert_rule.snuba_query.subscriptions.all()
         assert subscriptions.count() == 1
         assert alert_rule.snuba_query.subscriptions.get().project == self.project
@@ -1087,11 +971,13 @@ def test_new_updated_deleted_projects(self):
         project_updates = [self.project, new_project]
         with self.tasks():
             update_alert_rule(alert_rule, projects=project_updates, query=query_update)
+        assert alert_rule.snuba_query is not None
         updated_subscriptions = alert_rule.snuba_query.subscriptions.all()
         updated_projects = alert_rule.projects.all()
         assert {sub.project for sub in updated_subscriptions} == set(project_updates)
         assert set(updated_projects) == set(project_updates)
         for sub in updated_subscriptions:
+            assert sub.snuba_query is not None
             assert sub.snuba_query.query == query_update
 
     def test_with_attached_incident(self):
@@ -1616,6 +1502,7 @@ def test_update_dynamic_alerts(self, mock_seer_request):
             time_window=60,
             detection_type=AlertRuleDetectionType.DYNAMIC,
         )
+        assert dynamic_rule.snuba_query is not None
         snuba_query = SnubaQuery.objects.get(id=dynamic_rule.snuba_query_id)
         assert dynamic_rule.snuba_query.resolution == 60 * 60
         assert mock_seer_request.call_count == 1
@@ -2369,7 +2256,6 @@ def test(self):
         trigger = create_alert_rule_trigger(self.alert_rule, label, alert_threshold)
         assert trigger.label == label
         assert trigger.alert_threshold == alert_threshold
-        assert not AlertRuleTriggerExclusion.objects.filter(alert_rule_trigger=trigger).exists()
 
     def test_existing_label(self):
         name = "uh oh"
diff --git a/tests/sentry/incidents/test_receivers.py b/tests/sentry/incidents/test_receivers.py
index d30fa93f8fe802..06d9ea561157a3 100644
--- a/tests/sentry/incidents/test_receivers.py
+++ b/tests/sentry/incidents/test_receivers.py
@@ -15,7 +15,6 @@ class PreSaveIncidentTriggerTest(TestCase):
     def test_update_date_modified(self):
         org = Organization.objects.create(name="chris' test org")
         alert_rule = self.create_alert_rule()
-        alert_rule.query = "event.type:error"
         trigger = AlertRuleTrigger.objects.create(
             alert_rule=alert_rule,
             label="warning",
diff --git a/tests/sentry/incidents/test_subscription_processor.py b/tests/sentry/incidents/test_subscription_processor.py
index cef4bfb5f5f4b6..24589e0a4692d9 100644
--- a/tests/sentry/incidents/test_subscription_processor.py
+++ b/tests/sentry/incidents/test_subscription_processor.py
@@ -2191,6 +2191,7 @@ def test_slack_multiple_triggers_critical_before_warning(self):
             )
 
         # Send Critical Update
+        assert rule.snuba_query is not None
         self.send_update(
             rule,
             trigger.alert_threshold + 5,
@@ -2257,6 +2258,7 @@ def test_slack_metric_alert_chart(self, mock_generate_chart):
                 "organizations:metric-alert-chartcuterie",
             ]
         ):
+            assert rule.snuba_query is not None
             self.send_update(
                 rule,
                 trigger.alert_threshold + 5,
@@ -2322,6 +2324,7 @@ def test_slack_multiple_triggers_critical_fired_twice_before_warning(self):
         self.assert_slack_calls([])
 
         # Send update above critical
+        assert rule.snuba_query is not None
         self.send_update(
             rule,
             trigger.alert_threshold + 5,
diff --git a/tests/sentry/incidents/test_tasks.py b/tests/sentry/incidents/test_tasks.py
index 6302f6596398f8..7ed97da9dc148a 100644
--- a/tests/sentry/incidents/test_tasks.py
+++ b/tests/sentry/incidents/test_tasks.py
@@ -4,7 +4,6 @@
 from unittest.mock import Mock, call, patch
 
 import pytest
-from django.urls import reverse
 from django.utils import timezone
 
 from sentry.incidents.logic import (
@@ -12,152 +11,21 @@
     create_alert_rule_trigger,
     create_alert_rule_trigger_action,
     create_incident_activity,
-    subscribe_to_incident,
 )
 from sentry.incidents.models.alert_rule import AlertRuleTriggerAction
-from sentry.incidents.models.incident import (
-    INCIDENT_STATUS,
-    IncidentActivityType,
-    IncidentStatus,
-    IncidentSubscription,
-)
-from sentry.incidents.tasks import (
-    build_activity_context,
-    generate_incident_activity_email,
-    handle_subscription_metrics_logger,
-    handle_trigger_action,
-    send_subscriber_notifications,
-)
+from sentry.incidents.models.incident import IncidentActivityType, IncidentStatus
+from sentry.incidents.tasks import handle_subscription_metrics_logger, handle_trigger_action
 from sentry.incidents.utils.constants import SUBSCRIPTION_METRICS_LOGGER
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.models import SnubaQuery
 from sentry.snuba.subscriptions import create_snuba_query, create_snuba_subscription
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.alert_rule import TemporaryAlertRuleTriggerActionRegistry
-from sentry.testutils.helpers.datetime import freeze_time
 from sentry.testutils.skips import requires_kafka, requires_snuba
-from sentry.users.services.user.service import user_service
-from sentry.utils.http import absolute_uri
 
 pytestmark = [pytest.mark.sentry_metrics, requires_snuba, requires_kafka]
 
 
-class BaseIncidentActivityTest(TestCase):
-    @property
-    def incident(self):
-        return self.create_incident(title="hello")
-
-
-class TestSendSubscriberNotifications(BaseIncidentActivityTest):
-    @pytest.fixture(autouse=True)
-    def _setup_send_async_patch(self):
-        with mock.patch("sentry.utils.email.MessageBuilder.send_async") as self.send_async:
-            yield
-
-    def test_simple(self):
-        activity = create_incident_activity(
-            self.incident, IncidentActivityType.COMMENT, user=self.user, comment="hello"
-        )
-        send_subscriber_notifications(activity.id)
-        # User shouldn't receive an email for their own activity
-        assert self.send_async.call_count == 0
-
-        self.send_async.reset_mock()
-        non_member_user = self.create_user(email="non_member@test.com")
-        subscribe_to_incident(activity.incident, non_member_user.id)
-
-        member_user = self.create_user(email="member@test.com")
-        self.create_member([self.team], user=member_user, organization=self.organization)
-        subscribe_to_incident(activity.incident, member_user.id)
-        send_subscriber_notifications(activity.id)
-        self.send_async.assert_called_once_with([member_user.email])
-        assert not IncidentSubscription.objects.filter(
-            incident=activity.incident, user_id=non_member_user.id
-        ).exists()
-        assert IncidentSubscription.objects.filter(
-            incident=activity.incident, user_id=member_user.id
-        ).exists()
-
-    def test_invalid_types(self):
-        activity_type = IncidentActivityType.CREATED
-        activity = create_incident_activity(self.incident, activity_type)
-        send_subscriber_notifications(activity.id)
-        assert self.send_async.call_count == 0
-        self.send_async.reset_mock()
-
-
-class TestGenerateIncidentActivityEmail(BaseIncidentActivityTest):
-    @freeze_time()
-    def test_simple(self):
-        activity = create_incident_activity(
-            self.incident, IncidentActivityType.COMMENT, user=self.user, comment="hello"
-        )
-        incident = activity.incident
-        recipient = self.create_user()
-        message = generate_incident_activity_email(activity, recipient)
-        assert message.subject == f"Activity on Alert {incident.title} (#{incident.identifier})"
-        assert message.type == "incident.activity"
-        assert message.context == build_activity_context(activity, recipient)
-
-
-class TestBuildActivityContext(BaseIncidentActivityTest):
-    def run_test(
-        self, activity, expected_username, expected_action, expected_comment, expected_recipient
-    ):
-        incident = activity.incident
-        context = build_activity_context(activity, expected_recipient)
-        assert context["user_name"] == expected_username
-        assert (
-            context["action"]
-            == f"{expected_action} on alert {activity.incident.title} (#{activity.incident.identifier})"
-        )
-        assert (
-            context["link"]
-            == absolute_uri(
-                reverse(
-                    "sentry-metric-alert",
-                    kwargs={
-                        "organization_slug": incident.organization.slug,
-                        "incident_id": incident.identifier,
-                    },
-                )
-            )
-            + "?referrer=incident_activity_email"
-        )
-        assert context["comment"] == expected_comment
-
-    @freeze_time()
-    def test_simple(self):
-        activity = create_incident_activity(
-            self.incident, IncidentActivityType.COMMENT, user=self.user, comment="hello"
-        )
-        recipient = self.create_user()
-        assert activity.user_id is not None
-        user = user_service.get_user(user_id=activity.user_id)
-        assert user is not None
-        self.run_test(
-            activity,
-            expected_username=user.name,
-            expected_action="left a comment",
-            expected_comment=activity.comment,
-            expected_recipient=recipient,
-        )
-        activity.type = IncidentActivityType.STATUS_CHANGE
-        activity.value = str(IncidentStatus.CLOSED.value)
-        activity.previous_value = str(IncidentStatus.WARNING.value)
-        assert activity.user_id is not None
-        user = user_service.get_user(user_id=activity.user_id)
-        assert user is not None
-        self.run_test(
-            activity,
-            expected_username=user.name,
-            expected_action="changed status from %s to %s"
-            % (INCIDENT_STATUS[IncidentStatus.WARNING], INCIDENT_STATUS[IncidentStatus.CLOSED]),
-            expected_comment=activity.comment,
-            expected_recipient=recipient,
-        )
-
-
 class HandleTriggerActionTest(TestCase):
     @pytest.fixture(autouse=True)
     def _setup_metric_patch(self):
diff --git a/tests/sentry/ingest/billing_metrics_consumer/test_billing_metrics_consumer_kafka.py b/tests/sentry/ingest/billing_metrics_consumer/test_billing_metrics_consumer_kafka.py
index 683ba433210641..bd0fe63b29640e 100644
--- a/tests/sentry/ingest/billing_metrics_consumer/test_billing_metrics_consumer_kafka.py
+++ b/tests/sentry/ingest/billing_metrics_consumer/test_billing_metrics_consumer_kafka.py
@@ -266,22 +266,11 @@ def generate_kafka_message(generic_metric: GenericMetric) -> Message[KafkaPayloa
                     category=DataCategory.TRANSACTION,
                     quantity=1,
                 ),
-                mock.call(
-                    org_id=organization.id,
-                    project_id=missing_project_id,
-                    key_id=None,
-                    outcome=Outcome.ACCEPTED,
-                    reason=None,
-                    timestamp=mock.ANY,
-                    event_id=None,
-                    category=DataCategory.PROFILE,
-                    quantity=1,
-                ),
             ]
             # We double-check that the project does not exist.
             assert not Project.objects.filter(id=2).exists()
         else:
-            assert track_outcome.mock_calls[3:] == [
+            assert track_outcome.mock_calls[2:] == [
                 mock.call(
                     org_id=organization.id,
                     project_id=project_2.id,
diff --git a/tests/sentry/integrations/api/bases/test_integration.py b/tests/sentry/integrations/api/bases/test_integration.py
index ddb38dc7a1a77e..362cc430fa90dd 100644
--- a/tests/sentry/integrations/api/bases/test_integration.py
+++ b/tests/sentry/integrations/api/bases/test_integration.py
@@ -12,7 +12,7 @@
 @patch("sys.stderr.write")
 class IntegrationEndpointTest(TestCase):
 
-    # Since both `IntegrationEndpoint.handle_exception` and `Endpoint.handle_exception` potentially
+    # Since both `IntegrationEndpoint.handle_exception_with_details` and `Endpoint.handle_exception_with_details` potentially
     # run, and they both call their own module's copy of `capture_exception`, in order to prove that
     # neither one is not called, we assert on the underlying method from the SDK
     @patch("sentry_sdk.Scope.capture_exception")
@@ -23,7 +23,7 @@ def test_handle_rest_framework_exception(
         exc.status_code = 400  # not possible to set in init
         request = Request(HttpRequest())
 
-        resp = IntegrationEndpoint().handle_exception(request, exc)
+        resp = IntegrationEndpoint().handle_exception_with_details(request, exc)
 
         # `APIException`s are handled by Django REST Framework's built-in exception handler, which
         # doesn't log errors or report them to Sentry
@@ -42,7 +42,7 @@ def test_handle_exception_503(
         except ApiError as exc:
             request = Request(HttpRequest())
 
-            resp = IntegrationEndpoint().handle_exception(request, exc)
+            resp = IntegrationEndpoint().handle_exception_with_details(request, exc)
 
             mock_capture_exception.assert_called_with(exc)
             (((s,), _),) = mock_stderror_write.call_args_list
@@ -63,7 +63,7 @@ def test_handle_exception_stdlib(
         except ValueError as exc:
             request = Request(HttpRequest())
 
-            resp = IntegrationEndpoint().handle_exception(request, exc)
+            resp = IntegrationEndpoint().handle_exception_with_details(request, exc)
 
             assert mock_capture_exception.call_args.args[0] == exc
             (((s,), _),) = mock_stderror_write.call_args_list
diff --git a/tests/sentry/integrations/bitbucket/test_issues.py b/tests/sentry/integrations/bitbucket/test_issues.py
index 6c076ae99dc04a..d30acf1228d3ab 100644
--- a/tests/sentry/integrations/bitbucket/test_issues.py
+++ b/tests/sentry/integrations/bitbucket/test_issues.py
@@ -1,14 +1,9 @@
-from unittest import mock
-
 import orjson
-import pytest
 import responses
 
 from sentry.integrations.bitbucket.issues import ISSUE_TYPES, PRIORITIES
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.services.integration import integration_service
-from sentry.integrations.types import EventLifecycleOutcome
-from sentry.shared_integrations.exceptions import IntegrationFormError
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.factories import EventType
 from sentry.testutils.helpers.datetime import before_now
@@ -282,8 +277,7 @@ def test_get_link_issue_config(self):
         ]
 
     @responses.activate
-    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_create_issue(self, mock_record):
+    def test_create_issue(self):
         repo = "myaccount/repo1"
         id = "112"
         title = "hello"
@@ -299,28 +293,3 @@ def test_create_issue(self, mock_record):
             {"id": id, "title": title, "description": content, "repo": repo}
         )
         assert result == {"key": id, "title": title, "description": content, "repo": repo}
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
-
-    @responses.activate
-    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_create_issue_failure(self, mock_record):
-        """
-        This test is primarily used to verify that we omit failure metrics.
-        """
-        id = "112"
-        title = "hello"
-        content = {"html": "This is the description"}
-
-        installation = self.integration.get_installation(self.organization.id)
-        with pytest.raises(IntegrationFormError):
-            installation.create_issue(
-                {"id": id, "title": title, "description": content}  # omit repo
-            )
-
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.FAILURE
diff --git a/tests/sentry/integrations/bitbucket/test_search.py b/tests/sentry/integrations/bitbucket/test_search.py
index c01dad727abb0c..870be75ed8552d 100644
--- a/tests/sentry/integrations/bitbucket/test_search.py
+++ b/tests/sentry/integrations/bitbucket/test_search.py
@@ -1,6 +1,11 @@
+from unittest.mock import patch
+
 import responses
 from django.urls import reverse
 
+from sentry.integrations.source_code_management.metrics import SourceCodeSearchEndpointHaltReason
+from sentry.integrations.types import EventLifecycleOutcome
+from sentry.testutils.asserts import assert_halt_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import control_silo_test
 
@@ -30,7 +35,8 @@ def setUp(self):
         )
 
     @responses.activate
-    def test_search_issues(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_search_issues(self, mock_record):
         responses.add(
             responses.GET,
             "https://api.bitbucket.org/2.0/repositories/meredithanya/apples/issues",
@@ -51,9 +57,18 @@ def test_search_issues(self):
             {"label": "#123 Issue Title 123", "value": "123"},
             {"label": "#456 Issue Title 456", "value": "456"},
         ]
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = (
+            mock_record.mock_calls
+        )  # calls get, which calls handle_search_issues
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.SUCCESS
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
-    def test_search_repositories(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_search_repositories(self, mock_record):
         responses.add(
             responses.GET,
             "https://api.bitbucket.org/2.0/repositories/meredithanya",
@@ -63,9 +78,18 @@ def test_search_repositories(self):
 
         assert resp.status_code == 200
         assert resp.data == [{"label": "meredithanya/apples", "value": "meredithanya/apples"}]
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = (
+            mock_record.mock_calls
+        )  # calls get, which calls handle_search_repositories
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.SUCCESS
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
-    def test_search_repositories_no_issue_tracker(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_search_repositories_no_issue_tracker(self, mock_record):
         responses.add(
             responses.GET,
             "https://api.bitbucket.org/2.0/repositories/meredithanya/apples/issues",
@@ -78,3 +102,14 @@ def test_search_repositories_no_issue_tracker(self):
         )
         assert resp.status_code == 400
         assert resp.data == {"detail": "Bitbucket Repository has no issue tracker."}
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = (
+            mock_record.mock_calls
+        )  # calls get, which calls handle_search_issues
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, SourceCodeSearchEndpointHaltReason.NO_ISSUE_TRACKER.value)
+        # NOTE: handle_search_issues returns without raising an API error, so for the
+        # purposes of logging the GET request completes successfully
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
diff --git a/tests/sentry/integrations/bitbucket/test_webhook.py b/tests/sentry/integrations/bitbucket/test_webhook.py
index 7054093c5d65ac..b8ae1fc786419d 100644
--- a/tests/sentry/integrations/bitbucket/test_webhook.py
+++ b/tests/sentry/integrations/bitbucket/test_webhook.py
@@ -2,12 +2,14 @@
 
 from datetime import datetime, timezone
 from typing import Any
+from unittest.mock import patch
 
 from fixtures.bitbucket import PUSH_EVENT_EXAMPLE
 from sentry.integrations.bitbucket.webhook import PROVIDER_NAME
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
 from sentry.models.repository import Repository
+from sentry.testutils.asserts import assert_failure_metric, assert_success_metric
 from sentry.testutils.cases import APITestCase
 
 BAD_IP = "109.111.111.10"
@@ -110,12 +112,35 @@ def test_invalid_signature_ip(self):
 class PushEventWebhookTest(WebhookBaseTest):
     method = "post"
 
-    def test_simple(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_simple(self, mock_record):
         self.create_repository()
 
         self.send_webhook()
         self.assert_commit()
 
+        assert_success_metric(mock_record)
+
+    @patch("sentry.integrations.bitbucket.webhook.PushEventWebhook.__call__")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_webhook_error_metric(self, mock_record, mock_event):
+        self.create_repository()
+
+        error = Exception("error")
+        mock_event.side_effect = error
+
+        self.get_error_response(
+            self.organization_id,
+            raw_data=PUSH_EVENT_EXAMPLE,
+            extra_headers=dict(
+                HTTP_X_EVENT_KEY="repo:push",
+                REMOTE_ADDR=BITBUCKET_IP,
+            ),
+            status_code=500,
+        )
+
+        assert_failure_metric(mock_record, error)
+
     def test_anonymous_lookup(self):
         self.create_repository()
 
diff --git a/tests/sentry/integrations/bitbucket_server/test_integration.py b/tests/sentry/integrations/bitbucket_server/test_integration.py
index 137998206c111c..1daf7db9af59e7 100644
--- a/tests/sentry/integrations/bitbucket_server/test_integration.py
+++ b/tests/sentry/integrations/bitbucket_server/test_integration.py
@@ -7,7 +7,7 @@
 from sentry.integrations.bitbucket_server.integration import BitbucketServerIntegrationProvider
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
-from sentry.integrations.types import EventLifecycleOutcome
+from sentry.testutils.asserts import assert_failure_metric
 from sentry.testutils.cases import IntegrationTestCase
 from sentry.testutils.silo import control_silo_test
 from sentry.users.models.identity import Identity, IdentityProvider
@@ -17,12 +17,6 @@
 class BitbucketServerIntegrationTest(IntegrationTestCase):
     provider = BitbucketServerIntegrationProvider
 
-    def assert_failure_metric(self, mock_record, error_msg):
-        (event_failures,) = (
-            call for call in mock_record.mock_calls if call.args[0] == EventLifecycleOutcome.FAILURE
-        )
-        assert event_failures.args[1]["failure_reason"] == error_msg
-
     def test_config_view(self):
         resp = self.client.get(self.init_path)
         assert resp.status_code == 200
@@ -114,7 +108,7 @@ def test_authentication_request_token_timeout(self, mock_record):
         self.assertContains(resp, "request token from Bitbucket")
         self.assertContains(resp, "Timed out")
 
-        self.assert_failure_metric(
+        assert_failure_metric(
             mock_record, "Timed out attempting to reach host: bitbucket.example.com"
         )
 
@@ -142,7 +136,7 @@ def test_authentication_request_token_fails(self, mock_record):
         self.assertContains(resp, "Setup Error")
         self.assertContains(resp, "request token from Bitbucket")
 
-        self.assert_failure_metric(mock_record, "")
+        assert_failure_metric(mock_record, "")
 
     @responses.activate
     def test_authentication_request_token_redirect(self):
@@ -210,7 +204,7 @@ def test_authentication_access_token_failure(self, mock_record):
         self.assertContains(resp, "Setup Error")
         self.assertContains(resp, "access token from Bitbucket")
 
-        self.assert_failure_metric(mock_record, error_msg)
+        assert_failure_metric(mock_record, error_msg)
 
     def install_integration(self):
         # Get config page
@@ -259,7 +253,7 @@ def test_authentication_verifier_expired(self, mock_record):
         self.assertContains(resp, "Setup Error")
         self.assertContains(resp, "access token from Bitbucket")
 
-        self.assert_failure_metric(mock_record, error_msg)
+        assert_failure_metric(mock_record, error_msg)
 
     @responses.activate
     def test_authentication_success(self):
diff --git a/tests/sentry/integrations/bitbucket_server/test_webhook.py b/tests/sentry/integrations/bitbucket_server/test_webhook.py
index 40f11225558953..55ba3291c17ec5 100644
--- a/tests/sentry/integrations/bitbucket_server/test_webhook.py
+++ b/tests/sentry/integrations/bitbucket_server/test_webhook.py
@@ -1,7 +1,9 @@
 from time import time
 from typing import Any
+from unittest.mock import patch
 
 import orjson
+import pytest
 import responses
 from requests.exceptions import ConnectionError
 
@@ -9,6 +11,7 @@
 from sentry.integrations.bitbucket_server.webhook import PROVIDER_NAME
 from sentry.models.repository import Repository
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_failure_metric, assert_success_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.users.models.identity import Identity
@@ -117,13 +120,38 @@ def test_missing_integration(self):
             status_code=404,
         )
 
-    def test_simple(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_simple(self, mock_record):
         with assume_test_silo_mode(SiloMode.CONTROL):
             self.integration.add_organization(self.organization, default_auth_id=self.identity.id)
 
         self.create_repository()
         self.send_webhook()
 
+        assert_success_metric(mock_record)
+
+    @patch("sentry.integrations.bitbucket_server.webhook.PushEventWebhook.__call__")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_webhook_error_metric(self, mock_record, mock_event):
+        with assume_test_silo_mode(SiloMode.CONTROL):
+            self.integration.add_organization(self.organization, default_auth_id=self.identity.id)
+
+        self.create_repository()
+
+        error = Exception("error")
+        mock_event.side_effect = error
+
+        with pytest.raises(Exception):
+            self.get_error_response(
+                self.organization.id,
+                self.integration.id,
+                raw_data=REFS_CHANGED_EXAMPLE,
+                extra_headers=dict(HTTP_X_EVENT_KEY="repo:refs_changed"),
+                status_code=500,
+            )
+
+        assert_failure_metric(mock_record, error)
+
     @responses.activate
     def test_get_commits_error(self):
         responses.add(
diff --git a/tests/sentry/integrations/discord/test_message_builder.py b/tests/sentry/integrations/discord/test_message_builder.py
index ea07ffae9099f5..d02053adc324b6 100644
--- a/tests/sentry/integrations/discord/test_message_builder.py
+++ b/tests/sentry/integrations/discord/test_message_builder.py
@@ -35,7 +35,7 @@ def test_metric_alert_without_incidents(self):
             reverse(
                 "sentry-metric-alert-details",
                 kwargs={
-                    "organization_slug": self.alert_rule.organization.slug,
+                    "organization_slug": self.organization.slug,
                     "alert_rule_id": self.alert_rule.id,
                 },
             )
@@ -69,7 +69,7 @@ def test_metric_alert_with_selected_incident(self):
             reverse(
                 "sentry-metric-alert-details",
                 kwargs={
-                    "organization_slug": self.alert_rule.organization.slug,
+                    "organization_slug": self.organization.slug,
                     "alert_rule_id": self.alert_rule.id,
                 },
             )
@@ -104,7 +104,7 @@ def test_metric_alert_with_active_incident(self):
             reverse(
                 "sentry-metric-alert-details",
                 kwargs={
-                    "organization_slug": self.alert_rule.organization.slug,
+                    "organization_slug": self.organization.slug,
                     "alert_rule_id": self.alert_rule.id,
                 },
             )
@@ -140,7 +140,7 @@ def test_metric_value(self):
             reverse(
                 "sentry-metric-alert-details",
                 kwargs={
-                    "organization_slug": self.alert_rule.organization.slug,
+                    "organization_slug": self.organization.slug,
                     "alert_rule_id": self.alert_rule.id,
                 },
             )
@@ -173,7 +173,7 @@ def test_metric_alert_chart(self):
             reverse(
                 "sentry-metric-alert-details",
                 kwargs={
-                    "organization_slug": self.alert_rule.organization.slug,
+                    "organization_slug": self.organization.slug,
                     "alert_rule_id": self.alert_rule.id,
                 },
             )
@@ -212,7 +212,7 @@ def test_metric_alert_no_uuid(self):
             reverse(
                 "sentry-metric-alert-details",
                 kwargs={
-                    "organization_slug": self.alert_rule.organization.slug,
+                    "organization_slug": self.organization.slug,
                     "alert_rule_id": self.alert_rule.id,
                 },
             )
@@ -257,7 +257,7 @@ def test_metric_alert_with_anomaly_detection(self, mock_seer_request):
             reverse(
                 "sentry-metric-alert-details",
                 kwargs={
-                    "organization_slug": alert_rule.organization.slug,
+                    "organization_slug": self.organization.slug,
                     "alert_rule_id": alert_rule.id,
                 },
             )
diff --git a/tests/sentry/integrations/discord/test_uninstall.py b/tests/sentry/integrations/discord/test_uninstall.py
index 0a9212ae283d4f..1ce4af5823b1ee 100644
--- a/tests/sentry/integrations/discord/test_uninstall.py
+++ b/tests/sentry/integrations/discord/test_uninstall.py
@@ -13,6 +13,7 @@
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.factories import Factories
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
+from sentry.users.models.user import User
 from sentry.users.services.user.model import RpcUser
 
 GUILD_ID = "guild-id"
@@ -32,7 +33,7 @@ def setUp(self) -> None:
     def create_discord_integration(
         self,
         organization: Organization,
-        user: RpcUser | None,
+        user: RpcUser | User | None,
         guild_id: str = GUILD_ID,
         **kwargs: Any,
     ):
diff --git a/tests/sentry/integrations/discord/webhooks/test_command.py b/tests/sentry/integrations/discord/webhooks/test_command.py
index d7bf75f16e4a2f..8388f06b0a4d54 100644
--- a/tests/sentry/integrations/discord/webhooks/test_command.py
+++ b/tests/sentry/integrations/discord/webhooks/test_command.py
@@ -4,7 +4,9 @@
 from sentry.integrations.discord.requests.base import DiscordRequestTypes
 from sentry.integrations.discord.webhooks.command import HELP_MESSAGE, NOT_LINKED_MESSAGE
 from sentry.integrations.discord.webhooks.types import DiscordResponseTypes
+from sentry.integrations.messaging.metrics import MessageCommandFailureReason
 from sentry.integrations.types import EventLifecycleOutcome
+from sentry.testutils.asserts import assert_failure_metric
 from sentry.testutils.cases import APITestCase
 
 WEBHOOK_URL = "/extensions/discord/interactions/"
@@ -27,7 +29,8 @@ def test_command_interaction(self, mock_verify_signature):
         assert data["data"]["flags"] == EPHEMERAL_FLAG
         assert response.status_code == 200
 
-    def test_link_no_integration(self):
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_no_integration(self, mock_record):
         with mock.patch(
             "sentry.integrations.discord.requests.base.verify_signature", return_value=True
         ):
@@ -45,7 +48,13 @@ def test_link_no_integration(self):
             )
         assert resp.status_code == 200
 
-    def test_link_no_user_id(self):
+        start, failure = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert failure.args[0] == EventLifecycleOutcome.FAILURE
+        assert_failure_metric(mock_record, MessageCommandFailureReason.MISSING_DATA.value)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_no_user_id(self, mock_record):
         guild_id = "guild-id"
         self.create_integration(
             provider="discord",
@@ -70,7 +79,13 @@ def test_link_no_user_id(self):
             )
         assert resp.status_code == 200
 
-    def test_link_guild(self):
+        start, failure = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert failure.args[0] == EventLifecycleOutcome.FAILURE
+        assert_failure_metric(mock_record, MessageCommandFailureReason.MISSING_DATA.value)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_guild(self, mock_record):
         guild_id = "guild-id"
         self.create_integration(
             provider="discord",
@@ -103,7 +118,12 @@ def test_link_guild(self):
             assert data["data"]["flags"] == EPHEMERAL_FLAG
             assert response.status_code == 200
 
-    def test_link_dm(self):
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_dm(self, mock_record):
         guild_id = "guild-id"
         self.create_integration(
             provider="discord",
@@ -136,7 +156,12 @@ def test_link_dm(self):
             assert data["data"]["flags"] == EPHEMERAL_FLAG
             assert response.status_code == 200
 
-    def test_link_already_linked(self):
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_already_linked(self, mock_record):
         guild_id = "guild-id"
         discord_user_id = "user1234"
         integration = self.create_integration(
@@ -180,7 +205,12 @@ def test_link_already_linked(self):
             assert data["data"]["flags"] == EPHEMERAL_FLAG
             assert response.status_code == 200
 
-    def test_unlink_no_identity(self):
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_unlink_no_identity(self, mock_record):
         with mock.patch(
             "sentry.integrations.discord.requests.base.verify_signature", return_value=True
         ):
@@ -202,7 +232,12 @@ def test_unlink_no_identity(self):
             assert data["data"]["flags"] == EPHEMERAL_FLAG
             assert response.status_code == 200
 
-    def test_unlink(self):
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_unlink(self, mock_record):
         guild_id = "guild-id"
         discord_user_id = "user1234"
         integration = self.create_integration(
@@ -247,6 +282,10 @@ def test_unlink(self):
             assert data["data"]["flags"] == EPHEMERAL_FLAG
             assert response.status_code == 200
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     def test_help(self, mock_record):
         with mock.patch(
@@ -271,6 +310,6 @@ def test_help(self, mock_record):
             assert response.status_code == 200
 
         assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
+        start, success = mock_record.mock_calls
         assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
diff --git a/tests/sentry/integrations/github/tasks/test_link_all_repos.py b/tests/sentry/integrations/github/tasks/test_link_all_repos.py
index a64a564e106aaf..7a051f481d3f72 100644
--- a/tests/sentry/integrations/github/tasks/test_link_all_repos.py
+++ b/tests/sentry/integrations/github/tasks/test_link_all_repos.py
@@ -7,9 +7,12 @@
 from sentry.constants import ObjectStatus
 from sentry.integrations.github.integration import GitHubIntegrationProvider
 from sentry.integrations.github.tasks.link_all_repos import link_all_repos
+from sentry.integrations.source_code_management.metrics import LinkAllReposHaltReason
+from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.repository import Repository
 from sentry.shared_integrations.exceptions import ApiError
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_failure_metric, assert_halt_metric
 from sentry.testutils.cases import IntegrationTestCase
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
 
@@ -41,8 +44,9 @@ def _add_responses(self):
             },
         )
 
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.github.tasks.link_all_repos.metrics")
-    def test_link_all_repos_inactive_integration(self, mock_metrics, _):
+    def test_link_all_repos_inactive_integration(self, mock_metrics, mock_record, _):
         self.integration.update(status=ObjectStatus.DISABLED)
 
         link_all_repos(
@@ -55,8 +59,14 @@ def test_link_all_repos_inactive_integration(self, mock_metrics, _):
             "github.link_all_repos.error", tags={"type": "missing_integration"}
         )
 
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.FAILURE
+        assert_failure_metric(mock_record, LinkAllReposHaltReason.MISSING_INTEGRATION.value)
+
     @responses.activate
-    def test_link_all_repos(self, _):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_all_repos(self, mock_record, _):
         self._add_responses()
 
         link_all_repos(
@@ -76,8 +86,13 @@ def test_link_all_repos(self, _):
         assert repos[0].name == "getsentry/sentry"
         assert repos[1].name == "getsentry/snuba"
 
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
+
     @responses.activate
-    def test_link_all_repos_api_response_keyerror(self, _):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_all_repos_api_response_keyerror(self, mock_record, _):
 
         responses.add(
             responses.GET,
@@ -112,8 +127,48 @@ def test_link_all_repos_api_response_keyerror(self, _):
 
         assert repos[0].name == "getsentry/snuba"
 
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
+
+    @responses.activate
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_all_repos_api_response_keyerror_single_repo(self, mock_record, _):
+
+        responses.add(
+            responses.GET,
+            self.base_url + "/installation/repositories?per_page=100",
+            status=200,
+            json={
+                "total_count": 2,
+                "repositories": [
+                    {
+                        "full_name": "getsentry/sentry",
+                    },
+                ],
+            },
+        )
+
+        link_all_repos(
+            integration_key=self.key,
+            integration_id=self.integration.id,
+            organization_id=self.organization.id,
+        )
+
+        with assume_test_silo_mode(SiloMode.REGION):
+            repos = Repository.objects.all()
+        assert len(repos) == 0
+
+        start, halt = mock_record.mock_calls
+
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, LinkAllReposHaltReason.REPOSITORY_NOT_CREATED.value)
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.github.tasks.link_all_repos.metrics")
-    def test_link_all_repos_missing_integration(self, mock_metrics, _):
+    def test_link_all_repos_missing_integration(self, mock_metrics, mock_record, _):
         link_all_repos(
             integration_key=self.key,
             integration_id=0,
@@ -123,8 +178,14 @@ def test_link_all_repos_missing_integration(self, mock_metrics, _):
             "github.link_all_repos.error", tags={"type": "missing_integration"}
         )
 
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.FAILURE
+        assert_failure_metric(mock_record, LinkAllReposHaltReason.MISSING_INTEGRATION.value)
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.github.tasks.link_all_repos.metrics")
-    def test_link_all_repos_missing_organization(self, mock_metrics, _):
+    def test_link_all_repos_missing_organization(self, mock_metrics, mock_record, _):
         link_all_repos(
             integration_key=self.key,
             integration_id=self.integration.id,
@@ -134,9 +195,15 @@ def test_link_all_repos_missing_organization(self, mock_metrics, _):
             "github.link_all_repos.error", tags={"type": "missing_organization"}
         )
 
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.FAILURE
+        assert_failure_metric(mock_record, LinkAllReposHaltReason.MISSING_ORGANIZATION.value)
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.github.tasks.link_all_repos.metrics")
     @responses.activate
-    def test_link_all_repos_api_error(self, mock_metrics, _):
+    def test_link_all_repos_api_error(self, mock_metrics, mock_record, _):
 
         responses.add(
             responses.GET,
@@ -150,11 +217,16 @@ def test_link_all_repos_api_error(self, mock_metrics, _):
                 integration_id=self.integration.id,
                 organization_id=self.organization.id,
             )
-            mock_metrics.incr.assert_called_with("github.link_all_repos.api_error")
+        mock_metrics.incr.assert_called_with("github.link_all_repos.api_error")
 
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.FAILURE
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.github.integration.metrics")
     @responses.activate
-    def test_link_all_repos_api_error_rate_limited(self, mock_metrics, _):
+    def test_link_all_repos_api_error_rate_limited(self, mock_metrics, mock_record, _):
 
         responses.add(
             responses.GET,
@@ -173,10 +245,16 @@ def test_link_all_repos_api_error_rate_limited(self, mock_metrics, _):
         )
         mock_metrics.incr.assert_called_with("github.link_all_repos.rate_limited_error")
 
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, LinkAllReposHaltReason.RATE_LIMITED.value)
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.models.Repository.objects.create")
     @patch("sentry.integrations.github.tasks.link_all_repos.metrics")
     @responses.activate
-    def test_link_all_repos_repo_creation_error(self, mock_metrics, mock_repo, _):
+    def test_link_all_repos_repo_creation_error(self, mock_metrics, mock_repo, mock_record, _):
         mock_repo.side_effect = IntegrityError
 
         self._add_responses()
@@ -189,11 +267,17 @@ def test_link_all_repos_repo_creation_error(self, mock_metrics, mock_repo, _):
 
         mock_metrics.incr.assert_called_with("sentry.integration_repo_provider.repo_exists")
 
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, LinkAllReposHaltReason.REPOSITORY_NOT_CREATED.value)
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.services.repository.repository_service.create_repository")
     @patch("sentry.plugins.providers.IntegrationRepositoryProvider.on_delete_repository")
     @responses.activate
     def test_link_all_repos_repo_creation_exception(
-        self, mock_delete_repo, mock_create_repository, _
+        self, mock_delete_repo, mock_create_repository, mock_record, _
     ):
         mock_create_repository.return_value = None
         mock_delete_repo.side_effect = Exception
@@ -206,3 +290,7 @@ def test_link_all_repos_repo_creation_exception(
                 integration_id=self.integration.id,
                 organization_id=self.organization.id,
             )
+
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.FAILURE
diff --git a/tests/sentry/integrations/github/test_integration.py b/tests/sentry/integrations/github/test_integration.py
index eb882842ffb31d..c6ddd42c62203e 100644
--- a/tests/sentry/integrations/github/test_integration.py
+++ b/tests/sentry/integrations/github/test_integration.py
@@ -30,7 +30,6 @@
     FileBlameInfo,
     SourceLineInfo,
 )
-from sentry.integrations.types import EventLifecycleOutcome
 from sentry.integrations.utils.code_mapping import Repo, RepoTree
 from sentry.models.project import Project
 from sentry.models.repository import Repository
@@ -39,6 +38,7 @@
 from sentry.plugins.bases.issue2 import IssueTrackingPlugin2
 from sentry.shared_integrations.exceptions import ApiError
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_failure_metric
 from sentry.testutils.cases import IntegrationTestCase
 from sentry.testutils.helpers.integrations import get_installation_of_type
 from sentry.testutils.helpers.options import override_options
@@ -112,12 +112,6 @@ def tearDown(self):
         plugins.unregister(GitHubPlugin)
         super().tearDown()
 
-    def assert_failure_metric(self, mock_record, error_msg):
-        (event_failures,) = (
-            call for call in mock_record.mock_calls if call.args[0] == EventLifecycleOutcome.FAILURE
-        )
-        assert event_failures.args[1]["failure_reason"] == error_msg
-
     @pytest.fixture(autouse=True)
     def stub_get_jwt(self):
         with mock.patch.object(client, "get_jwt", return_value="jwt_token_1"):
@@ -372,7 +366,7 @@ def test_github_installed_on_another_org(self, mock_record):
                 f', "{generate_organization_url(self.organization_2.slug)}");'.encode()
                 in resp.content
             )
-            self.assert_failure_metric(mock_record, GitHubInstallationError.INSTALLATION_EXISTS)
+            assert_failure_metric(mock_record, GitHubInstallationError.INSTALLATION_EXISTS)
 
         # Delete the Integration
         integration = Integration.objects.get(external_id=self.installation_id)
@@ -413,7 +407,7 @@ def test_installation_not_found(self, mock_record):
             )
         )
         assert b"Invalid state" in resp.content
-        self.assert_failure_metric(mock_record, GitHubInstallationError.INVALID_STATE)
+        assert_failure_metric(mock_record, GitHubInstallationError.INVALID_STATE)
 
     @responses.activate
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -474,7 +468,7 @@ def test_github_user_mismatch(self, mock_record):
             assert resp.status_code == 200
             assert b'window.opener.postMessage({"success":false' in resp.content
             assert b"Authenticated user is not the same as who installed the app" in resp.content
-            self.assert_failure_metric(mock_record, GitHubInstallationError.USER_MISMATCH)
+            assert_failure_metric(mock_record, GitHubInstallationError.USER_MISMATCH)
 
     @responses.activate
     def test_disable_plugin_when_fully_migrated(self):
@@ -763,7 +757,7 @@ def test_github_prevent_install_until_pending_deletion_is_complete(self, mock_re
             in resp.content
         )
 
-        self.assert_failure_metric(mock_record, GitHubInstallationError.PENDING_DELETION)
+        assert_failure_metric(mock_record, GitHubInstallationError.PENDING_DELETION)
 
         # Delete the original Integration
         oi.delete()
diff --git a/tests/sentry/integrations/github/test_issues.py b/tests/sentry/integrations/github/test_issues.py
index c25f97a2cf947d..935a9cfd95f49e 100644
--- a/tests/sentry/integrations/github/test_issues.py
+++ b/tests/sentry/integrations/github/test_issues.py
@@ -1,11 +1,9 @@
 import datetime
 from functools import cached_property
 from typing import cast
-from unittest import mock
 from unittest.mock import patch
 
 import orjson
-import pytest
 import responses
 from django.test import RequestFactory
 from django.utils import timezone
@@ -15,9 +13,7 @@
 from sentry.integrations.github.integration import GitHubIntegration
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.services.integration import integration_service
-from sentry.integrations.types import EventLifecycleOutcome
 from sentry.issues.grouptype import FeedbackGroup
-from sentry.shared_integrations.exceptions import IntegrationError
 from sentry.silo.util import PROXY_BASE_URL_HEADER, PROXY_OI_HEADER, PROXY_SIGNATURE_HEADER
 from sentry.testutils.cases import IntegratedApiTestCase, PerformanceIssueTestCase, TestCase
 from sentry.testutils.helpers.datetime import before_now
@@ -195,8 +191,7 @@ def test_get_repo_labels(self):
             self._check_proxying()
 
     @responses.activate
-    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_create_issue(self, mock_record):
+    def test_create_issue(self):
         responses.add(
             responses.POST,
             "https://api.github.com/repos/getsentry/sentry/issues",
@@ -221,10 +216,6 @@ def test_create_issue(self, mock_record):
             "url": "https://github.com/getsentry/sentry/issues/231",
             "repo": "getsentry/sentry",
         }
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
 
         if self.should_call_api_without_proxying():
             assert len(responses.calls) == 2
@@ -244,25 +235,6 @@ def test_create_issue(self, mock_record):
         else:
             self._check_proxying()
 
-    @responses.activate
-    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_create_issue_failure(self, mock_record):
-        """
-        Test that metrics are being correctly emitted on failure.
-        """
-        form_data = {
-            "title": "rip",
-            "description": "Goodnight, sweet prince",
-        }
-
-        with pytest.raises(IntegrationError):
-            self.install.create_issue(form_data)
-
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.FAILURE
-
     def test_performance_issues_content(self):
         """Test that a GitHub issue created from a performance issue has the expected title and description"""
         event = self.create_performance_issue()
diff --git a/tests/sentry/integrations/github/test_search.py b/tests/sentry/integrations/github/test_search.py
index 2ba71f5e9dd056..624e7c7f176b19 100644
--- a/tests/sentry/integrations/github/test_search.py
+++ b/tests/sentry/integrations/github/test_search.py
@@ -1,9 +1,13 @@
 from datetime import datetime, timedelta
+from unittest.mock import patch
 
 import responses
 from django.urls import reverse
 
 from sentry.integrations.models.organization_integration import OrganizationIntegration
+from sentry.integrations.source_code_management.metrics import SourceCodeSearchEndpointHaltReason
+from sentry.integrations.types import EventLifecycleOutcome
+from sentry.testutils.asserts import assert_halt_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import control_silo_test
 from sentry.users.models.identity import Identity
@@ -36,7 +40,7 @@ def setUp(self):
         identity = Identity.objects.create(
             idp=self.create_identity_provider(type=self.provider),
             user=self.user,
-            external_id=self.user.id,
+            external_id=str(self.user.id),
             data={"access_token": "123456789"},
         )
         self.integration.add_organization(self.organization, self.user, identity.id)
@@ -53,7 +57,8 @@ def setUp(self):
 
     # Happy Paths
     @responses.activate
-    def test_finds_external_issue_results(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_finds_external_issue_results(self, mock_record):
         responses.add(
             responses.GET,
             self.base_url + "/search/issues?q=repo:example%20AEIOU",
@@ -73,6 +78,14 @@ def test_finds_external_issue_results(self):
             {"value": 25, "label": "#25 AEIOU Error"},
             {"value": 45, "label": "#45 AEIOU Error"},
         ]
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = (
+            mock_record.mock_calls
+        )  # calls get, which calls handle_search_issues
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.SUCCESS
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
     def test_finds_external_issue_results_with_id(self):
@@ -89,7 +102,8 @@ def test_finds_external_issue_results_with_id(self):
         assert resp.data == [{"value": 25, "label": "#25 AEIOU Error"}]
 
     @responses.activate
-    def test_finds_repo_results(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_finds_repo_results(self, mock_record):
         responses.add(
             responses.GET,
             self.base_url + "/search/repositories?q=org:test%20ex",
@@ -107,9 +121,18 @@ def test_finds_repo_results(self):
             {"value": "test/example", "label": "example"},
             {"value": "test/exhaust", "label": "exhaust"},
         ]
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = (
+            mock_record.mock_calls
+        )  # calls get, which calls handle_search_repositories
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.SUCCESS
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
-    def test_repo_search_validation_error(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_repo_search_validation_error(self, mock_record):
         responses.add(
             responses.GET,
             self.base_url + "/search/repositories?q=org:test%20nope",
@@ -122,6 +145,17 @@ def test_repo_search_validation_error(self):
         resp = self.client.get(self.url, data={"field": "repo", "query": "nope", "repo": "example"})
         assert resp.status_code == 404
         assert "detail" in resp.data
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = mock_record.mock_calls
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(
+            mock_record, SourceCodeSearchEndpointHaltReason.MISSING_REPOSITORY_OR_NO_ACCESS.value
+        )
+        # NOTE: handle_search_repositories returns without raising an API error, so for the
+        # purposes of logging the GET request completes successfully
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
     def test_finds_no_external_issues_results(self):
@@ -148,7 +182,8 @@ def test_finds_no_project_results(self):
         assert resp.data == []
 
     @responses.activate
-    def test_search_issues_rate_limit(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_search_issues_rate_limit(self, mock_record):
         responses.add(
             responses.GET,
             self.base_url + "/search/issues?q=repo:example%20ex",
@@ -162,9 +197,19 @@ def test_search_issues_rate_limit(self):
             self.url, data={"field": "externalIssue", "query": "ex", "repo": "example"}
         )
         assert resp.status_code == 429
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = mock_record.mock_calls
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, SourceCodeSearchEndpointHaltReason.RATE_LIMITED.value)
+        # NOTE: handle_search_issues returns without raising an API error, so for the
+        # purposes of logging the GET request completes successfully
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
-    def test_search_project_rate_limit(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_search_project_rate_limit(self, mock_record):
         responses.add(
             responses.GET,
             self.base_url + "/search/repositories?q=org:test%20ex",
@@ -176,16 +221,51 @@ def test_search_project_rate_limit(self):
         )
         resp = self.client.get(self.url, data={"field": "repo", "query": "ex"})
         assert resp.status_code == 429
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = mock_record.mock_calls
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, SourceCodeSearchEndpointHaltReason.RATE_LIMITED.value)
+        # NOTE: handle_search_repositories returns without raising an API error, so for the
+        # purposes of logging the GET request completes successfully
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
 
     # Request Validations
-    def test_missing_field(self):
+    # Test observability requests for GET requests failures here
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_missing_field(self, mock_record):
         resp = self.client.get(self.url, data={"query": "XYZ"})
         assert resp.status_code == 400
-
-    def test_missing_query(self):
+        assert len(mock_record.mock_calls) == 2
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, SourceCodeSearchEndpointHaltReason.SERIALIZER_ERRORS.value)
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_missing_query(self, mock_record):
         resp = self.client.get(self.url, data={"field": "externalIssue"})
 
         assert resp.status_code == 400
+        assert len(mock_record.mock_calls) == 2
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, SourceCodeSearchEndpointHaltReason.SERIALIZER_ERRORS.value)
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_missing_repository(self, mock_record):
+        resp = self.client.get(self.url, data={"field": "externalIssue", "query": "XYZ"})
+
+        assert resp.status_code == 400
+        assert len(mock_record.mock_calls) == 2
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(
+            mock_record, SourceCodeSearchEndpointHaltReason.MISSING_REPOSITORY_FIELD.value
+        )
 
     def test_invalid_field(self):
         resp = self.client.get(self.url, data={"field": "invalid-field", "query": "nope"})
@@ -193,7 +273,9 @@ def test_invalid_field(self):
         assert resp.status_code == 400
 
     # Missing Resources
-    def test_missing_integration(self):
+    # Test observability requests for GET requests failures here
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_missing_integration(self, mock_record):
         url = reverse(
             "sentry-integration-github-search",
             kwargs={
@@ -206,6 +288,13 @@ def test_missing_integration(self):
         )
 
         assert resp.status_code == 404
+        assert len(mock_record.mock_calls) == 2
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(
+            mock_record, SourceCodeSearchEndpointHaltReason.MISSING_INTEGRATION.value
+        )
 
     def test_missing_installation(self):
         # remove organization integration aka "uninstalling" installation
diff --git a/tests/sentry/integrations/github/test_webhooks.py b/tests/sentry/integrations/github/test_webhooks.py
index 55c4a5e89a591b..e98168197f66d5 100644
--- a/tests/sentry/integrations/github/test_webhooks.py
+++ b/tests/sentry/integrations/github/test_webhooks.py
@@ -26,6 +26,7 @@
 from sentry.models.pullrequest import PullRequest
 from sentry.models.repository import Repository
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_failure_metric, assert_success_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
 
@@ -79,7 +80,8 @@ def setUp(self):
 
     @responses.activate
     @patch("sentry.integrations.github.client.get_jwt", return_value="jwt_token_1")
-    def test_installation_created(self, get_jwt):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_installation_created(self, mock_record, get_jwt):
         responses.add(
             method=responses.GET,
             url="https://api.github.com/app/installations/2",
@@ -105,6 +107,36 @@ def test_installation_created(self, get_jwt):
         assert integration.metadata["sender"]["login"] == "octocat"
         assert integration.status == ObjectStatus.ACTIVE
 
+        assert_success_metric(mock_record)
+
+    @responses.activate
+    @patch("sentry.integrations.github.client.get_jwt", return_value="jwt_token_1")
+    @patch("sentry.integrations.github.webhook.InstallationEventWebhook.__call__")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_installation_error_metric(self, mock_record, mock_event, get_jwt):
+        responses.add(
+            method=responses.GET,
+            url="https://api.github.com/app/installations/2",
+            body=INSTALLATION_API_RESPONSE,
+            status=200,
+            content_type="application/json",
+        )
+
+        error = Exception("error")
+        mock_event.side_effect = error
+
+        response = self.client.post(
+            path=self.url,
+            data=INSTALLATION_EVENT_EXAMPLE,
+            content_type="application/json",
+            HTTP_X_GITHUB_EVENT="installation",
+            HTTP_X_HUB_SIGNATURE="sha1=348e46312df2901e8cb945616ee84ce30d9987c9",
+            HTTP_X_GITHUB_DELIVERY=str(uuid4()),
+        )
+        assert response.status_code == 500
+
+        assert_failure_metric(mock_record, error)
+
 
 @control_silo_test
 class InstallationDeleteEventWebhookTest(APITestCase):
@@ -222,7 +254,39 @@ def _setup_repo_test(self, project):
         assert response.status_code == 204
 
     @responses.activate
-    def test_simple(self):
+    @patch("sentry.integrations.github.client.get_jwt", return_value="jwt_token_1")
+    @patch("sentry.integrations.github.webhook.PushEventWebhook.__call__")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_webhook_error_metric(self, mock_record, mock_event, get_jwt):
+        future_expires = datetime.now().replace(microsecond=0) + timedelta(minutes=5)
+        with assume_test_silo_mode(SiloMode.CONTROL):
+            integration = self.create_integration(
+                organization=self.organization,
+                external_id="12345",
+                provider="github",
+                metadata={"access_token": "1234", "expires_at": future_expires.isoformat()},
+            )
+            integration.add_organization(self.project.organization.id, self.user)
+
+        error = Exception("error")
+        mock_event.side_effect = error
+
+        response = self.client.post(
+            path=self.url,
+            data=PUSH_EVENT_EXAMPLE_INSTALLATION,
+            content_type="application/json",
+            HTTP_X_GITHUB_EVENT="push",
+            HTTP_X_HUB_SIGNATURE="sha1=2b116e7c1f7510b62727673b0f9acc0db951263a",
+            HTTP_X_GITHUB_DELIVERY=str(uuid4()),
+        )
+
+        assert response.status_code == 500
+
+        assert_failure_metric(mock_record, error)
+
+    @responses.activate
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_simple(self, mock_record):
         project = self.project  # force creation
 
         repo = Repository.objects.create(
@@ -271,6 +335,8 @@ def test_simple(self):
         assert set(repo.languages) == {"python", "javascript"}
         assert repo.name == "baxterthehacker/public-repo"
 
+        assert_success_metric(mock_record)
+
     @responses.activate
     @patch("sentry.integrations.github.webhook.metrics")
     def test_creates_missing_repo(self, mock_metrics):
@@ -532,8 +598,40 @@ def _setup_repo_test(self, project):
 
         assert response.status_code == 204
 
+    @responses.activate
+    @patch("sentry.integrations.github.client.get_jwt", return_value="jwt_token_1")
+    @patch("sentry.integrations.github.webhook.PullRequestEventWebhook.__call__")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_webhook_error_metric(self, mock_record, mock_event, get_jwt):
+        future_expires = datetime.now().replace(microsecond=0) + timedelta(minutes=5)
+        with assume_test_silo_mode(SiloMode.CONTROL):
+            integration = self.create_integration(
+                organization=self.organization,
+                external_id="12345",
+                provider="github",
+                metadata={"access_token": "1234", "expires_at": future_expires.isoformat()},
+            )
+            integration.add_organization(self.project.organization.id, self.user)
+
+        error = Exception("error")
+        mock_event.side_effect = error
+
+        response = self.client.post(
+            path=self.url,
+            data=PULL_REQUEST_OPENED_EVENT_EXAMPLE,
+            content_type="application/json",
+            HTTP_X_GITHUB_EVENT="pull_request",
+            HTTP_X_HUB_SIGNATURE="sha1=bc7ce12fc1058a35bf99355e6fc0e6da72c35de3",
+            HTTP_X_GITHUB_DELIVERY=str(uuid4()),
+        )
+
+        assert response.status_code == 500
+
+        assert_failure_metric(mock_record, error)
+
     @patch("sentry.integrations.github.webhook.metrics")
-    def test_opened(self, mock_metrics):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_opened(self, mock_record, mock_metrics):
         project = self.project  # force creation
         group = self.create_group(project=project, short_id=7)
 
@@ -567,6 +665,8 @@ def test_opened(self, mock_metrics):
 
         mock_metrics.incr.assert_called_with("github.open_pr_comment.queue_task")
 
+        assert_success_metric(mock_record)
+
     @patch("sentry.integrations.github.webhook.metrics")
     def test_opened_missing_option(self, mock_metrics):
         project = self.project  # force creation
diff --git a/tests/sentry/integrations/github_enterprise/test_webhooks.py b/tests/sentry/integrations/github_enterprise/test_webhooks.py
index c3804097d78074..48bb679c12fe07 100644
--- a/tests/sentry/integrations/github_enterprise/test_webhooks.py
+++ b/tests/sentry/integrations/github_enterprise/test_webhooks.py
@@ -14,6 +14,7 @@
 from sentry.models.commitauthor import CommitAuthor
 from sentry.models.pullrequest import PullRequest
 from sentry.models.repository import Repository
+from sentry.testutils.asserts import assert_failure_metric, assert_success_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers import override_options
 
@@ -247,6 +248,8 @@ def test_missing_signature_fail_without_option_set(self, mock_installation):
         assert b"Missing headers X-Hub-Signature-256 or X-Hub-Signature" in response.content
 
 
+@patch("sentry.integrations.github_enterprise.client.get_jwt")
+@patch("sentry.integrations.github_enterprise.webhook.get_installation_metadata")
 class PushEventWebhookTest(APITestCase):
     def setUp(self):
         self.url = "/extensions/github-enterprise/webhook/"
@@ -266,9 +269,8 @@ def setUp(self):
         )
 
     @responses.activate
-    @patch("sentry.integrations.github_enterprise.client.get_jwt")
-    @patch("sentry.integrations.github_enterprise.webhook.get_installation_metadata")
-    def test_simple(self, mock_get_installation_metadata, mock_get_jwt):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_simple(self, mock_record, mock_get_installation_metadata, mock_get_jwt):
         responses.add(
             responses.POST,
             "https://35.232.149.196/extensions/github-enterprise/webhook/",
@@ -335,8 +337,56 @@ def test_simple(self, mock_get_installation_metadata, mock_get_jwt):
         assert commit.author.external_id is None
         assert commit.date_added == datetime(2015, 5, 5, 23, 40, 15, tzinfo=timezone.utc)
 
-    @patch("sentry.integrations.github_enterprise.webhook.get_installation_metadata")
-    def test_anonymous_lookup(self, mock_get_installation_metadata):
+        assert_success_metric(mock_record)
+
+    @responses.activate
+    @patch("sentry.integrations.github.webhook.PushEventWebhook.__call__")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_webhook_error_metric(
+        self, mock_record, mock_event, mock_get_installation_metadata, mock_get_jwt
+    ):
+        responses.add(
+            responses.POST,
+            "https://35.232.149.196/extensions/github-enterprise/webhook/",
+            status=204,
+        )
+
+        mock_get_jwt.return_value = ""
+        mock_get_installation_metadata.return_value = self.metadata
+
+        self.create_integration(
+            external_id="35.232.149.196:12345",
+            organization=self.project.organization,
+            provider="github_enterprise",
+            metadata={
+                "domain_name": "35.232.149.196/baxterthehacker",
+                "installation_id": "12345",
+                "installation": {
+                    "id": "2",
+                    "private_key": "private_key",
+                    "verify_ssl": True,
+                },
+            },
+        )
+
+        error = Exception("error")
+        mock_event.side_effect = error
+
+        response = self.client.post(
+            path=self.url,
+            data=PUSH_EVENT_EXAMPLE_INSTALLATION,
+            content_type="application/json",
+            HTTP_X_GITHUB_EVENT="push",
+            HTTP_X_GITHUB_ENTERPRISE_HOST="35.232.149.196",
+            HTTP_X_HUB_SIGNATURE="sha1=2a0586cc46490b17441834e1e143ec3d8c1fe032",
+            HTTP_X_GITHUB_DELIVERY=str(uuid4()),
+        )
+
+        assert response.status_code == 500
+
+        assert_failure_metric(mock_record, error)
+
+    def test_anonymous_lookup(self, mock_get_installation_metadata, mock_get_jwt):
         mock_get_installation_metadata.return_value = self.metadata
 
         self.create_integration(
@@ -401,8 +451,6 @@ def test_anonymous_lookup(self, mock_get_installation_metadata):
         assert commit.date_added == datetime(2015, 5, 5, 23, 40, 15, tzinfo=timezone.utc)
 
     @responses.activate
-    @patch("sentry.integrations.github_enterprise.client.get_jwt")
-    @patch("sentry.integrations.github_enterprise.webhook.get_installation_metadata")
     def test_multiple_orgs(self, mock_get_installation_metadata, mock_get_jwt):
         responses.add(
             responses.POST,
@@ -481,6 +529,7 @@ def test_multiple_orgs(self, mock_get_installation_metadata, mock_get_jwt):
         assert len(commit_list) == 0
 
 
+@patch("sentry.integrations.github_enterprise.webhook.get_installation_metadata")
 class PullRequestEventWebhook(APITestCase):
     def setUp(self):
         self.url = "/extensions/github-enterprise/webhook/"
@@ -513,8 +562,8 @@ def setUp(self):
             name="baxterthehacker/public-repo",
         )
 
-    @patch("sentry.integrations.github_enterprise.webhook.get_installation_metadata")
-    def test_opened(self, mock_get_installation_metadata):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_opened(self, mock_record, mock_get_installation_metadata):
         mock_get_installation_metadata.return_value = self.metadata
 
         response = self.client.post(
@@ -543,7 +592,29 @@ def test_opened(self, mock_get_installation_metadata):
         assert pr.author is not None
         assert pr.author.name == "baxterthehacker"
 
-    @patch("sentry.integrations.github_enterprise.webhook.get_installation_metadata")
+        assert_success_metric(mock_record)
+
+    @patch("sentry.integrations.github.webhook.PullRequestEventWebhook.__call__")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_webhook_error_metric(self, mock_record, mock_event, mock_get_installation_metadata):
+        mock_get_installation_metadata.return_value = self.metadata
+        error = Exception("error")
+        mock_event.side_effect = error
+
+        response = self.client.post(
+            path=self.url,
+            data=PULL_REQUEST_OPENED_EVENT_EXAMPLE,
+            content_type="application/json",
+            HTTP_X_GITHUB_EVENT="pull_request",
+            HTTP_X_GITHUB_ENTERPRISE_HOST="35.232.149.196",
+            HTTP_X_HUB_SIGNATURE="sha1=aa5b11bc52b9fac082cb59f9ee8667cb222c3aff",
+            HTTP_X_GITHUB_DELIVERY=str(uuid4()),
+        )
+
+        assert response.status_code == 500
+
+        assert_failure_metric(mock_record, error)
+
     def test_edited(self, mock_get_installation_metadata):
         mock_get_installation_metadata.return_value = self.metadata
 
@@ -573,7 +644,6 @@ def test_edited(self, mock_get_installation_metadata):
         assert pr.author is not None
         assert pr.author.name == "baxterthehacker"
 
-    @patch("sentry.integrations.github_enterprise.webhook.get_installation_metadata")
     def test_closed(self, mock_get_installation_metadata):
         mock_get_installation_metadata.return_value = self.metadata
 
diff --git a/tests/sentry/integrations/gitlab/test_issues.py b/tests/sentry/integrations/gitlab/test_issues.py
index 6531a61bfe4554..801609052dd7ea 100644
--- a/tests/sentry/integrations/gitlab/test_issues.py
+++ b/tests/sentry/integrations/gitlab/test_issues.py
@@ -1,12 +1,9 @@
-from unittest import mock
-
 import pytest
 import responses
 
 from fixtures.gitlab import GitLabTestCase
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.services.integration import integration_service
-from sentry.integrations.types import EventLifecycleOutcome
 from sentry.shared_integrations.exceptions import IntegrationError
 from sentry.testutils.factories import EventType
 from sentry.testutils.helpers.datetime import before_now
@@ -140,8 +137,7 @@ def test_get_link_issue_config(self):
         ]
 
     @responses.activate
-    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_create_issue(self, mock_record):
+    def test_create_issue(self):
         issue_iid = "1"
         project_id = "10"
         project_name = "getsentry/sentry"
@@ -176,29 +172,6 @@ def test_create_issue(self, mock_record):
             "project": project_id,
             "metadata": {"display_name": key},
         }
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
-
-    @responses.activate
-    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_create_issue_failure(self, mock_record):
-        """
-        Test that metrics are being correctly emitted on failure.
-        """
-        form_data = {
-            "title": "rip",
-            "description": "Goodnight, sweet prince",
-        }
-
-        with pytest.raises(IntegrationError):
-            self.installation.create_issue(form_data)
-
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.FAILURE
 
     @responses.activate
     def test_get_issue(self):
diff --git a/tests/sentry/integrations/gitlab/test_search.py b/tests/sentry/integrations/gitlab/test_search.py
index 04a4929c45d858..da7d99662ff5e3 100644
--- a/tests/sentry/integrations/gitlab/test_search.py
+++ b/tests/sentry/integrations/gitlab/test_search.py
@@ -1,3 +1,4 @@
+from unittest.mock import patch
 from urllib.parse import parse_qs
 
 import orjson
@@ -6,6 +7,7 @@
 
 from fixtures.gitlab import GitLabTestCase
 from sentry.integrations.models.organization_integration import OrganizationIntegration
+from sentry.integrations.types import EventLifecycleOutcome
 from sentry.testutils.silo import control_silo_test
 
 
@@ -25,7 +27,8 @@ def setUp(self):
 
     # Happy Paths
     @responses.activate
-    def test_finds_external_issue_results(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_finds_external_issue_results(self, mock_record):
         responses.add(
             responses.GET,
             "https://example.gitlab.com/api/v4/projects/5/issues?scope=all&search=AEIOU",
@@ -43,6 +46,14 @@ def test_finds_external_issue_results(self):
             {"value": "5#25", "label": "(#25) AEIOU Error"},
             {"value": "5#45", "label": "(#45) AEIOU Error"},
         ]
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = (
+            mock_record.mock_calls
+        )  # calls get, which calls handle_search_issues
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.SUCCESS
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
     def test_finds_external_issue_results_with_iid(self):
@@ -59,7 +70,8 @@ def test_finds_external_issue_results_with_iid(self):
         assert resp.data == [{"value": "5#25", "label": "(#25) AEIOU Error"}]
 
     @responses.activate
-    def test_finds_project_results(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_finds_project_results(self, mock_record):
         responses.add(
             responses.GET,
             "https://example.gitlab.com/api/v4/groups/1/projects?search=GetSentry&simple=True&include_subgroups=False&page=1&per_page=100&order_by=last_activity_at",
@@ -83,6 +95,14 @@ def test_finds_project_results(self):
             {"value": "1", "label": "GetSentry / Sentry"},
             {"value": "2", "label": "GetSentry2 / Sentry2"},
         ]
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = (
+            mock_record.mock_calls
+        )  # calls get, which calls handle_search_repositories
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.SUCCESS
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
     def test_finds_project_results_with_pagination(self):
@@ -214,15 +234,33 @@ def test_missing_installation(self):
 
     # Distributed System Issues
     @responses.activate
-    def test_search_issues_request_fails(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_search_issues_request_fails(self, mock_record):
         responses.add(responses.GET, "https://example.gitlab.com/api/v4/issues", status=503)
         resp = self.client.get(
             self.url, data={"field": "externalIssue", "query": "GetSentry", "project": "5"}
         )
         assert resp.status_code == 400
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = mock_record.mock_calls
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.FAILURE
+        # NOTE: handle_search_issues returns without raising an API error, so for the
+        # purposes of logging the GET request completes successfully
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
-    def test_projects_request_fails(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_projects_request_fails(self, mock_record):
         responses.add(responses.GET, "https://example.gitlab.com/api/v4/projects", status=503)
         resp = self.client.get(self.url, data={"field": "project", "query": "GetSentry"})
         assert resp.status_code == 400
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = mock_record.mock_calls
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.FAILURE
+        # NOTE: handle_search_issues returns without raising an API error, so for the
+        # purposes of logging the GET request completes successfully
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
diff --git a/tests/sentry/integrations/gitlab/test_webhook.py b/tests/sentry/integrations/gitlab/test_webhook.py
index 616d98e4c3e7c7..667d6681751fc5 100644
--- a/tests/sentry/integrations/gitlab/test_webhook.py
+++ b/tests/sentry/integrations/gitlab/test_webhook.py
@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 import orjson
 
 from fixtures.gitlab import (
@@ -14,6 +16,7 @@
 from sentry.models.grouplink import GroupLink
 from sentry.models.pullrequest import PullRequest
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_failure_metric, assert_success_metric
 from sentry.testutils.silo import assume_test_silo_mode, assume_test_silo_mode_of
 
 
@@ -120,6 +123,23 @@ def test_push_event_missing_repo(self):
         # repositories enabled.
         assert response.status_code == 204
 
+    @patch("sentry.integrations.gitlab.webhooks.PushEventWebhook.__call__")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_push_event_failure_metric(self, mock_record, mock_event):
+        error = Exception("oops")
+        mock_event.side_effect = error
+
+        response = self.client.post(
+            self.url,
+            data=PUSH_EVENT,
+            content_type="application/json",
+            HTTP_X_GITLAB_TOKEN=WEBHOOK_TOKEN,
+            HTTP_X_GITLAB_EVENT="Push Hook",
+        )
+        assert response.status_code == 500
+
+        assert_failure_metric(mock_record, error)
+
     def test_push_event_multiple_organizations_one_missing_repo(self):
         # Create a repo on the primary organization
         repo = self.create_repo("getsentry/sentry")
@@ -276,7 +296,27 @@ def test_merge_event_missing_repo(self):
         assert response.status_code == 204
         assert 0 == PullRequest.objects.count()
 
-    def test_merge_event_no_last_commit(self):
+    @patch("sentry.integrations.gitlab.webhooks.MergeEventWebhook.__call__")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_merge_event_failure_metric(self, mock_record, mock_event):
+        payload = orjson.loads(MERGE_REQUEST_OPENED_EVENT)
+
+        error = Exception("oops")
+        mock_event.side_effect = error
+
+        response = self.client.post(
+            self.url,
+            data=orjson.dumps(payload),
+            content_type="application/json",
+            HTTP_X_GITLAB_TOKEN=WEBHOOK_TOKEN,
+            HTTP_X_GITLAB_EVENT="Merge Request Hook",
+        )
+        assert response.status_code == 500
+
+        assert_failure_metric(mock_record, error)
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_merge_event_no_last_commit(self, mock_record):
         payload = orjson.loads(MERGE_REQUEST_OPENED_EVENT)
 
         # Remove required keys. There have been events in prod that are missing
@@ -293,6 +333,8 @@ def test_merge_event_no_last_commit(self):
         assert response.status_code == 204
         assert 0 == PullRequest.objects.count()
 
+        assert_success_metric(mock_record)
+
     def test_merge_event_create_pull_request(self):
         self.create_repo("getsentry/sentry")
         group = self.create_group(project=self.project, short_id=9)
diff --git a/tests/sentry/integrations/jira/test_installed.py b/tests/sentry/integrations/jira/test_installed.py
index 5848a0430a7a08..b408e00e13b55e 100644
--- a/tests/sentry/integrations/jira/test_installed.py
+++ b/tests/sentry/integrations/jira/test_installed.py
@@ -10,6 +10,8 @@
 
 from sentry.constants import ObjectStatus
 from sentry.integrations.models.integration import Integration
+from sentry.integrations.project_management.metrics import ProjectManagementFailuresReason
+from sentry.integrations.types import EventLifecycleOutcome
 from sentry.integrations.utils.atlassian_connect import (
     AtlassianConnectValidationError,
     get_query_hash,
@@ -72,12 +74,17 @@ def add_response(self) -> None:
             body=RS256_PUB_KEY,
         )
 
-    def test_missing_body(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_failure")
+    def test_missing_body(self, mock_record_failure):
         self.get_error_response(
             extra_headers=dict(HTTP_AUTHORIZATION="JWT anexampletoken"),
             status_code=status.HTTP_400_BAD_REQUEST,
         )
 
+        mock_record_failure.assert_called_with(
+            ProjectManagementFailuresReason.INSTALLATION_STATE_MISSING
+        )
+
     def test_missing_token(self):
         self.get_error_response(**self.body(), status_code=status.HTTP_409_CONFLICT)
 
@@ -102,8 +109,9 @@ def test_no_claims(self, mock_authenticate_asymmetric_jwt):
             status_code=status.HTTP_409_CONFLICT,
         )
 
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry_sdk.set_tag")
-    def test_with_shared_secret(self, mock_set_tag: MagicMock):
+    def test_with_shared_secret(self, mock_set_tag: MagicMock, mock_record_event):
         self.get_success_response(
             **self.body(),
             extra_headers=dict(HTTP_AUTHORIZATION="JWT " + self.jwt_token_secret()),
@@ -112,6 +120,7 @@ def test_with_shared_secret(self, mock_set_tag: MagicMock):
 
         mock_set_tag.assert_any_call("integration_id", integration.id)
         assert integration.status == ObjectStatus.ACTIVE
+        mock_record_event.assert_called_with(EventLifecycleOutcome.SUCCESS, None)
 
     @patch("sentry_sdk.set_tag")
     @responses.activate
diff --git a/tests/sentry/integrations/jira/test_ticket_action.py b/tests/sentry/integrations/jira/test_ticket_action.py
index 98262e5ed4efb5..a82b2374fc8905 100644
--- a/tests/sentry/integrations/jira/test_ticket_action.py
+++ b/tests/sentry/integrations/jira/test_ticket_action.py
@@ -1,5 +1,6 @@
 from unittest import mock
 
+import pytest
 from django.urls import reverse
 from rest_framework.test import APITestCase as BaseAPITestCase
 
@@ -7,10 +8,17 @@
 from sentry.eventstore.models import Event
 from sentry.integrations.jira import JiraCreateTicketAction, JiraIntegration
 from sentry.integrations.models.external_issue import ExternalIssue
+from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.rule import Rule
+from sentry.shared_integrations.exceptions import (
+    ApiInvalidRequestError,
+    IntegrationError,
+    IntegrationFormError,
+)
 from sentry.testutils.cases import RuleTestCase
 from sentry.testutils.skips import requires_snuba
 from sentry.types.rules import RuleFuture
+from sentry.utils import json
 
 pytestmark = [requires_snuba]
 
@@ -18,6 +26,7 @@
 class JiraTicketRulesTestCase(RuleTestCase, BaseAPITestCase):
     rule_cls = JiraCreateTicketAction
     mock_jira = None
+    broken_mock_jira = None
 
     def get_client(self):
         if not self.mock_jira:
@@ -57,40 +66,44 @@ def get_key(self, event: Event):
             "key", flat=True
         )[0]
 
-    def test_ticket_rules(self):
+    def configure_valid_alert_rule(self):
+        response = self.client.post(
+            reverse(
+                "sentry-api-0-project-rules",
+                kwargs={
+                    "organization_id_or_slug": self.organization.slug,
+                    "project_id_or_slug": self.project.slug,
+                },
+            ),
+            format="json",
+            data={
+                "name": "hello world",
+                "owner": self.user.id,
+                "environment": None,
+                "actionMatch": "any",
+                "frequency": 5,
+                "actions": [
+                    {
+                        "id": "sentry.integrations.jira.notify_action.JiraCreateTicketAction",
+                        "integration": self.integration.id,
+                        "dynamic_form_fields": [{"name": "project"}],
+                        "issuetype": "1",
+                        "name": "Create a Jira ticket in the Jira Cloud account",
+                        "project": "10000",
+                    }
+                ],
+                "conditions": [],
+            },
+        )
+        assert response.status_code == 200
+        return response
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_ticket_rules(self, mock_record_event):
         with mock.patch(
             "sentry.integrations.jira.integration.JiraIntegration.get_client", self.get_client
         ):
-            # Create a new Rule
-            response = self.client.post(
-                reverse(
-                    "sentry-api-0-project-rules",
-                    kwargs={
-                        "organization_id_or_slug": self.organization.slug,
-                        "project_id_or_slug": self.project.slug,
-                    },
-                ),
-                format="json",
-                data={
-                    "name": "hello world",
-                    "owner": self.user.id,
-                    "environment": None,
-                    "actionMatch": "any",
-                    "frequency": 5,
-                    "actions": [
-                        {
-                            "id": "sentry.integrations.jira.notify_action.JiraCreateTicketAction",
-                            "integration": self.integration.id,
-                            "dynamic_form_fields": [{"name": "project"}],
-                            "issuetype": "1",
-                            "name": "Create a Jira ticket in the Jira Cloud account",
-                            "project": "10000",
-                        }
-                    ],
-                    "conditions": [],
-                },
-            )
-            assert response.status_code == 200
+            response = self.configure_valid_alert_rule()
 
             # Get the rule from DB
             rule_object = Rule.objects.get(id=response.data["id"])
@@ -114,6 +127,35 @@ def test_ticket_rules(self):
 
             # assert new ticket NOT created in DB
             assert ExternalIssue.objects.count() == external_issue_count
+            mock_record_event.assert_called_with(EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    @mock.patch.object(MockJira, "create_issue")
+    def test_misconfigured_ticket_rule(self, mock_create_issue, mock_record_event):
+        def raise_api_error(*args, **kwargs):
+            raise ApiInvalidRequestError("Invalid data entered")
+
+        mock_create_issue.side_effect = raise_api_error
+        with mock.patch(
+            "sentry.integrations.jira.integration.JiraIntegration.get_client", self.get_client
+        ):
+            response = self.configure_valid_alert_rule()
+
+            rule_object = Rule.objects.get(id=response.data["id"])
+            event = self.get_event()
+
+            with pytest.raises(IntegrationError):
+                # Trigger its `after`, but with a broken client which should raise
+                # an ApiInvalidRequestError, which is reraised as an IntegrationError.
+                self.trigger(event, rule_object)
+
+            assert mock_record_event.call_count == 2
+            start, failure = mock_record_event.mock_calls
+            assert start.args == (EventLifecycleOutcome.STARTED,)
+            assert failure.args == (
+                EventLifecycleOutcome.FAILURE,
+                "Error Communicating with Jira (HTTP 400): unknown error",
+            )
 
     def test_fails_validation(self):
         """
@@ -148,3 +190,35 @@ def test_fails_validation(self):
         )
         assert response.status_code == 400
         assert response.data["actions"][0] == "Must configure issue link settings."
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_halt")
+    @mock.patch.object(MockJira, "create_issue")
+    def test_fails_with_field_configuration_error(self, mock_create_issue, mock_record_halt):
+        # Mock an error from the client response that cotains a field
+
+        def raise_api_error_with_payload(*args, **kwargs):
+            raise ApiInvalidRequestError(json.dumps({"errors": {"foo": "bar"}}))
+
+        mock_create_issue.side_effect = raise_api_error_with_payload
+        with mock.patch(
+            "sentry.integrations.jira.integration.JiraIntegration.get_client", self.get_client
+        ):
+            response = self.configure_valid_alert_rule()
+
+            rule_object = Rule.objects.get(id=response.data["id"])
+            event = self.get_event()
+
+            with pytest.raises(IntegrationFormError):
+                # Trigger its `after`, but with a broken client which should raise
+                # an ApiInvalidRequestError, which is reraised as an IntegrationError.
+                self.trigger(event, rule_object)
+
+            assert mock_record_halt.call_count == 1
+            mock_record_event_args = mock_record_halt.call_args_list[0][0]
+            assert mock_record_event_args[0] is not None
+
+            metric_exception_message = mock_record_event_args[0]
+
+            # The error message here is formatted by the Jira integration, and
+            # only includes extracted JSON from the error
+            assert metric_exception_message == "{'foo': ['bar']}"
diff --git a/tests/sentry/integrations/jira/test_webhooks.py b/tests/sentry/integrations/jira/test_webhooks.py
index 8eef96ebafd829..2dff97d6a4d2c8 100644
--- a/tests/sentry/integrations/jira/test_webhooks.py
+++ b/tests/sentry/integrations/jira/test_webhooks.py
@@ -236,7 +236,7 @@ def test_atlassian_pen_testing_bot(
         # This kind of error shouldn't be sent to Sentry
         assert mock_capture_exception.call_count == 0
 
-    @patch("sentry.api.base.Endpoint.handle_exception", return_value=Response())
+    @patch("sentry.api.base.Endpoint.handle_exception_with_details", return_value=Response())
     def test_APIError_host_and_path_added_as_tags(self, mock_super_handle_exception: MagicMock):
         handler_error = ApiError("", url="http://maiseycharlie.jira.com/rest/api/3/dogs/tricks")
         mock_endpoint = MockErroringJiraEndpoint.as_view(error=handler_error)
@@ -244,7 +244,7 @@ def test_APIError_host_and_path_added_as_tags(self, mock_super_handle_exception:
         request = self.make_request(method="GET")
         mock_endpoint(request)
 
-        # signature is super().handle_exception(request, error, handler_context, scope)
+        # signature is super().handle_exception_with_details(request, error, handler_context, scope)
         assert (
             mock_super_handle_exception.call_args.args[3]._tags["jira.host"]
             == "maiseycharlie.jira.com"
@@ -254,7 +254,7 @@ def test_APIError_host_and_path_added_as_tags(self, mock_super_handle_exception:
             == "/rest/api/3/dogs/tricks"
         )
 
-    @patch("sentry.api.base.Endpoint.handle_exception", return_value=Response())
+    @patch("sentry.api.base.Endpoint.handle_exception_with_details", return_value=Response())
     def test_handles_xml_as_error_message(self, mock_super_handle_exception: MagicMock):
         """Moves the XML to `handler_context` and replaces it with a human-friendly message"""
         xml_string = '<?xml version="1.0"?><status><code>500</code><message>PSQLException: too many connections</message></status>'
@@ -267,12 +267,12 @@ def test_handles_xml_as_error_message(self, mock_super_handle_exception: MagicMo
         request = self.make_request(method="GET")
         mock_endpoint(request)
 
-        # signature is super().handle_exception(request, error, handler_context, scope)
+        # signature is super().handle_exception_with_details(request, error, handler_context, scope)
         assert mock_super_handle_exception.call_args.args[1] == handler_error
         assert str(handler_error) == "Unknown error when requesting /rest/api/3/dogs/tricks"
         assert mock_super_handle_exception.call_args.args[2]["xml_response"] == xml_string
 
-    @patch("sentry.api.base.Endpoint.handle_exception", return_value=Response())
+    @patch("sentry.api.base.Endpoint.handle_exception_with_details", return_value=Response())
     def test_handles_html_as_error_message(self, mock_super_handle_exception: MagicMock):
         """Moves the HTML to `handler_context` and replaces it with a human-friendly message"""
         html_strings = [
@@ -291,12 +291,12 @@ def test_handles_html_as_error_message(self, mock_super_handle_exception: MagicM
             request = self.make_request(method="GET")
             mock_endpoint(request)
 
-            # signature is super().handle_exception(request, error, handler_context, scope)
+            # signature is super().handle_exception_with_details(request, error, handler_context, scope)
             assert mock_super_handle_exception.call_args.args[1] == handler_error
             assert str(handler_error) == "Unknown error when requesting /rest/api/3/dogs/tricks"
             assert mock_super_handle_exception.call_args.args[2]["html_response"] == html_string
 
-    @patch("sentry.api.base.Endpoint.handle_exception", return_value=Response())
+    @patch("sentry.api.base.Endpoint.handle_exception_with_details", return_value=Response())
     def test_replacement_error_messages(self, mock_super_handle_exception: MagicMock):
         replacement_messages_by_code = {
             429: "Rate limit hit when requesting /rest/api/3/dogs/tricks",
@@ -316,12 +316,12 @@ def test_replacement_error_messages(self, mock_super_handle_exception: MagicMock
             request = self.make_request(method="GET")
             mock_endpoint(request)
 
-            # signature is super().handle_exception(request, error, handler_context, scope)
+            # signature is super().handle_exception_with_details(request, error, handler_context, scope)
             assert mock_super_handle_exception.call_args.args[1] == handler_error
             assert str(handler_error) == new_message
 
     @patch("sentry.integrations.jira.webhooks.base.logger")
-    @patch("sentry.api.base.Endpoint.handle_exception", return_value=Response())
+    @patch("sentry.api.base.Endpoint.handle_exception_with_details", return_value=Response())
     def test_unexpected_jira_errors(
         self, mock_super_handle_exception: MagicMock, mock_logger: MagicMock
     ):
diff --git a/tests/sentry/integrations/msteams/test_message_builder.py b/tests/sentry/integrations/msteams/test_message_builder.py
index 076d0ac24ecb64..78edda2eb7f5b5 100644
--- a/tests/sentry/integrations/msteams/test_message_builder.py
+++ b/tests/sentry/integrations/msteams/test_message_builder.py
@@ -54,6 +54,7 @@
     DummyNotificationWithMoreFields,
 )
 from sentry.testutils.skips import requires_snuba
+from sentry.types.actor import Actor
 
 pytestmark = [requires_snuba]
 
@@ -484,7 +485,7 @@ def test_simple(self):
         notification_card = MSTeamsNotificationsMessageBuilder(
             self.notification,
             self.context,
-            self.recipient,
+            Actor.from_object(self.recipient),
         ).build_notification_card()
 
         body = notification_card["body"]
@@ -520,7 +521,7 @@ def test_without_footer(self):
         notification_card = MSTeamsNotificationsMessageBuilder(
             dummy_notification,
             self.context,
-            self.recipient,
+            Actor.from_object(self.recipient),
         ).build_notification_card()
 
         assert 2 == len(notification_card["body"])
diff --git a/tests/sentry/integrations/msteams/test_webhook.py b/tests/sentry/integrations/msteams/test_webhook.py
index ed0f26d869ead4..af9034180411b1 100644
--- a/tests/sentry/integrations/msteams/test_webhook.py
+++ b/tests/sentry/integrations/msteams/test_webhook.py
@@ -366,9 +366,10 @@ def test_different_user_mentioned(self, mock_time, mock_decode):
         assert len(responses.calls) == 2
 
     @responses.activate
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @mock.patch("sentry.utils.jwt.decode")
     @mock.patch("time.time")
-    def test_unlink_user(self, mock_time, mock_decode):
+    def test_unlink_user(self, mock_time, mock_decode, mock_record):
         access_json = {"expires_in": 86399, "access_token": "my_token"}
         responses.add(
             responses.POST,
@@ -396,6 +397,10 @@ def test_unlink_user(self, mock_time, mock_decode):
         )
         assert "Bearer my_token" in responses.calls[3].request.headers["Authorization"]
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
     @responses.activate
     @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @mock.patch("sentry.utils.jwt.decode")
@@ -431,14 +436,15 @@ def test_help_command(self, mock_time, mock_decode, mock_record):
         assert "Bearer my_token" in responses.calls[3].request.headers["Authorization"]
 
         assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
+        start, success = mock_record.mock_calls
         assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @mock.patch("sentry.utils.jwt.decode")
     @mock.patch("time.time")
-    def test_link_command(self, mock_time, mock_decode):
+    def test_link_command(self, mock_time, mock_decode, mock_record):
         other_command = deepcopy(EXAMPLE_UNLINK_COMMAND)
         other_command["text"] = "link"
         access_json = {"expires_in": 86399, "access_token": "my_token"}
@@ -494,10 +500,15 @@ def test_link_command(self, mock_time, mock_decode):
         ]
         assert self.metrics.incr.mock_calls == calls
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
     @responses.activate
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @mock.patch("sentry.utils.jwt.decode")
     @mock.patch("time.time")
-    def test_link_command_already_linked(self, mock_time, mock_decode):
+    def test_link_command_already_linked(self, mock_time, mock_decode, mock_record):
         other_command = deepcopy(EXAMPLE_UNLINK_COMMAND)
         other_command["text"] = "link"
         with assume_test_silo_mode(SiloMode.CONTROL):
@@ -533,6 +544,10 @@ def test_link_command_already_linked(self, mock_time, mock_decode):
         )
         assert "Bearer my_token" in responses.calls[3].request.headers["Authorization"]
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
     @responses.activate
     @mock.patch("sentry.utils.jwt.decode")
     @mock.patch("time.time")
diff --git a/tests/sentry/integrations/pagerduty/test_notify_action.py b/tests/sentry/integrations/pagerduty/test_notify_action.py
index 695e9f9838dcbe..3d3fb60682fd18 100644
--- a/tests/sentry/integrations/pagerduty/test_notify_action.py
+++ b/tests/sentry/integrations/pagerduty/test_notify_action.py
@@ -4,10 +4,12 @@
 import responses
 
 from sentry.integrations.models.organization_integration import OrganizationIntegration
+from sentry.integrations.on_call.metrics import OnCallIntegrationsHaltReason
 from sentry.integrations.pagerduty.actions.notification import PagerDutyNotifyServiceAction
 from sentry.integrations.pagerduty.utils import add_service
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_halt_metric
 from sentry.testutils.cases import PerformanceIssueTestCase, RuleTestCase
 from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.helpers.notifications import TEST_ISSUE_OCCURRENCE
@@ -330,4 +332,5 @@ def test_invalid_service_selected(self, mock_record):
         assert len(mock_record.mock_calls) == 2
         start, halt = mock_record.mock_calls
         assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.FAILURE
+        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, OnCallIntegrationsHaltReason.INVALID_SERVICE.value)
diff --git a/tests/sentry/integrations/repository/issue_alert/test_issue_alert_notification_message_repository.py b/tests/sentry/integrations/repository/issue_alert/test_issue_alert_notification_message_repository.py
index e34c96b2618da3..67c0f6cdf1cf08 100644
--- a/tests/sentry/integrations/repository/issue_alert/test_issue_alert_notification_message_repository.py
+++ b/tests/sentry/integrations/repository/issue_alert/test_issue_alert_notification_message_repository.py
@@ -5,8 +5,8 @@
     IssueAlertNotificationMessageRepository,
     NewIssueAlertNotificationMessage,
 )
-from sentry.models.notificationmessage import NotificationMessage
 from sentry.models.rulefirehistory import RuleFireHistory
+from sentry.notifications.models.notificationmessage import NotificationMessage
 from sentry.testutils.cases import TestCase
 
 
@@ -23,7 +23,7 @@ def setUp(self) -> None:
             }
         ]
         self.rule = self.create_project_rule(
-            project=self.project, action_match=self.notify_issue_owners_action
+            project=self.project, action_data=self.notify_issue_owners_action
         )
         self.event_id = 456
         self.notification_uuid = str(uuid4())
diff --git a/tests/sentry/integrations/repository/metric_alert/test_metric_alert_notification_message_repository.py b/tests/sentry/integrations/repository/metric_alert/test_metric_alert_notification_message_repository.py
index c77cd52ea3cd80..6a7f161b5b0e75 100644
--- a/tests/sentry/integrations/repository/metric_alert/test_metric_alert_notification_message_repository.py
+++ b/tests/sentry/integrations/repository/metric_alert/test_metric_alert_notification_message_repository.py
@@ -3,7 +3,7 @@
     MetricAlertNotificationMessageRepository,
     NewMetricAlertNotificationMessage,
 )
-from sentry.models.notificationmessage import NotificationMessage
+from sentry.notifications.models.notificationmessage import NotificationMessage
 from sentry.testutils.cases import TestCase
 
 
diff --git a/tests/sentry/integrations/slack/actions/notification/test_slack_notify_service_action.py b/tests/sentry/integrations/slack/actions/notification/test_slack_notify_service_action.py
index 7fd54f5aed6abb..0cc9b1a53cd236 100644
--- a/tests/sentry/integrations/slack/actions/notification/test_slack_notify_service_action.py
+++ b/tests/sentry/integrations/slack/actions/notification/test_slack_notify_service_action.py
@@ -5,8 +5,8 @@
 
 from sentry.integrations.slack import SlackNotifyServiceAction
 from sentry.integrations.slack.sdk_client import SLACK_DATADOG_METRIC
-from sentry.models.notificationmessage import NotificationMessage
 from sentry.models.rulefirehistory import RuleFireHistory
+from sentry.notifications.models.notificationmessage import NotificationMessage
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import RuleTestCase
 from sentry.testutils.helpers.features import with_feature
@@ -39,7 +39,7 @@ def setUp(self) -> None:
             "channel": "test-notifications",
             "uuid": self.uuid,
         }
-        self.rule = self.create_project_rule(project=self.project, action_match=[self.action_data])
+        self.rule = self.create_project_rule(project=self.project, action_data=[self.action_data])
         self.notification_uuid = str(uuid4())
         self.event = self.store_event(
             data={
diff --git a/tests/sentry/integrations/slack/notifications/test_issue_alert.py b/tests/sentry/integrations/slack/notifications/test_issue_alert.py
index 171fdf9ba9c996..c450e81552688c 100644
--- a/tests/sentry/integrations/slack/notifications/test_issue_alert.py
+++ b/tests/sentry/integrations/slack/notifications/test_issue_alert.py
@@ -16,10 +16,10 @@
 from sentry.integrations.types import ExternalProviders
 from sentry.issues.grouptype import MonitorIncidentType
 from sentry.issues.issue_occurrence import IssueEvidence, IssueOccurrence
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.projectownership import ProjectOwnership
 from sentry.models.rule import Rule
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.notifications.rules import AlertRuleNotification
 from sentry.notifications.types import ActionTargetType, FallthroughChoiceType, FineTuningAPIKey
 from sentry.ownership.grammar import Matcher, Owner
@@ -315,7 +315,7 @@ def test_issue_alert_issue_owners_environment_block(self):
         )
         rule = self.create_project_rule(
             project=self.project,
-            action_match=[action_data],
+            action_data=[action_data],
             name="ja rule",
             environment_id=environment.id,
         )
diff --git a/tests/sentry/integrations/slack/service/test_slack_service.py b/tests/sentry/integrations/slack/service/test_slack_service.py
index 3631f2eae2210e..14493e427a4c16 100644
--- a/tests/sentry/integrations/slack/service/test_slack_service.py
+++ b/tests/sentry/integrations/slack/service/test_slack_service.py
@@ -10,9 +10,9 @@
 from sentry.integrations.slack.sdk_client import SlackSdkClient
 from sentry.integrations.slack.service import RuleDataError, SlackService
 from sentry.models.activity import Activity
-from sentry.models.notificationmessage import NotificationMessage
 from sentry.models.options.organization_option import OrganizationOption
 from sentry.models.rulefirehistory import RuleFireHistory
+from sentry.notifications.models.notificationmessage import NotificationMessage
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import assume_test_silo_mode
@@ -68,7 +68,7 @@ def setUp(self) -> None:
             }
         ]
         self.rule = self.create_project_rule(
-            project=self.project, action_match=self.notify_issue_owners_action
+            project=self.project, action_data=self.notify_issue_owners_action
         )
         self.rule_fire_history = RuleFireHistory.objects.create(
             project=self.project,
@@ -205,7 +205,7 @@ def setUp(self) -> None:
             "uuid": self.rule_action_uuid,
         }
         self.rule = self.create_project_rule(
-            project=self.project, action_match=self.notify_issue_owners_action
+            project=self.project, action_data=self.notify_issue_owners_action
         )
         self.rule_fire_history = RuleFireHistory.objects.create(
             project=self.project,
@@ -216,7 +216,7 @@ def setUp(self) -> None:
         )
 
         self.slack_rule = self.create_project_rule(
-            project=self.project, action_match=[self.slack_action]
+            project=self.project, action_data=[self.slack_action]
         )
         self.slack_rule_fire_history = RuleFireHistory.objects.create(
             project=self.project,
@@ -314,7 +314,7 @@ def test_raises_exception_when_rule_action_does_not_exist(self) -> None:
             }
         ]
         rule = self.create_project_rule(
-            project=self.project, action_match=notify_issue_owners_action
+            project=self.project, action_data=notify_issue_owners_action
         )
         rule_fire_history = RuleFireHistory.objects.create(
             project=self.project,
diff --git a/tests/sentry/integrations/slack/test_link_team.py b/tests/sentry/integrations/slack/test_link_team.py
index 12fb8a9061c209..2d399f07eaec23 100644
--- a/tests/sentry/integrations/slack/test_link_team.py
+++ b/tests/sentry/integrations/slack/test_link_team.py
@@ -13,9 +13,9 @@
 from sentry.integrations.slack.views.link_team import build_team_linking_url
 from sentry.integrations.slack.views.unlink_team import build_team_unlinking_url
 from sentry.integrations.types import ExternalProviders
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.organization import Organization
 from sentry.models.team import Team
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers import add_identity, install_slack, link_team
diff --git a/tests/sentry/integrations/slack/test_message_builder.py b/tests/sentry/integrations/slack/test_message_builder.py
index 9e69cfa4b14984..3830b4ff4dc29e 100644
--- a/tests/sentry/integrations/slack/test_message_builder.py
+++ b/tests/sentry/integrations/slack/test_message_builder.py
@@ -868,7 +868,7 @@ def test_description_in_notification(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -912,7 +912,7 @@ def test_no_description_in_notification(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -950,7 +950,7 @@ def test_description_not_in_notification_closed_alerts(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -1018,7 +1018,7 @@ def test_simple(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -1058,7 +1058,7 @@ def test_metric_value(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -1098,7 +1098,7 @@ def test_chart(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -1151,7 +1151,7 @@ def test_metric_alert_with_anomaly_detection(self, mock_seer_request):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -1182,7 +1182,7 @@ def test_metric_alert_without_incidents(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -1215,7 +1215,7 @@ def test_metric_alert_with_selected_incident(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -1248,7 +1248,7 @@ def test_metric_alert_with_active_incident(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -1284,7 +1284,7 @@ def test_metric_value(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -1315,7 +1315,7 @@ def test_metric_alert_chart(self):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
@@ -1361,7 +1361,7 @@ def test_metric_alert_with_anomaly_detection(self, mock_seer_request):
                 reverse(
                     "sentry-metric-alert-details",
                     kwargs={
-                        "organization_slug": alert_rule.organization.slug,
+                        "organization_slug": self.organization.slug,
                         "alert_rule_id": alert_rule.id,
                     },
                 )
diff --git a/tests/sentry/integrations/slack/test_unfurl.py b/tests/sentry/integrations/slack/test_unfurl.py
index 064843781d4896..84e1d6bad38b10 100644
--- a/tests/sentry/integrations/slack/test_unfurl.py
+++ b/tests/sentry/integrations/slack/test_unfurl.py
@@ -15,7 +15,7 @@
 from sentry.integrations.slack.message_builder.metric_alerts import SlackMetricAlertMessageBuilder
 from sentry.integrations.slack.unfurl.handlers import link_handlers, match_link
 from sentry.integrations.slack.unfurl.types import LinkType, UnfurlableUrl
-from sentry.snuba import discover, errors, transactions
+from sentry.snuba import discover, errors, spans_eap, transactions
 from sentry.snuba.dataset import Dataset
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers import install_slack
@@ -407,6 +407,112 @@ def test_unfurl_metric_alerts_chart_transaction(self, mock_generate_chart):
         assert type(series_data[0]["value"]) is float
         assert chart_data["incidents"][0]["id"] == str(incident.id)
 
+    @patch("sentry.charts.backend.generate_chart", return_value="chart-url")
+    def test_unfurl_metric_alerts_chart_eap_spans(self, mock_generate_chart):
+        # Using the EventsAnalyticsPlatform dataset
+        alert_rule = self.create_alert_rule(
+            query="span.op:foo", dataset=Dataset.EventsAnalyticsPlatform
+        )
+        incident = self.create_incident(
+            status=2,
+            organization=self.organization,
+            projects=[self.project],
+            alert_rule=alert_rule,
+            date_started=timezone.now() - timedelta(minutes=2),
+        )
+        trigger = self.create_alert_rule_trigger(alert_rule, CRITICAL_TRIGGER_LABEL, 100)
+        self.create_alert_rule_trigger_action(
+            alert_rule_trigger=trigger, triggered_for_incident=incident
+        )
+
+        url = f"https://sentry.io/organizations/{self.organization.slug}/alerts/rules/details/{alert_rule.id}/?alert={incident.identifier}"
+        links = [
+            UnfurlableUrl(
+                url=url,
+                args={
+                    "org_slug": self.organization.slug,
+                    "alert_rule_id": alert_rule.id,
+                    "incident_id": incident.identifier,
+                    "period": None,
+                    "start": None,
+                    "end": None,
+                },
+            ),
+        ]
+
+        with self.feature(
+            [
+                "organizations:incidents",
+                "organizations:discover",
+                "organizations:performance-view",
+                "organizations:metric-alert-chartcuterie",
+            ]
+        ):
+            unfurls = link_handlers[LinkType.METRIC_ALERT].fn(self.request, self.integration, links)
+
+        assert (
+            unfurls[links[0].url]
+            == SlackMetricAlertMessageBuilder(alert_rule, incident, chart_url="chart-url").build()
+        )
+        assert len(mock_generate_chart.mock_calls) == 1
+        chart_data = mock_generate_chart.call_args[0][1]
+        assert chart_data["rule"]["id"] == str(alert_rule.id)
+        assert chart_data["rule"]["dataset"] == "events_analytics_platform"
+        assert chart_data["selectedIncident"]["identifier"] == str(incident.identifier)
+        series_data = chart_data["timeseriesData"][0]["data"]
+        assert len(series_data) > 0
+        # Validate format of timeseries
+        assert type(series_data[0]["name"]) is int
+        assert type(series_data[0]["value"]) is float
+        assert chart_data["incidents"][0]["id"] == str(incident.id)
+
+    @patch(
+        "sentry.api.bases.organization_events.OrganizationEventsV2EndpointBase.get_event_stats_data",
+    )
+    @patch("sentry.charts.backend.generate_chart", return_value="chart-url")
+    def test_unfurl_metric_alerts_chart_eap_spans_events_stats_call(
+        self, mock_generate_chart, mock_get_event_stats_data
+    ):
+        # Using the EventsAnalyticsPlatform dataset
+        alert_rule = self.create_alert_rule(
+            query="span.op:foo", dataset=Dataset.EventsAnalyticsPlatform
+        )
+        incident = self.create_incident(
+            status=2,
+            organization=self.organization,
+            projects=[self.project],
+            alert_rule=alert_rule,
+            date_started=timezone.now() - timedelta(minutes=2),
+        )
+
+        url = f"https://sentry.io/organizations/{self.organization.slug}/alerts/rules/details/{alert_rule.id}/?alert={incident.identifier}"
+        links = [
+            UnfurlableUrl(
+                url=url,
+                args={
+                    "org_slug": self.organization.slug,
+                    "alert_rule_id": alert_rule.id,
+                    "incident_id": incident.identifier,
+                    "period": None,
+                    "start": None,
+                    "end": None,
+                },
+            ),
+        ]
+
+        with self.feature(
+            [
+                "organizations:incidents",
+                "organizations:discover",
+                "organizations:performance-view",
+                "organizations:metric-alert-chartcuterie",
+            ]
+        ):
+            link_handlers[LinkType.METRIC_ALERT].fn(self.request, self.integration, links)
+
+        dataset = mock_get_event_stats_data.mock_calls[0][2]["dataset"]
+        assert dataset == spans_eap
+
     @patch("sentry.charts.backend.generate_chart", return_value="chart-url")
     def test_unfurl_metric_alerts_chart_crash_free(self, mock_generate_chart):
         alert_rule = self.create_alert_rule(
diff --git a/tests/sentry/integrations/slack/webhooks/actions/test_enable_notifications.py b/tests/sentry/integrations/slack/webhooks/actions/test_enable_notifications.py
index 66a67218797ebe..b06a197530356f 100644
--- a/tests/sentry/integrations/slack/webhooks/actions/test_enable_notifications.py
+++ b/tests/sentry/integrations/slack/webhooks/actions/test_enable_notifications.py
@@ -4,7 +4,7 @@
     ENABLE_SLACK_SUCCESS_MESSAGE,
     NO_IDENTITY_MESSAGE,
 )
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.silo.base import SiloMode
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.users.models.identity import Identity
diff --git a/tests/sentry/integrations/slack/webhooks/actions/test_status.py b/tests/sentry/integrations/slack/webhooks/actions/test_status.py
index cda1321eed7062..d3af6e075a1875 100644
--- a/tests/sentry/integrations/slack/webhooks/actions/test_status.py
+++ b/tests/sentry/integrations/slack/webhooks/actions/test_status.py
@@ -195,7 +195,7 @@ def assign_issue(self, original_message, selected_option, payload_data=None):
         # resp so that the tests can assert the response blocks looked as expected
         return resp
 
-    def resolve_issue(self, original_message, selected_option, payload_data=None):
+    def resolve_issue(self, original_message, selected_option, payload_data=None, mock_record=None):
         status_action = self.get_resolve_status_action()
         resp = self.post_webhook_block_kit(
             action_data=[status_action], original_message=original_message, data=payload_data
@@ -222,6 +222,15 @@ def resolve_issue(self, original_message, selected_option, payload_data=None):
 
         assert resp.status_code == 200, resp.content
 
+        # 4 lifecycle events are recorded: 2 for the view submission and 2 for the view update
+        if mock_record:
+            assert len(mock_record.mock_calls) == 4
+            start_1, success_1, start_2, success_2 = mock_record.mock_calls
+            assert start_1.args[0] == EventLifecycleOutcome.STARTED
+            assert success_1.args[0] == EventLifecycleOutcome.SUCCESS
+            assert start_2.args[0] == EventLifecycleOutcome.STARTED
+            assert success_2.args[0] == EventLifecycleOutcome.SUCCESS
+
     @freeze_time("2021-01-14T12:27:28.303Z")
     def test_ask_linking(self):
         """Freezing time to prevent flakiness from timestamp mismatch."""
@@ -255,10 +264,12 @@ def test_archive_issue_until_escalating(self, mock_tags, mock_record):
         assert "via" not in blocks[4]["elements"][0]["text"]
         assert ":white_circle:" in blocks[0]["text"]["text"]
 
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
+        assert len(mock_record.mock_calls) == 4
+        start_1, success_1, start_2, success_2 = mock_record.mock_calls
+        assert start_1.args[0] == EventLifecycleOutcome.STARTED
+        assert success_1.args[0] == EventLifecycleOutcome.SUCCESS
+        assert start_2.args[0] == EventLifecycleOutcome.STARTED
+        assert success_2.args[0] == EventLifecycleOutcome.SUCCESS
 
     @patch("sentry.integrations.slack.message_builder.issues.get_tags", return_value=[])
     def test_archive_issue_until_escalating_through_unfurl(self, mock_tags):
@@ -706,10 +717,11 @@ def test_assign_user_with_multiple_identities_through_unfurl(self):
         assert self.notification_text in blocks[1]["text"]["text"]
         assert blocks[2]["text"]["text"].endswith(expect_status), text
 
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.slack.message_builder.issues.get_tags", return_value=[])
-    def test_resolve_issue(self, mock_tags):
+    def test_resolve_issue(self, mock_tags, mock_record):
         original_message = self.get_original_message(self.group.id)
-        self.resolve_issue(original_message, "resolved")
+        self.resolve_issue(original_message, "resolved", mock_record)
 
         self.group = Group.objects.get(id=self.group.id)
         assert self.group.get_status() == GroupStatus.RESOLVED
@@ -723,8 +735,9 @@ def test_resolve_issue(self, mock_tags):
         assert blocks[2]["text"]["text"] == expect_status
         assert ":white_circle:" in blocks[0]["text"]["text"]
 
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.slack.message_builder.issues.get_tags", return_value=[])
-    def test_resolve_perf_issue(self, mock_tags):
+    def test_resolve_perf_issue(self, mock_tags, mock_record):
         group_fingerprint = f"{PerformanceNPlusOneGroupType.type_id}-group1"
 
         event_data_2 = load_data("transaction-n-plus-one", fingerprint=[group_fingerprint])
@@ -739,7 +752,7 @@ def test_resolve_perf_issue(self, mock_tags):
         assert self.group
 
         original_message = self.get_original_message(self.group.id)
-        self.resolve_issue(original_message, "resolved")
+        self.resolve_issue(original_message, "resolved", mock_record)
 
         self.group.refresh_from_db()
         assert self.group.get_status() == GroupStatus.RESOLVED
@@ -773,8 +786,9 @@ def test_resolve_issue_through_unfurl(self, mock_tags):
         assert self.notification_text in blocks[1]["text"]["text"]
         assert blocks[2]["text"]["text"] == expect_status
 
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.slack.message_builder.issues.get_tags", return_value=[])
-    def test_resolve_issue_in_current_release(self, mock_tags):
+    def test_resolve_issue_in_current_release(self, mock_tags, mock_record):
         release = Release.objects.create(
             organization_id=self.organization.id,
             version="1.0",
@@ -782,7 +796,7 @@ def test_resolve_issue_in_current_release(self, mock_tags):
         release.add_project(self.project)
 
         original_message = self.get_original_message(self.group.id)
-        self.resolve_issue(original_message, "resolved:inCurrentRelease")
+        self.resolve_issue(original_message, "resolved:inCurrentRelease", mock_record)
 
         self.group = Group.objects.get(id=self.group.id)
         assert self.group.get_status() == GroupStatus.RESOLVED
@@ -822,15 +836,16 @@ def test_resolve_issue_in_current_release_through_unfurl(self, mock_tags):
         assert self.notification_text in blocks[1]["text"]["text"]
         assert blocks[2]["text"]["text"].endswith(expect_status)
 
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.slack.message_builder.issues.get_tags", return_value=[])
-    def test_resolve_in_next_release(self, mock_tags):
+    def test_resolve_in_next_release(self, mock_tags, mock_record):
         release = Release.objects.create(
             organization_id=self.organization.id,
             version="1.0",
         )
         release.add_project(self.project)
         original_message = self.get_original_message(self.group.id)
-        self.resolve_issue(original_message, "resolved:inNextRelease")
+        self.resolve_issue(original_message, "resolved:inNextRelease", mock_record)
 
         self.group = Group.objects.get(id=self.group.id)
         assert self.group.get_status() == GroupStatus.RESOLVED
diff --git a/tests/sentry/integrations/slack/webhooks/commands/test_link_team.py b/tests/sentry/integrations/slack/webhooks/commands/test_link_team.py
index 9bc5ddff5118ed..0dfabb61c78776 100644
--- a/tests/sentry/integrations/slack/webhooks/commands/test_link_team.py
+++ b/tests/sentry/integrations/slack/webhooks/commands/test_link_team.py
@@ -65,9 +65,9 @@ def test_link_another_team_to_channel(self, mock_record):
         assert CHANNEL_ALREADY_LINKED_MESSAGE in get_response_text(data)
 
         assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
+        start, success = mock_record.mock_calls
         assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
 
     @with_feature("organizations:slack-multiple-team-single-channel-linking")
     @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
@@ -92,12 +92,13 @@ def test_link_another_team_to_channel_with_flag(self, mock_record):
         assert "Link your Sentry team to this Slack channel!" in get_response_text(data)
 
         assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
+        start, success = mock_record.mock_calls
         assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
-    def test_link_team_from_dm(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_team_from_dm(self, mock_record):
         """
         Test that if a user types `/sentry link team` from a DM instead of a
         channel, we reply with an error message.
@@ -113,8 +114,13 @@ def test_link_team_from_dm(self):
         data = orjson.loads(response.content)
         assert LINK_FROM_CHANNEL_MESSAGE in get_response_text(data)
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
     @responses.activate
-    def test_link_team_identity_does_not_exist(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_team_identity_does_not_exist(self, mock_record):
         """Test that get_identity fails if the user has no Identity and we reply with the LINK_USER_MESSAGE"""
         user2 = self.create_user()
         self.create_member(
@@ -124,8 +130,13 @@ def test_link_team_identity_does_not_exist(self):
         data = self.send_slack_message("link team", user_id=OTHER_SLACK_ID)
         assert LINK_USER_FIRST_MESSAGE in get_response_text(data)
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
     @responses.activate
-    def test_link_team_insufficient_role(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_team_insufficient_role(self, mock_record):
         """
         Test that when a user whose role is insufficient attempts to link a
         team, we reject them and reply with the INSUFFICIENT_ROLE_MESSAGE.
@@ -140,8 +151,13 @@ def test_link_team_insufficient_role(self):
         data = self.send_slack_message("link team", user_id=OTHER_SLACK_ID)
         assert INSUFFICIENT_ROLE_MESSAGE in get_response_text(data)
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
     @responses.activate
-    def test_link_team_as_team_admin(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_team_as_team_admin(self, mock_record):
         """
         Test that when a user who is a team admin attempts to link a team we allow it.
         """
@@ -151,6 +167,10 @@ def test_link_team_as_team_admin(self):
         data = self.send_slack_message("link team", user_id=OTHER_SLACK_ID)
         assert "Link your Sentry team to this Slack channel!" in get_response_text(data)
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
 
 class SlackCommandsUnlinkTeamTest(SlackCommandsLinkTeamTestBase):
     def setUp(self):
@@ -158,7 +178,8 @@ def setUp(self):
         self.link_team()
 
     @responses.activate
-    def test_unlink_team(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_unlink_team(self, mock_record):
         data = self.send_slack_message(
             "unlink team",
             channel_name=self.channel_name,
@@ -166,8 +187,13 @@ def test_unlink_team(self):
         )
         assert "Click here to unlink your team from this channel" in get_response_text(data)
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
     @responses.activate
-    def test_unlink_team_as_team_admin(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_unlink_team_as_team_admin(self, mock_record):
         """
         Test that when a user who is a team admin attempts to unlink a team we allow it.
         """
@@ -181,8 +207,13 @@ def test_unlink_team_as_team_admin(self):
         )
         assert "Click here to unlink your team from this channel" in get_response_text(data)
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
     @responses.activate
-    def test_unlink_no_team(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_unlink_no_team(self, mock_record):
         """
         Test for when a user attempts to remove a link between a Slack channel
         and a Sentry team that does not exist.
@@ -194,8 +225,13 @@ def test_unlink_no_team(self):
         )
         assert TEAM_NOT_LINKED_MESSAGE in get_response_text(data)
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
     @responses.activate
-    def test_unlink_multiple_orgs(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_unlink_multiple_orgs(self, mock_record):
         # Create another organization and team for this user that is linked through `self.integration`.
         organization2 = self.create_organization(owner=self.user)
         team2 = self.create_team(organization=organization2, members=[self.user])
@@ -211,3 +247,7 @@ def test_unlink_multiple_orgs(self):
             channel_id=self.channel_id,
         )
         assert "Click here to unlink your team from this channel" in get_response_text(data)
+
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
diff --git a/tests/sentry/integrations/slack/webhooks/commands/test_link_user.py b/tests/sentry/integrations/slack/webhooks/commands/test_link_user.py
index 6b65696ac137b2..b2b989eb4ca282 100644
--- a/tests/sentry/integrations/slack/webhooks/commands/test_link_user.py
+++ b/tests/sentry/integrations/slack/webhooks/commands/test_link_user.py
@@ -34,15 +34,25 @@ def test_link_user_identity(self):
 class SlackCommandsLinkUserTest(SlackCommandsTest):
     """Slash commands results are generated on Region Silo"""
 
-    def test_link_command(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_command(self, mock_record):
         data = self.send_slack_message("link")
         assert "Link your Slack identity" in get_response_text(data)
 
-    def test_link_command_already_linked(self):
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_link_command_already_linked(self, mock_record):
         self.link_user()
         data = self.send_slack_message("link")
         assert "You are already linked as" in get_response_text(data)
 
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
 
 @control_silo_test
 class SlackUnlinkIdentityViewTest(SlackCommandsTest):
@@ -112,10 +122,15 @@ def test_unlink_command(self, mock_record):
         assert "to unlink your identity" in get_response_text(data)
 
         assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
+        start, success = mock_record.mock_calls
         assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
 
-    def test_unlink_command_already_unlinked(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_unlink_command_already_unlinked(self, mock_record):
         data = self.send_slack_message("unlink")
         assert NOT_LINKED_MESSAGE in get_response_text(data)
+
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
diff --git a/tests/sentry/integrations/slack/webhooks/events/test_message_im.py b/tests/sentry/integrations/slack/webhooks/events/test_message_im.py
index 25b4de29820487..cd1a8a143b6346 100644
--- a/tests/sentry/integrations/slack/webhooks/events/test_message_im.py
+++ b/tests/sentry/integrations/slack/webhooks/events/test_message_im.py
@@ -108,9 +108,9 @@ def test_user_message_link(self, mock_record):
         assert "Link your Slack identity" in get_response_text(data)
 
         assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
+        start, success = mock_record.mock_calls
         assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
 
     def test_user_message_already_linked_sdk(self):
         """
diff --git a/tests/sentry/integrations/source_code_management/__init__.py b/tests/sentry/integrations/source_code_management/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/tests/sentry/integrations/source_code_management/test_commit_context_slo.py b/tests/sentry/integrations/source_code_management/test_commit_context_slo.py
new file mode 100644
index 00000000000000..c1a20d02bfbb0e
--- /dev/null
+++ b/tests/sentry/integrations/source_code_management/test_commit_context_slo.py
@@ -0,0 +1,115 @@
+from unittest.mock import Mock, patch
+
+from sentry.integrations.source_code_management.commit_context import (
+    CommitContextIntegration,
+    SourceLineInfo,
+)
+from sentry.integrations.types import EventLifecycleOutcome
+from sentry.models.repository import Repository
+from sentry.testutils.asserts import assert_failure_metric, assert_halt_metric
+from sentry.testutils.cases import TestCase
+from sentry.users.models.identity import Identity
+
+
+class MockCommitContextIntegration(CommitContextIntegration):
+    """Mock implementation for testing"""
+
+    integration_name = "mock_integration"
+
+    def __init__(self):
+        self.client = Mock()
+
+    def get_client(self):
+        return self.client
+
+
+class CommitContextIntegrationTest(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.integration = MockCommitContextIntegration()
+        self.repo = Repository.objects.create(
+            organization_id=self.organization.id,
+            name="example/repo",
+        )
+        self.source_line = SourceLineInfo(
+            lineno=10, path="src/file.py", ref="main", repo=self.repo, code_mapping=Mock()
+        )
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_get_blame_for_files_success(self, mock_record):
+        """Test successful blame retrieval records correct lifecycle events"""
+        self.integration.client.get_blame_for_files.return_value = []
+
+        result = self.integration.get_blame_for_files([self.source_line], {})
+
+        assert result == []
+        assert len(mock_record.mock_calls) == 2
+
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_get_blame_for_files_missing_identity(self, mock_record):
+        """Test missing identity records failure"""
+        self.integration.get_client = Mock(side_effect=Identity.DoesNotExist())
+
+        result = self.integration.get_blame_for_files([self.source_line], {})
+
+        assert result == []
+        assert len(mock_record.mock_calls) == 2
+
+        start, failure = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert failure.args[0] == EventLifecycleOutcome.FAILURE
+        assert_failure_metric(mock_record, Identity.DoesNotExist())
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_get_blame_for_files_invalid_identity(self, mock_record):
+        """Test invalid identity records failure"""
+        from sentry.auth.exceptions import IdentityNotValid
+
+        self.integration.client.get_blame_for_files = Mock(side_effect=IdentityNotValid())
+
+        result = self.integration.get_blame_for_files([self.source_line], {})
+
+        assert result == []
+        assert len(mock_record.mock_calls) == 2
+
+        start, failure = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert failure.args[0] == EventLifecycleOutcome.FAILURE
+        assert_failure_metric(mock_record, IdentityNotValid())
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_get_blame_for_files_rate_limited(self, mock_record):
+        """Test rate limited requests record halt"""
+        from sentry.shared_integrations.exceptions import ApiRateLimitedError
+
+        self.integration.client.get_blame_for_files = Mock(
+            side_effect=ApiRateLimitedError(text="Rate limited")
+        )
+
+        result = self.integration.get_blame_for_files([self.source_line], {})
+
+        assert result == []
+        assert len(mock_record.mock_calls) == 2
+
+        start, halt = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert halt.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, ApiRateLimitedError(text="Rate limited"))
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_get_commit_context_all_frames(self, mock_record):
+        """Test get_commit_context_all_frames records correct lifecycle events"""
+        self.integration.client.get_blame_for_files.return_value = []
+
+        result = self.integration.get_commit_context_all_frames([self.source_line], {})
+
+        assert result == []
+        assert len(mock_record.mock_calls) == 2
+
+        start, success = mock_record.mock_calls
+        assert start.args[0] == EventLifecycleOutcome.STARTED
+        assert success.args[0] == EventLifecycleOutcome.SUCCESS
diff --git a/tests/sentry/integrations/tasks/__init__.py b/tests/sentry/integrations/tasks/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/tests/sentry/integrations/tasks/test_sync_assignee_outbound.py b/tests/sentry/integrations/tasks/test_sync_assignee_outbound.py
new file mode 100644
index 00000000000000..bc64fb713fccec
--- /dev/null
+++ b/tests/sentry/integrations/tasks/test_sync_assignee_outbound.py
@@ -0,0 +1,136 @@
+from unittest import mock
+
+import pytest
+
+from sentry.integrations.example import ExampleIntegration
+from sentry.integrations.models import ExternalIssue, Integration
+from sentry.integrations.tasks import sync_assignee_outbound
+from sentry.integrations.types import EventLifecycleOutcome
+from sentry.testutils.cases import TestCase
+from sentry.testutils.silo import assume_test_silo_mode_of
+from sentry.users.services.user import RpcUser
+
+
+def raise_sync_assignee_exception(*args, **kwargs):
+    raise Exception("Something went wrong")
+
+
+class TestSyncAssigneeOutbound(TestCase):
+    def setUp(self):
+        self.example_integration = self.create_integration(
+            organization=self.group.organization,
+            external_id="123456",
+            provider="example",
+            oi_params={
+                "config": {
+                    "sync_comments": True,
+                    "sync_status_outbound": True,
+                    "sync_status_inbound": True,
+                    "sync_assignee_outbound": True,
+                    "sync_assignee_inbound": True,
+                }
+            },
+        )
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    @mock.patch.object(ExampleIntegration, "sync_assignee_outbound")
+    def test_syncs_outbound_assignee(self, mock_sync_assignee, mock_record_event):
+        external_issue = self.create_integration_external_issue(
+            group=self.group,
+            key="foo-1234",
+            integration=self.example_integration,
+        )
+
+        sync_assignee_outbound(external_issue.id, self.user.id, True, None)
+        mock_sync_assignee.assert_called_once()
+        mock_sync_assignee.assert_called_with(
+            external_issue, mock.ANY, assign=True, assignment_source=None
+        )
+
+        user_arg = mock_sync_assignee.call_args_list[0][0][1]
+        assert isinstance(user_arg, RpcUser)
+        assert user_arg.id == self.user.id
+
+        mock_record_event.assert_called_with(EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_failure")
+    @mock.patch.object(ExampleIntegration, "sync_assignee_outbound")
+    def test_sync_failure(self, mock_sync_assignee, mock_record_failure):
+        mock_sync_assignee.side_effect = raise_sync_assignee_exception
+
+        external_issue = self.create_integration_external_issue(
+            group=self.group,
+            key="foo-1234",
+            integration=self.example_integration,
+        )
+
+        with pytest.raises(Exception) as exc:
+            sync_assignee_outbound(external_issue.id, self.user.id, True, None)
+
+        assert exc.match("Something went wrong")
+        mock_record_failure.assert_called_once()
+        mock_record_failure_args = mock_record_failure.call_args_list[0][0]
+        assert mock_record_failure_args[0] is not None
+
+        metric_exception = mock_record_failure_args[0]
+        assert isinstance(metric_exception, Exception)
+        assert metric_exception.args[0] == "Something went wrong"
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    @mock.patch.object(ExampleIntegration, "sync_assignee_outbound")
+    @mock.patch.object(ExampleIntegration, "should_sync")
+    def test_skips_syncing_if_should_sync_false(
+        self, mock_should_sync, mock_sync_assignee, mock_record_event
+    ):
+        mock_should_sync.return_value = False
+        external_issue = self.create_integration_external_issue(
+            group=self.group,
+            key="foo-1234",
+            integration=self.example_integration,
+        )
+
+        sync_assignee_outbound(external_issue.id, self.user.id, True, None)
+        mock_sync_assignee.assert_not_called()
+
+        assert mock_record_event.call_count == 2
+        start, success = mock_record_event.mock_calls
+        assert start.args == (EventLifecycleOutcome.STARTED,)
+        assert success.args == (EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    @mock.patch.object(ExampleIntegration, "sync_assignee_outbound")
+    def test_missing_issue_sync(self, mock_sync_assignee, mock_record_event):
+        # The default test integration does not support issue sync,
+        # so creating an external issue for this integration should
+        # be enough to test this functionality.
+        external_issue = self.create_integration_external_issue(
+            group=self.group,
+            key="foo-1234",
+            integration=self.integration,
+        )
+
+        sync_assignee_outbound(external_issue.id, self.user.id, True, None)
+        mock_sync_assignee.assert_not_called()
+
+        # We don't want to log halt/failure metrics for these as it will taint
+        # all non-sync integrations' metrics.
+        assert mock_record_event.call_count == 2
+        start, success = mock_record_event.mock_calls
+        assert start.args == (EventLifecycleOutcome.STARTED,)
+        assert success.args == (EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch.object(ExampleIntegration, "sync_assignee_outbound")
+    def test_missing_integration_installation(self, mock_sync_assignee):
+        external_issue = self.create_integration_external_issue(
+            group=self.group,
+            key="foo-1234",
+            integration=self.example_integration,
+        )
+
+        # Delete all integrations, but ensure we still have an external issue
+        with assume_test_silo_mode_of(Integration):
+            Integration.objects.filter().delete()
+
+        assert ExternalIssue.objects.filter(id=external_issue.id).exists()
+        sync_assignee_outbound(external_issue.id, self.user.id, True, None)
+        mock_sync_assignee.assert_not_called()
diff --git a/tests/sentry/integrations/tasks/test_sync_status_outbound.py b/tests/sentry/integrations/tasks/test_sync_status_outbound.py
new file mode 100644
index 00000000000000..2e47effb869bb4
--- /dev/null
+++ b/tests/sentry/integrations/tasks/test_sync_status_outbound.py
@@ -0,0 +1,105 @@
+from unittest import mock
+
+import pytest
+
+from sentry.integrations.example import ExampleIntegration
+from sentry.integrations.models import ExternalIssue, Integration
+from sentry.integrations.tasks import sync_status_outbound
+from sentry.integrations.types import EventLifecycleOutcome
+from sentry.testutils.cases import TestCase
+from sentry.testutils.silo import assume_test_silo_mode_of, region_silo_test
+
+
+def raise_exception(_external_issue, _is_resolved, _group_proj_id):
+    raise Exception("Something went wrong")
+
+
+@region_silo_test
+class TestSyncStatusOutbound(TestCase):
+    def setUp(self):
+        self.example_integration = self.create_integration(
+            organization=self.group.organization,
+            external_id="123456",
+            provider="example",
+            oi_params={
+                "config": {
+                    "sync_comments": True,
+                    "sync_status_outbound": True,
+                    "sync_status_inbound": True,
+                    "sync_assignee_outbound": True,
+                    "sync_assignee_inbound": True,
+                }
+            },
+        )
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    @mock.patch.object(ExampleIntegration, "sync_status_outbound")
+    def test_successful_outbound_sync(self, mock_sync_status, mock_record_event):
+
+        external_issue: ExternalIssue = self.create_integration_external_issue(
+            group=self.group, key="foo_integration", integration=self.example_integration
+        )
+
+        sync_status_outbound(self.group.id, external_issue_id=external_issue.id)
+        mock_sync_status.assert_called_once_with(external_issue, False, self.group.project_id)
+        mock_record_event.assert_any_call(EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    @mock.patch.object(ExampleIntegration, "sync_status_outbound")
+    @mock.patch.object(ExampleIntegration, "should_sync")
+    def test_should_not_sync(self, mock_should_sync, mock_sync_status, mock_record_event):
+        mock_should_sync.return_value = False
+        external_issue: ExternalIssue = self.create_integration_external_issue(
+            group=self.group, key="foo_integration", integration=self.example_integration
+        )
+
+        sync_status_outbound(self.group.id, external_issue_id=external_issue.id)
+        mock_sync_status.assert_not_called()
+
+        assert mock_record_event.call_count == 2
+        start, success = mock_record_event.mock_calls
+        assert start.args == (EventLifecycleOutcome.STARTED,)
+        assert success.args == (EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch.object(ExampleIntegration, "sync_status_outbound")
+    def test_missing_external_issue(self, mock_sync_status):
+        # This shouldn't be an issue, but just verify that there's no external
+        # issue with this ID
+        assert not ExternalIssue.objects.filter(id=5432).exists()
+        sync_status_outbound(self.group.id, external_issue_id=5432)
+
+        mock_sync_status.assert_not_called()
+
+    @mock.patch.object(ExampleIntegration, "sync_status_outbound")
+    def test_missing_integration(self, mock_sync_status):
+        external_issue: ExternalIssue = self.create_integration_external_issue(
+            group=self.group, key="foo_integration", integration=self.example_integration
+        )
+
+        with assume_test_silo_mode_of(Integration):
+            Integration.objects.filter().delete()
+
+        assert ExternalIssue.objects.filter(id=external_issue.id).exists()
+        sync_status_outbound(self.group.id, external_issue_id=external_issue.id)
+        mock_sync_status.assert_not_called()
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_failure")
+    @mock.patch.object(ExampleIntegration, "sync_status_outbound")
+    def test_failed_sync(self, mock_sync_status, mock_record_failure):
+        mock_sync_status.side_effect = raise_exception
+        external_issue: ExternalIssue = self.create_integration_external_issue(
+            group=self.group, key="foo_integration", integration=self.example_integration
+        )
+
+        with pytest.raises(Exception) as exc:
+            sync_status_outbound(self.group.id, external_issue_id=external_issue.id)
+
+        assert exc.match("Something went wrong")
+
+        assert mock_record_failure.call_count == 1
+        mock_record_event_args = mock_record_failure.call_args_list[0][0]
+        assert mock_record_event_args[0] is not None
+
+        metric_exception = mock_record_event_args[0]
+        assert isinstance(metric_exception, Exception)
+        assert metric_exception.args[0] == "Something went wrong"
diff --git a/tests/sentry/integrations/test_issues.py b/tests/sentry/integrations/test_issues.py
index 3f86cbb2696ee1..b729f02831b2af 100644
--- a/tests/sentry/integrations/test_issues.py
+++ b/tests/sentry/integrations/test_issues.py
@@ -1,18 +1,14 @@
 from unittest import mock
 
-import pytest
-
 from sentry.integrations.example.integration import AliasedIntegrationProvider, ExampleIntegration
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.services.integration import integration_service
-from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.activity import Activity
 from sentry.models.group import Group, GroupStatus
 from sentry.models.grouplink import GroupLink
 from sentry.models.groupresolution import GroupResolution
 from sentry.models.release import Release
-from sentry.shared_integrations.exceptions import ApiError, IntegrationError
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import assume_test_silo_mode
@@ -410,15 +406,10 @@ def setUp(self):
         assert isinstance(installation, ExampleIntegration)
         self.installation = installation
 
-    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_get_repository_choices(self, mock_record):
+    def test_get_repository_choices(self):
         default_repo, repo_choice = self.installation.get_repository_choices(self.group, {})
         assert default_repo == "user/repo"
         assert repo_choice == [("user/repo", "repo")]
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
 
     def test_get_repository_choices_no_repos(self):
         with mock.patch.object(self.installation, "get_repositories", return_value=[]):
@@ -426,21 +417,6 @@ def test_get_repository_choices_no_repos(self):
             assert default_repo == ""
             assert repo_choice == []
 
-    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_get_repository_choices_error(self, mock_record):
-        with pytest.raises(IntegrationError):
-            with mock.patch.object(
-                self.installation,
-                "get_repositories",
-                return_value=[],
-                side_effect=ApiError("This sucks!"),
-            ):
-                self.installation.get_repository_choices(self.group, {})
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.FAILURE
-
     def test_get_repository_choices_default_repo(self):
         assert self.installation.org_integration is not None
         self.installation.org_integration = integration_service.update_organization_integration(
diff --git a/tests/sentry/integrations/test_notification_utilities.py b/tests/sentry/integrations/test_notification_utilities.py
index c84d556a450e09..d79f71c2463ada 100644
--- a/tests/sentry/integrations/test_notification_utilities.py
+++ b/tests/sentry/integrations/test_notification_utilities.py
@@ -44,7 +44,7 @@ def _assert_integrations_are(
     def test_simple(self):
         integrations_by_channel_by_recipient = get_integrations_by_channel_by_recipient(
             self.notification.organization,
-            [self.user],
+            [Actor.from_object(self.user)],
             ExternalProviders.SLACK,
         )
 
@@ -59,7 +59,7 @@ def test_matching_idp_and_identity_external_id(self):
         """
         integrations_by_channel_by_recipient = get_integrations_by_channel_by_recipient(
             self.notification.organization,
-            [self.user_2],
+            [Actor.from_object(self.user_2)],
             ExternalProviders.SLACK,
         )
 
@@ -68,7 +68,7 @@ def test_matching_idp_and_identity_external_id(self):
     def test_multiple(self):
         integrations_by_channel_by_recipient = get_integrations_by_channel_by_recipient(
             self.notification.organization,
-            [self.user, self.user_2],
+            [Actor.from_object(self.user), Actor.from_object(self.user_2)],
             ExternalProviders.SLACK,
         )
 
diff --git a/tests/sentry/integrations/utils/test_lifecycle_metrics.py b/tests/sentry/integrations/utils/test_lifecycle_metrics.py
index a7ebc9816da7cf..1c48b3b469b185 100644
--- a/tests/sentry/integrations/utils/test_lifecycle_metrics.py
+++ b/tests/sentry/integrations/utils/test_lifecycle_metrics.py
@@ -1,5 +1,7 @@
 from unittest import mock
 
+import pytest
+
 from sentry.integrations.base import IntegrationDomain
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.integrations.utils.metrics import IntegrationEventLifecycleMetric
@@ -7,6 +9,10 @@
 from sentry.testutils.silo import no_silo_test
 
 
+class ExampleException(Exception):
+    pass
+
+
 @no_silo_test
 class IntegrationEventLifecycleMetricTest(TestCase):
     class TestLifecycleMetric(IntegrationEventLifecycleMetric):
@@ -73,21 +79,108 @@ def test_recording_halt(self, mock_metrics, mock_logger):
 
     @mock.patch("sentry.integrations.utils.metrics.logger")
     @mock.patch("sentry.integrations.utils.metrics.metrics")
-    def test_recording_failure(self, mock_metrics, mock_logger):
-        class TestException(Exception):
-            pass
+    def test_recording_explicit_halt_with_exception(self, mock_metrics, mock_logger):
+        metric_obj = self.TestLifecycleMetric()
+        with metric_obj.capture() as lifecycle:
+            lifecycle.add_extra("extra", "value")
+            lifecycle.record_halt(ExampleException(""), extra={"even": "more"})
 
+        self._check_metrics_call_args(mock_metrics, "halted")
+        mock_logger.warning.assert_called_once_with(
+            "integrations.slo.halted",
+            extra={
+                "extra": "value",
+                "even": "more",
+                "integration_domain": "messaging",
+                "integration_name": "my_integration",
+                "interaction_type": "my_interaction",
+            },
+            exc_info=mock.ANY,
+        )
+
+    @mock.patch("sentry.integrations.utils.metrics.logger")
+    @mock.patch("sentry.integrations.utils.metrics.metrics")
+    def test_recording_explicit_halt_with_str(self, mock_metrics, mock_logger):
+        metric_obj = self.TestLifecycleMetric()
+        with metric_obj.capture() as lifecycle:
+            lifecycle.add_extra("extra", "value")
+            lifecycle.record_halt("Integration went boom", extra={"even": "more"})
+
+        self._check_metrics_call_args(mock_metrics, "halted")
+        mock_logger.warning.assert_called_once_with(
+            "integrations.slo.halted",
+            extra={
+                "outcome_reason": "Integration went boom",
+                "extra": "value",
+                "even": "more",
+                "integration_domain": "messaging",
+                "integration_name": "my_integration",
+                "interaction_type": "my_interaction",
+            },
+        )
+
+    @mock.patch("sentry.integrations.utils.metrics.logger")
+    @mock.patch("sentry.integrations.utils.metrics.metrics")
+    def test_recording_failure(self, mock_metrics, mock_logger):
         metric_obj = self.TestLifecycleMetric()
-        try:
+        with pytest.raises(ExampleException):
             with metric_obj.capture() as lifecycle:
                 lifecycle.add_extra("extra", "value")
-                raise TestException
-        except TestException:
-            pass
-        else:
-            self.fail()
+                raise ExampleException
+
+        self._check_metrics_call_args(mock_metrics, "failure")
+        mock_logger.error.assert_called_once_with(
+            "integrations.slo.failure",
+            extra={
+                "extra": "value",
+                "integration_domain": "messaging",
+                "integration_name": "my_integration",
+                "interaction_type": "my_interaction",
+            },
+            exc_info=mock.ANY,
+        )
+
+    @mock.patch("sentry.integrations.utils.metrics.logger")
+    @mock.patch("sentry.integrations.utils.metrics.metrics")
+    def test_recording_explicit_failure_with_exception(self, mock_metrics, mock_logger):
+        metric_obj = self.TestLifecycleMetric()
+        with metric_obj.capture() as lifecycle:
+            try:
+                lifecycle.add_extra("extra", "value")
+                raise ExampleException
+            except ExampleException as exc:
+                lifecycle.record_failure(exc, extra={"even": "more"})
+
+        self._check_metrics_call_args(mock_metrics, "failure")
+        mock_logger.error.assert_called_once_with(
+            "integrations.slo.failure",
+            extra={
+                "extra": "value",
+                "even": "more",
+                "integration_domain": "messaging",
+                "integration_name": "my_integration",
+                "interaction_type": "my_interaction",
+            },
+            exc_info=mock.ANY,
+        )
+
+    @mock.patch("sentry.integrations.utils.metrics.logger")
+    @mock.patch("sentry.integrations.utils.metrics.metrics")
+    def test_recording_explicit_failure_with_str(self, mock_metrics, mock_logger):
+        metric_obj = self.TestLifecycleMetric()
+        with metric_obj.capture() as lifecycle:
+            lifecycle.add_extra("extra", "value")
+            lifecycle.record_failure("Integration went boom", extra={"even": "more"})
 
         self._check_metrics_call_args(mock_metrics, "failure")
         mock_logger.error.assert_called_once_with(
-            "integrations.slo.failure", extra={"extra": "value"}, exc_info=mock.ANY
+            "integrations.slo.failure",
+            extra={
+                "outcome_reason": "Integration went boom",
+                "extra": "value",
+                "even": "more",
+                "integration_domain": "messaging",
+                "integration_name": "my_integration",
+                "interaction_type": "my_interaction",
+            },
         )
diff --git a/tests/sentry/integrations/utils/test_sync.py b/tests/sentry/integrations/utils/test_sync.py
new file mode 100644
index 00000000000000..34b708cc912fe9
--- /dev/null
+++ b/tests/sentry/integrations/utils/test_sync.py
@@ -0,0 +1,232 @@
+from unittest import mock
+
+import pytest
+
+from sentry.integrations.types import EventLifecycleOutcome
+from sentry.integrations.utils.sync import sync_group_assignee_inbound
+from sentry.models.group import Group
+from sentry.models.groupassignee import GroupAssignee
+from sentry.testutils.cases import TestCase
+from sentry.testutils.silo import assume_test_silo_mode_of, region_silo_test
+from sentry.users.models import User, UserEmail
+from sentry.users.services.user import RpcUser
+from sentry.users.services.user.serial import serialize_rpc_user
+
+
+@region_silo_test
+class TestSyncAssigneeInbound(TestCase):
+    def setUp(self):
+        self.example_integration = self.create_integration(
+            organization=self.group.organization,
+            external_id="123456",
+            provider="example",
+            oi_params={
+                "config": {
+                    "sync_comments": True,
+                    "sync_status_outbound": True,
+                    "sync_status_inbound": True,
+                    "sync_assignee_outbound": True,
+                    "sync_assignee_inbound": True,
+                }
+            },
+        )
+        self.test_user = self.create_user("test@example.com")
+        self.create_member(organization=self.organization, user=self.test_user, teams=[self.team])
+
+        with assume_test_silo_mode_of(UserEmail):
+            UserEmail.objects.filter(user=self.test_user).update(is_verified=True)
+            assert UserEmail.objects.filter(
+                user=self.test_user, email="test@example.com", is_verified=True
+            ).exists()
+
+    def create_example_integration(self, organization, external_id):
+        self.example_integration = self.create_integration(
+            organization=organization,
+            external_id=external_id,
+            provider="example",
+            oi_params={
+                "config": {
+                    "sync_comments": True,
+                    "sync_status_outbound": True,
+                    "sync_status_inbound": True,
+                    "sync_assignee_outbound": True,
+                    "sync_assignee_inbound": True,
+                }
+            },
+        )
+
+    def assign_default_group_to_user(self, user: User, group: Group | None = None):
+        group_to_update: Group = group or self.group
+        GroupAssignee.objects.assign(group_to_update, serialize_rpc_user(user))
+        group_to_update.refresh_from_db()
+        group_assignee = group_to_update.get_assignee()
+        assert group_assignee is not None and group_assignee.id == user.id
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_no_affected_groups(self, mock_record_event):
+        self.assign_default_group_to_user(self.test_user)
+
+        sync_group_assignee_inbound(
+            integration=self.example_integration,
+            email="foo@example.com",
+            external_issue_key="this-does-not-exist",
+            assign=True,
+        )
+
+        mock_record_event.record_event(EventLifecycleOutcome.SUCCESS)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_unassign(self, mock_record_event):
+        self.assign_default_group_to_user(self.test_user)
+        external_issue = self.create_integration_external_issue(
+            group=self.group,
+            key="foo-123",
+            integration=self.example_integration,
+        )
+
+        sync_group_assignee_inbound(
+            integration=self.example_integration,
+            email="test@example.com",
+            external_issue_key=external_issue.key,
+            assign=False,
+        )
+
+        assert self.group.get_assignee() is None
+        mock_record_event.assert_called_with(EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_assignment(self, mock_record_event):
+        assert self.group.get_assignee() is None
+
+        external_issue = self.create_integration_external_issue(
+            group=self.group,
+            key="foo-123",
+            integration=self.example_integration,
+        )
+
+        sync_group_assignee_inbound(
+            integration=self.example_integration,
+            email="test@example.com",
+            external_issue_key=external_issue.key,
+            assign=True,
+        )
+
+        updated_assignee = self.group.get_assignee()
+        assert updated_assignee is not None
+        assert updated_assignee.id == self.test_user.id
+        assert updated_assignee.email == "test@example.com"
+        mock_record_event.assert_called_with(EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_assign_with_multiple_groups(self, mock_record_event):
+        # Create a couple new test unassigned test groups
+        groups_to_assign: list[Group] = []
+        for i in range(2):
+            org = self.create_organization(owner=self.create_user())
+            team = self.create_team(organization=org)
+            project = self.create_project(organization=org, teams=[team])
+            self.create_member(organization=org, user=self.test_user, teams=[team])
+            self.create_organization_integration(
+                organization_id=org.id,
+                integration=self.example_integration,
+                config={
+                    "sync_comments": True,
+                    "sync_status_outbound": True,
+                    "sync_status_inbound": True,
+                    "sync_assignee_outbound": True,
+                    "sync_assignee_inbound": True,
+                },
+            )
+
+            groups_to_assign.append(
+                self.create_group(project=project),
+            )
+
+        external_issue_key = "foo-123"
+        for group in groups_to_assign:
+            assert group.get_assignee() is None
+            self.create_integration_external_issue(
+                group=group,
+                key="foo-123",
+                integration=self.example_integration,
+            )
+
+        sync_group_assignee_inbound(
+            integration=self.example_integration,
+            email="test@example.com",
+            external_issue_key=external_issue_key,
+            assign=True,
+        )
+
+        for group in groups_to_assign:
+            assignee = group.get_assignee()
+            assert assignee is not None
+            assert isinstance(assignee, RpcUser)
+            assert assignee.id == self.test_user.id
+            assert assignee.email == "test@example.com"
+
+        mock_record_event.assert_called_with(EventLifecycleOutcome.SUCCESS, None)
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_halt")
+    def test_assign_with_no_user_found(self, mock_record_halt):
+        assert self.group.get_assignee() is None
+
+        external_issue = self.create_integration_external_issue(
+            group=self.group,
+            key="foo-123",
+            integration=self.example_integration,
+        )
+
+        sync_group_assignee_inbound(
+            integration=self.example_integration,
+            email="oopsnotfound@example.com",
+            external_issue_key=external_issue.key,
+            assign=True,
+        )
+
+        updated_assignee = self.group.get_assignee()
+        assert updated_assignee is None
+        mock_record_halt.assert_called_with(
+            "inbound-assignee-not-found",
+            extra={
+                "integration_id": self.example_integration.id,
+                "email": "oopsnotfound@example.com",
+                "issue_key": external_issue.key,
+            },
+        )
+
+    @mock.patch("sentry.integrations.utils.metrics.EventLifecycle.record_failure")
+    @mock.patch("sentry.models.groupassignee.GroupAssigneeManager.assign")
+    def test_assignment_fails(self, mock_group_assign, mock_record_failure):
+        def raise_exception(*args, **kwargs):
+            raise Exception("oops, something went wrong")
+
+        assert self.group.get_assignee() is None
+
+        mock_group_assign.side_effect = raise_exception
+
+        external_issue = self.create_integration_external_issue(
+            group=self.group,
+            key="foo-123",
+            integration=self.example_integration,
+        )
+
+        with pytest.raises(Exception) as exc:
+            sync_group_assignee_inbound(
+                integration=self.example_integration,
+                email="test@example.com",
+                external_issue_key=external_issue.key,
+                assign=True,
+            )
+
+        assert exc.match("oops, something went wrong")
+
+        updated_assignee = self.group.get_assignee()
+        assert updated_assignee is None
+
+        mock_record_failure.assert_called_once_with(mock.ANY)
+
+        exception_param = mock_record_failure.call_args_list[0].args[0]
+
+        assert isinstance(exception_param, Exception)
+        assert exception_param.args[0] == "oops, something went wrong"
diff --git a/tests/sentry/integrations/vsts/test_integration.py b/tests/sentry/integrations/vsts/test_integration.py
index c5b4d02ecc3a9e..e123748f648bb4 100644
--- a/tests/sentry/integrations/vsts/test_integration.py
+++ b/tests/sentry/integrations/vsts/test_integration.py
@@ -17,6 +17,7 @@
 from sentry.models.repository import Repository
 from sentry.shared_integrations.exceptions import IntegrationError, IntegrationProviderError
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_failure_metric
 from sentry.testutils.helpers import with_feature
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
 from sentry.users.models.identity import Identity
@@ -165,7 +166,8 @@ def test_migrate_repositories(self):
             assert Repository.objects.get(id=accessible_repo.id).integration_id == integration.id
             assert Repository.objects.get(id=inaccessible_repo.id).integration_id is None
 
-    def test_accounts_list_failure(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_accounts_list_failure(self, mock_record):
         responses.replace(
             responses.GET,
             "https://app.vssps.visualstudio.com/_apis/accounts?memberId=%s&api-version=4.1"
@@ -184,6 +186,8 @@ def test_accounts_list_failure(self):
         assert resp.status_code == 200, resp.content
         assert b"No accounts found" in resp.content
 
+        assert_failure_metric(mock_record, "no_accounts")
+
     @patch("sentry.integrations.vsts.VstsIntegrationProvider.get_scopes", return_value=FULL_SCOPES)
     def test_webhook_subscription_created_once(self, mock_get_scopes):
         self.assert_installation()
diff --git a/tests/sentry/integrations/vsts/test_issues.py b/tests/sentry/integrations/vsts/test_issues.py
index 95c4d175842aab..7643a538f9a81a 100644
--- a/tests/sentry/integrations/vsts/test_issues.py
+++ b/tests/sentry/integrations/vsts/test_issues.py
@@ -21,7 +21,6 @@
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.models.integration_external_project import IntegrationExternalProject
 from sentry.integrations.services.integration import integration_service
-from sentry.integrations.types import EventLifecycleOutcome
 from sentry.integrations.vsts.integration import VstsIntegration
 from sentry.shared_integrations.exceptions import IntegrationError
 from sentry.silo.base import SiloMode
@@ -168,8 +167,7 @@ def tearDown(self):
         responses.reset()
 
     @responses.activate
-    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_create_issue(self, mock_record):
+    def test_create_issue(self):
         responses.add(
             responses.PATCH,
             "https://fabrikam-fiber-inc.visualstudio.com/0987654321/_apis/wit/workitems/$Microsoft.VSTS.WorkItemTypes.Task",
@@ -199,17 +197,9 @@ def test_create_issue(self, mock_record):
             {"op": "add", "path": "/fields/System.Description", "value": "<p>Fix this.</p>\n"},
             {"op": "add", "path": "/fields/System.History", "value": "<p>Fix this.</p>\n"},
         ]
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
 
     @responses.activate
-    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_create_issue_failure(self, mock_record):
-        """
-        Test that metrics are being correctly emitted on failure.
-        """
+    def test_create_issue_failure(self):
         form_data = {
             "title": "rip",
             "description": "Goodnight, sweet prince",
@@ -218,11 +208,6 @@ def test_create_issue_failure(self, mock_record):
         with pytest.raises(ValueError):
             self.integration.create_issue(form_data)
 
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.FAILURE
-
     @responses.activate
     def test_get_issue(self):
         responses.add(
@@ -242,8 +227,7 @@ def test_get_issue(self):
 
     @responses.activate
     @patch("sentry.integrations.vsts.client.VstsApiClient._use_proxy_url_for_tests")
-    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_sync_assignee_outbound(self, mock_record, use_proxy_url_for_tests):
+    def test_sync_assignee_outbound(self, use_proxy_url_for_tests):
         use_proxy_url_for_tests.return_value = True
         vsts_work_item_id = 5
         generate_mock_response(
@@ -289,55 +273,6 @@ def test_sync_assignee_outbound(self, mock_record, use_proxy_url_for_tests):
         assert request_body[0]["op"] == "replace"
         assert responses.calls[1].response.status_code == 200
 
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
-
-    @responses.activate
-    @patch("sentry.integrations.vsts.client.VstsApiClient._use_proxy_url_for_tests")
-    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_sync_assignee_outbound_error(self, mock_record, use_proxy_url_for_tests):
-        """
-        Test that halt metrics are being properly emitted.
-        """
-        use_proxy_url_for_tests.return_value = True
-        vsts_work_item_id = 5
-        generate_mock_response(
-            method=responses.PATCH,
-            body=WORK_ITEM_RESPONSE,
-            content_type="application/json",
-            path=f"_apis/wit/workitems/{vsts_work_item_id}",
-            non_region_url=f"https://fabrikam-fiber-inc.visualstudio.com/_apis/wit/workitems/{vsts_work_item_id}",
-        )
-        generate_mock_response(
-            method=responses.GET,
-            json={
-                "value": [
-                    {"mailAddress": "example1@example.com"},
-                    {"mailAddress": "example2@example.com"},
-                    {"mailAddress": "example3@example.com"},
-                ]
-            },
-            headers={},  # removing the continuation token takes us into the 'assignee is None' code path
-            path="_apis/graph/users",
-            non_region_url="https://fabrikam-fiber-inc.vssps.visualstudio.com/_apis/graph/users",
-        )
-        user = user_service.get_user(user_id=self.create_user("mifu@mifen.io").id)
-        external_issue = ExternalIssue.objects.create(
-            organization_id=self.organization.id,
-            integration_id=self.integration.model.id,
-            key=vsts_work_item_id,
-            title="The Little Prince",
-            description="The most beautiful things in the world cannot be seen or touched, they are felt with the heart.",
-        )
-        self.integration.sync_assignee_outbound(external_issue, user, assign=True)
-
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.HALTED
-
     @responses.activate
     @patch("sentry.integrations.vsts.client.VstsApiClient._use_proxy_url_for_tests")
     def test_sync_assignee_outbound_with_paging(self, use_proxy_url_for_tests):
@@ -402,8 +337,7 @@ def test_sync_assignee_outbound_with_paging(self, use_proxy_url_for_tests):
         assert responses.calls[2].response.status_code == 200
 
     @responses.activate
-    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_sync_status_outbound(self, mock_record):
+    def test_sync_status_outbound(self):
         vsts_work_item_id = 5
         responses.add(
             responses.PATCH,
@@ -457,57 +391,6 @@ def test_sync_status_outbound(self, mock_record):
         ]
         assert responses.calls[2].response.status_code == 200
 
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.SUCCESS
-
-    @responses.activate
-    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
-    def test_sync_status_outbound_error(self, mock_record):
-        """
-        Test that halt metrics are being properly emitted.
-        """
-        vsts_work_item_id = 5
-        responses.add(
-            responses.PATCH,
-            f"https://fabrikam-fiber-inc.visualstudio.com/_apis/wit/workitems/{vsts_work_item_id}",
-            body=WORK_ITEM_RESPONSE,
-            content_type="application/json",
-        )
-        responses.add(
-            responses.GET,
-            "https://fabrikam-fiber-inc.vssps.visualstudio.com/_apis/graph/users",
-            body=GET_USERS_RESPONSE,
-            content_type="application/json",
-        )
-        responses.add(
-            responses.GET,
-            f"https://fabrikam-fiber-inc.visualstudio.com/_apis/wit/workitems/{vsts_work_item_id}",
-            body=WORK_ITEM_RESPONSE,
-            content_type="application/json",
-        )
-        responses.add(
-            responses.GET,
-            "https://fabrikam-fiber-inc.visualstudio.com/_apis/projects",
-            body=GET_PROJECTS_RESPONSE,
-            content_type="application/json",
-        )
-        external_issue = ExternalIssue.objects.create(
-            organization_id=self.organization.id,
-            integration_id=self.integration.model.id,
-            key=vsts_work_item_id,
-            title="The Little Prince",
-            description="The most beautiful things in the world cannot be seen or touched, they are felt with the heart.",
-        )
-        self.integration.sync_status_outbound(
-            external_issue, True, self.project.id
-        )  # no external project will be found
-        assert len(mock_record.mock_calls) == 2
-        start, halt = mock_record.mock_calls
-        assert start.args[0] == EventLifecycleOutcome.STARTED
-        assert halt.args[0] == EventLifecycleOutcome.HALTED
-
     def test_get_issue_url(self):
         work_id = 345
         url = self.integration.get_issue_url(work_id)
diff --git a/tests/sentry/integrations/vsts/test_search.py b/tests/sentry/integrations/vsts/test_search.py
index 1a4978c6d942b7..225a50a89ffd5e 100644
--- a/tests/sentry/integrations/vsts/test_search.py
+++ b/tests/sentry/integrations/vsts/test_search.py
@@ -1,8 +1,10 @@
 from time import time
+from unittest.mock import patch
 
 import responses
 
 from sentry.integrations.models.integration import Integration
+from sentry.integrations.types import EventLifecycleOutcome
 from sentry.integrations.vsts.integration import VstsIntegration
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers.integrations import get_installation_of_type
@@ -57,7 +59,8 @@ def setUp(self):
         )
 
     @responses.activate
-    def test_search_issues(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_search_issues(self, mock_record):
         responses.add(
             responses.POST,
             f"https://{self.vsts_account_name.lower()}.almsearch.visualstudio.com/_apis/search/workitemsearchresults",
@@ -84,3 +87,11 @@ def test_search_issues(self):
         assert resp.data == [
             {"label": "(2) Title", "value": "2"},
         ]
+        assert len(mock_record.mock_calls) == 4
+        start1, start2, halt1, halt2 = (
+            mock_record.mock_calls
+        )  # calls get, which calls handle_search_issues
+        assert start1.args[0] == EventLifecycleOutcome.STARTED
+        assert start2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt1.args[0] == EventLifecycleOutcome.SUCCESS
+        assert halt2.args[0] == EventLifecycleOutcome.SUCCESS
diff --git a/tests/sentry/integrations/vsts/test_webhooks.py b/tests/sentry/integrations/vsts/test_webhooks.py
index ba68ff4cba0faa..892e8f77a3dbd7 100644
--- a/tests/sentry/integrations/vsts/test_webhooks.py
+++ b/tests/sentry/integrations/vsts/test_webhooks.py
@@ -18,6 +18,7 @@
 from sentry.models.group import Group, GroupStatus
 from sentry.models.grouplink import GroupLink
 from sentry.silo.base import SiloMode
+from sentry.testutils.asserts import assert_failure_metric, assert_success_metric
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.users.models.identity import Identity
@@ -94,7 +95,8 @@ def set_workitem_state(self, old_value, new_value):
         return work_item
 
     @responses.activate
-    def test_workitem_change_assignee(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_workitem_change_assignee(self, mock_record):
         work_item_id = 31
 
         external_issue = ExternalIssue.objects.create(
@@ -117,6 +119,24 @@ def test_workitem_change_assignee(self):
             assert args["external_issue_key"] == work_item_id
             assert args["assign"] is True
 
+        assert_success_metric(mock_record)  # multiple success metrics being recorded
+
+    @patch("sentry.integrations.vsts.webhooks.handle_updated_workitem")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_workitem_change_assignee_error_metric(self, mock_record, mock_handle):
+        error = Exception("oops")
+        mock_handle.side_effect = error
+
+        resp = self.client.post(
+            absolute_uri("/extensions/vsts/issue-updated/"),
+            data=WORK_ITEM_UPDATED,
+            HTTP_SHARED_SECRET=self.shared_secret,
+        )
+
+        assert resp.status_code == 500
+
+        assert_failure_metric(mock_record, error)
+
     @responses.activate
     def test_workitem_unassign(self):
         work_item_id = 33
@@ -141,7 +161,8 @@ def test_workitem_unassign(self):
             assert args["assign"] is False
 
     @responses.activate
-    def test_inbound_status_sync_resolve(self):
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_inbound_status_sync_resolve(self, mock_record):
 
         header_validation = []
         if SiloMode.get_current_mode() != SiloMode.REGION:
@@ -189,6 +210,27 @@ def test_inbound_status_sync_resolve(self):
         )
         assert len(Activity.objects.filter(group_id__in=group_ids)) == num_groups
 
+        assert_success_metric(mock_record)  # multiple success metrics being recorded
+
+    @patch("sentry.integrations.vsts.webhooks.handle_updated_workitem")
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
+    def test_inbound_status_sync_error_metric(self, mock_record, mock_handle):
+        error = Exception("oops")
+        mock_handle.side_effect = error
+
+        # Change so that state is changing from unresolved to resolved
+        work_item = self.set_workitem_state("Active", "Resolved")
+
+        with self.feature("organizations:integrations-issue-sync"), self.tasks():
+            resp = self.client.post(
+                absolute_uri("/extensions/vsts/issue-updated/"),
+                data=work_item,
+                HTTP_SHARED_SECRET=self.shared_secret,
+            )
+        assert resp.status_code == 500
+
+        assert_failure_metric(mock_record, error)  # multiple success metrics being recorded
+
     @responses.activate
     def test_inbound_status_sync_unresolve(self):
         responses.add(
diff --git a/tests/sentry/issues/endpoints/test_group_details.py b/tests/sentry/issues/endpoints/test_group_details.py
index ab3d568a50a6b0..e202523f17a144 100644
--- a/tests/sentry/issues/endpoints/test_group_details.py
+++ b/tests/sentry/issues/endpoints/test_group_details.py
@@ -22,6 +22,7 @@
 from sentry.models.groupsnooze import GroupSnooze
 from sentry.models.groupsubscription import GroupSubscription
 from sentry.models.grouptombstone import GroupTombstone
+from sentry.models.project import Project
 from sentry.models.release import Release
 from sentry.notifications.types import GroupSubscriptionReason
 from sentry.plugins.base import plugins
@@ -33,9 +34,16 @@
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.testutils.skips import requires_snuba
 from sentry.types.activity import ActivityType
+from sentry.types.group import GroupSubStatus
 
 pytestmark = [requires_snuba]
 
+# XXX: The tests in here have a mix of testing two different endpoints:
+# - /api/0/issues/{group_id}/
+# - /api/0/organizations/{org_slug}/issues/{group_id}/
+# We should either split them up or rewrite the tests to test both endpoints
+# TODO: See what is different between the endpoints and see if we can unify them
+
 
 class GroupDetailsTest(APITestCase, SnubaTestCase):
     def test_with_numerical_id(self):
@@ -89,7 +97,6 @@ def test_with_first_release(self):
 
     def test_no_releases(self):
         self.login_as(user=self.user)
-
         event = self.store_event(data={}, project_id=self.project.id)
 
         group = event.group
@@ -324,18 +331,16 @@ def test_resolve(self):
 
     def test_resolved_in_next_release_non_semver(self):
         self.login_as(user=self.user)
+        project = self.create_project_with_releases()
+        group = self.create_group_with_no_release(project)
 
-        project = self.create_project()
-        project.flags.has_releases = True
-        project.save()
-        group = self.create_group(project=project)
-        Release.get_or_create(version="abcd", project=project)
-        most_recent_version = Release.get_or_create(version="def", project=project)
+        # Two releases are created, the most recent one will be used for group resolution
+        Release.get_or_create(version="abcd", project=group.project)
+        most_recent_version = Release.get_or_create(version="def", project=group.project)
         assert group.status == GroupStatus.UNRESOLVED
         assert GroupResolution.objects.all().count() == 0
 
         url = f"/api/0/issues/{group.id}/"
-
         response = self.client.put(url, data={"status": "resolvedInNextRelease"})
         assert response.status_code == 200, response.content
 
@@ -350,49 +355,47 @@ def test_resolved_in_next_release_non_semver(self):
         assert group_resolution.status == GroupResolution.Status.pending
         assert group_resolution.release.version == most_recent_version.version
 
-    # XXX: Remove this test once the feature flag is removed
-    def test_resolved_in_next_release_semver_without_feature_flag(self):
-        self.login_as(user=self.user)
-
+    def create_project_with_releases(self) -> Project:
         project = self.create_project()
         project.flags.has_releases = True
         project.save()
-        Release.get_or_create(version="com.foo.bar@1.0+0", project=project)
-        Release.get_or_create(version="com.foo.bar@2.0+0", project=project)
-        wrong_release = Release.get_or_create(version="com.foo.bar@1.0+1", project=project)
-        group = self.create_group(project=project)
-        assert group.status == GroupStatus.UNRESOLVED
-        assert GroupResolution.objects.all().count() == 0
+        return project
 
-        url = f"/api/0/issues/{group.id}/"
-        data = {"status": "resolvedInNextRelease"}
-        response = self.client.put(url, data=data)
-        assert response.status_code == 200, response.content == {}
+    def create_group_with_no_release(self, project: Project) -> Group:
+        # Using store_event() instead of create_group() produces GroupRelease objects
+        # which is considered during the update_groups() call
+        event = self.store_event(data={}, project_id=project.id)
+        group = event.group
+        assert group is not None
 
-        # Refetch from DB to ensure the latest state is fetched
-        group = Group.objects.get(id=group.id, project=project.id)
-        assert group.status == GroupStatus.RESOLVED
+        return group
 
-        group_resolution = GroupResolution.objects.filter(group=group).first()
-        assert group_resolution is not None
-        assert group_resolution.group == group
-        assert group_resolution.type == GroupResolution.Type.in_next_release
-        assert group_resolution.status == GroupResolution.Status.pending
-        assert group_resolution.release.version == wrong_release.version
-
-    @with_feature("organizations:releases-resolve-next-release-semver-fix")
-    def test_resolved_in_next_release_semver(self):
+    def resolved_in_next_release_helper(self, with_first_release: bool = True) -> None:
         self.login_as(user=self.user)
-
-        project = self.create_project()
-        project.flags.has_releases = True
-        project.save()
-        Release.get_or_create(version="com.foo.bar@1.0+0", project=project)
-        greatest_version = Release.get_or_create(version="com.foo.bar@2.0+0", project=project)
-        # It should not be picked up based on creation date
-        Release.get_or_create(version="com.foo.bar@1.0+1", project=project)
-        group = self.create_group(project=project)
+        project = self.create_project_with_releases()
+        releases = [
+            Release.get_or_create(version="com.foo.bar@1.0+0", project=project),
+            Release.get_or_create(version="com.foo.bar@2.0+0", project=project),
+            # We create this release last but it is not the greatest version, thus, it should not be picked up
+            Release.get_or_create(version="com.foo.bar@1.0+1", project=project),
+        ]
+        first_release = releases[0]
+        greatest_version = releases[1]
+
+        data = {}
+        if with_first_release:
+            data["release"] = first_release.version
+        # Using store_event() instead of create_group() produces GroupRelease objects
+        # which is considered during the update_groups() call
+        event = self.store_event(data=data, project_id=project.id)
+        group = event.group
+        assert group is not None
         assert group.status == GroupStatus.UNRESOLVED
+        assert group.substatus == GroupSubStatus.NEW
+        if with_first_release:
+            assert group.first_release == first_release
+        else:
+            assert group.first_release is None
         assert GroupResolution.objects.all().count() == 0
 
         url = f"/api/0/issues/{group.id}/"
@@ -407,27 +410,53 @@ def test_resolved_in_next_release_semver(self):
         group_resolution = GroupResolution.objects.filter(group=group).first()
         assert group_resolution is not None
         assert group_resolution.group == group
-        assert group_resolution.type == GroupResolution.Type.in_next_release
-        assert group_resolution.status == GroupResolution.Status.pending
+        # For semver projects, we consider resolution based on an expression rather than a specific release,
+        # thus, it is considered resolved in the release that has the highest semver
+        assert group_resolution.type == GroupResolution.Type.in_release
+        assert group_resolution.status == GroupResolution.Status.resolved
         assert group_resolution.release.version == greatest_version.version
+        assert response.data["statusDetails"]["inRelease"] == greatest_version.version
+
+        new_release = Release.get_or_create(version="com.foo.bar@3.0+0", project=project)
+        # A lesser release than 2.x but created more recently than 3.x
+        old_version = Release.get_or_create(version="com.foo.bar@1.1+0", project=project)
+
+        # Let's test that none of these releases regress the group
+        for release in releases + [old_version]:
+            event = self.store_event(data={"release": release.version}, project_id=project.id)
+            assert event.group == group
+            # Refetch from DB to ensure the latest state is fetched
+            group = Group.objects.get(id=group.id, project=project.id)
+            assert group.status == GroupStatus.RESOLVED
+
+        # Let's test that the latest semver release regress the group
+        event = self.store_event(data={"release": new_release.version}, project_id=project.id)
+        group = Group.objects.get(id=group.id, project=project.id)
+        assert group.status == GroupStatus.UNRESOLVED
+        assert group.substatus == GroupSubStatus.REGRESSED
+
+    def test_resolved_in_next_release_semver_no_first_release(self):
+        self.resolved_in_next_release_helper(with_first_release=False)
+
+    def test_resolved_in_next_release_semver_and_first_release(self):
+        self.resolved_in_next_release_helper(with_first_release=True)
 
     def test_resolved_in_next_release_no_release(self):
         self.login_as(user=self.user)
-
-        project = self.create_project()
-        project.flags.has_releases = True
-        project.save()
-        group = self.create_group(project=project)
+        project = self.create_project_with_releases()
+        group = self.create_group_with_no_release(project)
 
         url = f"/api/0/organizations/{group.organization.slug}/issues/{group.id}/"
         response = self.client.put(url, data={"status": "resolvedInNextRelease"})
         assert response.status_code == 200, response.content
 
+        # Refetch from DB to ensure the latest state is fetched
         group = Group.objects.get(id=group.id, project=group.project.id)
         assert group.status == GroupStatus.RESOLVED
 
         # no GroupResolution because there is no release
         assert not GroupResolution.objects.filter(group=group).exists()
+        assert response.data["statusDetails"] == {}
 
     def test_snooze_duration(self):
         group = self.create_group(status=GroupStatus.RESOLVED)
diff --git a/tests/sentry/issues/endpoints/test_group_similar_issues_embeddings.py b/tests/sentry/issues/endpoints/test_group_similar_issues_embeddings.py
index c5d85bae93dbd8..0c6ee350588ea2 100644
--- a/tests/sentry/issues/endpoints/test_group_similar_issues_embeddings.py
+++ b/tests/sentry/issues/endpoints/test_group_similar_issues_embeddings.py
@@ -14,6 +14,7 @@
 from sentry.models.group import Group
 from sentry.models.grouphash import GroupHash
 from sentry.seer.similarity.types import SeerSimilarIssueData, SimilarIssuesEmbeddingsResponse
+from sentry.seer.similarity.utils import MAX_FRAME_COUNT
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers.eventprocessing import save_new_event
 from sentry.utils.types import NonNone
@@ -739,3 +740,68 @@ def test_obeys_useReranking_query_param(self, mock_seer_request):
             assert request_params["use_reranking"] == outgoing_value
 
             mock_seer_request.reset_mock()
+
+    def test_too_many_system_frames(self):
+        type = "FailedToFetchError"
+        value = "Charlie didn't bring the ball back"
+        context_line = f"raise {type}('{value}')"
+        error_data = {
+            "exception": {
+                "values": [
+                    {
+                        "type": type,
+                        "value": value,
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "function": f"play_fetch_{i}",
+                                    "filename": f"dogpark{i}.py",
+                                    "context_line": context_line,
+                                }
+                                for i in range(MAX_FRAME_COUNT + 1)
+                            ]
+                        },
+                    }
+                ]
+            },
+            "platform": "java",
+        }
+        new_event = self.store_event(data=error_data, project_id=self.project)
+        assert new_event.group
+        response = self.client.get(
+            path=f"/api/0/issues/{new_event.group.id}/similar-issues-embeddings/",
+            data={"k": "1", "threshold": "0.01"},
+        )
+        assert response.data == []
+
+    def test_no_filename_or_module(self):
+        type = "FailedToFetchError"
+        value = "Charlie didn't bring the ball back"
+        context_line = f"raise {type}('{value}')"
+        error_data = {
+            "exception": {
+                "values": [
+                    {
+                        "type": type,
+                        "value": value,
+                        "stacktrace": {
+                            "frames": [
+                                {
+                                    "function": f"play_fetch_{i}",
+                                    "context_line": context_line,
+                                }
+                                for i in range(MAX_FRAME_COUNT + 1)
+                            ]
+                        },
+                    }
+                ]
+            },
+            "platform": "python",
+        }
+        new_event = self.store_event(data=error_data, project_id=self.project)
+        assert new_event.group
+        response = self.client.get(
+            path=f"/api/0/issues/{new_event.group.id}/similar-issues-embeddings/",
+            data={"k": "1", "threshold": "0.01"},
+        )
+        assert response.data == []
diff --git a/tests/sentry/issues/endpoints/test_organization_group_index.py b/tests/sentry/issues/endpoints/test_organization_group_index.py
index 89e5711d07f0ad..166fb5bac8ba3d 100644
--- a/tests/sentry/issues/endpoints/test_organization_group_index.py
+++ b/tests/sentry/issues/endpoints/test_organization_group_index.py
@@ -4348,15 +4348,15 @@ def test_in_semver_projects_group_resolution_stores_current_release_version(self
         GroupResolution.current_release_version is set to the latest release associated with a
         Group, when the project follows semantic versioning scheme
         """
-        release_1 = self.create_release(version="fake_package@21.1.0")
-        release_2 = self.create_release(version="fake_package@21.1.1")
-        release_3 = self.create_release(version="fake_package@21.1.2")
+        release_21_1_0 = self.create_release(version="fake_package@21.1.0")
+        release_21_1_1 = self.create_release(version="fake_package@21.1.1")
+        release_21_1_2 = self.create_release(version="fake_package@21.1.2")
 
         self.store_event(
             data={
                 "timestamp": iso_format(before_now(seconds=10)),
                 "fingerprint": ["group-1"],
-                "release": release_2.version,
+                "release": release_21_1_1.version,
             },
             project_id=self.project.id,
         )
@@ -4364,7 +4364,7 @@ def test_in_semver_projects_group_resolution_stores_current_release_version(self
             data={
                 "timestamp": iso_format(before_now(seconds=12)),
                 "fingerprint": ["group-1"],
-                "release": release_1.version,
+                "release": release_21_1_0.version,
             },
             project_id=self.project.id,
         ).group
@@ -4381,7 +4381,7 @@ def test_in_semver_projects_group_resolution_stores_current_release_version(self
         # a group
         grp_resolution = GroupResolution.objects.get(group=group)
 
-        assert grp_resolution.current_release_version == release_2.version
+        assert grp_resolution.current_release_version == release_21_1_2.version
 
         # "resolvedInNextRelease" with semver releases is considered as "resolvedInRelease"
         assert grp_resolution.type == GroupResolution.Type.in_release
@@ -4389,12 +4389,13 @@ def test_in_semver_projects_group_resolution_stores_current_release_version(self
 
         # Add release that is between 2 and 3 to ensure that any release after release 2 should
         # not have a resolution
-        release_4 = self.create_release(version="fake_package@21.1.1+1")
+        release_21_1_1_plus_1 = self.create_release(version="fake_package@21.1.1+1")
+        release_21_1_3 = self.create_release(version="fake_package@21.1.3")
 
-        for release in [release_1, release_2]:
+        for release in [release_21_1_0, release_21_1_1, release_21_1_1_plus_1, release_21_1_2]:
             assert GroupResolution.has_resolution(group=group, release=release)
 
-        for release in [release_3, release_4]:
+        for release in [release_21_1_3]:
             assert not GroupResolution.has_resolution(group=group, release=release)
 
         # Ensure that Activity has `current_release_version` set on `Resolved in next release`
@@ -4404,7 +4405,7 @@ def test_in_semver_projects_group_resolution_stores_current_release_version(self
             ident=grp_resolution.id,
         )
 
-        assert activity.data["current_release_version"] == release_2.version
+        assert activity.data["current_release_version"] == release_21_1_2.version
 
     def test_in_non_semver_projects_group_resolution_stores_current_release_version(self) -> None:
         """
diff --git a/tests/sentry/issues/endpoints/test_organization_group_search_views.py b/tests/sentry/issues/endpoints/test_organization_group_search_views.py
index c08f0382211982..f65aba051fc6b4 100644
--- a/tests/sentry/issues/endpoints/test_organization_group_search_views.py
+++ b/tests/sentry/issues/endpoints/test_organization_group_search_views.py
@@ -332,3 +332,80 @@ def test_updated_deleted_view(self) -> None:
         assert response.data[1]["query"] == view_one["query"]
         assert response.data[1]["querySort"] == view_one["querySort"]
         assert response.data[2] == views[2]
+
+
+class OrganizationGroupSearchViewsPutRegressionTest(APITestCase):
+    endpoint = "sentry-api-0-organization-group-search-views"
+    method = "put"
+
+    def setUp(self) -> None:
+        self.user_2 = self.create_user()
+        self.create_member(organization=self.organization, user=self.user_2)
+
+        self.url = reverse(
+            "sentry-api-0-organization-group-search-views",
+            kwargs={"organization_id_or_slug": self.organization.slug},
+        )
+
+    @with_feature({"organizations:issue-stream-custom-views": True})
+    def test_cannot_rename_other_users_views(self) -> None:
+        self.login_as(user=self.user)
+        views = self.client.get(self.url).data
+        view = views[0]
+
+        # ensure we only have the default view
+        assert len(views) == 1
+        assert view["name"] == "Prioritized"
+        assert view["query"] == "is:unresolved issue.priority:[high, medium]"
+        assert view["querySort"] == "date"
+        assert view["position"] == 0
+
+        # create a new custom view
+        views.append(
+            {
+                "name": "Custom View Two",
+                "query": "is:unresolved",
+                "query_sort": "date",
+            }
+        )
+
+        response = self.get_success_response(self.organization.slug, views=views)
+
+        assert len(response.data) == 2  # 1 existing default view + 1 new view
+        assert response.data[1]["name"] == "Custom View Two"
+        assert response.data[1]["query"] == "is:unresolved"
+        assert response.data[1]["querySort"] == "date"
+
+        # now "delete" the custom view so the default view gets a proper ID
+        views = self.client.get(self.url).data
+        views.pop(1)
+
+        response = self.get_success_response(self.organization.slug, views=views)
+
+        # we should only have the default view now
+        assert len(response.data) == 1
+        assert response.data[0]["name"] == "Prioritized"
+        assert response.data[0]["id"]  # and it should now have an ID
+
+        # attempt to change user's 1 view from user 2
+        views = self.client.get(self.url).data
+        default_view = views[0]
+        default_view["name"] = "New Name"
+
+        self.login_as(user=self.user_2)
+        response = self.get_success_response(self.organization.slug, views=views)
+
+        # instead of editing the original view, it should create a new view for user 2
+        assert len(response.data) == 1
+        assert response.data[0]["id"] != default_view["id"]
+        assert response.data[0]["name"] == "New Name"
+
+        # as user 1, verify the name has not been changed
+        self.login_as(user=self.user)
+        response = self.client.get(self.url)
+
+        assert len(response.data) == 1
+        assert response.data[0]["id"] == default_view["id"]
+        assert response.data[0]["name"] == "Prioritized"
+        assert response.data[0]["query"] == view["query"]
+        assert response.data[0]["querySort"] == view["querySort"]
diff --git a/tests/sentry/issues/test_ignored.py b/tests/sentry/issues/test_ignored.py
index 6054e703363e52..e061864582c010 100644
--- a/tests/sentry/issues/test_ignored.py
+++ b/tests/sentry/issues/test_ignored.py
@@ -22,14 +22,14 @@ def setUp(self) -> None:
         add_group_to_inbox(self.group, GroupInboxReason.NEW)
 
     def test_ignored_forever(self) -> None:
-        status_details = handle_ignored(self.group_ids, self.group_list, {}, self.user, self.user)
+        status_details = handle_ignored(self.group_list, {}, self.user, self.user)
         assert status_details == {}
         assert not GroupInbox.objects.filter(group=self.group).exists()
         assert not GroupSnooze.objects.filter(group=self.group).exists()
 
     def test_ignored_duration(self) -> None:
         status_details = handle_ignored(
-            self.group_ids, self.group_list, {"ignoreDuration": 30}, self.user, self.user
+            self.group_list, {"ignoreDuration": 30}, self.user, self.user
         )
         assert status_details is not None
         assert not GroupInbox.objects.filter(group=self.group).exists()
@@ -37,9 +37,7 @@ def test_ignored_duration(self) -> None:
         assert snooze.until == status_details.get("ignoreUntil")
 
     def test_ignored_count(self) -> None:
-        status_details = handle_ignored(
-            self.group_ids, self.group_list, {"ignoreCount": 50}, self.user, self.user
-        )
+        status_details = handle_ignored(self.group_list, {"ignoreCount": 50}, self.user, self.user)
         assert status_details is not None
         assert not GroupInbox.objects.filter(group=self.group).exists()
         snooze = GroupSnooze.objects.filter(group=self.group).get()
@@ -47,7 +45,7 @@ def test_ignored_count(self) -> None:
 
     def test_ignored_user_count(self) -> None:
         status_details = handle_ignored(
-            self.group_ids, self.group_list, {"ignoreUserCount": 100}, self.user, self.user
+            self.group_list, {"ignoreUserCount": 100}, self.user, self.user
         )
         assert status_details is not None
         assert not GroupInbox.objects.filter(group=self.group).exists()
diff --git a/tests/sentry/mail/activity/test_note.py b/tests/sentry/mail/activity/test_note.py
index da3d30b42dfc85..77391b5fe15d04 100644
--- a/tests/sentry/mail/activity/test_note.py
+++ b/tests/sentry/mail/activity/test_note.py
@@ -1,6 +1,6 @@
 from sentry.integrations.types import ExternalProviders
 from sentry.models.activity import Activity
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.notifications.activity.note import NoteActivityNotification
 from sentry.notifications.types import GroupSubscriptionReason
 from sentry.silo.base import SiloMode
diff --git a/tests/sentry/mail/activity/test_release.py b/tests/sentry/mail/activity/test_release.py
index b33c5157cf2f8c..fb806f96efe133 100644
--- a/tests/sentry/mail/activity/test_release.py
+++ b/tests/sentry/mail/activity/test_release.py
@@ -3,10 +3,10 @@
 from sentry.integrations.types import ExternalProviderEnum, ExternalProviders
 from sentry.models.activity import Activity
 from sentry.models.environment import Environment
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.release import Release
 from sentry.models.repository import Repository
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.notifications.activity.release import ReleaseActivityNotification
 from sentry.notifications.types import (
     GroupSubscriptionReason,
diff --git a/tests/sentry/mail/test_adapter.py b/tests/sentry/mail/test_adapter.py
index d67844c3bbcd01..90e879a74e9040 100644
--- a/tests/sentry/mail/test_adapter.py
+++ b/tests/sentry/mail/test_adapter.py
@@ -22,8 +22,6 @@
 from sentry.mail import build_subject_prefix, mail_adapter
 from sentry.models.activity import Activity
 from sentry.models.grouprelease import GroupRelease
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.organization import Organization
 from sentry.models.organizationmember import OrganizationMember
@@ -33,6 +31,8 @@
 from sentry.models.repository import Repository
 from sentry.models.rule import Rule
 from sentry.models.userreport import UserReport
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.notifications.rules import AlertRuleNotification
 from sentry.notifications.types import ActionTargetType, FallthroughChoiceType
 from sentry.notifications.utils.digest import get_digest_subject
diff --git a/tests/sentry/migrations/test_0007_update_detected_subscription_interval.py b/tests/sentry/migrations/test_0007_update_detected_subscription_interval.py
index b7a6567c02676a..b77a7040fc7d89 100644
--- a/tests/sentry/migrations/test_0007_update_detected_subscription_interval.py
+++ b/tests/sentry/migrations/test_0007_update_detected_subscription_interval.py
@@ -28,7 +28,7 @@ def setup_before_migration(self, apps):
         )
 
         self.uptime_subscription_unchanged_2 = self.create_uptime_subscription(
-            url="http://sontry.io", interval_seconds=120
+            url="http://sontry.io", interval_seconds=300
         )
         self.create_project_uptime_subscription(
             uptime_subscription=self.uptime_subscription_unchanged_2,
@@ -43,5 +43,5 @@ def test(self):
         assert self.uptime_subscription_unchanged.interval_seconds == 300
         assert self.uptime_subscription_unchanged.status == UptimeSubscription.Status.ACTIVE.value
         self.uptime_subscription_unchanged_2.refresh_from_db()
-        assert self.uptime_subscription_unchanged_2.interval_seconds == 120
+        assert self.uptime_subscription_unchanged_2.interval_seconds == 300
         assert self.uptime_subscription_unchanged_2.status == UptimeSubscription.Status.ACTIVE.value
diff --git a/tests/sentry/migrations/test_0574_bacfkill_weekly_report_settings.py b/tests/sentry/migrations/test_0574_bacfkill_weekly_report_settings.py
index 74693f0cc8e66a..f5cc89c387a2b1 100644
--- a/tests/sentry/migrations/test_0574_bacfkill_weekly_report_settings.py
+++ b/tests/sentry/migrations/test_0574_bacfkill_weekly_report_settings.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.testutils.cases import TestMigrations
 
 
diff --git a/tests/sentry/migrations/test_0645_backfill_add_uuid_to_all_rule_actions.py b/tests/sentry/migrations/test_0645_backfill_add_uuid_to_all_rule_actions.py
index 209bcad10d9d6a..f6a21524d8ff1f 100644
--- a/tests/sentry/migrations/test_0645_backfill_add_uuid_to_all_rule_actions.py
+++ b/tests/sentry/migrations/test_0645_backfill_add_uuid_to_all_rule_actions.py
@@ -13,7 +13,7 @@ class BackfillAddUuidToAllRuleActions(TestMigrations):
     def setup_before_migration(self, apps):
         # Create your db state here
         self.notify_event_action = [{"id": "sentry.rules.actions.notify_event.NotifyEventAction"}]
-        self.rule = self.create_project_rule(action_match=self.notify_event_action)
+        self.rule = self.create_project_rule(action_data=self.notify_event_action)
 
     @pytest.mark.skip(
         reason="This reaches into code to create projects, rather than migration code. Don't need this test anymore"
diff --git a/tests/sentry/migrations/test_0730_add_subscription_fk_to_incident.py b/tests/sentry/migrations/test_0730_add_subscription_fk_to_incident.py
deleted file mode 100644
index caa91ee9fbab17..00000000000000
--- a/tests/sentry/migrations/test_0730_add_subscription_fk_to_incident.py
+++ /dev/null
@@ -1,158 +0,0 @@
-from datetime import timedelta
-
-import pytest
-
-from sentry.incidents.models.alert_rule import AlertRule, AlertRuleThresholdType
-from sentry.snuba.dataset import Dataset
-from sentry.snuba.models import SnubaQuery
-from sentry.snuba.subscriptions import create_snuba_query
-from sentry.testutils.cases import TestMigrations
-
-
-@pytest.mark.skip("Migration is no longer runnable. Retain until migration is removed.")
-class AlertRuleProjectBackfillTest(TestMigrations):
-    migrate_from = "0729_backfill_groupsearchviews_with_pinned_searches"
-    migrate_to = "0730_add_subscription_fk_to_incident"
-
-    def setup_before_migration(self, app):
-        self.snuba_query = create_snuba_query(
-            aggregate="",
-            dataset=Dataset.Events,
-            environment=None,
-            query="",
-            query_type=SnubaQuery.Type.ERROR,
-            resolution=timedelta(minutes=5),
-            time_window=timedelta(minutes=5),
-        )
-        self.alert_rule = AlertRule.objects.create(
-            organization=self.organization,
-            snuba_query=self.snuba_query,
-            name="foo",
-            threshold_type=AlertRuleThresholdType.ABOVE.value,
-            threshold_period=1,
-            include_all_projects=False,
-        )
-
-        # creates a QuerySubscription for the alertrule and project
-        self.alert_rule.subscribe_projects(projects=[self.project])
-        self.query_subscription = self.snuba_query.subscriptions.get()
-
-        self.incident = self.create_incident(projects=[self.project], alert_rule=self.alert_rule)
-
-        assert self.incident.alert_rule == self.alert_rule
-        assert not self.incident.subscription
-
-        snuba_query_existing_sub = create_snuba_query(
-            aggregate="",
-            dataset=Dataset.Events,
-            environment=None,
-            query="",
-            query_type=SnubaQuery.Type.ERROR,
-            resolution=timedelta(minutes=5),
-            time_window=timedelta(minutes=5),
-        )
-        alert_rule_existing_sub = AlertRule.objects.create(
-            organization=self.organization,
-            snuba_query=snuba_query_existing_sub,
-            name="foo",
-            threshold_type=AlertRuleThresholdType.ABOVE.value,
-            threshold_period=1,
-            include_all_projects=False,
-        )
-
-        # creates a QuerySubscription for the alertrule and project
-        alert_rule_existing_sub.subscribe_projects(projects=[self.project])
-        self.query_subscription_existing_sub = snuba_query_existing_sub.subscriptions.get()
-
-        self.incident_existing_sub = self.create_incident(
-            projects=[self.project],
-            alert_rule=alert_rule_existing_sub,
-            subscription=self.query_subscription_existing_sub,
-        )
-
-        assert self.incident_existing_sub.alert_rule == alert_rule_existing_sub
-        assert self.incident_existing_sub.subscription == self.query_subscription_existing_sub
-
-        # Incident with a no subscriptions
-        snuba_query_no_sub = create_snuba_query(
-            aggregate="",
-            dataset=Dataset.Events,
-            environment=None,
-            query="",
-            query_type=SnubaQuery.Type.ERROR,
-            resolution=timedelta(minutes=5),
-            time_window=timedelta(minutes=5),
-        )
-        self.alert_rule_no_sub = AlertRule.objects.create(
-            organization=self.organization,
-            snuba_query=snuba_query_no_sub,
-            name="foo",
-            threshold_type=AlertRuleThresholdType.ABOVE.value,
-            threshold_period=1,
-            include_all_projects=False,
-        )
-
-        # creates a QuerySubscription for the alertrule and project
-        self.alert_rule_no_sub.subscribe_projects(projects=[self.project])
-        temp_subscription = snuba_query_no_sub.subscriptions.get()
-        temp_subscription.delete()
-
-        self.incident_no_sub = self.create_incident(
-            projects=[self.project], alert_rule=self.alert_rule_no_sub
-        )
-
-        assert self.incident_no_sub.alert_rule == self.alert_rule_no_sub
-        assert not self.incident_no_sub.subscription
-
-        # Incident for alert rule with multiple subscriptions
-        snuba_query_mult = create_snuba_query(
-            aggregate="",
-            dataset=Dataset.Events,
-            environment=None,
-            query="",
-            query_type=SnubaQuery.Type.ERROR,
-            resolution=timedelta(minutes=5),
-            time_window=timedelta(minutes=5),
-        )
-        self.alert_rule_mult = AlertRule.objects.create(
-            organization=self.organization,
-            snuba_query=snuba_query_mult,
-            name="foo",
-            threshold_type=AlertRuleThresholdType.ABOVE.value,
-            threshold_period=1,
-            include_all_projects=False,
-        )
-
-        # creates a QuerySubscription for the alertrule and project
-        self.alert_rule_mult.subscribe_projects(projects=[self.project])
-        self.alert_rule_mult.subscribe_projects(projects=[self.project])
-        all_subscriptions = snuba_query_mult.subscriptions.all()
-
-        self.incident_mult = self.create_incident(
-            projects=[self.project], alert_rule=self.alert_rule_mult
-        )
-
-        assert len(all_subscriptions) > 1
-        assert self.incident_mult.alert_rule
-        assert not self.incident_mult.subscription
-
-    @pytest.mark.skip(reason="old migration test")
-    def test(self):
-        self.incident.refresh_from_db()
-        assert self.incident.subscription is not None
-        assert self.incident.subscription == self.query_subscription
-
-        self.query_subscription.delete()
-        self.incident.refresh_from_db()
-        assert self.incident
-        assert self.incident.subscription is None
-
-        self.incident_existing_sub.refresh_from_db()
-        assert self.incident_existing_sub.subscription is not None
-        assert self.incident_existing_sub.subscription == self.query_subscription_existing_sub
-
-        self.incident_no_sub.refresh_from_db()
-        assert not self.incident_no_sub.subscription
-
-        self.incident_mult.refresh_from_db()
-        assert not self.incident_mult.subscription
diff --git a/tests/sentry/migrations/test_0743_backfill_broken_monitor_notification_setting_option.py b/tests/sentry/migrations/test_0743_backfill_broken_monitor_notification_setting_option.py
index 680cab38294a76..b60e81ad90141b 100644
--- a/tests/sentry/migrations/test_0743_backfill_broken_monitor_notification_setting_option.py
+++ b/tests/sentry/migrations/test_0743_backfill_broken_monitor_notification_setting_option.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.testutils.cases import TestMigrations
 from sentry.testutils.silo import control_silo_test
 
diff --git a/tests/sentry/models/test_debugfile.py b/tests/sentry/models/test_debugfile.py
index 48d5eca08166d1..29824ab5a08e73 100644
--- a/tests/sentry/models/test_debugfile.py
+++ b/tests/sentry/models/test_debugfile.py
@@ -6,10 +6,16 @@
 from io import BytesIO
 from typing import Any
 
+import pytest
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.urls import reverse
 
-from sentry.models.debugfile import DifMeta, ProjectDebugFile, create_dif_from_id
+from sentry.models.debugfile import (
+    DifMeta,
+    ProjectDebugFile,
+    create_dif_from_id,
+    detect_dif_from_path,
+)
 from sentry.models.files.file import File
 from sentry.testutils.cases import APITestCase, TestCase
 
@@ -298,3 +304,67 @@ def test_simple_cache_clear(self):
 
         # But it's gone now
         assert not os.path.isfile(difs[PROGUARD_UUID])
+
+
+@pytest.mark.parametrize(
+    ("path", "name", "uuid"),
+    (
+        (
+            "/proguard/mapping-00000000-0000-0000-0000-000000000000.txt",
+            None,
+            "00000000-0000-0000-0000-000000000000",
+        ),
+        (
+            "/proguard/00000000-0000-0000-0000-000000000000.txt",
+            None,
+            "00000000-0000-0000-0000-000000000000",
+        ),
+        (
+            "/var/folders/x5/zw3gnf_x3ts0dwg56362ftrw0000gn/T/tmpbs2r93sr",
+            "/proguard/mapping-00000000-0000-0000-0000-000000000000.txt",
+            "00000000-0000-0000-0000-000000000000",
+        ),
+        (
+            "/var/folders/x5/zw3gnf_x3ts0dwg56362ftrw0000gn/T/tmpbs2r93sr",
+            "/proguard/00000000-0000-0000-0000-000000000000.txt",
+            "00000000-0000-0000-0000-000000000000",
+        ),
+    ),
+)
+def test_proguard_files_detected(path, name, uuid):
+    # ProGuard files are detected by the path/name, not the file contents.
+    # So, the ProGuard check should not depend on the file existing.
+    detected = detect_dif_from_path(path, name)
+
+    assert len(detected) == 1
+
+    (dif_meta,) = detected
+    assert dif_meta.file_format == "proguard"
+    assert dif_meta.debug_id == uuid
+    assert dif_meta.data == {"features": ["mapping"]}
+
+
+@pytest.mark.parametrize(
+    ("path", "name"),
+    (
+        ("/var/folders/x5/zw3gnf_x3ts0dwg56362ftrw0000gn/T/tmpbs2r93sr", None),
+        ("/var/folders/x5/zw3gnf_x3ts0dwg56362ftrw0000gn/T/tmpbs2r93sr", "not-a-proguard-file.txt"),
+        (
+            # Note: "/" missing from beginning of path
+            "proguard/mapping-00000000-0000-0000-0000-000000000000.txt",
+            None,
+        ),
+        (
+            "/var/folders/x5/zw3gnf_x3ts0dwg56362ftrw0000gn/T/tmpbs2r93sr",
+            # Note: "/" missing from beginning of path
+            "proguard/mapping-00000000-0000-0000-0000-000000000000.txt",
+        ),
+    ),
+)
+def test_proguard_file_not_detected(path, name):
+    with pytest.raises(FileNotFoundError):
+        # If the file is not detected as a ProGuard file, detect_dif_from_path
+        # attempts to open the file, which probably doesn't exist.
+        # Note that if the path or name does exist as a file on the filesystem,
+        # this test will fail.
+        detect_dif_from_path(path, name)
diff --git a/tests/sentry/models/test_groupsubscription.py b/tests/sentry/models/test_groupsubscription.py
index 2dedc4a5d7ea46..16e95ce46fcde3 100644
--- a/tests/sentry/models/test_groupsubscription.py
+++ b/tests/sentry/models/test_groupsubscription.py
@@ -1,13 +1,11 @@
 from __future__ import annotations
 
-from collections.abc import Mapping
-
 from sentry.integrations.types import ExternalProviderEnum, ExternalProviders
 from sentry.models.group import Group
 from sentry.models.groupsubscription import GroupSubscription
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.team import Team
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.types import (
     GroupSubscriptionReason,
     NotificationScopeEnum,
@@ -20,7 +18,7 @@
 from sentry.testutils.helpers.slack import link_team
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.types.actor import Actor
-from sentry.users.models.user import User
+from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
 
 
@@ -198,7 +196,9 @@ def setUp(self):
         self.user = self.create_user()
         self.create_member(user=self.user, organization=self.org, teams=[self.team])
         self.update_user_settings_always()
-        self.user = user_service.get_user(self.user.id)  # Redo the serialization for diffs
+        rpc_user = user_service.get_user(self.user.id)  # Redo the serialization for diffs
+        assert rpc_user is not None
+        self.rpc_user = rpc_user
 
     @assume_test_silo_mode(SiloMode.CONTROL)
     def update_user_settings_always(self):
@@ -322,8 +322,8 @@ def _assert_subscribers_are(
         self,
         group: Group | None = None,
         *,
-        email: Mapping[User, int] | Mapping[Team, int] | None = None,
-        slack: Mapping[User, int] | Mapping[Team, int] | None = None,
+        email: dict[RpcUser, int] | dict[Team, int] | None = None,
+        slack: dict[RpcUser, int] | dict[Team, int] | None = None,
     ):
         all_participants = GroupSubscription.objects.get_participants(group or self.group)
 
@@ -347,8 +347,8 @@ def test_simple(self):
         # implicit membership
         self._assert_subscribers_are(
             group,
-            email={self.user: GroupSubscriptionReason.implicit},
-            slack={self.user: GroupSubscriptionReason.implicit},
+            email={self.rpc_user: GroupSubscriptionReason.implicit},
+            slack={self.rpc_user: GroupSubscriptionReason.implicit},
         )
 
         # unsubscribed
@@ -376,8 +376,8 @@ def test_simple(self):
 
         self._assert_subscribers_are(
             group,
-            email={self.user: GroupSubscriptionReason.comment},
-            slack={self.user: GroupSubscriptionReason.comment},
+            email={self.rpc_user: GroupSubscriptionReason.comment},
+            slack={self.rpc_user: GroupSubscriptionReason.comment},
         )
 
     @with_feature("organizations:team-workflow-notifications")
@@ -402,11 +402,11 @@ def test_simple_teams(self):
         self._assert_subscribers_are(
             group,
             email={
-                self.user: GroupSubscriptionReason.implicit,
+                self.rpc_user: GroupSubscriptionReason.implicit,
                 team: GroupSubscriptionReason.comment,
             },
             slack={
-                self.user: GroupSubscriptionReason.implicit,
+                self.rpc_user: GroupSubscriptionReason.implicit,
                 team: GroupSubscriptionReason.comment,
             },
         )
@@ -424,8 +424,8 @@ def test_simple_with_workflow(self):
         # implicit membership
         self._assert_subscribers_are(
             group,
-            email={self.user: GroupSubscriptionReason.implicit},
-            slack={self.user: GroupSubscriptionReason.implicit},
+            email={self.rpc_user: GroupSubscriptionReason.implicit},
+            slack={self.rpc_user: GroupSubscriptionReason.implicit},
         )
 
         # unsubscribed
@@ -453,16 +453,16 @@ def test_simple_with_workflow(self):
 
         self._assert_subscribers_are(
             group,
-            email={self.user: GroupSubscriptionReason.comment},
-            slack={self.user: GroupSubscriptionReason.comment},
+            email={self.rpc_user: GroupSubscriptionReason.comment},
+            slack={self.rpc_user: GroupSubscriptionReason.comment},
         )
 
     def test_no_conversations(self):
         # Implicit subscription, ensure the project setting overrides the
         # default global option.
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.implicit},
-            slack={self.user: GroupSubscriptionReason.implicit},
+            email={self.rpc_user: GroupSubscriptionReason.implicit},
+            slack={self.rpc_user: GroupSubscriptionReason.implicit},
         )
         self.update_project_setting_never()
         self._assert_subscribers_are()
@@ -483,8 +483,8 @@ def test_no_conversations(self):
         self.update_user_settings_always()
 
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.implicit},
-            slack={self.user: GroupSubscriptionReason.implicit},
+            email={self.rpc_user: GroupSubscriptionReason.implicit},
+            slack={self.rpc_user: GroupSubscriptionReason.implicit},
         )
         self.update_project_setting_never()
         self._assert_subscribers_are()
@@ -510,8 +510,8 @@ def test_no_conversations(self):
         )
 
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.comment},
-            slack={self.user: GroupSubscriptionReason.comment},
+            email={self.rpc_user: GroupSubscriptionReason.comment},
+            slack={self.rpc_user: GroupSubscriptionReason.comment},
         )
 
         with assume_test_silo_mode(SiloMode.CONTROL):
@@ -523,7 +523,7 @@ def test_no_conversations(self):
                 provider=ExternalProviderEnum.EMAIL.value,
                 defaults={"value": NotificationSettingsOptionEnum.NEVER.value},
             )
-        self._assert_subscribers_are(slack={self.user: GroupSubscriptionReason.comment})
+        self._assert_subscribers_are(slack={self.rpc_user: GroupSubscriptionReason.comment})
 
         with assume_test_silo_mode(SiloMode.CONTROL):
             NotificationSettingOption.objects.filter(
@@ -540,8 +540,8 @@ def test_no_conversations(self):
         self.update_user_setting_subscribe_only()
 
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.comment},
-            slack={self.user: GroupSubscriptionReason.comment},
+            email={self.rpc_user: GroupSubscriptionReason.comment},
+            slack={self.rpc_user: GroupSubscriptionReason.comment},
         )
         with assume_test_silo_mode(SiloMode.CONTROL):
             NotificationSettingProvider.objects.update_or_create(
@@ -552,7 +552,7 @@ def test_no_conversations(self):
                 user_id=self.user.id,
                 defaults={"value": NotificationSettingsOptionEnum.NEVER.value},
             )
-        self._assert_subscribers_are(slack={self.user: GroupSubscriptionReason.comment})
+        self._assert_subscribers_are(slack={self.rpc_user: GroupSubscriptionReason.comment})
 
         with assume_test_silo_mode(SiloMode.CONTROL):
             NotificationSettingOption.objects.filter(
@@ -568,8 +568,8 @@ def test_no_conversations(self):
         # overrides the default option.
 
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.comment},
-            slack={self.user: GroupSubscriptionReason.comment},
+            email={self.rpc_user: GroupSubscriptionReason.comment},
+            slack={self.rpc_user: GroupSubscriptionReason.comment},
         )
         with assume_test_silo_mode(SiloMode.CONTROL):
             NotificationSettingProvider.objects.update_or_create(
@@ -580,13 +580,13 @@ def test_no_conversations(self):
                 user_id=self.user.id,
                 defaults={"value": NotificationSettingsOptionEnum.NEVER.value},
             )
-        self._assert_subscribers_are(slack={self.user: GroupSubscriptionReason.comment})
+        self._assert_subscribers_are(slack={self.rpc_user: GroupSubscriptionReason.comment})
 
     def test_participating_only(self):
         # Implicit subscription, ensure the project setting overrides the default global option.
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.implicit},
-            slack={self.user: GroupSubscriptionReason.implicit},
+            email={self.rpc_user: GroupSubscriptionReason.implicit},
+            slack={self.rpc_user: GroupSubscriptionReason.implicit},
         )
 
         with assume_test_silo_mode(SiloMode.CONTROL):
@@ -623,8 +623,8 @@ def test_participating_only(self):
         self.update_user_settings_always()
 
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.implicit},
-            slack={self.user: GroupSubscriptionReason.implicit},
+            email={self.rpc_user: GroupSubscriptionReason.implicit},
+            slack={self.rpc_user: GroupSubscriptionReason.implicit},
         )
         with assume_test_silo_mode(SiloMode.CONTROL):
             NotificationSettingProvider.objects.update_or_create(
@@ -636,7 +636,7 @@ def test_participating_only(self):
                 defaults={"value": NotificationSettingsOptionEnum.NEVER.value},
             )
         self._assert_subscribers_are(
-            slack={self.user: GroupSubscriptionReason.implicit},
+            slack={self.rpc_user: GroupSubscriptionReason.implicit},
         )
 
         with assume_test_silo_mode(SiloMode.CONTROL):
@@ -661,8 +661,8 @@ def test_participating_only(self):
             reason=GroupSubscriptionReason.comment,
         )
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.comment},
-            slack={self.user: GroupSubscriptionReason.comment},
+            email={self.rpc_user: GroupSubscriptionReason.comment},
+            slack={self.rpc_user: GroupSubscriptionReason.comment},
         )
 
         subscription.delete()
@@ -688,8 +688,8 @@ def test_participating_only(self):
             reason=GroupSubscriptionReason.comment,
         )
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.comment},
-            slack={self.user: GroupSubscriptionReason.comment},
+            email={self.rpc_user: GroupSubscriptionReason.comment},
+            slack={self.rpc_user: GroupSubscriptionReason.comment},
         )
 
         subscription.delete()
@@ -717,8 +717,8 @@ def test_participating_only(self):
             reason=GroupSubscriptionReason.comment,
         )
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.comment},
-            slack={self.user: GroupSubscriptionReason.comment},
+            email={self.rpc_user: GroupSubscriptionReason.comment},
+            slack={self.rpc_user: GroupSubscriptionReason.comment},
         )
 
         subscription.delete()
@@ -736,8 +736,8 @@ def test_participating_only(self):
         self.update_project_setting_always()
 
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.implicit},
-            slack={self.user: GroupSubscriptionReason.implicit},
+            email={self.rpc_user: GroupSubscriptionReason.implicit},
+            slack={self.rpc_user: GroupSubscriptionReason.implicit},
         )
         subscription = GroupSubscription.objects.create(
             user_id=self.user.id,
@@ -747,8 +747,8 @@ def test_participating_only(self):
             reason=GroupSubscriptionReason.comment,
         )
         self._assert_subscribers_are(
-            email={self.user: GroupSubscriptionReason.comment},
-            slack={self.user: GroupSubscriptionReason.comment},
+            email={self.rpc_user: GroupSubscriptionReason.comment},
+            slack={self.rpc_user: GroupSubscriptionReason.comment},
         )
 
     def test_does_not_include_nonmember(self):
diff --git a/tests/sentry/models/test_organization.py b/tests/sentry/models/test_organization.py
index 91045e0444be0c..852a505a73079d 100644
--- a/tests/sentry/models/test_organization.py
+++ b/tests/sentry/models/test_organization.py
@@ -19,11 +19,11 @@
 )
 from sentry.models.apikey import ApiKey
 from sentry.models.auditlogentry import AuditLogEntry
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.options.organization_option import OrganizationOption
 from sentry.models.organization import Organization
 from sentry.models.organizationmember import OrganizationMember
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.features import with_feature
diff --git a/tests/sentry/models/test_project.py b/tests/sentry/models/test_project.py
index 88d70b6231e492..21431776a8dd27 100644
--- a/tests/sentry/models/test_project.py
+++ b/tests/sentry/models/test_project.py
@@ -7,7 +7,6 @@
 from sentry.integrations.types import ExternalProviders
 from sentry.models.environment import Environment, EnvironmentProject
 from sentry.models.grouplink import GroupLink
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.options.project_template_option import ProjectTemplateOption
 from sentry.models.organizationmember import OrganizationMember
@@ -20,6 +19,7 @@
 from sentry.models.releases.release_project import ReleaseProject
 from sentry.models.rule import Rule
 from sentry.monitors.models import Monitor, MonitorEnvironment, MonitorType, ScheduleType
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import NotificationSettingEnum
 from sentry.notifications.utils.participants import get_notification_recipients
 from sentry.silo.base import SiloMode
diff --git a/tests/sentry/models/test_rule.py b/tests/sentry/models/test_rule.py
index 1768b13175d742..f83c421ffdf5a4 100644
--- a/tests/sentry/models/test_rule.py
+++ b/tests/sentry/models/test_rule.py
@@ -24,7 +24,7 @@ def setUp(self) -> None:
             },
         ]
         self.rule = self.create_project_rule(
-            project=self.project, action_match=self.notify_issue_owners_action
+            project=self.project, action_data=self.notify_issue_owners_action
         )
 
     def test_simple(self) -> None:
@@ -38,7 +38,7 @@ def test_returns_none(self) -> None:
     def test_when_no_actions_are_in_rule(self) -> None:
         rule = self.create_project_rule(
             project=self.project,
-            action_match=[],
+            action_data=[],
         )
         result = rule.get_rule_action_details_by_uuid(str(uuid4()))
         assert result is None
@@ -46,7 +46,7 @@ def test_when_no_actions_are_in_rule(self) -> None:
     def test_when_actions_have_missing_uuid_key(self) -> None:
         rule = self.create_project_rule(
             project=self.project,
-            action_match=[
+            action_data=[
                 {
                     "targetType": "IssueOwners",
                     "fallthroughType": "ActiveMembers",
@@ -61,7 +61,7 @@ def test_when_actions_have_missing_uuid_key(self) -> None:
     def test_when_action_has_missing_uuid_value(self) -> None:
         rule = self.create_project_rule(
             project=self.project,
-            action_match=[
+            action_data=[
                 {
                     "targetType": "IssueOwners",
                     "fallthroughType": "ActiveMembers",
diff --git a/tests/sentry/models/test_team.py b/tests/sentry/models/test_team.py
index f1c9401dea3bec..44b12849939cd7 100644
--- a/tests/sentry/models/test_team.py
+++ b/tests/sentry/models/test_team.py
@@ -1,11 +1,11 @@
 from django.test import override_settings
 
 from sentry.deletions.tasks.hybrid_cloud import schedule_hybrid_cloud_foreign_key_jobs_control
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.organizationmemberteam import OrganizationMemberTeam
 from sentry.models.team import Team
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.outbox import outbox_runner
diff --git a/tests/sentry/monitors/consumers/test_clock_tick_consumer.py b/tests/sentry/monitors/consumers/test_clock_tick_consumer.py
index d43fe016c9d4cb..e6faf4e7d13e65 100644
--- a/tests/sentry/monitors/consumers/test_clock_tick_consumer.py
+++ b/tests/sentry/monitors/consumers/test_clock_tick_consumer.py
@@ -25,7 +25,9 @@
     MonitorType,
     ScheduleType,
 )
+from sentry.monitors.system_incidents import DecisionResult, TickAnomalyDecision
 from sentry.testutils.cases import TestCase
+from sentry.testutils.helpers.options import override_options
 
 partition = Partition(Topic("test"), 0)
 
@@ -38,9 +40,10 @@ def create_consumer():
 
 @mock.patch("sentry.monitors.consumers.clock_tick_consumer.dispatch_check_missing")
 @mock.patch("sentry.monitors.consumers.clock_tick_consumer.dispatch_check_timeout")
-@mock.patch("sentry.monitors.consumers.clock_tick_consumer.record_clock_tick_volume_metric")
+@mock.patch("sentry.monitors.consumers.clock_tick_consumer.process_clock_tick_for_system_incidents")
+@override_options({"crons.system_incidents.use_decisions": True})
 def test_simple(
-    mock_record_clock_tick_volume_metric,
+    mock_process_clock_tick_for_system_incidents,
     mock_dispatch_check_timeout,
     mock_dispatch_check_missing,
 ):
@@ -48,6 +51,11 @@ def test_simple(
 
     ts = timezone.now().replace(second=0, microsecond=0)
 
+    # System incident reports a normal clock tick
+    mock_process_clock_tick_for_system_incidents.return_value = DecisionResult(
+        ts, TickAnomalyDecision.NORMAL, None
+    )
+
     value = BrokerValue(
         KafkaPayload(b"fake-key", MONITORS_CLOCK_TICK_CODEC.encode({"ts": ts.timestamp()}), []),
         partition,
@@ -56,15 +64,57 @@ def test_simple(
     )
     consumer.submit(Message(value))
 
-    assert mock_record_clock_tick_volume_metric.call_count == 1
-    assert mock_record_clock_tick_volume_metric.mock_calls[0] == mock.call(ts)
+    assert mock_process_clock_tick_for_system_incidents.call_count == 1
+    assert mock_process_clock_tick_for_system_incidents.mock_calls[0] == mock.call(ts)
+
+    assert mock_dispatch_check_missing.call_count == 1
+    assert mock_dispatch_check_missing.mock_calls[0] == mock.call(ts)
 
     assert mock_dispatch_check_timeout.call_count == 1
     assert mock_dispatch_check_timeout.mock_calls[0] == mock.call(ts)
 
+
+@mock.patch("sentry.monitors.consumers.clock_tick_consumer.dispatch_mark_unknown")
+@mock.patch("sentry.monitors.consumers.clock_tick_consumer.dispatch_check_missing")
+@mock.patch("sentry.monitors.consumers.clock_tick_consumer.dispatch_check_timeout")
+@mock.patch("sentry.monitors.consumers.clock_tick_consumer.process_clock_tick_for_system_incidents")
+@override_options({"crons.system_incidents.use_decisions": True})
+def test_incident_mark_unknown(
+    mock_process_clock_tick_for_system_incidents,
+    mock_dispatch_check_timeout,
+    mock_dispatch_check_missing,
+    mock_dispatch_mark_unknown,
+):
+    """
+    Test that during an incident we mark in-progress check-ins as unknown and
+    do NOT dispatch mark timeouts.
+    """
+    consumer = create_consumer()
+
+    ts = timezone.now().replace(second=0, microsecond=0)
+
+    mock_process_clock_tick_for_system_incidents.return_value = DecisionResult(
+        ts, TickAnomalyDecision.INCIDENT, None
+    )
+    value = BrokerValue(
+        KafkaPayload(b"fake-key", MONITORS_CLOCK_TICK_CODEC.encode({"ts": ts.timestamp()}), []),
+        partition,
+        1,
+        ts,
+    )
+    consumer.submit(Message(value))
+
+    assert mock_process_clock_tick_for_system_incidents.call_count == 1
+    assert mock_process_clock_tick_for_system_incidents.mock_calls[0] == mock.call(ts)
+
     assert mock_dispatch_check_missing.call_count == 1
     assert mock_dispatch_check_missing.mock_calls[0] == mock.call(ts)
 
+    assert mock_dispatch_check_timeout.call_count == 0
+
+    assert mock_dispatch_mark_unknown.call_count == 1
+    assert mock_dispatch_mark_unknown.mock_calls[0] == mock.call(ts)
+
 
 class MonitorsClockTickEndToEndTest(TestCase):
     @override_settings(SENTRY_EVENTSTREAM="sentry.eventstream.kafka.KafkaEventStream")
diff --git a/tests/sentry/monitors/consumers/test_incident_occurrence_consumer.py b/tests/sentry/monitors/consumers/test_incident_occurrence_consumer.py
index d6f279440920ba..49034336913d38 100644
--- a/tests/sentry/monitors/consumers/test_incident_occurrence_consumer.py
+++ b/tests/sentry/monitors/consumers/test_incident_occurrence_consumer.py
@@ -1,8 +1,9 @@
 from datetime import datetime
 from unittest import mock
 
+import pytest
 from arroyo.backends.kafka import KafkaPayload
-from arroyo.processing.strategies import ProcessingStrategy
+from arroyo.processing.strategies import MessageRejected, ProcessingStrategy
 from arroyo.types import BrokerValue, Message, Partition, Topic
 from django.utils import timezone
 from sentry_kafka_schemas.schema_types.monitors_incident_occurrences_v1 import IncidentOccurrence
@@ -11,6 +12,16 @@
     MONITORS_INCIDENT_OCCURRENCES,
     MonitorIncidentOccurenceStrategyFactory,
 )
+from sentry.monitors.models import (
+    CheckInStatus,
+    MonitorCheckIn,
+    MonitorEnvironment,
+    MonitorIncident,
+    MonitorStatus,
+)
+from sentry.monitors.system_incidents import TickAnomalyDecision
+from sentry.testutils.cases import TestCase
+from sentry.testutils.helpers import override_options
 
 partition = Partition(Topic("test"), 0)
 
@@ -21,7 +32,7 @@ def create_consumer() -> ProcessingStrategy[KafkaPayload]:
     return factory.create_with_partitions(commit, {partition: 0})
 
 
-def sned_incident_occurrence(
+def send_incident_occurrence(
     consumer: ProcessingStrategy[KafkaPayload],
     ts: datetime,
     incident_occurrence: IncidentOccurrence,
@@ -35,19 +46,170 @@ def sned_incident_occurrence(
     consumer.submit(Message(value))
 
 
-def test_simple():
-    # XXX(epurkhiser): Doesn't really test anything yet
-    ts = timezone.now().replace(second=0, microsecond=0)
+class MonitorsIncidentOccurrenceConsumerTestCase(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.monitor = self.create_monitor()
+        self.monitor_environment = MonitorEnvironment.objects.create(
+            monitor=self.monitor,
+            environment_id=self.environment.id,
+            status=MonitorStatus.ERROR,
+        )
+        self.failed_checkin = MonitorCheckIn.objects.create(
+            monitor=self.monitor,
+            monitor_environment=self.monitor_environment,
+            project_id=self.project.id,
+            status=CheckInStatus.MISSED,
+            date_added=timezone.now(),
+        )
+        self.incident = MonitorIncident.objects.create(
+            monitor=self.monitor,
+            monitor_environment=self.monitor_environment,
+            starting_checkin=self.failed_checkin,
+            starting_timestamp=self.failed_checkin.date_added,
+        )
 
-    consumer = create_consumer()
-    sned_incident_occurrence(
-        consumer,
-        ts,
-        {
-            "clock_tick_ts": 1617895645,
-            "received_ts": 1617895650,
-            "failed_checkin_id": 123456,
-            "incident_id": 987654,
-            "previous_checkin_ids": [111222, 333444, 55666],
-        },
-    )
+    @mock.patch("sentry.monitors.consumers.incident_occurrences_consumer.send_incident_occurrence")
+    def test_simple(self, mock_send_incident_occurrence):
+        ts = timezone.now().replace(second=0, microsecond=0)
+
+        consumer = create_consumer()
+        send_incident_occurrence(
+            consumer,
+            ts,
+            {
+                "clock_tick_ts": int(ts.timestamp()),
+                "received_ts": int(self.failed_checkin.date_added.timestamp()),
+                "incident_id": self.incident.id,
+                "failed_checkin_id": self.failed_checkin.id,
+                "previous_checkin_ids": [self.failed_checkin.id],
+            },
+        )
+
+        assert mock_send_incident_occurrence.call_count == 1
+        assert mock_send_incident_occurrence.mock_calls[0] == mock.call(
+            self.failed_checkin,
+            [self.failed_checkin],
+            self.incident,
+            self.failed_checkin.date_added.replace(microsecond=0),
+        )
+
+    @mock.patch("sentry.monitors.consumers.incident_occurrences_consumer.logger")
+    def test_missing_data(self, mock_logger):
+        ts = timezone.now().replace(second=0, microsecond=0)
+
+        consumer = create_consumer()
+
+        # Send with bad incident id
+        send_incident_occurrence(
+            consumer,
+            ts,
+            {
+                "clock_tick_ts": int(ts.timestamp()),
+                "received_ts": int(self.failed_checkin.date_added.timestamp()),
+                "incident_id": 1234,
+                "failed_checkin_id": self.failed_checkin.id,
+                "previous_checkin_ids": [self.failed_checkin.id],
+            },
+        )
+        mock_logger.exception.assert_called_with("missing_incident")
+
+        # Send with bad failed_checkin_id
+        send_incident_occurrence(
+            consumer,
+            ts,
+            {
+                "clock_tick_ts": int(ts.timestamp()),
+                "received_ts": int(self.failed_checkin.date_added.timestamp()),
+                "incident_id": self.incident.id,
+                "failed_checkin_id": 1234,
+                "previous_checkin_ids": [self.failed_checkin.id],
+            },
+        )
+        mock_logger.error.assert_called_with("missing_check_ins")
+
+        # Send with bad previous_checkin_ids
+        send_incident_occurrence(
+            consumer,
+            ts,
+            {
+                "clock_tick_ts": int(ts.timestamp()),
+                "received_ts": int(self.failed_checkin.date_added.timestamp()),
+                "incident_id": self.incident.id,
+                "failed_checkin_id": self.failed_checkin.id,
+                "previous_checkin_ids": [123],
+            },
+        )
+        mock_logger.error.assert_called_with("missing_check_ins")
+
+    @mock.patch("sentry.monitors.consumers.incident_occurrences_consumer.send_incident_occurrence")
+    @mock.patch("sentry.monitors.consumers.incident_occurrences_consumer.memoized_tick_decision")
+    @override_options({"crons.system_incidents.use_decisions": True})
+    def test_delayed_decision_dispatch(
+        self,
+        mock_memoized_tick_decision,
+        mock_send_incident_occurrence,
+    ):
+        """
+        Tests that the consumer does NOT send an incident occurrence when the
+        clock tick decision is marked as ABNORMAL or RECOVERING. In these cases
+        we expect the consumer to just keep checking the decision until it
+        resolve to INCIDENT or NORMAL
+        """
+        mock_memoized_tick_decision.return_value = TickAnomalyDecision.ABNORMAL
+
+        ts = timezone.now().replace(second=0, microsecond=0)
+
+        consumer = create_consumer()
+
+        message: IncidentOccurrence = {
+            "clock_tick_ts": int(ts.timestamp()),
+            "received_ts": int(self.failed_checkin.date_added.timestamp()),
+            "incident_id": self.incident.id,
+            "failed_checkin_id": self.failed_checkin.id,
+            "previous_checkin_ids": [self.failed_checkin.id],
+        }
+
+        # Raises a message rejected and does not send the occurrence
+        with pytest.raises(MessageRejected):
+            send_incident_occurrence(consumer, ts, message)
+            assert mock_send_incident_occurrence.call_count == 0
+
+        # Tick decision resolves to OK
+        mock_memoized_tick_decision.return_value = TickAnomalyDecision.NORMAL
+        send_incident_occurrence(consumer, ts, message)
+        assert mock_send_incident_occurrence.call_count == 1
+
+    @mock.patch("sentry.monitors.consumers.incident_occurrences_consumer.send_incident_occurrence")
+    @mock.patch("sentry.monitors.consumers.incident_occurrences_consumer.memoized_tick_decision")
+    @override_options({"crons.system_incidents.use_decisions": True})
+    def test_incident_decision_dispatch(
+        self,
+        mock_memoized_tick_decision,
+        mock_send_incident_occurrence,
+    ):
+        """
+        Tests that the cosnumer does NOT send an incident occurrence when the
+        clock decision is INCIDENT, in which case we should update the failed
+        check-in with an UNKNOWN status.
+        """
+        mock_memoized_tick_decision.return_value = TickAnomalyDecision.INCIDENT
+
+        ts = timezone.now().replace(second=0, microsecond=0)
+
+        consumer = create_consumer()
+
+        message: IncidentOccurrence = {
+            "clock_tick_ts": int(ts.timestamp()),
+            "received_ts": int(self.failed_checkin.date_added.timestamp()),
+            "incident_id": self.incident.id,
+            "failed_checkin_id": self.failed_checkin.id,
+            "previous_checkin_ids": [self.failed_checkin.id],
+        }
+
+        send_incident_occurrence(consumer, ts, message)
+        assert mock_send_incident_occurrence.call_count == 0
+
+        # The failed check-in is updated as UNKNOWN
+        self.failed_checkin.refresh_from_db()
+        assert self.failed_checkin.status == CheckInStatus.UNKNOWN
diff --git a/tests/sentry/monitors/endpoints/test_base_monitor_stats.py b/tests/sentry/monitors/endpoints/test_base_monitor_stats.py
index 3bdbf376e238b0..6a4c46b7592776 100644
--- a/tests/sentry/monitors/endpoints/test_base_monitor_stats.py
+++ b/tests/sentry/monitors/endpoints/test_base_monitor_stats.py
@@ -81,6 +81,7 @@ def test_simple(self):
         assert hour_one["missed"] == 0
         assert hour_one["error"] == 0
         assert hour_one["timeout"] == 0
+        assert hour_one["unknown"] == 0
         assert "in_progress" not in hour_one
 
         assert hour_two["duration"] == 2500
@@ -88,6 +89,7 @@ def test_simple(self):
         assert hour_two["missed"] == 1
         assert hour_two["error"] == 1
         assert hour_two["timeout"] == 2
+        assert hour_two["unknown"] == 0
 
     def test_simple_environment(self):
         resp = self.get_success_response(
@@ -107,12 +109,14 @@ def test_simple_environment(self):
         assert hour_one["missed"] == 0
         assert hour_one["error"] == 0
         assert hour_one["timeout"] == 0
+        assert hour_one["unknown"] == 0
 
         assert hour_two["duration"] == 2250
         assert hour_two["ok"] == 0
         assert hour_two["missed"] == 1
         assert hour_two["error"] == 0
         assert hour_two["timeout"] == 1
+        assert hour_two["unknown"] == 0
 
     def test_multiple_environment(self):
         resp = self.get_success_response(
@@ -132,12 +136,14 @@ def test_multiple_environment(self):
         assert hour_one["missed"] == 0
         assert hour_one["error"] == 0
         assert hour_one["timeout"] == 0
+        assert hour_one["unknown"] == 0
 
         assert hour_two["duration"] == 2500
         assert hour_two["ok"] == 0
         assert hour_two["missed"] == 1
         assert hour_two["error"] == 1
         assert hour_two["timeout"] == 2
+        assert hour_two["unknown"] == 0
 
     def test_bad_monitorenvironment(self):
         self.create_environment(name="empty", project=self.project)
@@ -158,9 +164,11 @@ def test_bad_monitorenvironment(self):
         assert hour_one["missed"] == 0
         assert hour_one["error"] == 0
         assert hour_one["timeout"] == 0
+        assert hour_one["unknown"] == 0
 
         assert hour_two["duration"] == 0
         assert hour_two["ok"] == 0
         assert hour_two["missed"] == 0
         assert hour_two["error"] == 0
         assert hour_two["timeout"] == 0
+        assert hour_two["unknown"] == 0
diff --git a/tests/sentry/monitors/endpoints/test_organization_monitor_index_stats.py b/tests/sentry/monitors/endpoints/test_organization_monitor_index_stats.py
index e8cdecca92362c..fd4b1f5490a829 100644
--- a/tests/sentry/monitors/endpoints/test_organization_monitor_index_stats.py
+++ b/tests/sentry/monitors/endpoints/test_organization_monitor_index_stats.py
@@ -62,6 +62,12 @@ def setUp(self):
             env=self.env_debug,
             status=CheckInStatus.TIMEOUT,
         )
+        self.add_checkin(
+            self.monitor1,
+            offset={"hours": 1, "minutes": 2},
+            env=self.env_debug,
+            status=CheckInStatus.UNKNOWN,
+        )
 
         self.add_checkin(self.monitor2, env=self.env_prod_2, offset={"minutes": 1})
         self.add_checkin(self.monitor2, env=self.env_prod_2, offset={"minutes": 2})
@@ -84,15 +90,43 @@ def test_simple(self):
         assert hour_one == [
             1647846000,
             {
-                "production": {"in_progress": 1, "ok": 1, "error": 0, "missed": 0, "timeout": 0},
-                "debug": {"in_progress": 0, "ok": 1, "error": 0, "missed": 0, "timeout": 0},
+                "production": {
+                    "in_progress": 1,
+                    "ok": 1,
+                    "error": 0,
+                    "missed": 0,
+                    "timeout": 0,
+                    "unknown": 0,
+                },
+                "debug": {
+                    "in_progress": 0,
+                    "ok": 1,
+                    "error": 0,
+                    "missed": 0,
+                    "timeout": 0,
+                    "unknown": 0,
+                },
             },
         ]
         assert hour_two == [
             1647849600,
             {
-                "production": {"in_progress": 0, "ok": 0, "error": 0, "missed": 1, "timeout": 1},
-                "debug": {"in_progress": 0, "ok": 0, "error": 1, "missed": 0, "timeout": 1},
+                "production": {
+                    "in_progress": 0,
+                    "ok": 0,
+                    "error": 0,
+                    "missed": 1,
+                    "timeout": 1,
+                    "unknown": 0,
+                },
+                "debug": {
+                    "in_progress": 0,
+                    "ok": 0,
+                    "error": 1,
+                    "missed": 0,
+                    "timeout": 1,
+                    "unknown": 1,
+                },
             },
         ]
 
@@ -101,7 +135,14 @@ def test_simple(self):
         assert hour_one == [
             1647846000,
             {
-                "production": {"ok": 2, "error": 0, "missed": 0, "timeout": 0, "in_progress": 0},
+                "production": {
+                    "ok": 2,
+                    "error": 0,
+                    "missed": 0,
+                    "timeout": 0,
+                    "in_progress": 0,
+                    "unknown": 0,
+                },
             },
         ]
 
@@ -123,7 +164,14 @@ def test_filtered(self):
         assert hour_one == [
             1647846000,
             {
-                "production": {"ok": 2, "error": 0, "missed": 0, "timeout": 0, "in_progress": 0},
+                "production": {
+                    "ok": 2,
+                    "error": 0,
+                    "missed": 0,
+                    "timeout": 0,
+                    "in_progress": 0,
+                    "unknown": 0,
+                },
             },
         ]
 
@@ -150,7 +198,14 @@ def test_custom_resolution(self):
         assert min_1 == [
             1647849480,
             {
-                "production": {"in_progress": 1, "ok": 1, "error": 0, "missed": 0, "timeout": 0},
+                "production": {
+                    "in_progress": 1,
+                    "ok": 1,
+                    "error": 0,
+                    "missed": 0,
+                    "timeout": 0,
+                    "unknown": 0,
+                },
             },
         ]
 
diff --git a/tests/sentry/monitors/logic/test_incident_occurrence.py b/tests/sentry/monitors/logic/test_incident_occurrence.py
new file mode 100644
index 00000000000000..1a62bf082729a2
--- /dev/null
+++ b/tests/sentry/monitors/logic/test_incident_occurrence.py
@@ -0,0 +1,321 @@
+import uuid
+from datetime import timedelta
+from unittest import mock
+
+from arroyo import Topic
+from arroyo.backends.kafka import KafkaPayload
+from django.test import override_settings
+from django.utils import timezone
+from sentry_kafka_schemas.schema_types.monitors_incident_occurrences_v1 import IncidentOccurrence
+
+from sentry.issues.grouptype import MonitorIncidentType
+from sentry.monitors.logic.incident_occurrence import (
+    MONITORS_INCIDENT_OCCURRENCES,
+    dispatch_incident_occurrence,
+    get_failure_reason,
+    queue_incident_occurrence,
+    send_incident_occurrence,
+)
+from sentry.monitors.models import (
+    CheckInStatus,
+    Monitor,
+    MonitorCheckIn,
+    MonitorEnvironment,
+    MonitorIncident,
+    MonitorStatus,
+    MonitorType,
+    ScheduleType,
+)
+from sentry.testutils.cases import TestCase
+
+
+class IncidentOccurrenceTestCase(TestCase):
+    @mock.patch("sentry.monitors.logic.incident_occurrence.produce_occurrence_to_kafka")
+    def test_send_incident_occurrence(self, mock_produce_occurrence_to_kafka):
+        monitor = Monitor.objects.create(
+            name="test monitor",
+            organization_id=self.organization.id,
+            project_id=self.project.id,
+            type=MonitorType.CRON_JOB,
+            config={
+                "schedule": [1, "month"],
+                "schedule_type": ScheduleType.INTERVAL,
+                "max_runtime": None,
+                "checkin_margin": None,
+            },
+        )
+        monitor_environment = MonitorEnvironment.objects.create(
+            monitor=monitor,
+            environment_id=self.environment.id,
+            status=MonitorStatus.ERROR,
+        )
+
+        successful_checkin = MonitorCheckIn.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            project_id=self.project.id,
+            status=CheckInStatus.OK,
+        )
+
+        last_checkin = timezone.now()
+        trace_id = uuid.uuid4()
+
+        timeout_checkin = MonitorCheckIn.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            project_id=self.project.id,
+            status=CheckInStatus.TIMEOUT,
+            trace_id=uuid.uuid4(),
+            date_added=last_checkin - timedelta(minutes=1),
+        )
+        failed_checkin = MonitorCheckIn.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            project_id=self.project.id,
+            status=CheckInStatus.ERROR,
+            trace_id=trace_id,
+            date_added=last_checkin,
+        )
+        incident = MonitorIncident.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            starting_checkin=failed_checkin,
+            starting_timestamp=last_checkin,
+            grouphash="abcd",
+        )
+
+        send_incident_occurrence(
+            failed_checkin,
+            [timeout_checkin, failed_checkin],
+            incident,
+            last_checkin,
+        )
+
+        assert mock_produce_occurrence_to_kafka.call_count == 1
+        kwargs = mock_produce_occurrence_to_kafka.call_args.kwargs
+
+        occurrence = kwargs["occurrence"]
+        event = kwargs["event_data"]
+        occurrence = occurrence.to_dict()
+
+        assert dict(
+            occurrence,
+            **{
+                "project_id": self.project.id,
+                "fingerprint": [incident.grouphash],
+                "issue_title": f"Monitor failure: {monitor.name}",
+                "subtitle": "Your monitor has reached its failure threshold.",
+                "resource_id": None,
+                "evidence_data": {},
+                "evidence_display": [
+                    {
+                        "name": "Failure reason",
+                        "value": "1 timeout and 1 error check-ins detected",
+                        "important": True,
+                    },
+                    {
+                        "name": "Environment",
+                        "value": monitor_environment.get_environment().name,
+                        "important": False,
+                    },
+                    {
+                        "name": "Last successful check-in",
+                        "value": successful_checkin.date_added.isoformat(),
+                        "important": False,
+                    },
+                ],
+                "type": MonitorIncidentType.type_id,
+                "level": "error",
+                "culprit": "",
+            },
+        ) == dict(occurrence)
+
+        assert dict(
+            event,
+            **{
+                "contexts": {
+                    "monitor": {
+                        "status": "error",
+                        "type": "cron_job",
+                        "config": monitor.config,
+                        "id": str(monitor.guid),
+                        "name": monitor.name,
+                        "slug": monitor.slug,
+                    },
+                    "trace": {
+                        "trace_id": trace_id.hex,
+                        "span_id": None,
+                    },
+                },
+                "environment": monitor_environment.get_environment().name,
+                "event_id": occurrence["event_id"],
+                "fingerprint": [incident.grouphash],
+                "platform": "other",
+                "project_id": monitor.project_id,
+                "sdk": None,
+                "tags": {
+                    "monitor.id": str(monitor.guid),
+                    "monitor.slug": str(monitor.slug),
+                    "monitor.incident": str(incident.id),
+                },
+            },
+        ) == dict(event)
+
+    def test_failure_reason(self):
+        monitor = self.create_monitor()
+        monitor_environment = MonitorEnvironment.objects.create(
+            monitor=monitor,
+            environment_id=self.environment.id,
+        )
+        timeout_checkin = MonitorCheckIn.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            project_id=self.project.id,
+            status=CheckInStatus.TIMEOUT,
+        )
+        error_checkin = MonitorCheckIn.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            project_id=self.project.id,
+            status=CheckInStatus.ERROR,
+        )
+        miss_checkin = MonitorCheckIn.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            project_id=self.project.id,
+            status=CheckInStatus.MISSED,
+        )
+
+        assert get_failure_reason([error_checkin]) == "An error check-in was detected"
+        assert get_failure_reason([timeout_checkin]) == "A timeout check-in was detected"
+        assert get_failure_reason([miss_checkin]) == "A missed check-in was detected"
+
+        assert (
+            get_failure_reason([error_checkin, miss_checkin, timeout_checkin])
+            == "1 error, 1 missed and 1 timeout check-ins detected"
+        )
+        assert (
+            get_failure_reason([miss_checkin, timeout_checkin])
+            == "1 missed and 1 timeout check-ins detected"
+        )
+
+    @override_settings(
+        KAFKA_TOPIC_OVERRIDES={"monitors-incident-occurrences": "monitors-test-topic"}
+    )
+    @mock.patch("sentry.monitors.logic.incident_occurrence._incident_occurrence_producer")
+    def test_queue_incident_occurrence(self, mock_producer):
+        tick = timezone.now().replace(second=0, microsecond=0)
+
+        monitor = self.create_monitor()
+        monitor_environment = MonitorEnvironment.objects.create(
+            monitor=monitor,
+            environment_id=self.environment.id,
+            status=MonitorStatus.ERROR,
+        )
+
+        last_checkin = timezone.now()
+        trace_id = uuid.uuid4()
+
+        failed_checkin = MonitorCheckIn.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            project_id=self.project.id,
+            status=CheckInStatus.ERROR,
+            trace_id=trace_id,
+            date_added=last_checkin,
+        )
+        incident = MonitorIncident.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            starting_checkin=failed_checkin,
+            starting_timestamp=last_checkin,
+        )
+
+        queue_incident_occurrence(
+            failed_checkin,
+            [failed_checkin],
+            incident,
+            last_checkin,
+            tick,
+        )
+
+        incident_occurrence: IncidentOccurrence = {
+            "incident_id": incident.id,
+            "failed_checkin_id": failed_checkin.id,
+            "previous_checkin_ids": [failed_checkin.id],
+            "received_ts": int(last_checkin.timestamp()),
+            "clock_tick_ts": int(tick.timestamp()),
+        }
+        test_payload = KafkaPayload(
+            str(monitor_environment.id).encode(),
+            MONITORS_INCIDENT_OCCURRENCES.encode(incident_occurrence),
+            [],
+        )
+
+        assert mock_producer.produce.call_count == 1
+        assert mock_producer.produce.mock_calls[0] == mock.call(
+            Topic("monitors-test-topic"), test_payload
+        )
+
+    @mock.patch("sentry.monitors.logic.incident_occurrence.send_incident_occurrence")
+    @mock.patch("sentry.monitors.logic.incident_occurrence.queue_incident_occurrence")
+    def test_dispatch_incident_occurrence(
+        self,
+        mock_queue_incident_occurrence,
+        mock_send_incident_occurrence,
+    ):
+        monitor = self.create_monitor()
+        monitor_environment = MonitorEnvironment.objects.create(
+            monitor=monitor,
+            environment_id=self.environment.id,
+            status=MonitorStatus.ERROR,
+        )
+        failed_checkin = MonitorCheckIn.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            project_id=self.project.id,
+            status=CheckInStatus.ERROR,
+            date_added=timezone.now(),
+        )
+        incident = MonitorIncident.objects.create(
+            monitor=monitor,
+            monitor_environment=monitor_environment,
+            starting_checkin=failed_checkin,
+            starting_timestamp=failed_checkin.date_added,
+        )
+
+        # Sending without tick triggers send_incident_occurrence
+        dispatch_incident_occurrence(
+            failed_checkin,
+            [failed_checkin],
+            incident,
+            received=failed_checkin.date_added,
+            clock_tick=None,
+        )
+        assert mock_send_incident_occurrence.call_count == 1
+        mock_send_incident_occurrence.reset_mock()
+
+        # Sending with tick triggers send_incident_occurrence unless we enable
+        # the crons.dispatch_incident_occurrences_to_consumer option
+        dispatch_incident_occurrence(
+            failed_checkin,
+            [failed_checkin],
+            incident,
+            received=failed_checkin.date_added,
+            clock_tick=timezone.now(),
+        )
+        assert mock_send_incident_occurrence.call_count == 1
+        mock_send_incident_occurrence.reset_mock()
+
+        # Sending with tick and option set dispatches via
+        # queue_incident_occurrence
+        with self.options({"crons.dispatch_incident_occurrences_to_consumer": True}):
+            dispatch_incident_occurrence(
+                failed_checkin,
+                [failed_checkin],
+                incident,
+                received=failed_checkin.date_added,
+                clock_tick=timezone.now(),
+            )
+            assert mock_queue_incident_occurrence.call_count == 1
+            assert mock_send_incident_occurrence.call_count == 0
diff --git a/tests/sentry/monitors/logic/test_mark_failed.py b/tests/sentry/monitors/logic/test_mark_failed.py
index a0b5ff709e2866..ad7a099c1e0aab 100644
--- a/tests/sentry/monitors/logic/test_mark_failed.py
+++ b/tests/sentry/monitors/logic/test_mark_failed.py
@@ -1,10 +1,9 @@
 import uuid
 from itertools import cycle
-from unittest.mock import patch
+from unittest import mock
 
 from django.utils import timezone
 
-from sentry.issues.grouptype import MonitorIncidentType
 from sentry.issues.ingest import process_occurrence_data
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.grouphash import GroupHash
@@ -23,8 +22,8 @@
 
 
 class MarkFailedTestCase(TestCase):
-    @patch("sentry.issues.producer.produce_occurrence_to_kafka")
-    def test_mark_failed_default_params(self, mock_produce_occurrence_to_kafka):
+    @mock.patch("sentry.monitors.logic.incidents.dispatch_incident_occurrence")
+    def test_mark_failed_default_params(self, mock_dispatch_incident_occurrence):
         monitor = Monitor.objects.create(
             name="test monitor",
             organization_id=self.organization.id,
@@ -40,14 +39,7 @@ def test_mark_failed_default_params(self, mock_produce_occurrence_to_kafka):
         monitor_environment = MonitorEnvironment.objects.create(
             monitor=monitor,
             environment_id=self.environment.id,
-            status=monitor.status,
-        )
-
-        successful_check_in = MonitorCheckIn.objects.create(
-            monitor=monitor,
-            monitor_environment=monitor_environment,
-            project_id=self.project.id,
-            status=CheckInStatus.OK,
+            status=MonitorStatus.OK,
         )
 
         last_checkin = timezone.now()
@@ -69,83 +61,17 @@ def test_mark_failed_default_params(self, mock_produce_occurrence_to_kafka):
         monitor_incidents = MonitorIncident.objects.filter(monitor_environment=monitor_environment)
         assert len(monitor_incidents) == 1
 
-        assert len(mock_produce_occurrence_to_kafka.mock_calls) == 1
-
-        kwargs = mock_produce_occurrence_to_kafka.call_args.kwargs
-        occurrence = kwargs["occurrence"]
-        event = kwargs["event_data"]
-        occurrence = occurrence.to_dict()
-
-        assert dict(
-            occurrence,
-            **{
-                "project_id": self.project.id,
-                "fingerprint": [monitor_incidents[0].grouphash],
-                "issue_title": f"Monitor failure: {monitor.name}",
-                "subtitle": "Your monitor has reached its failure threshold.",
-                "resource_id": None,
-                "evidence_data": {},
-                "evidence_display": [
-                    {
-                        "name": "Failure reason",
-                        "value": "An error check-in was detected",
-                        "important": True,
-                    },
-                    {
-                        "name": "Environment",
-                        "value": monitor_environment.get_environment().name,
-                        "important": False,
-                    },
-                    {
-                        "name": "Last successful check-in",
-                        "value": successful_check_in.date_added.isoformat(),
-                        "important": False,
-                    },
-                ],
-                "type": MonitorIncidentType.type_id,
-                "level": "error",
-                "culprit": "",
-            },
-        ) == dict(occurrence)
-
-        assert dict(
-            event,
-            **{
-                "contexts": {
-                    "monitor": {
-                        "status": "error",
-                        "type": "cron_job",
-                        "config": {
-                            "schedule_type": 2,
-                            "schedule": [1, "month"],
-                            "max_runtime": None,
-                            "checkin_margin": None,
-                        },
-                        "id": str(monitor.guid),
-                        "name": monitor.name,
-                        "slug": monitor.slug,
-                    },
-                    "trace": {
-                        "trace_id": trace_id.hex,
-                        "span_id": None,
-                    },
-                },
-                "environment": monitor_environment.get_environment().name,
-                "event_id": occurrence["event_id"],
-                "fingerprint": [monitor_incidents[0].grouphash],
-                "platform": "other",
-                "project_id": monitor.project_id,
-                "sdk": None,
-                "tags": {
-                    "monitor.id": str(monitor.guid),
-                    "monitor.slug": str(monitor.slug),
-                    "monitor.incident": str(monitor_incidents[0].id),
-                },
-            },
-        ) == dict(event)
+        assert mock_dispatch_incident_occurrence.call_count == 1
+        assert mock_dispatch_incident_occurrence.call_args == mock.call(
+            checkin,
+            [checkin],
+            monitor_incidents[0],
+            checkin.date_added,
+            None,
+        )
 
-    @patch("sentry.issues.producer.produce_occurrence_to_kafka")
-    def test_mark_failed_muted(self, mock_produce_occurrence_to_kafka):
+    @mock.patch("sentry.monitors.logic.incidents.dispatch_incident_occurrence")
+    def test_mark_failed_muted(self, mock_dispatch_incident_occurrence):
         monitor = Monitor.objects.create(
             name="test monitor",
             organization_id=self.organization.id,
@@ -178,11 +104,11 @@ def test_mark_failed_muted(self, mock_produce_occurrence_to_kafka):
         assert monitor.is_muted
         assert monitor_environment.status == MonitorStatus.ERROR
 
-        assert len(mock_produce_occurrence_to_kafka.mock_calls) == 0
+        assert mock_dispatch_incident_occurrence.call_count == 0
         assert monitor_environment.active_incident is not None
 
-    @patch("sentry.issues.producer.produce_occurrence_to_kafka")
-    def test_mark_failed_env_muted(self, mock_produce_occurrence_to_kafka):
+    @mock.patch("sentry.monitors.logic.incidents.dispatch_incident_occurrence")
+    def test_mark_failed_env_muted(self, mock_dispatch_incident_occurrence):
         monitor = Monitor.objects.create(
             name="test monitor",
             organization_id=self.organization.id,
@@ -217,11 +143,11 @@ def test_mark_failed_env_muted(self, mock_produce_occurrence_to_kafka):
         assert not monitor.is_muted
         assert monitor_environment.is_muted
         assert monitor_environment.status == MonitorStatus.ERROR
-        assert len(mock_produce_occurrence_to_kafka.mock_calls) == 0
+        assert mock_dispatch_incident_occurrence.call_count == 0
         assert monitor_environment.active_incident is not None
 
-    @patch("sentry.issues.producer.produce_occurrence_to_kafka")
-    def test_mark_failed_issue_threshold(self, mock_produce_occurrence_to_kafka):
+    @mock.patch("sentry.monitors.logic.incidents.dispatch_incident_occurrence")
+    def test_mark_failed_issue_threshold(self, mock_dispatch_incident_occurrence):
         failure_issue_threshold = 8
         monitor = Monitor.objects.create(
             name="test monitor",
@@ -297,18 +223,7 @@ def test_mark_failed_issue_threshold(self, mock_produce_occurrence_to_kafka):
         assert monitor_incident.grouphash == monitor_environment.active_incident.grouphash
 
         # assert correct number of occurrences was sent
-        assert len(mock_produce_occurrence_to_kafka.mock_calls) == failure_issue_threshold
-        # assert that the correct uuid fingerprint was sent
-        kwargs = mock_produce_occurrence_to_kafka.call_args.kwargs
-        occurrence = kwargs["occurrence"]
-        occurrence = occurrence.to_dict()
-        assert occurrence["fingerprint"][0] == monitor_incident.grouphash
-
-        # Human readible failure reason
-        assert (
-            occurrence["evidence_display"][0]["value"]
-            == "3 timeout, 3 missed and 2 error check-ins detected"
-        )
+        assert mock_dispatch_incident_occurrence.call_count == failure_issue_threshold
 
         # send another check-in to make sure the incident does not change
         status = next(failure_statuses)
@@ -328,12 +243,7 @@ def test_mark_failed_issue_threshold(self, mock_produce_occurrence_to_kafka):
         assert monitor_incident.grouphash == monitor_environment.active_incident.grouphash
 
         # assert correct number of occurrences was sent
-        assert len(mock_produce_occurrence_to_kafka.mock_calls) == failure_issue_threshold + 1
-        # assert that the correct uuid fingerprint was sent
-        kwargs = mock_produce_occurrence_to_kafka.call_args.kwargs
-        occurrence = kwargs["occurrence"]
-        occurrence = occurrence.to_dict()
-        assert occurrence["fingerprint"][0] == monitor_incident.grouphash
+        assert mock_dispatch_incident_occurrence.call_count == failure_issue_threshold + 1
 
         # Resolve the incident with an OK check-in
         ok_checkin = MonitorCheckIn.objects.create(
@@ -364,8 +274,8 @@ def test_mark_failed_issue_threshold(self, mock_produce_occurrence_to_kafka):
 
     # Test to make sure that timeout mark_failed (which occur in the past)
     # correctly create issues once passing the failure_issue_threshold
-    @patch("sentry.issues.producer.produce_occurrence_to_kafka")
-    def test_mark_failed_issue_threshold_timeout(self, mock_produce_occurrence_to_kafka):
+    @mock.patch("sentry.monitors.logic.incidents.dispatch_incident_occurrence")
+    def test_mark_failed_issue_threshold_timeout(self, mock_dispatch_incident_occurrence):
         failure_issue_threshold = 8
         monitor = Monitor.objects.create(
             name="test monitor",
@@ -432,19 +342,11 @@ def test_mark_failed_issue_threshold_timeout(self, mock_produce_occurrence_to_ka
         assert monitor_incident.grouphash == monitor_environment.active_incident.grouphash
 
         # assert correct number of occurrences was sent
-        assert len(mock_produce_occurrence_to_kafka.mock_calls) == failure_issue_threshold
-        # assert that the correct uuid fingerprint was sent
-        kwargs = mock_produce_occurrence_to_kafka.call_args.kwargs
-        occurrence = kwargs["occurrence"]
-        occurrence = occurrence.to_dict()
-        assert occurrence["fingerprint"][0] == monitor_incident.grouphash
-
-        # Human readible failure reason
-        assert occurrence["evidence_display"][0]["value"] == "8 timeout check-ins detected"
+        assert mock_dispatch_incident_occurrence.call_count == failure_issue_threshold
 
     # we are duplicating this test as the code paths are different, for now
-    @patch("sentry.issues.producer.produce_occurrence_to_kafka")
-    def test_mark_failed_issue_threshold_disabled(self, mock_produce_occurrence_to_kafka):
+    @mock.patch("sentry.monitors.logic.incidents.dispatch_incident_occurrence")
+    def test_mark_failed_issue_threshold_disabled(self, mock_dispatch_incident_occurrence):
         failure_issue_threshold = 8
         monitor = Monitor.objects.create(
             name="test monitor",
@@ -480,7 +382,7 @@ def test_mark_failed_issue_threshold_disabled(self, mock_produce_occurrence_to_k
         assert monitor.is_muted
         assert monitor_environment.status == MonitorStatus.ERROR
 
-        assert len(mock_produce_occurrence_to_kafka.mock_calls) == 0
+        assert mock_dispatch_incident_occurrence.call_count == 0
         assert monitor_environment.active_incident is not None
 
     def test_mark_failed_issue_assignment(self):
diff --git a/tests/sentry/monitors/logic/test_mark_ok.py b/tests/sentry/monitors/logic/test_mark_ok.py
index d29f9731d0fcf0..acd9ff7305d3e2 100644
--- a/tests/sentry/monitors/logic/test_mark_ok.py
+++ b/tests/sentry/monitors/logic/test_mark_ok.py
@@ -110,7 +110,7 @@ def test_muted_ok(self):
         assert monitor_environment.next_checkin_latest == now + timedelta(minutes=2)
         assert monitor_environment.last_checkin == now
 
-    @patch("sentry.issues.producer.produce_occurrence_to_kafka")
+    @patch("sentry.monitors.logic.incident_occurrence.produce_occurrence_to_kafka")
     def test_mark_ok_recovery_threshold(self, mock_produce_occurrence_to_kafka):
         now = timezone.now().replace(second=0, microsecond=0)
 
diff --git a/tests/sentry/monitors/tasks/test_detect_broken_monitor_envs.py b/tests/sentry/monitors/tasks/test_detect_broken_monitor_envs.py
index c8070831e230af..d861f8c5ce875d 100644
--- a/tests/sentry/monitors/tasks/test_detect_broken_monitor_envs.py
+++ b/tests/sentry/monitors/tasks/test_detect_broken_monitor_envs.py
@@ -6,7 +6,6 @@
 
 from sentry.constants import ObjectStatus
 from sentry.grouping.utils import hash_from_values
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.monitors.models import (
     CheckInStatus,
     Monitor,
@@ -19,6 +18,7 @@
     ScheduleType,
 )
 from sentry.monitors.tasks.detect_broken_monitor_envs import detect_broken_monitor_envs
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.datetime import before_now
diff --git a/tests/sentry/monitors/test_clock_dispatch.py b/tests/sentry/monitors/test_clock_dispatch.py
index 1bf58c035f882d..d4d1d07c0be507 100644
--- a/tests/sentry/monitors/test_clock_dispatch.py
+++ b/tests/sentry/monitors/test_clock_dispatch.py
@@ -13,7 +13,7 @@
 
 
 @mock.patch("sentry.monitors.clock_dispatch._dispatch_tick")
-@override_options({"crons.tick_volume_anomaly_detection": False})
+@override_options({"crons.system_incidents.collect_metrics": False})
 def test_monitor_task_trigger(dispatch_tick):
     now = timezone.now().replace(second=0, microsecond=0)
 
@@ -42,7 +42,7 @@ def test_monitor_task_trigger(dispatch_tick):
 
 
 @mock.patch("sentry.monitors.clock_dispatch._dispatch_tick")
-@override_options({"crons.tick_volume_anomaly_detection": False})
+@override_options({"crons.system_incidents.collect_metrics": False})
 def test_monitor_task_trigger_partition_desync(dispatch_tick):
     """
     When consumer partitions are not completely synchronized we may read
@@ -74,7 +74,7 @@ def test_monitor_task_trigger_partition_desync(dispatch_tick):
 
 
 @mock.patch("sentry.monitors.clock_dispatch._dispatch_tick")
-@override_options({"crons.tick_volume_anomaly_detection": False})
+@override_options({"crons.system_incidents.collect_metrics": False})
 def test_monitor_task_trigger_partition_sync(dispatch_tick):
     """
     When the kafka topic has multiple partitions we want to only tick our clock
@@ -103,7 +103,7 @@ def test_monitor_task_trigger_partition_sync(dispatch_tick):
 
 
 @mock.patch("sentry.monitors.clock_dispatch._dispatch_tick")
-@override_options({"crons.tick_volume_anomaly_detection": False})
+@override_options({"crons.system_incidents.collect_metrics": False})
 def test_monitor_task_trigger_partition_tick_skip(dispatch_tick):
     """
     In a scenario where all partitions move multiple ticks past the slowest
@@ -141,7 +141,7 @@ def test_monitor_task_trigger_partition_tick_skip(dispatch_tick):
 @override_settings(KAFKA_TOPIC_OVERRIDES={"monitors-clock-tick": "clock-tick-test-topic"})
 @override_settings(SENTRY_EVENTSTREAM="sentry.eventstream.kafka.KafkaEventStream")
 @mock.patch("sentry.monitors.clock_dispatch._clock_tick_producer")
-@override_options({"crons.tick_volume_anomaly_detection": False})
+@override_options({"crons.system_incidents.collect_metrics": False})
 def test_dispatch_to_kafka(clock_tick_producer_mock):
     now = timezone.now().replace(second=0, microsecond=0)
     _dispatch_tick(now)
diff --git a/tests/sentry/monitors/test_system_incidents.py b/tests/sentry/monitors/test_system_incidents.py
index 06f71562b970d1..190eb45b712900 100644
--- a/tests/sentry/monitors/test_system_incidents.py
+++ b/tests/sentry/monitors/test_system_incidents.py
@@ -12,11 +12,15 @@
     MONITOR_VOLUME_HISTORY,
     MONITOR_VOLUME_RETENTION,
     AnomalyTransition,
+    DecisionResult,
     TickAnomalyDecision,
     _make_reference_ts,
     get_clock_tick_decision,
     get_clock_tick_volume_metric,
+    get_last_incident_ts,
     make_clock_tick_decision,
+    process_clock_tick_for_system_incidents,
+    prune_incident_check_in_volume,
     record_clock_tick_volume_metric,
     update_check_in_volume,
 )
@@ -105,8 +109,73 @@ def make_key(offset: timedelta) -> str:
 
 @mock.patch("sentry.monitors.system_incidents.logger")
 @mock.patch("sentry.monitors.system_incidents.metrics")
-@override_options({"crons.tick_volume_anomaly_detection": True})
-def test_record_clock_tiock_volume_metric_simple(metrics, logger):
+@mock.patch("sentry.monitors.system_incidents.record_clock_tick_volume_metric")
+@mock.patch("sentry.monitors.system_incidents.make_clock_tick_decision")
+@mock.patch("sentry.monitors.system_incidents.prune_incident_check_in_volume")
+def test_process_clock_tick_for_system_incident(
+    mock_prune_incident_check_in_volume,
+    mock_make_clock_tick_decision,
+    mock_record_clock_tick_volume_metric,
+    mock_metrics,
+    mock_logger,
+):
+    ts = timezone.now().replace(second=0, microsecond=0)
+
+    mock_make_clock_tick_decision.return_value = DecisionResult(
+        ts=ts,
+        decision=TickAnomalyDecision.ABNORMAL,
+        transition=AnomalyTransition.ABNORMALITY_STARTED,
+    )
+    process_clock_tick_for_system_incidents(ts)
+
+    assert mock_record_clock_tick_volume_metric.call_count == 1
+    assert mock_make_clock_tick_decision.call_count == 1
+
+    # Metrics and logs are recorded
+    assert mock_logger.info.call_args_list[0] == mock.call(
+        "process_clock_tick",
+        extra={
+            "decision": TickAnomalyDecision.ABNORMAL,
+            "transition": AnomalyTransition.ABNORMALITY_STARTED,
+        },
+    )
+    assert mock_metrics.incr.call_args_list[0] == mock.call(
+        "monitors.tasks.clock_tick.tick_decision",
+        tags={"decision": TickAnomalyDecision.ABNORMAL},
+        sample_rate=1.0,
+    )
+    assert mock_metrics.incr.call_args_list[1] == mock.call(
+        "monitors.tasks.clock_tick.tick_transition",
+        tags={"transition": AnomalyTransition.ABNORMALITY_STARTED},
+        sample_rate=1.0,
+    )
+
+    # Transition into an incident records the start timestamp
+    mock_make_clock_tick_decision.return_value = DecisionResult(
+        ts=ts,
+        decision=TickAnomalyDecision.INCIDENT,
+        transition=AnomalyTransition.INCIDENT_STARTED,
+    )
+    process_clock_tick_for_system_incidents(ts)
+    assert get_last_incident_ts() == ts
+
+    # Transitioning out of an incident prunes volume during the incident
+    mock_make_clock_tick_decision.return_value = DecisionResult(
+        ts=ts + timedelta(minutes=5),
+        decision=TickAnomalyDecision.NORMAL,
+        transition=AnomalyTransition.INCIDENT_RECOVERED,
+    )
+    process_clock_tick_for_system_incidents(ts)
+    assert mock_prune_incident_check_in_volume.call_args_list[0] == mock.call(
+        ts,
+        ts + timedelta(minutes=5),
+    )
+
+
+@mock.patch("sentry.monitors.system_incidents.logger")
+@mock.patch("sentry.monitors.system_incidents.metrics")
+@override_options({"crons.system_incidents.collect_metrics": True})
+def test_record_clock_tick_volume_metric_simple(metrics, logger):
     tick = timezone.now().replace(second=0, microsecond=0)
 
     # This is the timestamp we're looking at just before the tick
@@ -126,7 +195,7 @@ def test_record_clock_tiock_volume_metric_simple(metrics, logger):
     record_clock_tick_volume_metric(tick)
 
     logger.info.assert_called_with(
-        "monitors.system_incidents.volume_history",
+        "volume_history",
         extra={
             "reference_datetime": str(tick),
             "evaluation_minute": past_ts.strftime("%H:%M"),
@@ -158,8 +227,8 @@ def test_record_clock_tiock_volume_metric_simple(metrics, logger):
 
 @mock.patch("sentry.monitors.system_incidents.logger")
 @mock.patch("sentry.monitors.system_incidents.metrics")
-@override_options({"crons.tick_volume_anomaly_detection": True})
-def test_record_clock_tiock_volume_metric_volume_drop(metrics, logger):
+@override_options({"crons.system_incidents.collect_metrics": True})
+def test_record_clock_tick_volume_metric_volume_drop(metrics, logger):
     tick = timezone.now().replace(second=0, microsecond=0)
 
     # This is the timestamp we're looking at just before the tick
@@ -180,7 +249,7 @@ def test_record_clock_tiock_volume_metric_volume_drop(metrics, logger):
 
     # Note that the pct_deviation and z_score are extremes
     logger.info.assert_called_with(
-        "monitors.system_incidents.volume_history",
+        "volume_history",
         extra={
             "reference_datetime": str(tick),
             "evaluation_minute": past_ts.strftime("%H:%M"),
@@ -212,8 +281,8 @@ def test_record_clock_tiock_volume_metric_volume_drop(metrics, logger):
 
 @mock.patch("sentry.monitors.system_incidents.logger")
 @mock.patch("sentry.monitors.system_incidents.metrics")
-@override_options({"crons.tick_volume_anomaly_detection": True})
-def test_record_clock_tiock_volume_metric_low_history(metrics, logger):
+@override_options({"crons.system_incidents.collect_metrics": True})
+def test_record_clock_tick_volume_metric_low_history(metrics, logger):
     tick = timezone.now().replace(second=0, microsecond=0)
 
     # This is the timestamp we're looking at just before the tick
@@ -227,15 +296,19 @@ def test_record_clock_tiock_volume_metric_low_history(metrics, logger):
 
     # We should do nothing because there was not enough daata to make any
     # calculation
-    assert not logger.info.called
+    logger.info.assert_called_with(
+        "history_volume_low",
+        extra={"reference_datetime": tick},
+    )
     assert not metrics.gauge.called
+
     assert get_clock_tick_volume_metric(past_ts) is None
 
 
 @mock.patch("sentry.monitors.system_incidents.logger")
 @mock.patch("sentry.monitors.system_incidents.metrics")
-@override_options({"crons.tick_volume_anomaly_detection": True})
-def test_record_clock_tiock_volume_metric_uniform(metrics, logger):
+@override_options({"crons.system_incidents.collect_metrics": True})
+def test_record_clock_tick_volume_metric_uniform(metrics, logger):
     tick = timezone.now().replace(second=0, microsecond=0)
 
     # This is the timestamp we're looking at just before the tick
@@ -255,7 +328,7 @@ def test_record_clock_tiock_volume_metric_uniform(metrics, logger):
     record_clock_tick_volume_metric(tick)
 
     logger.info.assert_called_with(
-        "monitors.system_incidents.volume_history",
+        "volume_history",
         extra={
             "reference_datetime": str(tick),
             "evaluation_minute": past_ts.strftime("%H:%M"),
@@ -285,17 +358,43 @@ def test_record_clock_tiock_volume_metric_uniform(metrics, logger):
     assert get_clock_tick_volume_metric(past_ts) == 0.0
 
 
+@override_options({"crons.system_incidents.collect_metrics": True})
+def test_prune_incident_check_in_volume():
+    now = timezone.now().replace(second=0, microsecond=0)
+
+    # Fill in some historic volume data
+    for offset in range(10):
+        update_check_in_volume([now + timedelta(minutes=offset)] * (offset + 1))
+
+    # Remove data in the middle
+    prune_incident_check_in_volume(
+        now + timedelta(minutes=2),
+        now + timedelta(minutes=6),
+    )
+
+    def make_key(offset: timedelta) -> str:
+        ts = now.replace(second=0, microsecond=0) + offset
+        return MONITOR_VOLUME_HISTORY.format(ts=int(ts.timestamp()))
+
+    volumes = [redis_client.get(make_key(timedelta(minutes=offset))) for offset in range(10)]
+
+    # Ensure we removed the correct keys. remmeber,
+    # prune_incident_check_in_volume recieves the timestamp of the incident
+    # tick decisions, but the volume data is recorded in the timestamp before
+    assert volumes == ["1", None, None, None, None, "6", "7", "8", "9", "10"]
+
+
 @django_db_all
 @override_options(
     {
-        "crons.tick_volume_anomaly_detection": True,
+        "crons.system_incidents.collect_metrics": True,
         "crons.system_incidents.tick_decision_window": 5,
         "crons.system_incidents.pct_deviation_anomaly_threshold": -5,
         "crons.system_incidents.pct_deviation_incident_threshold": -25,
     }
 )
 def test_tick_decision_anomaly_recovery():
-    start = timezone.now().replace(second=0, microsecond=0)
+    start = timezone.now().replace(minute=0, second=0, microsecond=0)
 
     test_metrics = [
         # fmt: off
@@ -316,24 +415,28 @@ def test_tick_decision_anomaly_recovery():
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.NORMAL
         assert result.transition is None
+        assert result.ts == ts
 
     # Transition into anomalous state (-6)
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.ABNORMAL
         assert result.transition == AnomalyTransition.ABNORMALITY_STARTED
+        assert result.ts == ts
 
     # Next 5 ticks (-7, -4, -3, -3, -4) stay in abnormal state
     for _ in range(0, 5):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.ABNORMAL
         assert result.transition is None
+        assert result.ts == ts
 
     # Next tick recovers the abnormality after 5 ticks under the abnormality threshold
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.NORMAL
         assert result.transition == AnomalyTransition.ABNORMALITY_RECOVERED
+        assert result.ts == ts
 
     # The last 6 ABNORMAL ticks transitioned to NORMAL
     for i in range(1, 7):
@@ -343,7 +446,7 @@ def test_tick_decision_anomaly_recovery():
 @django_db_all
 @override_options(
     {
-        "crons.tick_volume_anomaly_detection": True,
+        "crons.system_incidents.collect_metrics": True,
         "crons.system_incidents.tick_decision_window": 5,
         "crons.system_incidents.pct_deviation_anomaly_threshold": -5,
         "crons.system_incidents.pct_deviation_incident_threshold": -25,
@@ -354,7 +457,7 @@ def test_tick_decisions_simple_incident():
     Tests incident detection for an incident that immediately starts and
     immediately stops.
     """
-    start = timezone.now().replace(second=0, microsecond=0)
+    start = timezone.now().replace(minute=0, second=0, microsecond=0)
 
     test_metrics = [
         # fmt: off
@@ -375,36 +478,43 @@ def test_tick_decisions_simple_incident():
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.NORMAL
         assert result.transition is None
+        assert result.ts == ts
 
     # Transition into incident (-35)
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.INCIDENT
         assert result.transition == AnomalyTransition.INCIDENT_STARTED
+        assert result.ts == ts
 
     # Incident continues (-80, -100, -50)
     for _ in range(0, 3):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.INCIDENT
         assert result.transition is None
+        assert result.ts == ts
 
-    # Incident recovers (-3)
+    # Incident begins recovery (-3)
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.RECOVERING
         assert result.transition == AnomalyTransition.INCIDENT_RECOVERING
+        assert result.ts == ts
 
     # Incident continues recovery (-2, -4, -1)
     for _ in range(0, 3):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.RECOVERING
         assert result.transition is None
+        assert result.ts == ts
 
     # Incident recovers
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.NORMAL
         assert result.transition == AnomalyTransition.INCIDENT_RECOVERED
+        # True recovery was 4 ticks ago
+        assert result.ts == ts - timedelta(minutes=4)
 
     # The last 4 RECOVERING ticks transitioned to NORMAL
     for i in range(1, 5):
@@ -414,7 +524,7 @@ def test_tick_decisions_simple_incident():
 @django_db_all
 @override_options(
     {
-        "crons.tick_volume_anomaly_detection": True,
+        "crons.system_incidents.collect_metrics": True,
         "crons.system_incidents.tick_decision_window": 5,
         "crons.system_incidents.pct_deviation_anomaly_threshold": -5,
         "crons.system_incidents.pct_deviation_incident_threshold": -25,
@@ -424,7 +534,7 @@ def test_tick_decisions_variable_incident():
     """
     Tests an incident that slowly starts and slowly recovers.
     """
-    start = timezone.now().replace(second=0, microsecond=0)
+    start = timezone.now().replace(minute=0, second=0, microsecond=0)
 
     test_metrics = [
         # fmt: off
@@ -459,24 +569,29 @@ def test_tick_decisions_variable_incident():
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.NORMAL
         assert result.transition is None
+        assert result.ts == ts
 
     # Transition into anomalous state (-6)
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.ABNORMAL
         assert result.transition == AnomalyTransition.ABNORMALITY_STARTED
+        assert result.ts == ts
 
     # Next 4 ticks (-7, -4, -3, -10) stay in anomaly
     for _ in range(0, 4):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.ABNORMAL
         assert result.transition is None
+        assert result.ts == ts
 
     # Incident starts (-30)
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.INCIDENT
         assert result.transition == AnomalyTransition.INCIDENT_STARTED
+        # True incident start was 5 ticks ago
+        assert result.ts == ts - timedelta(minutes=5)
 
     # The last 5 ABNORMAL ticks transitioned to INCIDENT
     for i in range(1, 6):
@@ -487,24 +602,28 @@ def test_tick_decisions_variable_incident():
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.INCIDENT
         assert result.transition is None
+        assert result.ts == ts
 
     # Incident begins recovering (-4)
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.RECOVERING
         assert result.transition == AnomalyTransition.INCIDENT_RECOVERING
+        assert result.ts == ts
 
     # Incident continues to recover (-3)
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.RECOVERING
         assert result.transition is None
+        assert result.ts == ts
 
     # Incident has anomalous tick again (-6), not fully recovered
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.INCIDENT
         assert result.transition == AnomalyTransition.INCIDENT_RECOVERY_FAILED
+        assert result.ts == ts
 
     # The last 2 RECOVERING ticks transitioned back to incident
     for i in range(1, 3):
@@ -515,18 +634,21 @@ def test_tick_decisions_variable_incident():
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.RECOVERING
         assert result.transition == AnomalyTransition.INCIDENT_RECOVERING
+        assert result.ts == ts
 
     # Incident continues to recover (-1)
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.RECOVERING
         assert result.transition is None
+        assert result.ts == ts
 
     # Incident has incident tick again (-30), not fully recovered
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.INCIDENT
         assert result.transition == AnomalyTransition.INCIDENT_RECOVERY_FAILED
+        assert result.ts == ts
 
     # The last 2 RECOVERING ticks transitioned back to incident
     for i in range(1, 3):
@@ -537,18 +659,22 @@ def test_tick_decisions_variable_incident():
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.RECOVERING
         assert result.transition == AnomalyTransition.INCIDENT_RECOVERING
+        assert result.ts == ts
 
     # Incident continues to recover for the next 3 normal ticks (-2, -4, -4)
     for _ in range(0, 3):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.RECOVERING
         assert result.transition is None
+        assert result.ts == ts
 
     # Incident recovers at the final 5th tick (-3)
     for _ in range(0, 1):
         result = make_clock_tick_decision(ts := ts + timedelta(minutes=1))
         assert result.decision == TickAnomalyDecision.NORMAL
         assert result.transition == AnomalyTransition.INCIDENT_RECOVERED
+        # True incident recovery was 4 ticks ago
+        assert result.ts == ts - timedelta(minutes=4)
 
     # The last 4 RECOVERING ticks transitioned to NORMAL
     for i in range(1, 5):
diff --git a/tests/sentry/models/test_notificationaction.py b/tests/sentry/notifications/models/test_notificationaction.py
similarity index 88%
rename from tests/sentry/models/test_notificationaction.py
rename to tests/sentry/notifications/models/test_notificationaction.py
index 81d1e8d1360b8c..0acb38c096a01e 100644
--- a/tests/sentry/models/test_notificationaction.py
+++ b/tests/sentry/notifications/models/test_notificationaction.py
@@ -2,8 +2,12 @@
 
 import pytest
 
-from sentry.models.notificationaction import ActionService, ActionTarget, NotificationAction
-from sentry.models.notificationaction import logger as NotificationActionLogger
+from sentry.notifications.models.notificationaction import (
+    ActionService,
+    ActionTarget,
+    NotificationAction,
+)
+from sentry.notifications.models.notificationaction import logger as NotificationActionLogger
 from sentry.testutils.cases import TestCase
 
 
@@ -34,7 +38,7 @@ def test_register_action_for_fire(self, mock_error_logger):
         assert not mock_error_logger.called
         assert mock_handler.called
 
-    @patch("sentry.models.notificationaction.ActionTrigger")
+    @patch("sentry.notifications.models.notificationaction.ActionTrigger")
     def test_register_action_for_overlap(self, mock_action_trigger):
         mock_action_trigger.as_choices.return_value = (self.test_trigger,)
         mock_handler = MagicMock()
diff --git a/tests/sentry/models/test_notificationsettingoption.py b/tests/sentry/notifications/models/test_notificationsettingoption.py
similarity index 96%
rename from tests/sentry/models/test_notificationsettingoption.py
rename to tests/sentry/notifications/models/test_notificationsettingoption.py
index fe4d3f17bdd2ff..e1852fa10fb810 100644
--- a/tests/sentry/models/test_notificationsettingoption.py
+++ b/tests/sentry/notifications/models/test_notificationsettingoption.py
@@ -1,5 +1,5 @@
 from sentry.deletions.tasks.hybrid_cloud import schedule_hybrid_cloud_foreign_key_jobs_control
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.outbox import outbox_runner
diff --git a/tests/sentry/models/test_notificationsettingprovider.py b/tests/sentry/notifications/models/test_notificationsettingprovider.py
similarity index 96%
rename from tests/sentry/models/test_notificationsettingprovider.py
rename to tests/sentry/notifications/models/test_notificationsettingprovider.py
index fa8be37e77f1b5..54b2def42bc168 100644
--- a/tests/sentry/models/test_notificationsettingprovider.py
+++ b/tests/sentry/notifications/models/test_notificationsettingprovider.py
@@ -1,5 +1,5 @@
 from sentry.deletions.tasks.hybrid_cloud import schedule_hybrid_cloud_foreign_key_jobs_control
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.outbox import outbox_runner
diff --git a/tests/sentry/notifications/notifications/test_digests.py b/tests/sentry/notifications/notifications/test_digests.py
index be02406aa1f701..21499d4b20a9f2 100644
--- a/tests/sentry/notifications/notifications/test_digests.py
+++ b/tests/sentry/notifications/notifications/test_digests.py
@@ -163,7 +163,7 @@ def test_slack_digest_notification_block(self, digests):
         backend = RedisBackend()
         digests.backend.digest = backend.digest
         digests.enabled.return_value = True
-        timestamp_raw = before_now(days=1)
+        timestamp_raw = before_now(days=1).replace(microsecond=0)
         timestamp_secs = int(timestamp_raw.timestamp())
         timestamp = timestamp_raw.isoformat()
         key = f"slack:p:{self.project.id}:IssueOwners::AllMembers"
diff --git a/tests/sentry/notifications/test_helpers.py b/tests/sentry/notifications/test_helpers.py
index 069bc738690635..8e556abfb0aea6 100644
--- a/tests/sentry/notifications/test_helpers.py
+++ b/tests/sentry/notifications/test_helpers.py
@@ -2,7 +2,6 @@
 from urllib.parse import parse_qs, urlparse
 
 from sentry.integrations.models.external_actor import ExternalActor
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.organizationmemberteamreplica import OrganizationMemberTeamReplica
 from sentry.models.rule import Rule
 from sentry.notifications.helpers import (
@@ -12,6 +11,7 @@
     team_is_valid_recipient,
     validate,
 )
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import NotificationSettingEnum, NotificationSettingsOptionEnum
 from sentry.notifications.utils import (
     get_email_link_extra_params,
diff --git a/tests/sentry/notifications/test_notificationcontroller.py b/tests/sentry/notifications/test_notificationcontroller.py
index ba887f384f7afb..33e3ebf7ce7024 100644
--- a/tests/sentry/notifications/test_notificationcontroller.py
+++ b/tests/sentry/notifications/test_notificationcontroller.py
@@ -1,8 +1,8 @@
 from sentry.integrations.models.external_actor import ExternalActor
 from sentry.integrations.types import ExternalProviderEnum, ExternalProviders
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.team import Team
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.notificationcontroller import NotificationController
 from sentry.notifications.types import (
     GroupSubscriptionStatus,
diff --git a/tests/sentry/notifications/test_notifications.py b/tests/sentry/notifications/test_notifications.py
index 74f481b8f7d7af..902f15941e5fe3 100644
--- a/tests/sentry/notifications/test_notifications.py
+++ b/tests/sentry/notifications/test_notifications.py
@@ -18,8 +18,8 @@
 from sentry.models.activity import Activity
 from sentry.models.group import Group, GroupStatus
 from sentry.models.groupassignee import GroupAssignee
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.rule import Rule
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.notifications.activity.assigned import AssignedActivityNotification
 from sentry.notifications.notifications.activity.regression import RegressionActivityNotification
 from sentry.silo.base import SiloMode
diff --git a/tests/sentry/notifications/utils/test_participants.py b/tests/sentry/notifications/utils/test_participants.py
index d2a7c8ebfdb5f4..ac290c900a1c0c 100644
--- a/tests/sentry/notifications/utils/test_participants.py
+++ b/tests/sentry/notifications/utils/test_participants.py
@@ -12,12 +12,12 @@
 from sentry.models.commit import Commit
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.groupowner import GroupOwner, GroupOwnerType
-from sentry.models.notificationsettingoption import NotificationSettingOption
-from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.project import Project
 from sentry.models.projectownership import ProjectOwnership
 from sentry.models.repository import Repository
 from sentry.models.team import Team
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.notifications.types import (
     ActionTargetType,
     FallthroughChoiceType,
diff --git a/tests/sentry/profiles/test_flamegraph.py b/tests/sentry/profiles/test_flamegraph.py
deleted file mode 100644
index 7720854bc6a081..00000000000000
--- a/tests/sentry/profiles/test_flamegraph.py
+++ /dev/null
@@ -1,111 +0,0 @@
-from datetime import timedelta, timezone
-
-from sentry.profiles.flamegraph import get_profiles_with_function
-from sentry.search.events.types import SnubaParams
-from sentry.testutils.cases import ProfilesSnubaTestCase
-from sentry.testutils.helpers.datetime import before_now
-from sentry.utils.samples import load_data
-
-
-class GetProfileWithFunctionTest(ProfilesSnubaTestCase):
-    def setUp(self):
-        super().setUp()
-
-        self.now = before_now(minutes=10)
-        self.hour_ago = (self.now - timedelta(hours=1)).replace(
-            minute=0, second=0, microsecond=0, tzinfo=timezone.utc
-        )
-
-        for i in range(3):
-            self.store_functions(
-                [
-                    {
-                        "self_times_ns": [100 for _ in range(10)],
-                        "package": "foo",
-                        "function": "foo",
-                        "in_app": True,
-                    },
-                ],
-                project=self.project,
-                timestamp=self.hour_ago - timedelta(hours=i),
-            )
-
-        transaction = load_data("transaction", timestamp=before_now(minutes=10))
-        transaction["transaction"] = "foobar"
-
-        self.store_functions(
-            [
-                {
-                    "self_times_ns": [100 for _ in range(10)],
-                    "package": "foo",
-                    "function": "foo",
-                    "in_app": True,
-                },
-            ],
-            project=self.project,
-            timestamp=self.hour_ago,
-            transaction=transaction,
-        )
-
-        transaction = load_data("transaction", timestamp=before_now(minutes=10))
-        transaction["transaction"] = "foobar"
-        profile_context = transaction.setdefault("contexts", {}).setdefault("profile", {})
-        profile_context["profile_id"] = "00000000000000000000000000000000"
-        self.store_functions(
-            [
-                {
-                    "self_times_ns": [100 for _ in range(10)],
-                    "package": "foo",
-                    "function": "foo",
-                    "in_app": True,
-                },
-            ],
-            project=self.project,
-            timestamp=self.hour_ago,
-            transaction=transaction,
-        )
-
-    def test_get_profile_with_function(self):
-        profile_ids = get_profiles_with_function(
-            self.organization.id,
-            self.project.id,
-            self.function_fingerprint({"package": "foo", "function": "foo"}),
-            SnubaParams(
-                organization=self.organization,
-                projects=[self.project],
-                start=before_now(days=1),
-                end=self.now,
-            ),
-            "",
-        )
-        assert len(profile_ids["profile_ids"]) == 4, profile_ids
-
-    def test_get_profile_with_function_with_transaction_filter(self):
-        profile_ids = get_profiles_with_function(
-            self.organization.id,
-            self.project.id,
-            self.function_fingerprint({"package": "foo", "function": "foo"}),
-            SnubaParams(
-                organization=self.organization,
-                projects=[self.project],
-                start=before_now(days=1),
-                end=self.now,
-            ),
-            "transaction:foobar",
-        )
-        assert len(profile_ids["profile_ids"]) == 1, profile_ids
-
-    def test_get_profile_with_function_no_match(self):
-        profile_ids = get_profiles_with_function(
-            self.organization.id,
-            self.project.id,
-            self.function_fingerprint({"package": "foo", "function": "foo"}),
-            SnubaParams(
-                organization=self.organization,
-                projects=[self.project],
-                start=before_now(days=1),
-                end=self.now,
-            ),
-            "transaction:foo",
-        )
-        assert len(profile_ids["profile_ids"]) == 0, profile_ids
diff --git a/tests/sentry/profiles/test_task.py b/tests/sentry/profiles/test_task.py
index 74323e9758a0a2..73f1536149f205 100644
--- a/tests/sentry/profiles/test_task.py
+++ b/tests/sentry/profiles/test_task.py
@@ -833,33 +833,23 @@ def test_get_metrics_dsn(default_project):
     assert get_metrics_dsn(default_project.id) == key1.get_dsn(public=True)
 
 
-@patch("sentry.options.get")
 @patch("sentry.profiles.task._track_outcome")
-@patch("sentry.profiles.task._track_outcome_legacy")
 @patch("sentry.profiles.task._track_duration_outcome")
 @patch("sentry.profiles.task._symbolicate_profile")
 @patch("sentry.profiles.task._deobfuscate_profile")
 @patch("sentry.profiles.task._push_profile_to_vroom")
 @django_db_all
 @pytest.mark.parametrize(
-    "profile,outcomes_in_consumer",
-    [
-        ("sample_v1_profile", True),
-        ("sample_v2_profile", True),
-        ("sample_v1_profile", False),
-        ("sample_v2_profile", False),
-    ],
+    "profile",
+    ["sample_v1_profile", "sample_v2_profile"],
 )
 def test_process_profile_task_should_emit_profile_duration_outcome(
     _push_profile_to_vroom,
     _deobfuscate_profile,
     _symbolicate_profile,
     _track_duration_outcome,
-    _track_outcome_legacy,
     _track_outcome,
-    options_get,
     profile,
-    outcomes_in_consumer,
     organization,
     project,
     request,
@@ -867,11 +857,6 @@ def test_process_profile_task_should_emit_profile_duration_outcome(
     _push_profile_to_vroom.return_value = True
     _deobfuscate_profile.return_value = True
     _symbolicate_profile.return_value = True
-    options_get.side_effect = lambda name: (
-        outcomes_in_consumer
-        if name == "profiling.emit_outcomes_in_profiling_consumer.enabled"
-        else None
-    )
 
     profile = request.getfixturevalue(profile)
     profile["organization_id"] = organization.id
@@ -882,58 +867,40 @@ def test_process_profile_task_should_emit_profile_duration_outcome(
     assert _track_duration_outcome.call_count == 1
 
     if "profiler_id" not in profile:
-        if outcomes_in_consumer:
-            assert _track_outcome.call_count == 1
-            _track_outcome.assert_called_with(
-                profile=profile,
-                project=project,
-                categories=[DataCategory.PROFILE, DataCategory.PROFILE_INDEXED],
-                outcome=Outcome.ACCEPTED,
-            )
-        else:
-            assert _track_outcome_legacy.call_count == 1
+        assert _track_outcome.call_count == 1
+        _track_outcome.assert_called_with(
+            profile=profile,
+            project=project,
+            categories=[DataCategory.PROFILE, DataCategory.PROFILE_INDEXED],
+            outcome=Outcome.ACCEPTED,
+        )
     else:
-        assert _track_outcome_legacy.call_count == 0
+        assert _track_outcome.call_count == 0
 
 
-@patch("sentry.options.get")
 @patch("sentry.quotas.backend.should_emit_profile_duration_outcome")
 @patch("sentry.profiles.task._track_outcome")
-@patch("sentry.profiles.task._track_outcome_legacy")
 @patch("sentry.profiles.task._track_duration_outcome")
 @patch("sentry.profiles.task._symbolicate_profile")
 @patch("sentry.profiles.task._deobfuscate_profile")
 @patch("sentry.profiles.task._push_profile_to_vroom")
 @django_db_all
 @pytest.mark.parametrize(
-    "profile,outcomes_in_consumer",
-    [
-        ("sample_v1_profile", True),
-        ("sample_v2_profile", True),
-        ("sample_v1_profile", False),
-        ("sample_v2_profile", False),
-    ],
+    "profile",
+    ["sample_v1_profile", "sample_v2_profile"],
 )
 def test_process_profile_task_should_not_emit_profile_duration_outcome(
     _push_profile_to_vroom,
     _deobfuscate_profile,
     _symbolicate_profile,
     _track_duration_outcome,
-    _track_outcome_legacy,
     _track_outcome,
     should_emit_profile_duration_outcome,
-    options_get,
     profile,
-    outcomes_in_consumer,
     organization,
     project,
     request,
 ):
-    options_get.side_effect = lambda name: (
-        outcomes_in_consumer
-        if name == "profiling.emit_outcomes_in_profiling_consumer.enabled"
-        else None
-    )
     _push_profile_to_vroom.return_value = True
     _deobfuscate_profile.return_value = True
     _symbolicate_profile.return_value = True
@@ -952,15 +919,13 @@ def test_process_profile_task_should_not_emit_profile_duration_outcome(
     )
 
     if "profiler_id" not in profile:
-        if outcomes_in_consumer:
-            assert _track_outcome.call_count == 1
-            _track_outcome.assert_called_with(
-                profile=profile,
-                project=project,
-                categories=[DataCategory.PROFILE, DataCategory.PROFILE_INDEXED],
-                outcome=Outcome.ACCEPTED,
-            )
-        else:
-            assert _track_outcome_legacy.call_count == 1
+        assert _track_outcome.call_count == 1
+        _track_outcome.assert_called_with(
+            profile=profile,
+            project=project,
+            categories=[DataCategory.PROFILE, DataCategory.PROFILE_INDEXED],
+            outcome=Outcome.ACCEPTED,
+        )
+
     else:
-        assert _track_outcome_legacy.call_count == 0
+        assert _track_outcome.call_count == 0
diff --git a/tests/sentry/profiling/test_flamegraph.py b/tests/sentry/profiling/test_flamegraph.py
deleted file mode 100644
index 2fe3bcaf6345df..00000000000000
--- a/tests/sentry/profiling/test_flamegraph.py
+++ /dev/null
@@ -1,103 +0,0 @@
-import pytest
-from snuba_sdk import And, Column, Condition, Op, Or
-
-from sentry.profiles.flamegraph import get_chunk_snuba_conditions_from_spans_metadata
-
-
-@pytest.mark.parametrize(
-    ["span_metadata", "expected_condition"],
-    [
-        (
-            {
-                "0000": [
-                    {"start": "1", "end": "2"},
-                    {"start": "5", "end": "7"},
-                ]
-            },
-            [
-                And(
-                    [
-                        Condition(Column("profiler_id"), Op.EQ, "0000"),
-                        Or(
-                            [
-                                And(
-                                    [
-                                        Condition(Column("end_timestamp"), Op.GTE, "1"),
-                                        Condition(Column("start_timestamp"), Op.LT, "2"),
-                                    ]
-                                ),
-                                And(
-                                    [
-                                        Condition(Column("end_timestamp"), Op.GTE, "5"),
-                                        Condition(Column("start_timestamp"), Op.LT, "7"),
-                                    ]
-                                ),
-                            ]
-                        ),  # end Or
-                    ]
-                )
-            ],  # end And
-        ),
-        (
-            {
-                "1111": [
-                    {"start": "1", "end": "2"},
-                ]
-            },
-            [
-                And(
-                    [
-                        Condition(Column("profiler_id"), Op.EQ, "1111"),
-                        And(
-                            [
-                                Condition(Column("end_timestamp"), Op.GTE, "1"),
-                                Condition(Column("start_timestamp"), Op.LT, "2"),
-                            ]
-                        ),
-                    ]
-                )
-            ],  # end And
-        ),
-        (
-            {
-                "1111": [
-                    {"start": "1", "end": "2"},
-                ],
-                "2222": [
-                    {"start": "1", "end": "2"},
-                ],
-            },
-            [
-                Or(
-                    [
-                        And(
-                            [
-                                Condition(Column("profiler_id"), Op.EQ, "1111"),
-                                And(
-                                    [
-                                        Condition(Column("end_timestamp"), Op.GTE, "1"),
-                                        Condition(Column("start_timestamp"), Op.LT, "2"),
-                                    ]
-                                ),
-                            ]
-                        ),
-                        And(
-                            [
-                                Condition(Column("profiler_id"), Op.EQ, "2222"),
-                                And(
-                                    [
-                                        Condition(Column("end_timestamp"), Op.GTE, "1"),
-                                        Condition(Column("start_timestamp"), Op.LT, "2"),
-                                    ]
-                                ),
-                            ]
-                        ),
-                    ]
-                )
-            ],
-        ),
-    ],
-)
-def test_get_chunk_snuba_conditions_from_spans_metadata(span_metadata, expected_condition):
-    condition = get_chunk_snuba_conditions_from_spans_metadata(span_metadata)
-    assert condition == expected_condition
diff --git a/tests/sentry/receivers/outbox/test_control.py b/tests/sentry/receivers/outbox/test_control.py
index 7af298ddb6541a..92c2b5f67328a0 100644
--- a/tests/sentry/receivers/outbox/test_control.py
+++ b/tests/sentry/receivers/outbox/test_control.py
@@ -65,3 +65,11 @@ def test_process_sentry_app_updates(self, mock_caching):
             key=f"app_service.get_by_application_id:{sentry_app.application_id}",
             region_name=_TEST_REGION.name,
         )
+        mock_caching.clear_key.assert_any_call(
+            key=f"app_service.get_installed_for_organization:{org.id}",
+            region_name=_TEST_REGION.name,
+        )
+        mock_caching.clear_key.assert_any_call(
+            key=f"app_service.get_installed_for_organization:{org_two.id}",
+            region_name=_TEST_REGION.name,
+        )
diff --git a/tests/sentry/receivers/test_onboarding.py b/tests/sentry/receivers/test_onboarding.py
index 3f64ac15794f4c..8bd7f5dbc51942 100644
--- a/tests/sentry/receivers/test_onboarding.py
+++ b/tests/sentry/receivers/test_onboarding.py
@@ -87,9 +87,9 @@ def test_event_processed(self):
                 "platform": "javascript",
                 "timestamp": before_now(minutes=1).isoformat(),
                 "tags": {
-                    "sentry:release": "e1b5d1900526feaf20fe2bc9cad83d392136030a",
                     "sentry:user": "id:41656",
                 },
+                "release": "e1b5d1900526feaf20fe2bc9cad83d392136030a",
                 "user": {"ip_address": "0.0.0.0", "id": "41656", "email": "test@example.com"},
                 "exception": {
                     "values": [
@@ -414,9 +414,9 @@ def test_onboarding_complete(self, record_analytics):
                 "platform": "javascript",
                 "timestamp": before_now(minutes=1).isoformat(),
                 "tags": {
-                    "sentry:release": "e1b5d1900526feaf20fe2bc9cad83d392136030a",
                     "sentry:user": "id:41656",
                 },
+                "release": "e1b5d1900526feaf20fe2bc9cad83d392136030a",
                 "user": {"ip_address": "0.0.0.0", "id": "41656", "email": "test@example.com"},
                 "exception": {
                     "values": [
@@ -947,3 +947,37 @@ def test_source_code_management_added(self, record_analytics):
                 id=integration_id,
                 provider="github",
             )
+
+    def test_second_platform_complete(self):
+        with self.feature("organizations:quick-start-updates"):
+            now = timezone.now()
+            project = self.create_project(first_event=now)
+            second_project = self.create_project(first_event=now)
+
+            project_created.send(project=project, user=self.user, sender=type(project))
+            project_created.send(
+                project=second_project, user=self.user, sender=type(second_project)
+            )
+
+            task = OrganizationOnboardingTask.objects.get(
+                organization=self.organization,
+                task=OnboardingTask.SECOND_PLATFORM,
+                status=OnboardingTaskStatus.COMPLETE,
+            )
+            assert task is not None
+
+    def test_release_received_through_transaction_event(self):
+        project = self.create_project()
+
+        event_data = load_data("transaction")
+        event_data.update({"release": "my-first-release", "tags": []})
+
+        event = self.store_event(data=event_data, project_id=project.id)
+        event_processed.send(project=project, event=event, sender=type(project))
+
+        task = OrganizationOnboardingTask.objects.get(
+            organization=project.organization,
+            task=OnboardingTask.RELEASE_TRACKING,
+            status=OnboardingTaskStatus.COMPLETE,
+        )
+        assert task is not None
diff --git a/tests/sentry/relay/snapshots/test_config/test_get_project_config/REGION.pysnap b/tests/sentry/relay/snapshots/test_config/test_get_project_config/REGION.pysnap
index 91ae21e863075a..f5deb3a212136d 100644
--- a/tests/sentry/relay/snapshots/test_config/test_get_project_config/REGION.pysnap
+++ b/tests/sentry/relay/snapshots/test_config/test_get_project_config/REGION.pysnap
@@ -83,17 +83,17 @@ config:
       patterns:
       - '*healthcheck*'
       - '*heartbeat*'
-      - '*/health'
-      - '*/healthy'
-      - '*/healthz'
-      - '*/_health'
-      - '*/\[_health\]'
-      - '*/live'
-      - '*/livez'
-      - '*/ready'
-      - '*/readyz'
-      - '*/ping'
-      - '*/up'
+      - '*/health{/,}'
+      - '*/healthy{/,}'
+      - '*/healthz{/,}'
+      - '*/_health{/,}'
+      - '*/\[_health\]{/,}'
+      - '*/live{/,}'
+      - '*/livez{/,}'
+      - '*/ready{/,}'
+      - '*/readyz{/,}'
+      - '*/ping{/,}'
+      - '*/up{/,}'
   groupingConfig:
     enhancements: KLUv_SAYwQAAkwKRs25ld3N0eWxlOjIwMjMtMDEtMTGQ
     id: newstyle:2023-01-11
diff --git a/tests/sentry/rules/conditions/test_event_attribute.py b/tests/sentry/rules/conditions/test_event_attribute.py
index 8bcf50e1533803..dd4b1858ba3980 100644
--- a/tests/sentry/rules/conditions/test_event_attribute.py
+++ b/tests/sentry/rules/conditions/test_event_attribute.py
@@ -64,12 +64,7 @@ def get_event(self, **kwargs):
                 "unreal": {
                     "crash_type": "crash",
                 },
-                "os": {
-                    "distribution": {
-                        "name": "ubuntu",
-                        "version": "22.04",
-                    }
-                },
+                "os": {"distribution_name": "ubuntu", "distribution_version": "22.04"},
             },
             "threads": {
                 "values": [
@@ -824,24 +819,21 @@ def test_app_in_foreground(self):
         )
         self.assertDoesNotPass(rule, event)
 
-    def test_os_distribution_only(self):
-        event = self.get_event()
-        rule = self.get_rule(
-            data={"match": MatchType.EQUAL, "attribute": "os.distribution", "value": "irrelevant"}
-        )
-        self.assertDoesNotPass(rule, event)
-
     def test_os_distribution_name_and_version(self):
         event = self.get_event()
         rule = self.get_rule(
-            data={"match": MatchType.EQUAL, "attribute": "os.distribution.name", "value": "ubuntu"}
+            data={
+                "match": MatchType.EQUAL,
+                "attribute": "os.distribution_name",
+                "value": "ubuntu",
+            }
         )
         self.assertPasses(rule, event)
 
         rule = self.get_rule(
             data={
                 "match": MatchType.EQUAL,
-                "attribute": "os.distribution.version",
+                "attribute": "os.distribution_version",
                 "value": "22.04",
             }
         )
@@ -850,7 +842,7 @@ def test_os_distribution_name_and_version(self):
         rule = self.get_rule(
             data={
                 "match": MatchType.EQUAL,
-                "attribute": "os.distribution.name",
+                "attribute": "os.distribution_name",
                 "value": "slackware",
             }
         )
@@ -859,7 +851,7 @@ def test_os_distribution_name_and_version(self):
         rule = self.get_rule(
             data={
                 "match": MatchType.EQUAL,
-                "attribute": "os.distribution.version",
+                "attribute": "os.distribution_version",
                 "value": "20.04",
             }
         )
diff --git a/tests/sentry/rules/processing/test_delayed_processing.py b/tests/sentry/rules/processing/test_delayed_processing.py
index de9e4f3f95fa5d..b65d5d9a248198 100644
--- a/tests/sentry/rules/processing/test_delayed_processing.py
+++ b/tests/sentry/rules/processing/test_delayed_processing.py
@@ -452,8 +452,7 @@ def test_invalid_project_id(self):
         assert len(result) == 0
 
     def test_empty_group_ids(self):
-        parsed_data: dict[tuple[str, str], dict[str, str]] = {}
-        result = get_group_to_groupevent(parsed_data, self.project.id, set())
+        result = get_group_to_groupevent({}, self.project.id, set())
         assert len(result) == 0
 
     def test_invalid_group_ids(self):
@@ -469,7 +468,7 @@ def setUp(self):
 
         self.rule1: Rule = self.create_project_rule(
             project=self.project,
-            condition_match=[TEST_RULE_SLOW_CONDITION],
+            condition_data=[TEST_RULE_SLOW_CONDITION],
             environment_id=self.environment.id,
         )
         self.group1: Group = self.create_group(self.project)
@@ -557,7 +556,7 @@ def test_empty_input(self):
     def test_multiple_rules_and_groups(self, mock_passes):
         rule2 = self.create_project_rule(
             project=self.project,
-            condition_match=[TEST_RULE_SLOW_CONDITION],
+            condition_data=[TEST_RULE_SLOW_CONDITION],
             environment_id=self.environment.id,
         )
         self.rules_to_slow_conditions[rule2].append(TEST_RULE_SLOW_CONDITION)
@@ -642,19 +641,18 @@ def test_parse_rulegroup(self):
 
         result = parse_rulegroup_to_event_data(input_data)
         assert result == {
-            (str(self.rule.id), str(self.group.id)): self.event_data,
-            (str(self.rule_two.id), str(self.group_two.id)): self.event_data,
+            (self.rule.id, self.group.id): self.event_data,
+            (self.rule_two.id, self.group_two.id): self.event_data,
         }
 
     def test_parse_rulegroup_empty(self):
-        input_data: dict[str, str] = {}
-        result = parse_rulegroup_to_event_data(input_data)
+        result = parse_rulegroup_to_event_data({})
         assert result == {}
 
     def test_parse_rulegroup_basic(self):
         input_data = {f"{self.rule.id}:{self.group.id}": json.dumps(self.event_data)}
         result = parse_rulegroup_to_event_data(input_data)
-        assert result == {(str(self.rule.id), str(self.group.id)): self.event_data}
+        assert result == {(self.rule.id, self.group.id): self.event_data}
 
     def test_parse_rulegroup_invalid_json(self):
         input_data = {f"{self.rule.id}:{self.group.id}": "}"}
@@ -694,7 +692,7 @@ def setUp(self):
 
         self.rule1 = self.create_project_rule(
             project=self.project,
-            condition_match=[self.event_frequency_condition],
+            condition_data=[self.event_frequency_condition],
             environment_id=self.environment.id,
         )
         self.event1 = self.create_event(
@@ -705,7 +703,7 @@ def setUp(self):
         self.group1 = self.event1.group
 
         self.rule2 = self.create_project_rule(
-            project=self.project, condition_match=[self.user_frequency_condition]
+            project=self.project, condition_data=[self.user_frequency_condition]
         )
         self.event2 = self.create_event(
             self.project.id, FROZEN_TIME, "group-2", self.environment.name
@@ -725,7 +723,7 @@ def setUp(self):
 
         self.rule3 = self.create_project_rule(
             project=self.project_two,
-            condition_match=[self.event_frequency_condition2],
+            condition_data=[self.event_frequency_condition2],
             environment_id=self.environment2.id,
         )
         self.event3 = self.create_event(
@@ -738,7 +736,7 @@ def setUp(self):
         self.group3 = self.event3.group
 
         self.rule4 = self.create_project_rule(
-            project=self.project_two, condition_match=[event_frequency_percent_condition]
+            project=self.project_two, condition_data=[event_frequency_percent_condition]
         )
         self.event4 = self.create_event(self.project_two.id, FROZEN_TIME, "group-4")
         assert self.event4.group
@@ -787,13 +785,13 @@ def test_get_condition_groups(self):
         env3 = self.create_environment(project=project_three)
         rule_1 = self.create_project_rule(
             project=project_three,
-            condition_match=[self.event_frequency_condition],
+            condition_data=[self.event_frequency_condition],
             filter_match=[self.tag_filter],
             environment_id=env3.id,
         )
         rule_2 = self.create_project_rule(
             project=project_three,
-            condition_match=[self.event_frequency_condition2],
+            condition_data=[self.event_frequency_condition2],
             environment_id=env3.id,
         )
         rules_to_groups = {rule_1.id: {1, 2, 3}, rule_2.id: {3, 4, 5}}
@@ -861,7 +859,7 @@ def test_apply_delayed_issue_platform_event(self):
         self._push_base_events()
         rule5 = self.create_project_rule(
             project=self.project,
-            condition_match=[self.event_frequency_condition2],
+            condition_data=[self.event_frequency_condition2],
         )
         tags = [["foo", "guux"], ["sentry:release", "releaseme"]]
         contexts = {"trace": {"trace_id": "b" * 32, "span_id": "c" * 16, "op": ""}}
@@ -902,7 +900,7 @@ def test_apply_delayed_snoozed_rule(self):
         self._push_base_events()
         rule5 = self.create_project_rule(
             project=self.project,
-            condition_match=[self.event_frequency_condition2],
+            condition_data=[self.event_frequency_condition2],
             environment_id=self.environment.id,
         )
         self.snooze_rule(owner_id=self.user.id, rule=rule5)
@@ -934,7 +932,7 @@ def test_apply_delayed_same_condition_diff_value(self):
         self._push_base_events()
         rule5 = self.create_project_rule(
             project=self.project,
-            condition_match=[self.event_frequency_condition2],
+            condition_data=[self.event_frequency_condition2],
             environment_id=self.environment.id,
         )
         event5 = self.create_event(self.project.id, FROZEN_TIME, "group-5", self.environment.name)
@@ -967,7 +965,7 @@ def test_apply_delayed_same_condition_diff_interval(self):
         self._push_base_events()
         diff_interval_rule = self.create_project_rule(
             project=self.project,
-            condition_match=[self.event_frequency_condition3],
+            condition_data=[self.event_frequency_condition3],
             environment_id=self.environment.id,
         )
         event5 = self.create_event(self.project.id, FROZEN_TIME, "group-5", self.environment.name)
@@ -1000,7 +998,7 @@ def test_apply_delayed_same_condition_diff_env(self):
         environment3 = self.create_environment(project=self.project)
         diff_env_rule = self.create_project_rule(
             project=self.project,
-            condition_match=[self.event_frequency_condition],
+            condition_data=[self.event_frequency_condition],
             environment_id=environment3.id,
         )
         event5 = self.create_event(self.project.id, FROZEN_TIME, "group-5", environment3.name)
@@ -1038,7 +1036,7 @@ def test_apply_delayed_two_rules_one_fires(self):
         }
         no_fire_rule = self.create_project_rule(
             project=self.project,
-            condition_match=[high_event_frequency_condition],
+            condition_data=[high_event_frequency_condition],
             environment_id=self.environment.id,
         )
         event5 = self.create_event(self.project.id, FROZEN_TIME, "group-5", self.environment.name)
@@ -1069,7 +1067,7 @@ def test_apply_delayed_action_match_all(self):
         self._push_base_events()
         two_conditions_match_all_rule = self.create_project_rule(
             project=self.project,
-            condition_match=[self.event_frequency_condition, self.user_frequency_condition],
+            condition_data=[self.event_frequency_condition, self.user_frequency_condition],
             environment_id=self.environment.id,
         )
         event5 = self.create_event(self.project.id, FROZEN_TIME, "group-5", self.environment.name)
@@ -1090,7 +1088,7 @@ def test_apply_delayed_action_match_all(self):
         )
         condition_wont_pass_rule = self.create_project_rule(
             project=self.project,
-            condition_match=[self.create_event_frequency_condition(value=100)],
+            condition_data=[self.create_event_frequency_condition(value=100)],
             environment_id=self.environment.id,
         )
         self.push_to_hash(
@@ -1260,13 +1258,13 @@ def test_apply_delayed_shared_condition_diff_filter(self):
         buffer.backend.push_to_sorted_set(key=PROJECT_ID_BUFFER_LIST_KEY, value=project_three.id)
         rule_1 = self.create_project_rule(
             project=project_three,
-            condition_match=[self.event_frequency_condition],
+            condition_data=[self.event_frequency_condition],
             filter_match=[self.tag_filter],
             environment_id=env3.id,
         )
         rule_2 = self.create_project_rule(
             project=project_three,
-            condition_match=[self.event_frequency_condition],
+            condition_data=[self.event_frequency_condition],
             environment_id=env3.id,
         )
         event1 = self.create_event(
@@ -1315,7 +1313,7 @@ def test_apply_delayed_percent_comparison_condition_interval(self):
         )
         percent_comparison_rule = self.create_project_rule(
             project=self.project,
-            condition_match=[percent_condition],
+            condition_data=[percent_condition],
         )
 
         incorrect_interval_time = FROZEN_TIME - timedelta(hours=1, minutes=30)
@@ -1362,7 +1360,7 @@ def test_apply_delayed_event_frequency_percent_comparison_interval(self):
         )
         percent_comparison_rule = self.create_project_rule(
             project=self.project,
-            condition_match=[percent_condition],
+            condition_data=[percent_condition],
         )
 
         event5 = self.create_event(self.project.id, FROZEN_TIME, "group-5")
@@ -1391,7 +1389,7 @@ def _setup_count_percent_test(self) -> int:
         )
         self.fires_percent_rule = self.create_project_rule(
             project=self.project,
-            condition_match=[fires_percent_condition],
+            condition_data=[fires_percent_condition],
             environment_id=self.environment.id,
         )
 
@@ -1401,7 +1399,7 @@ def _setup_count_percent_test(self) -> int:
         )
         self.fires_count_rule = self.create_project_rule(
             project=self.project,
-            condition_match=[fires_count_condition],
+            condition_data=[fires_count_condition],
             environment_id=self.environment.id,
         )
         skips_count_condition = self.create_event_frequency_condition(
@@ -1410,7 +1408,7 @@ def _setup_count_percent_test(self) -> int:
         )
         self.skips_count_rule = self.create_project_rule(
             project=self.project,
-            condition_match=[skips_count_condition],
+            condition_data=[skips_count_condition],
             environment_id=self.environment.id,
         )
 
diff --git a/tests/sentry/search/eap/test_spans.py b/tests/sentry/search/eap/test_spans.py
index acf832dc456671..e793689306285c 100644
--- a/tests/sentry/search/eap/test_spans.py
+++ b/tests/sentry/search/eap/test_spans.py
@@ -3,6 +3,7 @@
     AttributeAggregation,
     AttributeKey,
     AttributeValue,
+    ExtrapolationMode,
     Function,
     IntArray,
     StrArray,
@@ -220,8 +221,8 @@ def test_query_with_or_and_brackets(self):
         )
 
     def test_empty_query(self):
-        query = self.resolver.resolve_query("")
-        assert query is None
+        assert self.resolver.resolve_query("") is None
+        assert self.resolver.resolve_query(None) is None
 
 
 class SearchResolverColumnTest(TestCase):
@@ -288,6 +289,7 @@ def test_sum_function(self):
             aggregate=Function.FUNCTION_SUM,
             key=AttributeKey(name="sentry.exclusive_time_ms", type=AttributeKey.Type.TYPE_FLOAT),
             label="sum(span.self_time)",
+            extrapolation_mode=ExtrapolationMode.EXTRAPOLATION_MODE_SAMPLE_WEIGHTED,
         )
         assert virtual_context is None
 
@@ -297,6 +299,7 @@ def test_sum_default_argument(self):
             aggregate=Function.FUNCTION_SUM,
             key=AttributeKey(name="sentry.duration_ms", type=AttributeKey.Type.TYPE_FLOAT),
             label="sum()",
+            extrapolation_mode=ExtrapolationMode.EXTRAPOLATION_MODE_SAMPLE_WEIGHTED,
         )
         assert virtual_context is None
 
@@ -306,6 +309,7 @@ def test_function_alias(self):
             aggregate=Function.FUNCTION_SUM,
             key=AttributeKey(name="sentry.duration_ms", type=AttributeKey.Type.TYPE_FLOAT),
             label="test",
+            extrapolation_mode=ExtrapolationMode.EXTRAPOLATION_MODE_SAMPLE_WEIGHTED,
         )
         assert virtual_context is None
 
@@ -315,6 +319,7 @@ def test_count(self):
             aggregate=Function.FUNCTION_COUNT,
             key=AttributeKey(name="sentry.duration_ms", type=AttributeKey.Type.TYPE_FLOAT),
             label="count()",
+            extrapolation_mode=ExtrapolationMode.EXTRAPOLATION_MODE_SAMPLE_WEIGHTED,
         )
         assert virtual_context is None
         resolved_column, virtual_context = self.resolver.resolve_column("count(span.duration)")
@@ -322,6 +327,7 @@ def test_count(self):
             aggregate=Function.FUNCTION_COUNT,
             key=AttributeKey(name="sentry.duration_ms", type=AttributeKey.Type.TYPE_FLOAT),
             label="count(span.duration)",
+            extrapolation_mode=ExtrapolationMode.EXTRAPOLATION_MODE_SAMPLE_WEIGHTED,
         )
         assert virtual_context is None
 
@@ -331,6 +337,7 @@ def test_p50(self):
             aggregate=Function.FUNCTION_P50,
             key=AttributeKey(name="sentry.duration_ms", type=AttributeKey.Type.TYPE_FLOAT),
             label="p50()",
+            extrapolation_mode=ExtrapolationMode.EXTRAPOLATION_MODE_SAMPLE_WEIGHTED,
         )
         assert virtual_context is None
 
@@ -340,5 +347,28 @@ def test_count_unique(self):
             aggregate=Function.FUNCTION_UNIQ,
             key=AttributeKey(name="sentry.action", type=AttributeKey.Type.TYPE_STRING),
             label="count_unique(span.action)",
+            extrapolation_mode=ExtrapolationMode.EXTRAPOLATION_MODE_SAMPLE_WEIGHTED,
         )
         assert virtual_context is None
+
+    def test_resolver_cache_attribute(self):
+        self.resolver.resolve_columns(["span.op"])
+        assert "span.op" in self.resolver._resolved_attribute_cache
+
+        project_column, project_context = self.resolver.resolve_column("project")
+        # Override the cache so we can confirm its being used
+        self.resolver._resolved_attribute_cache["span.op"] = project_column, project_context  # type: ignore[assignment]
+
+        # If we resolve op again, we should get the project context and column instead
+        resolved_column, virtual_context = self.resolver.resolve_column("span.op")
+        assert (resolved_column, virtual_context) == (project_column, project_context)
+
+    def test_resolver_cache_function(self):
+        self.resolver.resolve_columns(["count()"])
+        assert "count()" in self.resolver._resolved_function_cache
+
+        p95_column, p95_context = self.resolver.resolve_column("p95(span.duration) as foo")
+        self.resolver._resolved_function_cache["count()"] = p95_column, p95_context  # type: ignore[assignment]
+
+        resolved_column, virtual_context = self.resolver.resolve_column("count()")
+        assert (resolved_column, virtual_context) == (p95_column, p95_context)
diff --git a/tests/sentry/search/events/builder/test_profile_functions_metrics.py b/tests/sentry/search/events/builder/test_profile_functions_metrics.py
deleted file mode 100644
index 712e0e38bee336..00000000000000
--- a/tests/sentry/search/events/builder/test_profile_functions_metrics.py
+++ /dev/null
@@ -1,99 +0,0 @@
-from datetime import datetime, timedelta, timezone
-
-import pytest
-from snuba_sdk.column import Column
-from snuba_sdk.conditions import Condition, Op
-from snuba_sdk.function import Function
-
-from sentry.search.events.builder.profile_functions_metrics import (
-    ProfileFunctionsMetricsQueryBuilder,
-)
-from sentry.testutils.factories import Factories
-from sentry.testutils.pytest.fixtures import django_db_all
-
-pytestmark = pytest.mark.sentry_metrics
-
-
-@pytest.fixture
-def now():
-    return datetime(2022, 10, 31, 0, 0, tzinfo=timezone.utc)
-
-
-@pytest.fixture
-def today(now):
-    return now.replace(hour=0, minute=0, second=0, microsecond=0)
-
-
-@pytest.fixture
-def params(now, today):
-    organization = Factories.create_organization()
-    team = Factories.create_team(organization=organization)
-    project1 = Factories.create_project(organization=organization, teams=[team])
-    project2 = Factories.create_project(organization=organization, teams=[team])
-
-    user = Factories.create_user()
-    Factories.create_team_membership(team=team, user=user)
-
-    return {
-        "start": now - timedelta(days=7),
-        "end": now - timedelta(seconds=1),
-        "project_id": [project1.id, project2.id],
-        "project_objects": [project1, project2],
-        "organization_id": organization.id,
-        "user_id": user.id,
-        "team_id": [team.id],
-    }
-
-
-@pytest.mark.parametrize(
-    "search,condition",
-    [
-        pytest.param(
-            'package:""',
-            Condition(
-                Function("has", parameters=[Column("tags.key"), 9223372036854776075]), Op("!="), 1
-            ),
-            id="empty package",
-            marks=pytest.mark.querybuilder,
-        ),
-        pytest.param(
-            '!package:""',
-            Condition(
-                Function("has", parameters=[Column("tags.key"), 9223372036854776075]), Op("="), 1
-            ),
-            id="not empty package",
-        ),
-        pytest.param(
-            'function:""',
-            Condition(
-                Function("has", parameters=[Column("tags.key"), 9223372036854776074]), Op("!="), 1
-            ),
-            id="empty function",
-        ),
-        pytest.param(
-            '!function:""',
-            Condition(
-                Function("has", parameters=[Column("tags.key"), 9223372036854776074]), Op("="), 1
-            ),
-            id="not empty function",
-        ),
-        pytest.param(
-            "fingerprint:123",
-            Condition(Column("tags[9223372036854776076]"), Op("="), "123"),
-            id="fingerprint",
-        ),
-        pytest.param(
-            "!fingerprint:123",
-            Condition(Column("tags[9223372036854776076]"), Op("!="), "123"),
-            id="not fingerprint",
-        ),
-    ],
-)
-@django_db_all
-def test_where(params, search, condition):
-    builder = ProfileFunctionsMetricsQueryBuilder(
-        params,
-        query=search,
-        selected_columns=["count()"],
-    )
-    assert condition in builder.where
diff --git a/tests/sentry/seer/similarity/test_utils.py b/tests/sentry/seer/similarity/test_utils.py
index 2bbe76601e432f..966cdc0593732d 100644
--- a/tests/sentry/seer/similarity/test_utils.py
+++ b/tests/sentry/seer/similarity/test_utils.py
@@ -3,14 +3,20 @@
 from typing import Any, Literal, cast
 from uuid import uuid1
 
+import pytest
+
 from sentry.eventstore.models import Event
 from sentry.seer.similarity.utils import (
     BASE64_ENCODED_PREFIXES,
+    MAX_FRAME_COUNT,
     SEER_ELIGIBLE_PLATFORMS,
+    ReferrerOptions,
+    TooManyOnlySystemFramesException,
     _is_snipped_context_line,
     event_content_is_seer_eligible,
     filter_null_from_string,
     get_stacktrace_string,
+    get_stacktrace_string_with_metrics,
 )
 from sentry.testutils.cases import TestCase
 
@@ -327,14 +333,14 @@ class GetStacktraceStringTest(TestCase):
                                                 "name": None,
                                                 "contributes": True,
                                                 "hint": None,
-                                                "values": [],
+                                                "values": ["module"],
                                             },
                                             {
                                                 "id": "filename",
                                                 "name": None,
                                                 "contributes": True,
                                                 "hint": None,
-                                                "values": [],
+                                                "values": ["filename"],
                                             },
                                             {
                                                 "id": "function",
@@ -670,7 +676,7 @@ def test_chained_too_many_frames_minified_js_frame_limit(self):
             )
 
     def test_chained_too_many_exceptions(self):
-        """Test that we restrict number of chained exceptions to 30."""
+        """Test that we restrict number of chained exceptions to MAX_FRAME_COUNT."""
         data_chained_exception = copy.deepcopy(self.CHAINED_APP_DATA)
         data_chained_exception["app"]["component"]["values"][0]["values"] = [
             self.create_exception(
@@ -678,16 +684,16 @@ def test_chained_too_many_exceptions(self):
                 exception_value=f"exception {i} message!",
                 frames=self.create_frames(num_frames=1, context_line_factory=lambda i: f"line {i}"),
             )
-            for i in range(1, 32)
+            for i in range(1, MAX_FRAME_COUNT + 2)
         ]
         stacktrace_str = get_stacktrace_string(data_chained_exception)
-        for i in range(2, 32):
+        for i in range(2, MAX_FRAME_COUNT + 2):
             assert f"exception {i} message!" in stacktrace_str
         assert "exception 1 message!" not in stacktrace_str
 
     def test_thread(self):
         stacktrace_str = get_stacktrace_string(self.MOBILE_THREAD_DATA)
-        assert stacktrace_str == 'File "", function TestHandler'
+        assert stacktrace_str == 'File "filename", function TestHandler'
 
     def test_system(self):
         data_system = copy.deepcopy(self.BASE_APP_DATA)
@@ -710,9 +716,59 @@ def test_no_app_no_system(self):
         stacktrace_str = get_stacktrace_string(data)
         assert stacktrace_str == ""
 
-    def test_over_30_contributing_frames(self):
-        """Check that when there are over 30 contributing frames, the last 30 are included."""
+    def test_too_many_system_frames_single_exception(self):
+        data_system = copy.deepcopy(self.BASE_APP_DATA)
+        data_system["system"] = data_system.pop("app")
+        data_system["system"]["component"]["values"][0]["values"][0][
+            "values"
+        ] += self.create_frames(MAX_FRAME_COUNT + 1, True)
 
+        with pytest.raises(TooManyOnlySystemFramesException):
+            get_stacktrace_string(data_system, platform="java")
+
+    def test_too_many_system_frames_single_exception_invalid_platform(self):
+        data_system = copy.deepcopy(self.BASE_APP_DATA)
+        data_system["system"] = data_system.pop("app")
+        data_system["system"]["component"]["values"][0]["values"][0][
+            "values"
+        ] += self.create_frames(MAX_FRAME_COUNT + 1, True)
+
+        stacktrace_string = get_stacktrace_string(data_system, "python")
+        assert stacktrace_string is not None and stacktrace_string != ""
+
+    def test_too_many_system_frames_chained_exception(self):
+        data_system = copy.deepcopy(self.CHAINED_APP_DATA)
+        data_system["system"] = data_system.pop("app")
+        # Split MAX_FRAME_COUNT across the two exceptions
+        data_system["system"]["component"]["values"][0]["values"][0]["values"][0][
+            "values"
+        ] += self.create_frames(MAX_FRAME_COUNT // 2, True)
+        data_system["system"]["component"]["values"][0]["values"][1]["values"][0][
+            "values"
+        ] += self.create_frames(MAX_FRAME_COUNT // 2, True)
+
+        with pytest.raises(TooManyOnlySystemFramesException):
+            get_stacktrace_string(data_system, platform="java")
+
+    def test_too_many_system_frames_chained_exception_invalid_platform(self):
+        data_system = copy.deepcopy(self.CHAINED_APP_DATA)
+        data_system["system"] = data_system.pop("app")
+        # Split MAX_FRAME_COUNT across the two exceptions
+        data_system["system"]["component"]["values"][0]["values"][0]["values"][0][
+            "values"
+        ] += self.create_frames(MAX_FRAME_COUNT // 2, True)
+        data_system["system"]["component"]["values"][0]["values"][1]["values"][0][
+            "values"
+        ] += self.create_frames(MAX_FRAME_COUNT // 2, True)
+
+        stacktrace_string = get_stacktrace_string(data_system, "python")
+        assert stacktrace_string is not None and stacktrace_string != ""
+
+    def test_too_many_in_app_contributing_frames(self):
+        """
+        Check that when there are over MAX_FRAME_COUNT contributing frames, the last MAX_FRAME_COUNT
+        is included.
+        """
         data_frames = copy.deepcopy(self.BASE_APP_DATA)
         # Create 30 contributing frames, 1-20 -> last 10 should be included
         data_frames["app"]["component"]["values"][0]["values"][0]["values"] = self.create_frames(
@@ -726,7 +782,7 @@ def test_over_30_contributing_frames(self):
         data_frames["app"]["component"]["values"][0]["values"][0]["values"] += self.create_frames(
             20, True, 41
         )
-        stacktrace_str = get_stacktrace_string(data_frames)
+        stacktrace_str = get_stacktrace_string(data_frames, "java")
 
         num_frames = 0
         for i in range(1, 11):
@@ -739,7 +795,7 @@ def test_over_30_contributing_frames(self):
         for i in range(41, 61):
             num_frames += 1
             assert ("test = " + str(i) + "!") in stacktrace_str
-        assert num_frames == 30
+        assert num_frames == MAX_FRAME_COUNT
 
     def test_too_many_frames_minified_js_frame_limit(self):
         """Test that we restrict fully-minified stacktraces to 20 frames, and all other stacktraces to 30 frames."""
@@ -784,6 +840,31 @@ def test_only_stacktrace_frames(self):
         stacktrace_str = get_stacktrace_string(self.ONLY_STACKTRACE)
         assert stacktrace_str == 'File "index.php", function \n    $server->emit($server->run());'
 
+    def test_replace_file_with_module(self):
+        exception = copy.deepcopy(self.BASE_APP_DATA)
+        # delete filename from the exception
+        del exception["app"]["component"]["values"][0]["values"][0]["values"][0]["values"][1]
+        stacktrace_string = get_stacktrace_string_with_metrics(
+            exception, "python", ReferrerOptions.INGEST
+        )
+        assert (
+            stacktrace_string
+            == 'ZeroDivisionError: division by zero\n  File "__main__", function divide_by_zero\n    divide = 1/0'
+        )
+
+    def test_no_filename_or_module(self):
+        exception = copy.deepcopy(self.BASE_APP_DATA)
+        # delete module from the exception
+        del exception["app"]["component"]["values"][0]["values"][0]["values"][0]["values"][0]
+        # delete filename from the exception
+        del exception["app"]["component"]["values"][0]["values"][0]["values"][0]["values"][0]
+        stacktrace_string = get_stacktrace_string(exception)
+        # It only includes the exception type and value because there's no filename or module
+        assert (
+            stacktrace_string
+            == 'ZeroDivisionError: division by zero\n  File "None", function divide_by_zero\n    divide = 1/0'
+        )
+
 
 class EventContentIsSeerEligibleTest(TestCase):
     def get_eligible_event_data(self) -> dict[str, Any]:
diff --git a/tests/sentry/sentry_apps/api/endpoints/test_sentry_apps.py b/tests/sentry/sentry_apps/api/endpoints/test_sentry_apps.py
index ffe2760e16bca2..ba18f4735755fe 100644
--- a/tests/sentry/sentry_apps/api/endpoints/test_sentry_apps.py
+++ b/tests/sentry/sentry_apps/api/endpoints/test_sentry_apps.py
@@ -41,6 +41,36 @@
 }
 
 
+class MockOrganizationRoles:
+    TEST_ORG_ROLES = [
+        {
+            "id": "alice",
+            "name": "Alice",
+            "desc": "In Wonderland",
+            "scopes": ["rabbit:follow"],
+        },
+        {
+            "id": "owner",
+            "name": "Owner",
+            "desc": "Minimal version of Owner",
+            "scopes": ["org:admin"],
+        },
+    ]
+
+    TEST_TEAM_ROLES = [
+        {"id": "alice", "name": "Alice", "desc": "In Wonderland"},
+    ]
+
+    def __init__(self):
+        from sentry.roles.manager import RoleManager
+
+        self.default_manager = RoleManager(self.TEST_ORG_ROLES, self.TEST_TEAM_ROLES)
+        self.organization_roles = self.default_manager.organization_roles
+
+    def get(self, x):
+        return self.organization_roles.get(x)
+
+
 class SentryAppsTest(APITestCase):
     endpoint = "sentry-api-0-sentry-apps"
 
@@ -343,6 +373,21 @@ def test_users_dont_see_internal_apps_outside_their_orgs(self):
         response = self.get_success_response(status_code=200)
         assert internal_app.uuid not in [a["uuid"] for a in response.data]
 
+    def test_billing_users_dont_see_apps(self):
+        mock_org_roles = MockOrganizationRoles()
+        with (patch("sentry.roles.organization_roles.get", mock_org_roles.get),):
+            alice = self.create_member(
+                user=self.create_user(), organization=self.organization, role="alice"
+            )
+            self.login_as(alice)
+
+            response = self.get_success_response(
+                qs_params={"status": "unpublished"}, status_code=200
+            )
+            assert response.status_code == 200
+            content = orjson.loads(response.content)
+            assert content == []
+
 
 @control_silo_test
 class SuperuserStaffPostSentryAppsTest(SentryAppsTest):
diff --git a/tests/sentry/sentry_apps/external_requests/test_issue_link_requester.py b/tests/sentry/sentry_apps/external_requests/test_issue_link_requester.py
index a098fc1f7a90d2..082a40e84cdd6c 100644
--- a/tests/sentry/sentry_apps/external_requests/test_issue_link_requester.py
+++ b/tests/sentry/sentry_apps/external_requests/test_issue_link_requester.py
@@ -27,7 +27,7 @@ def setUp(self):
         self.orm_install = self.create_sentry_app_installation(
             slug="foo", organization=self.org, user=self.user
         )
-        self.user = serialize_rpc_user(self.user)
+        self.rpc_user = serialize_rpc_user(self.user)
         self.install = app_service.get_many(filter=dict(installation_ids=[self.orm_install.id]))[0]
 
     @responses.activate
@@ -51,7 +51,7 @@ def test_makes_request(self):
             group=self.group,
             uri="/link-issue",
             fields=fields,
-            user=self.user,
+            user=self.rpc_user,
             action="create",
         ).run()
         assert result == {
@@ -101,7 +101,7 @@ def test_invalid_response_format(self):
                 group=self.group,
                 uri="/link-issue",
                 fields={},
-                user=self.user,
+                user=self.rpc_user,
                 action="create",
             ).run()
 
@@ -120,7 +120,7 @@ def test_500_response(self):
                 group=self.group,
                 uri="/link-issue",
                 fields={},
-                user=self.user,
+                user=self.rpc_user,
                 action="create",
             ).run()
 
diff --git a/tests/sentry/sentry_apps/external_requests/test_select_requester.py b/tests/sentry/sentry_apps/external_requests/test_select_requester.py
index 63a726515e5b58..45ad13df13145d 100644
--- a/tests/sentry/sentry_apps/external_requests/test_select_requester.py
+++ b/tests/sentry/sentry_apps/external_requests/test_select_requester.py
@@ -120,3 +120,66 @@ def test_500_response(self):
         assert len(requests) == 1
         assert requests[0]["response_code"] == 500
         assert requests[0]["event_type"] == "select_options.requested"
+
+    @responses.activate
+    def test_api_error_message(self):
+        responses.add(
+            method=responses.GET,
+            url=f"https://example.com/get-issues?installationId={self.install.uuid}&projectSlug={self.project.slug}",
+            body="Something failed",
+            status=500,
+        )
+
+        with pytest.raises(APIError) as exception_info:
+            SelectRequester(
+                install=self.install,
+                project_slug=self.project.slug,
+                uri="/get-issues",
+            ).run()
+        assert (
+            str(exception_info.value)
+            == f"Something went wrong while getting SelectFields from {self.sentry_app.slug}"
+        )
+
+    @responses.activate
+    def test_validation_error_message_validator(self):
+        uri = "/get-issues"
+
+        responses.add(
+            method=responses.GET,
+            url=f"https://example.com/get-issues?installationId={self.install.uuid}&projectSlug={self.project.slug}",
+            json={},
+            status=200,
+        )
+
+        with pytest.raises(ValidationError) as exception_info:
+            SelectRequester(
+                install=self.install,
+                project_slug=self.project.slug,
+                uri=uri,
+            ).run()
+
+        assert (
+            str(exception_info.value)
+            == f"Invalid response format for SelectField in {self.sentry_app.slug} from uri: {uri}"
+        )
+
+    @responses.activate
+    def test_validation_error_message_missing_field(self):
+        responses.add(
+            method=responses.GET,
+            url=f"https://example.com/get-issues?installationId={self.install.uuid}&projectSlug={self.project.slug}",
+            json=[{"bruh": "bruhhhhh"}],
+            status=200,
+        )
+
+        with pytest.raises(ValidationError) as exception_info:
+            SelectRequester(
+                install=self.install,
+                project_slug=self.project.slug,
+                uri="/get-issues",
+            ).run()
+
+        assert (
+            str(exception_info.value) == "Missing `value` or `label` in option data for SelectField"
+        )
diff --git a/tests/sentry/sentry_apps/models/test_sentryapp.py b/tests/sentry/sentry_apps/models/test_sentryapp.py
index 68a30e115aab66..98ca936c3630cc 100644
--- a/tests/sentry/sentry_apps/models/test_sentryapp.py
+++ b/tests/sentry/sentry_apps/models/test_sentryapp.py
@@ -4,10 +4,10 @@
 from sentry.models.apiapplication import ApiApplication
 from sentry.sentry_apps.models.sentry_app import SentryApp
 from sentry.testutils.cases import TestCase
-from sentry.testutils.silo import control_silo_test
+from sentry.testutils.silo import control_silo_test, create_test_regions
 
 
-@control_silo_test
+@control_silo_test(regions=create_test_regions("us", "eu"))
 class SentryAppTest(TestCase):
     def setUp(self):
         self.user = self.create_user()
@@ -81,6 +81,19 @@ def test_save_outbox_update(self):
 
         self.sentry_app.update(name="NoneDB")
         outboxes = ControlOutbox.objects.filter(category=OutboxCategory.SENTRY_APP_UPDATE).all()
-        assert len(outboxes) == 1
+        assert len(outboxes) == 2
         assert outboxes[0].shard_identifier == self.sentry_app.id
         assert outboxes[0].region_name
+
+    def test_regions_with_installations(self):
+        self.us_org = self.create_organization(name="us test name", region="us")
+        self.create_sentry_app_installation(
+            organization=self.us_org, slug=self.sentry_app.slug, prevent_token_exchange=True
+        )
+        assert self.sentry_app.regions_with_installations() == {"us"}
+
+        self.eu_org = self.create_organization(name="eu test name", region="eu")
+        self.create_sentry_app_installation(
+            organization=self.eu_org, slug=self.sentry_app.slug, prevent_token_exchange=True
+        )
+        assert self.sentry_app.regions_with_installations() == {"us", "eu"}
diff --git a/tests/sentry/sentry_apps/services/test_app_request.py b/tests/sentry/sentry_apps/services/test_app_request.py
new file mode 100644
index 00000000000000..03b07634a29bea
--- /dev/null
+++ b/tests/sentry/sentry_apps/services/test_app_request.py
@@ -0,0 +1,80 @@
+from sentry.sentry_apps.services.app_request import SentryAppRequestFilterArgs, app_request_service
+from sentry.testutils.cases import TestCase
+from sentry.testutils.factories import Factories
+from sentry.testutils.pytest.fixtures import django_db_all
+from sentry.testutils.silo import control_silo_test, create_test_regions
+from sentry.utils.sentry_apps import SentryAppWebhookRequestsBuffer
+
+
+@django_db_all(transaction=True)
+@control_silo_test(regions=create_test_regions("us"))
+class TestRegionApp(TestCase):
+    def setUp(self):
+        self.user = Factories.create_user()
+        self.org = Factories.create_organization(owner=self.user, region="us")
+        self.app = Factories.create_sentry_app(
+            name="demo-app",
+            user=self.user,
+            organization=self.org,
+            published=True,
+            schema={
+                "elements": [
+                    {
+                        "type": "alert-rule-trigger",
+                        "title": "go beep",
+                        "settings": {
+                            "type": "alert-rule-settings",
+                            "uri": "https://example.com/search/",
+                        },
+                    },
+                ]
+            },
+        )
+
+    def test_get_buffer_requests_for_region(self):
+        buffer = SentryAppWebhookRequestsBuffer(self.app)
+        buffer.add_request(
+            response_code=200,
+            org_id=self.org.id,
+            event="issue.assigned",
+            url=self.app.webhook_url,
+        )
+        requests = app_request_service.get_buffer_requests_for_region(
+            sentry_app_id=self.app.id, region_name="us"
+        )
+        assert requests and len(requests) == 1
+        assert requests[0].organization_id == self.org.id
+
+    def test_get_filtered_buffer_requests_for_region(self):
+        buffer = SentryAppWebhookRequestsBuffer(self.app)
+        buffer.add_request(
+            response_code=200,
+            org_id=self.org.id,
+            event="issue.assigned",
+            url=self.app.webhook_url,
+        )
+        buffer.add_request(
+            response_code=200,
+            org_id=self.org.id,
+            event="issue.resolved",
+            url=self.app.webhook_url,
+        )
+        filter: SentryAppRequestFilterArgs = {"event": "issue.assigned"}
+        requests = app_request_service.get_buffer_requests_for_region(
+            sentry_app_id=self.app.id, region_name="us", filter=filter
+        )
+        assert requests and len(requests) == 1
+        assert requests[0].organization_id == self.org.id
+
+    def test_empty_buffer(self):
+        requests = app_request_service.get_buffer_requests_for_region(
+            sentry_app_id=self.app.id, region_name="us"
+        )
+        assert requests == []
+
+    def test_invalid_app_id(self):
+        requests = app_request_service.get_buffer_requests_for_region(
+            sentry_app_id=-1,
+            region_name="us",
+        )
+        assert requests is None
diff --git a/tests/sentry/sentry_apps/tasks/test_sentry_apps.py b/tests/sentry/sentry_apps/tasks/test_sentry_apps.py
index e289f49e551279..d67795de2d9f2d 100644
--- a/tests/sentry/sentry_apps/tasks/test_sentry_apps.py
+++ b/tests/sentry/sentry_apps/tasks/test_sentry_apps.py
@@ -12,11 +12,14 @@
 
 from sentry import audit_log
 from sentry.api.serializers import serialize
+from sentry.api.serializers.rest_framework import convert_dict_key_case, snake_to_camel_case
 from sentry.constants import SentryAppStatus
+from sentry.eventstore.models import GroupEvent
 from sentry.eventstream.types import EventStreamEventType
 from sentry.integrations.models.utils import get_redis_key
 from sentry.integrations.notify_disable import notify_disable
 from sentry.integrations.request_buffer import IntegrationRequestBuffer
+from sentry.issues.ingest import save_issue_occurrence
 from sentry.models.activity import Activity
 from sentry.models.auditlogentry import AuditLogEntry
 from sentry.models.rule import Rule
@@ -28,6 +31,7 @@
     notify_sentry_app,
     process_resource_change_bound,
     send_alert_event,
+    send_alert_webhook,
     send_webhooks,
     workflow_notification,
 )
@@ -37,6 +41,7 @@
 from sentry.testutils.helpers import with_feature
 from sentry.testutils.helpers.datetime import before_now, freeze_time
 from sentry.testutils.helpers.eventprocessing import write_event_to_cache
+from sentry.testutils.helpers.options import override_options
 from sentry.testutils.outbox import outbox_runner
 from sentry.testutils.silo import assume_test_silo_mode_of, control_silo_test
 from sentry.testutils.skips import requires_snuba
@@ -46,6 +51,7 @@
 from sentry.utils import json
 from sentry.utils.http import absolute_uri
 from sentry.utils.sentry_apps import SentryAppWebhookRequestsBuffer
+from tests.sentry.issues.test_utils import OccurrenceTestMixin
 
 pytestmark = [requires_snuba]
 
@@ -92,7 +98,7 @@ def __init__(self):
 MockResponse404 = MockResponse({}, {}, "", False, 404, raiseException, None)
 
 
-class TestSendAlertEvent(TestCase):
+class TestSendAlertEvent(TestCase, OccurrenceTestMixin):
     def setUp(self):
         self.sentry_app = self.create_sentry_app(organization=self.organization)
         self.rule = Rule.objects.create(project=self.project, label="Issa Rule")
@@ -103,17 +109,36 @@ def setUp(self):
     @patch("sentry.utils.sentry_apps.webhooks.safe_urlopen")
     def test_no_sentry_app(self, safe_urlopen):
         event = self.store_event(data={}, project_id=self.project.id)
-        send_alert_event(event, self.rule, 9999)
+        assert event.group is not None
+        group_event = GroupEvent.from_event(event, event.group)
+        send_alert_event(group_event, self.rule, 9999)
+
+        assert not safe_urlopen.called
+
+    @patch("sentry.utils.sentry_apps.webhooks.safe_urlopen")
+    def test_no_sentry_app_for_send_alert_event_v2(self, safe_urlopen):
+        event = self.store_event(data={}, project_id=self.project.id)
+        assert event.group is not None
+        group_event = GroupEvent.from_event(event, event.group)
+        send_alert_webhook(
+            instance_id=group_event.event_id,
+            group_id=group_event.group_id,
+            occurrence_id=None,
+            rule=self.rule,
+            sentry_app_id=9999,
+        )
 
         assert not safe_urlopen.called
 
     @patch("sentry.utils.sentry_apps.webhooks.safe_urlopen")
     def test_no_sentry_app_in_future(self, safe_urlopen):
         event = self.store_event(data={}, project_id=self.project.id)
+        assert event.group is not None
+        group_event = GroupEvent.from_event(event, event.group)
         rule_future = RuleFuture(rule=self.rule, kwargs={})
 
         with self.tasks():
-            notify_sentry_app(event, [rule_future])
+            notify_sentry_app(group_event, [rule_future])
 
         assert not safe_urlopen.called
 
@@ -121,10 +146,12 @@ def test_no_sentry_app_in_future(self, safe_urlopen):
     def test_no_installation(self, safe_urlopen):
         sentry_app = self.create_sentry_app(organization=self.organization)
         event = self.store_event(data={}, project_id=self.project.id)
+        assert event.group is not None
+        group_event = GroupEvent.from_event(event, event.group)
         rule_future = RuleFuture(rule=self.rule, kwargs={"sentry_app": sentry_app})
 
         with self.tasks():
-            notify_sentry_app(event, [rule_future])
+            notify_sentry_app(group_event, [rule_future])
 
         assert not safe_urlopen.called
 
@@ -133,14 +160,14 @@ def test_send_alert_event(self, safe_urlopen):
         event = self.store_event(data={}, project_id=self.project.id)
         assert event.group is not None
         group = event.group
+        group_event = GroupEvent.from_event(event, group)
         rule_future = RuleFuture(rule=self.rule, kwargs={"sentry_app": self.sentry_app})
 
         with self.tasks():
-            notify_sentry_app(event, [rule_future])
+            notify_sentry_app(group_event, [rule_future])
 
         ((args, kwargs),) = safe_urlopen.call_args_list
         data = json.loads(kwargs["data"])
-
         assert data == {
             "action": "triggered",
             "installation": {"uuid": self.install.uuid},
@@ -150,17 +177,18 @@ def test_send_alert_event(self, safe_urlopen):
             },
             "actor": {"type": "application", "id": "sentry", "name": "Sentry"},
         }
-        assert data["data"]["event"]["event_id"] == event.event_id
+        assert data["data"]["event"]["project"] == self.project.id
+        assert data["data"]["event"]["event_id"] == group_event.event_id
         assert data["data"]["event"]["url"] == absolute_uri(
             reverse(
                 "sentry-api-0-project-event-details",
-                args=[self.organization.slug, self.project.slug, event.event_id],
+                args=[self.organization.slug, self.project.slug, group_event.event_id],
             )
         )
         assert data["data"]["event"]["web_url"] == absolute_uri(
             reverse(
                 "sentry-organization-event-detail",
-                args=[self.organization.slug, group.id, event.event_id],
+                args=[self.organization.slug, group.id, group_event.event_id],
             )
         )
         assert data["data"]["event"]["issue_url"] == absolute_uri(f"/api/0/issues/{group.id}/")
@@ -184,6 +212,9 @@ def test_send_alert_event(self, safe_urlopen):
     @patch("sentry.utils.sentry_apps.webhooks.safe_urlopen", return_value=MockResponseInstance)
     def test_send_alert_event_with_additional_payload(self, safe_urlopen):
         event = self.store_event(data={}, project_id=self.project.id)
+        assert event.group is not None
+
+        group_event = GroupEvent.from_event(event, event.group)
         settings = [
             {"name": "alert_prefix", "value": "[Not Good]"},
             {"name": "channel", "value": "#ignored-errors"},
@@ -198,7 +229,7 @@ def test_send_alert_event_with_additional_payload(self, safe_urlopen):
         )
 
         with self.tasks():
-            notify_sentry_app(event, [rule_future])
+            notify_sentry_app(group_event, [rule_future])
 
         ((args, kwargs),) = safe_urlopen.call_args_list
         payload = json.loads(kwargs["data"])
@@ -219,6 +250,70 @@ def test_send_alert_event_with_additional_payload(self, safe_urlopen):
         assert requests[0]["response_code"] == 200
         assert requests[0]["event_type"] == "event_alert.triggered"
 
+    @override_options({"sentryapps.send_alert_event.use-eventid": 1.0})
+    @patch("sentry.utils.sentry_apps.webhooks.safe_urlopen", return_value=MockResponseInstance)
+    def test_send_alert_event_with_groupevent(self, safe_urlopen):
+        event = self.store_event(data={}, project_id=self.project.id)
+        occurrence_data = self.build_occurrence_data(
+            event_id=event.event_id, project_id=self.project.id
+        )
+        occurrence, group_info = save_issue_occurrence(occurrence_data=occurrence_data, event=event)
+        assert group_info is not None
+
+        group_event = event.for_group(group_info.group)
+        group_event.occurrence = occurrence
+        rule_future = RuleFuture(rule=self.rule, kwargs={"sentry_app": self.sentry_app})
+
+        with self.tasks():
+            notify_sentry_app(group_event, [rule_future])
+
+        ((args, kwargs),) = safe_urlopen.call_args_list
+        data = json.loads(kwargs["data"])
+        assert data == {
+            "action": "triggered",
+            "installation": {"uuid": self.install.uuid},
+            "data": {
+                "event": ANY,  # tested below
+                "triggered_rule": self.rule.label,
+            },
+            "actor": {"type": "application", "id": "sentry", "name": "Sentry"},
+        }
+        assert data["data"]["event"]["project"] == self.project.id
+        assert data["data"]["event"]["event_id"] == group_event.event_id
+        assert data["data"]["event"]["url"] == absolute_uri(
+            reverse(
+                "sentry-api-0-project-event-details",
+                args=[self.organization.slug, self.project.slug, group_event.event_id],
+            )
+        )
+        assert data["data"]["event"]["web_url"] == absolute_uri(
+            reverse(
+                "sentry-organization-event-detail",
+                args=[self.organization.slug, group_event.group.id, group_event.event_id],
+            )
+        )
+        assert data["data"]["event"]["issue_url"] == absolute_uri(
+            f"/api/0/issues/{group_event.group.id}/"
+        )
+        assert data["data"]["event"]["issue_id"] == str(group_event.group.id)
+        assert data["data"]["event"]["occurrence"] == convert_dict_key_case(
+            group_event.occurrence.to_dict(), snake_to_camel_case
+        )
+        assert kwargs["headers"].keys() >= {
+            "Content-Type",
+            "Request-ID",
+            "Sentry-Hook-Resource",
+            "Sentry-Hook-Timestamp",
+            "Sentry-Hook-Signature",
+        }
+
+        buffer = SentryAppWebhookRequestsBuffer(self.sentry_app)
+        requests = buffer.get_requests()
+
+        assert len(requests) == 1
+        assert requests[0]["response_code"] == 200
+        assert requests[0]["event_type"] == "event_alert.triggered"
+
 
 @patch("sentry.utils.sentry_apps.webhooks.safe_urlopen", return_value=MockResponseInstance)
 class TestProcessResourceChange(TestCase):
diff --git a/tests/sentry/snuba/test_tasks.py b/tests/sentry/snuba/test_tasks.py
index dafa05f9696e24..4e09b2f51ffb62 100644
--- a/tests/sentry/snuba/test_tasks.py
+++ b/tests/sentry/snuba/test_tasks.py
@@ -22,7 +22,7 @@
 from sentry.sentry_metrics.configuration import UseCaseKey
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID
 from sentry.sentry_metrics.utils import resolve, resolve_tag_key, resolve_tag_value
-from sentry.snuba.dataset import Dataset
+from sentry.snuba.dataset import Dataset, EntityKey
 from sentry.snuba.entity_subscription import (
     apply_dataset_query_conditions,
     get_entity_key_from_query_builder,
@@ -372,25 +372,28 @@ def test_eap_rpc_query_count(self):
             aggregate="count(span.duration)",
             dataset=Dataset.EventsAnalyticsPlatform,
         )
-        with patch("sentry.utils.snuba_rpc._snuba_pool") as pool:
-            resp = Mock()
-            resp.status = 202
-            resp.data = b'\n"0/a92bba96a12e11ef8b0eaeb51d7f1da4'
-            pool.urlopen.return_value = resp
-
-            create_subscription_in_snuba(sub.id)
-            sub = QuerySubscription.objects.get(id=sub.id)
-            assert sub.status == QuerySubscription.Status.ACTIVE.value
-            assert sub.subscription_id is not None
+        with patch("sentry.utils.snuba_rpc._snuba_pool") as rpc_pool:
+            with patch("sentry.snuba.tasks._snuba_pool") as pool:
+                resp = Mock()
+                resp.status = 202
+                resp.data = b'\n"0/a92bba96a12e11ef8b0eaeb51d7f1da4'
+                rpc_pool.urlopen.return_value = resp
+                pool.urlopen.return_value = resp
+
+                create_subscription_in_snuba(sub.id)
+                sub = QuerySubscription.objects.get(id=sub.id)
+                assert sub.status == QuerySubscription.Status.ACTIVE.value
+                assert sub.subscription_id is not None
 
-            sub.status = QuerySubscription.Status.UPDATING.value
-            sub.update(
-                status=QuerySubscription.Status.UPDATING.value, subscription_id=sub.subscription_id
-            )
-            update_subscription_in_snuba(sub.id)
-            sub = QuerySubscription.objects.get(id=sub.id)
-            assert sub.status == QuerySubscription.Status.ACTIVE.value
-            assert sub.subscription_id is not None
+                sub.status = QuerySubscription.Status.UPDATING.value
+                sub.update(
+                    status=QuerySubscription.Status.UPDATING.value,
+                    subscription_id=sub.subscription_id,
+                )
+                update_subscription_in_snuba(sub.id)
+                sub = QuerySubscription.objects.get(id=sub.id)
+                assert sub.status == QuerySubscription.Status.ACTIVE.value
+                assert sub.subscription_id is not None
 
 
 class DeleteSubscriptionFromSnubaTest(BaseSnubaTaskTest):
@@ -423,11 +426,23 @@ def test_eap_rpc_query_count(self):
             QuerySubscription.Status.DELETING,
             subscription_id=subscription_id,
             query="span.module:db",
-            aggregate="spm()",
-            dataset=Dataset.PerformanceMetrics,
+            aggregate="count(span.duration)",
+            dataset=Dataset.EventsAnalyticsPlatform,
         )
-        delete_subscription_from_snuba(sub.id)
-        assert not QuerySubscription.objects.filter(id=sub.id).exists()
+        with patch("sentry.snuba.tasks._snuba_pool") as pool:
+            resp = Mock()
+            resp.status = 202
+            pool.urlopen.return_value = resp
+
+            delete_subscription_from_snuba(sub.id)
+            assert not QuerySubscription.objects.filter(id=sub.id).exists()
+
+            (method, url) = pool.urlopen.call_args[0]
+            assert method == "DELETE"
+            assert (
+                url
+                == f"/{Dataset.EventsAnalyticsPlatform.value}/{EntityKey.EAPSpans.value}/subscriptions/{subscription_id}"
+            )
 
     def test_no_subscription_id(self):
         sub = self.create_subscription(QuerySubscription.Status.DELETING)
diff --git a/tests/sentry/tasks/snapshots/PreprocessingTransferTest/test_success.pysnap b/tests/sentry/tasks/snapshots/PreprocessingTransferTest/test_success.pysnap
index 917c0e9f5eb59b..1fe65ca894a88d 100644
--- a/tests/sentry/tasks/snapshots/PreprocessingTransferTest/test_success.pysnap
+++ b/tests/sentry/tasks/snapshots/PreprocessingTransferTest/test_success.pysnap
@@ -1,5 +1,5 @@
 ---
-created: '2024-11-06T18:16:10.211369+00:00'
+created: '2024-12-03T20:16:20.099220+00:00'
 creator: sentry
 source: tests/sentry/tasks/test_relocation.py
 ---
@@ -96,7 +96,7 @@ steps:
   - -U
   - postgres
   - -c
-  - TRUNCATE sentry_controloption,sentry_integration,sentry_option,sentry_organization,sentry_organizationintegration,sentry_organizationoptions,sentry_projecttemplate,sentry_projecttemplateoption,sentry_relay,sentry_relayusage,sentry_repository,sentry_team,auth_user,sentry_userip,sentry_userpermission,sentry_userrole,sentry_userrole_users,workflow_engine_dataconditiongroup,workflow_engine_datasource,workflow_engine_detector,workflow_engine_workflow,workflow_engine_workflowdataconditiongroup,workflow_engine_detectorworkflow,workflow_engine_datasourcedetector,workflow_engine_datacondition,sentry_savedsearch,sentry_recentsearch,sentry_project,sentry_orgauthtoken,sentry_organizationmember,sentry_organizationaccessrequest,sentry_monitor,sentry_groupsearchview,sentry_environment,sentry_email,sentry_datasecrecywaiver,sentry_dashboardtombstone,sentry_dashboard,sentry_customdynamicsamplingrule,sentry_projectcounter,sentry_authprovider,sentry_authidentity,auth_authenticator,sentry_apikey,sentry_apiapplication,sentry_useroption,sentry_useremail,sentry_snubaquery,sentry_sentryapp,sentry_rule,sentry_querysubscription,sentry_projectteam,sentry_projectredirect,sentry_projectownership,sentry_projectoptions,sentry_projectkey,sentry_projectintegration,sentry_projectbookmark,sentry_organizationmember_teams,sentry_notificationaction,sentry_neglectedrule,sentry_environmentproject,sentry_dashboardwidget,sentry_dashboardpermissions,sentry_customdynamicsamplingruleproject,sentry_apitoken,sentry_apigrant,sentry_apiauthorization,sentry_alertrule,sentry_snubaqueryeventtype,sentry_sentryappinstallation,sentry_sentryappcomponent,sentry_rulesnooze,sentry_ruleactivity,sentry_notificationactionproject,sentry_dashboardwidgetquery,sentry_dashboardpermissionsteam,sentry_alertruletrigger,sentry_alertruleprojects,sentry_alertruleexcludedprojects,sentry_alertruleactivity,sentry_alertruleactivationcondition,sentry_servicehook,sentry_incident,sentry_dashboardwidgetqueryondemand,sentry_alertruletriggerexclusion,sentry_alertruletriggeraction,sentry_timeseriessnapshot,sentry_pendingincidentsnapshot,sentry_incidenttrigger,sentry_incidentsubscription,sentry_incidentsnapshot,sentry_incidentactivity
+  - TRUNCATE sentry_controloption,sentry_integration,sentry_option,sentry_organization,sentry_organizationintegration,sentry_organizationoptions,sentry_projecttemplate,sentry_projecttemplateoption,sentry_relay,sentry_relayusage,sentry_repository,sentry_team,auth_user,sentry_userip,sentry_userpermission,sentry_userrole,sentry_userrole_users,workflow_engine_dataconditiongroup,workflow_engine_datasource,workflow_engine_datacondition,sentry_savedsearch,sentry_recentsearch,sentry_project,sentry_orgauthtoken,sentry_organizationmember,sentry_organizationaccessrequest,sentry_monitor,sentry_groupsearchview,sentry_environment,sentry_email,sentry_datasecrecywaiver,sentry_dashboardtombstone,sentry_dashboard,sentry_customdynamicsamplingrule,sentry_projectcounter,sentry_authprovider,sentry_authidentity,auth_authenticator,sentry_apikey,sentry_apiapplication,workflow_engine_workflow,workflow_engine_detector,workflow_engine_datasourcedetector,sentry_useroption,sentry_useremail,sentry_snubaquery,sentry_sentryapp,sentry_rule,sentry_querysubscription,sentry_projectteam,sentry_projectredirect,sentry_projectownership,sentry_projectoptions,sentry_projectkey,sentry_projectintegration,sentry_projectbookmark,sentry_organizationmember_teams,sentry_notificationaction,sentry_neglectedrule,sentry_environmentproject,sentry_dashboardwidget,sentry_dashboardpermissions,sentry_dashboardfavoriteuser,sentry_customdynamicsamplingruleproject,sentry_apitoken,sentry_apigrant,sentry_apiauthorization,sentry_alertrule,workflow_engine_workflowdataconditiongroup,workflow_engine_detectorworkflow,sentry_snubaqueryeventtype,sentry_sentryappinstallation,sentry_sentryappcomponent,sentry_rulesnooze,sentry_ruleactivity,sentry_notificationactionproject,sentry_dashboardwidgetquery,sentry_dashboardpermissionsteam,sentry_alertruletrigger,sentry_alertruleprojects,sentry_alertruleactivity,sentry_alertruleactivationcondition,sentry_servicehook,sentry_incident,sentry_dashboardwidgetqueryondemand,sentry_alertruletriggeraction,sentry_timeseriessnapshot,sentry_pendingincidentsnapshot,sentry_incidenttrigger,sentry_incidentsnapshot,sentry_incidentactivity
     RESTART IDENTITY CASCADE;
   id: clear-database
   name: gcr.io/cloud-builders/docker
diff --git a/tests/sentry/tasks/test_backfill_seer_grouping_records.py b/tests/sentry/tasks/test_backfill_seer_grouping_records.py
index efad864ac4809d..4c9a0d758d07bf 100644
--- a/tests/sentry/tasks/test_backfill_seer_grouping_records.py
+++ b/tests/sentry/tasks/test_backfill_seer_grouping_records.py
@@ -25,6 +25,7 @@
 from sentry.models.grouphash import GroupHash
 from sentry.seer.similarity.grouping_records import CreateGroupingRecordData
 from sentry.seer.similarity.types import RawSeerSimilarIssueData
+from sentry.seer.similarity.utils import MAX_FRAME_COUNT
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.referrer import Referrer
 from sentry.tasks.embeddings_grouping.backfill_seer_grouping_records_for_project import (
@@ -47,7 +48,7 @@
 from sentry.utils.safe import get_path
 from sentry.utils.snuba import QueryTooManySimultaneous, RateLimitExceeded, bulk_snuba_queries
 
-EXCEPTION = {
+EXCEPTION: dict[str, Any] = {
     "values": [
         {
             "stacktrace": {
@@ -365,6 +366,69 @@ def test_lookup_group_data_stacktrace_bulk_no_stacktrace_exception(self):
         assert bulk_group_data_stacktraces["data"] == expected_group_data
         assert bulk_group_data_stacktraces["stacktrace_list"] == expected_stacktraces
 
+    @patch("sentry.seer.similarity.utils.metrics")
+    def test_lookup_group_data_stacktrace_bulk_invalid_stacktrace_exception(self, mock_metrics):
+        """
+        Test that if a group has over MAX_FRAME_COUNT only system frames, its data is not included in
+        the bulk lookup result
+        """
+        # Use 2 events
+        rows, events, hashes = self.bulk_rows[:2], self.bulk_events[:2], {}
+        group_ids = [row["group_id"] for row in rows]
+        for group_id in group_ids:
+            hashes.update({group_id: self.group_hashes[group_id]})
+        # Create one event where the stacktrace has over MAX_FRAME_COUNT system only frames
+        exception = copy.deepcopy(EXCEPTION)
+        exception["values"][0]["stacktrace"]["frames"] += [
+            {
+                "function": f"divide_by_zero_{i}",
+                "module": "__main__",
+                "filename": "python_onboarding_{i}.py",
+                "abs_path": "/Users/user/python_onboarding/python_onboarding_{i}.py",
+                "lineno": i,
+                "in_app": True,
+            }
+            for i in range(MAX_FRAME_COUNT + 1)
+        ]
+        event = self.store_event(
+            data={
+                "platform": "java",
+                "exception": exception,
+                "title": "title",
+                "timestamp": before_now(seconds=10).isoformat(),
+            },
+            project_id=self.project.id,
+            assert_no_errors=False,
+        )
+        rows.append({"event_id": event.event_id, "group_id": event.group_id})
+        group_hash = GroupHash.objects.filter(group_id=event.group.id).first()
+        assert group_hash
+        hashes.update({event.group_id: group_hash.hash})
+
+        bulk_group_data_stacktraces, _ = get_events_from_nodestore(self.project, rows, group_ids)
+        expected_group_data = [
+            CreateGroupingRecordData(
+                group_id=event.group.id,
+                hash=hashes[event.group.id],
+                project_id=self.project.id,
+                exception_type=get_path(event.data, "exception", "values", -1, "type"),
+            )
+            for event in events
+        ]
+        expected_stacktraces = [
+            f'Error{i}: error with value\n  File "function_{i}.py", function function_{i}'
+            for i in range(2)
+        ]
+        assert bulk_group_data_stacktraces["data"] == expected_group_data
+        assert bulk_group_data_stacktraces["stacktrace_list"] == expected_stacktraces
+
+        sample_rate = options.get("seer.similarity.metrics_sample_rate")
+        mock_metrics.incr.assert_called_with(
+            "grouping.similarity.over_threshold_only_system_frames",
+            sample_rate=sample_rate,
+            tags={"platform": "java", "referrer": "backfill"},
+        )
+
     def test_lookup_group_data_stacktrace_bulk_with_fallback_success(self):
         """Test successful bulk lookup with fallback, where the fallback isn't used"""
         rows, events, hashes = (
diff --git a/tests/sentry/tasks/test_commit_context.py b/tests/sentry/tasks/test_commit_context.py
index d533996da5fbeb..9beae02b04826d 100644
--- a/tests/sentry/tasks/test_commit_context.py
+++ b/tests/sentry/tasks/test_commit_context.py
@@ -17,6 +17,8 @@
     FileBlameInfo,
     SourceLineInfo,
 )
+from sentry.integrations.source_code_management.metrics import CommitContextHaltReason
+from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
 from sentry.models.groupowner import GroupOwner, GroupOwnerType
@@ -31,6 +33,7 @@
 from sentry.shared_integrations.exceptions import ApiError
 from sentry.silo.base import SiloMode
 from sentry.tasks.commit_context import PR_COMMENT_WINDOW, process_commit_context
+from sentry.testutils.asserts import assert_halt_metric
 from sentry.testutils.cases import IntegrationTestCase, TestCase
 from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import assume_test_silo_mode
@@ -1183,9 +1186,12 @@ def test_gh_comment_no_repo(self, mock_comment_workflow, mock_get_commit_context
             assert not mock_comment_workflow.called
             assert len(PullRequestCommit.objects.all()) == 0
 
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.github.client.get_jwt", return_value="jwt_token_1")
     @responses.activate
-    def test_gh_comment_debounces(self, get_jwt, mock_comment_workflow, mock_get_commit_context):
+    def test_gh_comment_debounces(
+        self, get_jwt, mock_record, mock_comment_workflow, mock_get_commit_context
+    ):
         mock_get_commit_context.return_value = [self.blame]
         self.add_responses()
         assert not GroupOwner.objects.filter(group=self.event.group).exists()
@@ -1223,10 +1229,18 @@ def test_gh_comment_debounces(self, get_jwt, mock_comment_workflow, mock_get_com
             )
             assert mock_comment_workflow.call_count == 1
 
+        start_1, success_1, start_2, halt_2 = mock_record.mock_calls
+        assert start_1.args[0] == EventLifecycleOutcome.STARTED
+        assert success_1.args[0] == EventLifecycleOutcome.SUCCESS
+        assert start_2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt_2.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, CommitContextHaltReason.ALREADY_QUEUED)
+
+    @patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
     @patch("sentry.integrations.github.client.get_jwt", return_value="jwt_token_1")
     @responses.activate
     def test_gh_comment_multiple_comments(
-        self, get_jwt, mock_comment_workflow, mock_get_commit_context
+        self, get_jwt, mock_record, mock_comment_workflow, mock_get_commit_context
     ):
         self.add_responses()
 
@@ -1274,3 +1288,10 @@ def test_gh_comment_multiple_comments(
                 group_id=self.event.group_id,
             )
             assert mock_comment_workflow.call_count == 1
+
+        start_1, success_1, start_2, halt_2 = mock_record.mock_calls
+        assert start_1.args[0] == EventLifecycleOutcome.STARTED
+        assert success_1.args[0] == EventLifecycleOutcome.SUCCESS
+        assert start_2.args[0] == EventLifecycleOutcome.STARTED
+        assert halt_2.args[0] == EventLifecycleOutcome.HALTED
+        assert_halt_metric(mock_record, CommitContextHaltReason.ALREADY_QUEUED)
diff --git a/tests/sentry/tasks/test_daily_summary.py b/tests/sentry/tasks/test_daily_summary.py
index 4adb8fdd4a0a1c..6433737618d3f8 100644
--- a/tests/sentry/tasks/test_daily_summary.py
+++ b/tests/sentry/tasks/test_daily_summary.py
@@ -32,6 +32,7 @@
 from sentry.testutils.helpers.datetime import before_now, freeze_time
 from sentry.testutils.helpers.features import with_feature
 from sentry.types.activity import ActivityType
+from sentry.types.actor import Actor
 from sentry.types.group import GroupSubStatus
 from sentry.users.services.user_option import user_option_service
 from sentry.utils.outcomes import Outcome
@@ -640,7 +641,7 @@ def test_slack_notification_contents(self):
         with self.tasks():
             DailySummaryNotification(
                 organization=ctx.organization,
-                recipient=self.user,
+                recipient=Actor.from_object(self.user),
                 provider=ExternalProviders.SLACK,
                 project_context=top_projects_context_map,
             ).send()
@@ -703,7 +704,7 @@ def test_slack_notification_contents_discover_link(self):
         with self.tasks():
             DailySummaryNotification(
                 organization=ctx.organization,
-                recipient=self.user,
+                recipient=Actor.from_object(self.user),
                 provider=ExternalProviders.SLACK,
                 project_context=top_projects_context_map,
             ).send()
@@ -776,7 +777,7 @@ def test_slack_notification_contents_newline(self):
         with self.tasks():
             DailySummaryNotification(
                 organization=ctx.organization,
-                recipient=self.user,
+                recipient=Actor.from_object(self.user),
                 provider=ExternalProviders.SLACK,
                 project_context=top_projects_context_map,
             ).send()
@@ -824,7 +825,7 @@ def test_slack_notification_contents_newline_no_attachment_text(self):
         with self.tasks():
             DailySummaryNotification(
                 organization=ctx.organization,
-                recipient=self.user,
+                recipient=Actor.from_object(self.user),
                 provider=ExternalProviders.SLACK,
                 project_context=top_projects_context_map,
             ).send()
@@ -872,7 +873,7 @@ def test_slack_notification_contents_truncate_text(self):
         with self.tasks():
             DailySummaryNotification(
                 organization=ctx.organization,
-                recipient=self.user,
+                recipient=Actor.from_object(self.user),
                 provider=ExternalProviders.SLACK,
                 project_context=top_projects_context_map,
             ).send()
@@ -906,7 +907,7 @@ def test_limit_to_two_projects(self):
         with self.tasks():
             DailySummaryNotification(
                 organization=context.organization,
-                recipient=self.user,
+                recipient=Actor.from_object(self.user),
                 provider=ExternalProviders.SLACK,
                 project_context=top_projects_context_map,
             ).send()
@@ -928,7 +929,7 @@ def test_no_release_data(self):
         with self.tasks():
             DailySummaryNotification(
                 organization=ctx.organization,
-                recipient=self.user,
+                recipient=Actor.from_object(self.user),
                 provider=ExternalProviders.SLACK,
                 project_context=top_projects_context_map,
             ).send()
@@ -954,7 +955,7 @@ def test_no_performance_issues(self):
         with self.tasks():
             DailySummaryNotification(
                 organization=ctx.organization,
-                recipient=self.user,
+                recipient=Actor.from_object(self.user),
                 provider=ExternalProviders.SLACK,
                 project_context=top_projects_context_map,
             ).send()
@@ -1001,7 +1002,7 @@ def test_no_escalated_regressed_issues(self):
         with self.tasks():
             DailySummaryNotification(
                 organization=ctx.organization,
-                recipient=self.user,
+                recipient=Actor.from_object(self.user),
                 provider=ExternalProviders.SLACK,
                 project_context=top_projects_context_map,
             ).send()
diff --git a/tests/sentry/tasks/test_derive_code_mappings.py b/tests/sentry/tasks/test_derive_code_mappings.py
index 762ecf811db367..cc593f0ea996be 100644
--- a/tests/sentry/tasks/test_derive_code_mappings.py
+++ b/tests/sentry/tasks/test_derive_code_mappings.py
@@ -13,7 +13,12 @@
 from sentry.models.organization import OrganizationStatus
 from sentry.models.repository import Repository
 from sentry.shared_integrations.exceptions import ApiError
-from sentry.tasks.derive_code_mappings import derive_code_mappings, identify_stacktrace_paths
+from sentry.tasks.derive_code_mappings import (
+    DeriveCodeMappingsErrorReason,
+    derive_code_mappings,
+    identify_stacktrace_paths,
+)
+from sentry.testutils.asserts import assert_failure_metric, assert_halt_metric
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers import with_feature
 from sentry.testutils.silo import assume_test_silo_mode_of
@@ -43,58 +48,56 @@ def generate_data(self, frames: list[dict[str, str | bool]], platform: str = "")
         return self.store_event(data=test_data, project_id=self.project.id).data
 
 
+@patch("sentry.integrations.utils.metrics.EventLifecycle.record_event")
 class TestTaskBehavior(BaseDeriveCodeMappings):
     """Test task behavior that is not language specific."""
 
     def setUp(self):
         super().setUp()
-        self.platform = "any"
         self.event_data = self.generate_data(
             [{"filename": "foo.py", "in_app": True}],
-            platform="any",
+            platform="javascript",
         )
 
-    def test_does_not_raise_installation_removed(self):
+    def test_does_not_raise_installation_removed(self, mock_record):
+        error = ApiError(
+            '{"message":"Not Found","documentation_url":"https://docs.github.com/rest/reference/apps#create-an-installation-access-token-for-an-app"}'
+        )
         with patch(
             "sentry.integrations.github.client.GitHubBaseClient.get_trees_for_org",
-            side_effect=ApiError(
-                '{"message":"Not Found","documentation_url":"https://docs.github.com/rest/reference/apps#create-an-installation-access-token-for-an-app"}'
-            ),
+            side_effect=error,
         ):
             assert derive_code_mappings(self.project.id, self.event_data) is None
+            assert_halt_metric(mock_record, error)
 
     @patch("sentry.tasks.derive_code_mappings.logger")
-    def test_raises_other_api_errors(self, mock_logger):
-        with patch("sentry.tasks.derive_code_mappings.SUPPORTED_LANGUAGES", ["other"]):
-            with patch(
-                "sentry.integrations.github.client.GitHubBaseClient.get_trees_for_org",
-                side_effect=ApiError("foo"),
-            ):
-                derive_code_mappings(self.project.id, self.event_data)
-                assert mock_logger.error.call_count == 1
-
-    def test_unable_to_get_lock(self):
-        with patch("sentry.tasks.derive_code_mappings.SUPPORTED_LANGUAGES", ["other"]):
-            with patch(
-                "sentry.integrations.github.client.GitHubBaseClient.get_trees_for_org",
-                side_effect=UnableToAcquireLock,
-            ):
-                derive_code_mappings(self.project.id, self.event_data)
-                assert not RepositoryProjectPathConfig.objects.exists()
+    def test_raises_other_api_errors(self, mock_logger, mock_record):
+        with patch(
+            "sentry.integrations.github.client.GitHubBaseClient.get_trees_for_org",
+            side_effect=ApiError("foo"),
+        ):
+            derive_code_mappings(self.project.id, self.event_data)
+            assert mock_logger.error.call_count == 1
+            assert_halt_metric(mock_record, ApiError("foo"))
+
+    def test_unable_to_get_lock(self, mock_record):
+        error = UnableToAcquireLock()
+        with patch(
+            "sentry.integrations.github.client.GitHubBaseClient.get_trees_for_org",
+            side_effect=UnableToAcquireLock(),
+        ):
+            derive_code_mappings(self.project.id, self.event_data)
+            assert not RepositoryProjectPathConfig.objects.exists()
+            assert_failure_metric(mock_record, error)
 
     @patch("sentry.tasks.derive_code_mappings.logger")
-    def test_raises_generic_errors(self, mock_logger):
-        with patch("sentry.tasks.derive_code_mappings.SUPPORTED_LANGUAGES", ["other"]):
-            with patch(
-                "sentry.integrations.github.client.GitHubBaseClient.get_trees_for_org",
-                side_effect=Exception("foo"),
-            ):
-                derive_code_mappings(self.project.id, self.event_data)
-                assert mock_logger.exception.call_count == 1
-                assert (
-                    mock_logger.exception.call_args.args[0]
-                    == "Unexpected error type while calling `get_trees_for_org()`."
-                )
+    def test_raises_generic_errors(self, mock_logger, mock_record):
+        with patch(
+            "sentry.integrations.github.client.GitHubBaseClient.get_trees_for_org",
+            side_effect=Exception("foo"),
+        ):
+            derive_code_mappings(self.project.id, self.event_data)
+            assert_failure_metric(mock_record, DeriveCodeMappingsErrorReason.UNEXPECTED_ERROR)
 
 
 class TestBackSlashDeriveCodeMappings(BaseDeriveCodeMappings):
diff --git a/tests/sentry/tasks/test_on_demand_metrics.py b/tests/sentry/tasks/test_on_demand_metrics.py
index 9e03f49abeb792..d51bf6a63b3d75 100644
--- a/tests/sentry/tasks/test_on_demand_metrics.py
+++ b/tests/sentry/tasks/test_on_demand_metrics.py
@@ -29,7 +29,7 @@
 
 
 @pytest.fixture
-def owner() -> None:
+def owner() -> User:
     return Factories.create_user()
 
 
diff --git a/tests/sentry/tasks/test_post_process.py b/tests/sentry/tasks/test_post_process.py
index 80de27eadeb67e..be8e80b75098e6 100644
--- a/tests/sentry/tasks/test_post_process.py
+++ b/tests/sentry/tasks/test_post_process.py
@@ -60,6 +60,7 @@
 from sentry.tasks.post_process import (
     HIGHER_ISSUE_OWNERS_PER_PROJECT_PER_MIN_RATELIMIT,
     ISSUE_OWNERS_PER_PROJECT_PER_MIN_RATELIMIT,
+    _get_event_id_from_cache_key,
     feedback_filter_decorator,
     locks,
     post_process_group,
@@ -2436,9 +2437,23 @@ def assert_not_called_with(self, mock_function: Mock):
             return
         raise AssertionError("Expected safe_execute to not be called with similarity.record")
 
-    @with_feature("projects:similarity-embeddings")
     @patch("sentry.tasks.post_process.safe_execute")
     def test_skip_process_similarity(self, mock_safe_execute):
+        self.project.update_option("sentry:similarity_backfill_completed", int(time.time()))
+        event = self.create_event(data={}, project_id=self.project.id)
+
+        self.call_post_process_group(
+            is_new=True,
+            is_regression=False,
+            is_new_group_environment=False,
+            event=event,
+        )
+
+        self.assert_not_called_with(mock_safe_execute)
+
+    @patch("sentry.tasks.post_process.safe_execute")
+    @override_options({"sentry.similarity.indexing.enabled": False})
+    def test_skip_process_similarity_global(self, mock_safe_execute):
         event = self.create_event(data={}, project_id=self.project.id)
 
         self.call_post_process_group(
@@ -2735,6 +2750,60 @@ def test_process_transaction_event_clusterer(
         ]
 
 
+class ProcessingStoreTransactionEmptyTestcase(TestCase):
+    @patch("sentry.tasks.post_process.logger")
+    def test_logger_called_when_empty(self, mock_logger):
+        post_process_group(
+            is_new=False,
+            is_regression=False,
+            is_new_group_environment=False,
+            cache_key="e:1:2",
+            group_id=None,
+            project_id=self.project.id,
+            eventstream_type=EventStreamEventType.Transaction,
+        )
+        assert mock_logger.info.called
+        mock_logger.info.assert_called_with(
+            "post_process.skipped", extra={"cache_key": "e:1:2", "reason": "missing_cache"}
+        )
+
+    @patch("sentry.tasks.post_process.logger")
+    @patch("sentry.utils.metrics.incr")
+    @override_options({"transactions.do_post_process_in_save": 1.0})
+    def test_logger_called_when_empty_option_on(self, mock_metric_incr, mock_logger):
+        post_process_group(
+            is_new=False,
+            is_regression=False,
+            is_new_group_environment=False,
+            cache_key="e:1:2",
+            group_id=None,
+            project_id=self.project.id,
+            eventstream_type=EventStreamEventType.Transaction,
+        )
+        assert not mock_logger.info.called
+        mock_metric_incr.assert_called_with("post_process.skipped_do_post_process_in_save")
+
+    @patch("sentry.tasks.post_process.logger")
+    @override_options({"transactions.do_post_process_in_save": 1.0})
+    def test_logger_called_when_empty_option_on_invalid_cache_key(self, mock_logger):
+        post_process_group(
+            is_new=False,
+            is_regression=False,
+            is_new_group_environment=False,
+            cache_key="invalidhehe",
+            group_id=None,
+            project_id=self.project.id,
+            eventstream_type=EventStreamEventType.Transaction,
+        )
+        mock_logger.info.assert_called_with(
+            "post_process.skipped", extra={"cache_key": "invalidhehe", "reason": "missing_cache"}
+        )
+
+    def test_get_event_id_from_cache_key(self):
+        assert _get_event_id_from_cache_key("e:1:2") == "1"
+        assert _get_event_id_from_cache_key("invalid") is None
+
+
 class PostProcessGroupGenericTest(
     TestCase,
     SnubaTestCase,
diff --git a/tests/sentry/tasks/test_relocation.py b/tests/sentry/tasks/test_relocation.py
index 40b79bda06acd2..1304e4c71238a1 100644
--- a/tests/sentry/tasks/test_relocation.py
+++ b/tests/sentry/tasks/test_relocation.py
@@ -15,6 +15,7 @@
 from google_crc32c import value as crc32c
 
 from sentry.backup.crypto import (
+    EncryptorDecryptorPair,
     LocalFileDecryptor,
     LocalFileEncryptor,
     create_encrypted_export_tarball,
@@ -94,7 +95,12 @@
 from sentry.users.models.lostpasswordhash import LostPasswordHash
 from sentry.users.models.user import User
 from sentry.utils import json
-from sentry.utils.relocation import RELOCATION_BLOB_SIZE, RELOCATION_FILE_TYPE, OrderedTask
+from sentry.utils.relocation import (
+    RELOCATION_BLOB_SIZE,
+    RELOCATION_FILE_TYPE,
+    OrderedTask,
+    StorageBackedCheckpointExporter,
+)
 
 IMPORT_JSON_FILE_PATH = get_fixture_path("backup", "fresh-install.json")
 
@@ -302,7 +308,7 @@ def test_success_saas_to_saas(
         assert uploading_complete_mock.call_count == 1
         assert cross_region_export_timeout_check_mock.call_count == 1
         assert fake_message_builder.call_count == 0
-        assert fake_kms_client.get_public_key.call_count == 1
+        assert fake_kms_client.get_public_key.call_count > 0
         assert fake_kms_client.asymmetric_decrypt.call_count == 0
 
         assert RelocationFile.objects.filter(
@@ -345,7 +351,7 @@ def test_success_saas_to_saas_racing(
         assert uploading_complete_mock.call_count == 1
         assert cross_region_export_timeout_check_mock.call_count == 1
         assert fake_message_builder.call_count == 0
-        assert fake_kms_client.get_public_key.call_count == 2
+        assert fake_kms_client.get_public_key.call_count > 0
         assert fake_kms_client.asymmetric_decrypt.call_count == 0
 
         assert (
@@ -1990,6 +1996,7 @@ def setUp(self):
         self.relocation.step = Relocation.Step.VALIDATING.value
         self.relocation.latest_task = OrderedTask.VALIDATING_COMPLETE.name
         self.relocation.save()
+        self.storage = get_relocation_storage()
 
     def test_success_self_hosted(
         self, postprocessing_mock: Mock, fake_kms_client: FakeKeyManagementServiceClient
@@ -2035,19 +2042,66 @@ def test_success_saas_to_saas(
         with assume_test_silo_mode(SiloMode.CONTROL):
             user_count = User.objects.all().count()
 
+        # Create an export checkpointer, so that we can validate that it stores checkpoints properly
+        # over multiple export attempts.
+        decryptor = LocalFileDecryptor(BytesIO(self.priv_key_pem))
+        encryptor = LocalFileEncryptor(BytesIO(self.pub_key_pem))
+        export_checkpointer = StorageBackedCheckpointExporter(
+            crypto=EncryptorDecryptorPair(
+                encryptor=encryptor,
+                decryptor=decryptor,
+            ),
+            uuid=self.relocation.uuid,
+            storage=self.storage,
+        )
+        with TemporaryDirectory() as tmp_dir:
+            tmp_priv_key_path = Path(tmp_dir).joinpath("key")
+            tmp_pub_key_path = Path(tmp_dir).joinpath("key.pub")
+            with open(tmp_priv_key_path, "wb") as f:
+                f.write(self.priv_key_pem)
+            with open(tmp_pub_key_path, "wb") as f:
+                f.write(self.pub_key_pem)
+
         # Export the existing state of the `testing` organization, so that we retain exact ids.
         export_contents = BytesIO()
         export_in_organization_scope(
             export_contents,
             org_filter=set(self.relocation.want_org_slugs),
             printer=Printer(),
+            checkpointer=export_checkpointer,
+        )
+
+        # Verify cache writes, to the checkpoint cache.
+        (_, num_checkpoints) = self.storage.listdir(
+            f"runs/{self.relocation.uuid}/saas_to_saas_export/_checkpoints/"
+        )
+        assert len(num_checkpoints) > 0
+
+        # Export again, to sanity-check the export checkpointer.
+        reexport_contents = BytesIO()
+        export_in_organization_scope(
+            reexport_contents,
+            org_filter=set(self.relocation.want_org_slugs),
+            printer=Printer(),
+            checkpointer=export_checkpointer,
+        )
+
+        # Verify no cache writes, to the checkpoint cache on the second pass, then check for output
+        # equality.
+        (_, num_recheckpoints) = self.storage.listdir(
+            f"runs/{self.relocation.uuid}/saas_to_saas_export/_checkpoints/"
         )
+        assert num_checkpoints == num_recheckpoints
+        assert export_contents.getvalue() == reexport_contents.getvalue()
         export_contents.seek(0)
 
         # Convert this into a `SAAS_TO_SAAS` relocation, and use the data we just exported as the
         # import blob.
         file = RelocationFile.objects.get(relocation=self.relocation).file
-        self.swap_relocation_file(file, export_contents)
+        self.tarball = create_encrypted_export_tarball(
+            json.load(export_contents), encryptor
+        ).getvalue()
+        file.putfile(BytesIO(self.tarball), blob_size=RELOCATION_BLOB_SIZE)
         self.mock_kms_client(fake_kms_client)
         self.relocation.provenance = Relocation.Provenance.SAAS_TO_SAAS
         self.relocation.save()
diff --git a/tests/sentry/tasks/test_reprocessing2.py b/tests/sentry/tasks/test_reprocessing2.py
index 8bf1e03f374096..3b59699a829bc9 100644
--- a/tests/sentry/tasks/test_reprocessing2.py
+++ b/tests/sentry/tasks/test_reprocessing2.py
@@ -26,7 +26,7 @@
 from sentry.reprocessing2 import is_group_finished
 from sentry.tasks.reprocessing2 import finish_reprocessing, reprocess_group
 from sentry.tasks.store import preprocess_event
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.helpers.task_runner import BurstTaskRunner
 from sentry.testutils.pytest.fixtures import django_db_all
 from sentry.testutils.skips import requires_snuba
@@ -73,7 +73,9 @@ def inner(data, seconds_ago=1):
         data.setdefault("platform", "native")
         # Every request to snuba has a timestamp that's clamped in a curious way to
         # ensure data consistency
-        data.setdefault("timestamp", iso_format(before_now(seconds=seconds_ago)))
+        data.setdefault(
+            "timestamp", before_now(seconds=seconds_ago).replace(microsecond=0).isoformat()
+        )
         mgr = EventManager(data=data, project=default_project)
         mgr.normalize()
         data = mgr.get_data()
diff --git a/tests/sentry/tasks/test_store.py b/tests/sentry/tasks/test_store.py
index 838fa5f5c913cb..48544658436c94 100644
--- a/tests/sentry/tasks/test_store.py
+++ b/tests/sentry/tasks/test_store.py
@@ -14,6 +14,7 @@
     save_event,
     save_event_transaction,
 )
+from sentry.testutils.helpers.options import override_options
 from sentry.testutils.pytest.fixtures import django_db_all
 
 EVENT_ID = "cc3e6c2bb6b6498097f336d1e6979f4b"
@@ -397,3 +398,35 @@ def test_store_consumer_type(
         )
 
     mock_transaction_processing_store.get.assert_called_once_with("tx:3")
+    mock_transaction_processing_store.delete_by_key.assert_not_called()
+
+
+@django_db_all
+@override_options({"transactions.do_post_process_in_save": 1.0})
+def test_transactions_do_post_process_in_save_deletes_from_processing_store(
+    default_project,
+    mock_transaction_processing_store,
+):
+    transaction_data = {
+        "project": default_project.id,
+        "platform": "transaction",
+        "event_id": EVENT_ID,
+        "extra": {"foo": "bar"},
+        "timestamp": time(),
+        "start_timestamp": time() - 1,
+    }
+
+    mock_transaction_processing_store.get.return_value = transaction_data
+    mock_transaction_processing_store.store.return_value = "tx:3"
+
+    with mock.patch("sentry.event_manager.EventManager.save", return_value=None):
+        save_event_transaction(
+            cache_key="tx:3",
+            data=None,
+            start_time=1,
+            event_id=EVENT_ID,
+            project_id=default_project.id,
+        )
+
+    mock_transaction_processing_store.get.assert_called_once_with("tx:3")
+    mock_transaction_processing_store.delete_by_key.assert_called_once_with("tx:3")
diff --git a/tests/sentry/tasks/test_weekly_reports.py b/tests/sentry/tasks/test_weekly_reports.py
index edd4f54c5eb91e..191df95f1ef137 100644
--- a/tests/sentry/tasks/test_weekly_reports.py
+++ b/tests/sentry/tasks/test_weekly_reports.py
@@ -14,9 +14,9 @@
 from sentry.issues.grouptype import MonitorIncidentType, PerformanceNPlusOneGroupType
 from sentry.models.group import GroupStatus
 from sentry.models.grouphistory import GroupHistoryStatus
-from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.project import Project
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.silo.base import SiloMode
 from sentry.silo.safety import unguarded_write
 from sentry.snuba.referrer import Referrer
@@ -38,7 +38,7 @@
 from sentry.testutils.cases import OutcomesSnubaTest, PerformanceIssueTestCase, SnubaTestCase
 from sentry.testutils.factories import EventType
 from sentry.testutils.helpers import with_feature
-from sentry.testutils.helpers.datetime import before_now, freeze_time, iso_format
+from sentry.testutils.helpers.datetime import before_now, freeze_time
 from sentry.testutils.outbox import outbox_runner
 from sentry.testutils.silo import assume_test_silo_mode
 from sentry.types.group import GroupSubStatus
@@ -267,7 +267,7 @@ def test_transferred_project(self, message_builder):
     @freeze_time(before_now(days=2).replace(hour=0, minute=0, second=0, microsecond=0))
     def test_organization_project_issue_substatus_summaries(self):
         self.login_as(user=self.user)
-        min_ago = iso_format(self.now - timedelta(minutes=1))
+        min_ago = (self.now - timedelta(minutes=1)).isoformat()
         event1 = self.store_event(
             data={
                 "event_id": "a" * 32,
@@ -314,7 +314,7 @@ def test_organization_project_issue_substatus_summaries(self):
     def test_organization_project_issue_status(self):
         self.login_as(user=self.user)
         self.project.first_event = self.now - timedelta(days=3)
-        min_ago = iso_format(self.now - timedelta(minutes=1))
+        min_ago = (self.now - timedelta(minutes=1)).isoformat()
         event1 = self.store_event(
             data={
                 "event_id": "a" * 32,
diff --git a/tests/sentry/taskworker/test_client.py b/tests/sentry/taskworker/test_client.py
new file mode 100644
index 00000000000000..ed2dae3240aedd
--- /dev/null
+++ b/tests/sentry/taskworker/test_client.py
@@ -0,0 +1,172 @@
+from collections import defaultdict
+from collections.abc import Callable
+from typing import Any
+from unittest.mock import patch
+
+import grpc
+import pytest
+from google.protobuf.message import Message
+from sentry_protos.sentry.v1.taskworker_pb2 import (
+    TASK_ACTIVATION_STATUS_RETRY,
+    GetTaskResponse,
+    SetTaskStatusResponse,
+    TaskActivation,
+)
+
+from sentry.taskworker.client import TaskworkerClient
+
+
+class MockServiceMethod:
+    """Stub for grpc service methods"""
+
+    def __init__(
+        self,
+        path: str,
+        responses: list[Any],
+        request_serializer: Callable,
+        response_deserializer: Callable,
+    ):
+        self.path = path
+        self.request_serializer = request_serializer
+        self.response_deserializer = response_deserializer
+        self.responses = responses
+
+    def __call__(self, *args, **kwargs):
+        """Capture calls and use registered mocks"""
+        # move the head to the tail
+        res = self.responses[0]
+        tail = self.responses[1:]
+        self.responses = tail + [res]
+
+        if isinstance(res, Exception):
+            raise res
+        return res
+
+
+class MockChannel:
+    def __init__(self):
+        self._responses = defaultdict(list)
+
+    def unary_unary(
+        self, path: str, request_serializer: Callable, response_deserializer: Callable, **kwargs
+    ):
+        return MockServiceMethod(
+            path, self._responses.get(path, []), request_serializer, response_deserializer
+        )
+
+    def add_response(self, path: str, resp: Message | Exception):
+        self._responses[path].append(resp)
+
+
+class MockGrpcError(grpc.RpcError):
+    """Grpc error are elusive and this mock simulates the interface in mypy stubs"""
+
+    def __init__(self, code, message):
+        self._code = code
+        self._message = message
+
+    def code(self) -> grpc.StatusCode:
+        return self._code
+
+    def details(self) -> str:
+        return self._message
+
+
+def test_get_task_ok():
+    channel = MockChannel()
+    channel.add_response(
+        "/sentry_protos.sentry.v1.ConsumerService/GetTask",
+        GetTaskResponse(
+            task=TaskActivation(
+                id="abc123",
+                namespace="testing",
+                taskname="do_thing",
+                parameters="",
+                headers={},
+                processing_deadline_duration=10,
+            )
+        ),
+    )
+    with patch("sentry.taskworker.client.grpc.insecure_channel") as mock_channel:
+        mock_channel.return_value = channel
+        client = TaskworkerClient("localhost:50051")
+        result = client.get_task()
+
+        assert result
+        assert result.id
+        assert result.namespace == "testing"
+
+
+def test_get_task_not_found():
+    channel = MockChannel()
+    channel.add_response(
+        "/sentry_protos.sentry.v1.ConsumerService/GetTask",
+        MockGrpcError(grpc.StatusCode.NOT_FOUND, "no pending task found"),
+    )
+    with patch("sentry.taskworker.client.grpc.insecure_channel") as mock_channel:
+        mock_channel.return_value = channel
+        client = TaskworkerClient("localhost:50051")
+        result = client.get_task()
+
+        assert result is None
+
+
+def test_get_task_failure():
+    channel = MockChannel()
+    channel.add_response(
+        "/sentry_protos.sentry.v1.ConsumerService/GetTask",
+        MockGrpcError(grpc.StatusCode.INTERNAL, "something bad"),
+    )
+    with patch("sentry.taskworker.client.grpc.insecure_channel") as mock_channel:
+        mock_channel.return_value = channel
+        client = TaskworkerClient("localhost:50051")
+        with pytest.raises(grpc.RpcError):
+            client.get_task()
+
+
+def test_update_task_ok_with_next():
+    channel = MockChannel()
+    channel.add_response(
+        "/sentry_protos.sentry.v1.ConsumerService/SetTaskStatus",
+        SetTaskStatusResponse(
+            task=TaskActivation(
+                id="abc123",
+                namespace="testing",
+                taskname="do_thing",
+                parameters="",
+                headers={},
+                processing_deadline_duration=10,
+            )
+        ),
+    )
+    with patch("sentry.taskworker.client.grpc.insecure_channel") as mock_channel:
+        mock_channel.return_value = channel
+        client = TaskworkerClient("localhost:50051")
+        result = client.update_task("abc123", TASK_ACTIVATION_STATUS_RETRY)
+        assert result
+        assert result.id == "abc123"
+
+
+def test_update_task_ok_no_next():
+    channel = MockChannel()
+    channel.add_response(
+        "/sentry_protos.sentry.v1.ConsumerService/SetTaskStatus", SetTaskStatusResponse()
+    )
+    with patch("sentry.taskworker.client.grpc.insecure_channel") as mock_channel:
+        mock_channel.return_value = channel
+        client = TaskworkerClient("localhost:50051")
+        result = client.update_task("abc123", TASK_ACTIVATION_STATUS_RETRY)
+        assert result is None
+
+
+def test_update_task_not_found():
+    channel = MockChannel()
+    channel.add_response(
+        "/sentry_protos.sentry.v1.ConsumerService/SetTaskStatus",
+        MockGrpcError(grpc.StatusCode.NOT_FOUND, "no pending tasks found"),
+    )
+    with patch("sentry.taskworker.client.grpc.insecure_channel") as mock_channel:
+        mock_channel.return_value = channel
+        client = TaskworkerClient("localhost:50051")
+        result = client.update_task("abc123", TASK_ACTIVATION_STATUS_RETRY)
+        assert result is None
diff --git a/tests/sentry/taskworker/test_retry.py b/tests/sentry/taskworker/test_retry.py
index 614293b1518c66..9b4bc2d87ee67d 100644
--- a/tests/sentry/taskworker/test_retry.py
+++ b/tests/sentry/taskworker/test_retry.py
@@ -47,7 +47,7 @@ def test_should_retry_retryerror() -> None:
     err = RetryError("something bad")
     assert retry.should_retry(state, err)
 
-    state.attempts = 5
+    state.attempts = 4
     assert not retry.should_retry(state, err)
 
 
@@ -58,6 +58,13 @@ def test_should_retry_multiprocessing_timeout() -> None:
     timeout = TimeoutError("timeouts should retry if there are attempts left")
     assert retry.should_retry(state, timeout)
 
+    state.attempts = 1
+    assert retry.should_retry(state, timeout)
+
+    # attempt = 2 is actually the third attempt.
+    state.attempts = 2
+    assert not retry.should_retry(state, timeout)
+
     state.attempts = 3
     assert not retry.should_retry(state, timeout)
 
diff --git a/tests/sentry/taskworker/test_task.py b/tests/sentry/taskworker/test_task.py
index c6dd566f6f8216..374d0221cf2814 100644
--- a/tests/sentry/taskworker/test_task.py
+++ b/tests/sentry/taskworker/test_task.py
@@ -32,6 +32,18 @@ def test_define_task_retry(task_namespace: TaskNamespace) -> None:
     assert task.retry == retry
 
 
+def test_define_task_at_most_once_with_retry(task_namespace: TaskNamespace):
+    with pytest.raises(AssertionError) as err:
+        Task(
+            name="test.do_things",
+            func=do_things,
+            namespace=task_namespace,
+            at_most_once=True,
+            retry=Retry(times=3),
+        )
+    assert "You cannot enable at_most_once and have retries" in str(err)
+
+
 def test_delay_taskrunner_immediate_mode(task_namespace: TaskNamespace) -> None:
     calls = []
 
@@ -110,6 +122,12 @@ def test_create_activation(task_namespace: TaskNamespace) -> None:
         processing_deadline_duration=30,
     )
 
+    at_most_once_task = Task(
+        name="test.at_most_once",
+        func=do_things,
+        namespace=task_namespace,
+        at_most_once=True,
+    )
     # No retries will be made as there is no retry policy on the task or namespace.
     activation = no_retry_task.create_activation()
     assert activation.taskname == "test.no_retry"
@@ -136,6 +154,15 @@ def test_create_activation(task_namespace: TaskNamespace) -> None:
     assert activation.expires == 300
     assert activation.processing_deadline_duration == 30
 
+    activation = at_most_once_task.create_activation()
+    assert activation.taskname == "test.at_most_once"
+    assert activation.namespace == task_namespace.name
+    assert activation.retry_state
+    assert activation.retry_state.at_most_once is True
+    assert activation.retry_state.attempts == 0
+    assert activation.retry_state.discard_after_attempt == 1
+    assert activation.retry_state.deadletter_after_attempt == 0
+
 
 def test_create_activation_parameters(task_namespace: TaskNamespace) -> None:
     @task_namespace.register(name="test.parameters")
diff --git a/tests/sentry/taskworker/test_worker.py b/tests/sentry/taskworker/test_worker.py
index e8c2f5154ff30c..e7d9c11eeeddfc 100644
--- a/tests/sentry/taskworker/test_worker.py
+++ b/tests/sentry/taskworker/test_worker.py
@@ -34,6 +34,11 @@ def fail_task():
     raise ValueError("nope")
 
 
+@test_namespace.register(name="test.at_most_once", at_most_once=True)
+def at_most_once_task():
+    pass
+
+
 SIMPLE_TASK = TaskActivation(
     id="111",
     taskname="test.simple_task",
@@ -66,6 +71,14 @@ def fail_task():
     processing_deadline_duration=1,
 )
 
+AT_MOST_ONCE_TASK = TaskActivation(
+    id="555",
+    taskname="test.at_most_once",
+    namespace="tests",
+    parameters='{"args": [], "kwargs": {}}',
+    processing_deadline_duration=1,
+)
+
 
 @override_settings(TASKWORKER_IMPORTS=("tests.sentry.taskworker.test_worker",))
 class TestTaskWorker(TestCase):
@@ -118,16 +131,32 @@ def test_process_task_retry(self) -> None:
 
     def test_process_task_failure(self) -> None:
         taskworker = TaskWorker(rpc_host="127.0.0.1:50051", max_task_count=100)
-        with mock.patch.object(taskworker.client, "update_task") as mock_update_task:
-            mock_update_task.return_value = SIMPLE_TASK
+        with mock.patch.object(taskworker.client, "update_task") as mock_update:
+            mock_update.return_value = SIMPLE_TASK
             result = taskworker.process_task(FAIL_TASK)
 
-            mock_update_task.assert_called_with(
+            mock_update.assert_called_with(
                 task_id=FAIL_TASK.id, status=TASK_ACTIVATION_STATUS_FAILURE
             )
             assert result
             assert result.id == SIMPLE_TASK.id
 
+    def test_process_task_at_most_once(self) -> None:
+        taskworker = TaskWorker(rpc_host="127.0.0.1:50051", max_task_count=100)
+        with mock.patch.object(taskworker.client, "update_task") as mock_update:
+            mock_update.return_value = SIMPLE_TASK
+            result = taskworker.process_task(AT_MOST_ONCE_TASK)
+
+            mock_update.assert_called_with(
+                task_id=AT_MOST_ONCE_TASK.id, status=TASK_ACTIVATION_STATUS_COMPLETE
+            )
+        assert taskworker.process_task(AT_MOST_ONCE_TASK) is None
+        assert result
+        assert result.id == SIMPLE_TASK.id
+
+        result = taskworker.process_task(AT_MOST_ONCE_TASK)
+        assert result is None
+
     def test_start_max_task_count(self) -> None:
         taskworker = TaskWorker(rpc_host="127.0.0.1:50051", max_task_count=1)
         with mock.patch.object(taskworker, "client") as mock_client:
diff --git a/tests/sentry/toolbar/views/test_iframe_view.py b/tests/sentry/toolbar/views/test_iframe_view.py
index d62ea1f02f5393..3d0a1903b98899 100644
--- a/tests/sentry/toolbar/views/test_iframe_view.py
+++ b/tests/sentry/toolbar/views/test_iframe_view.py
@@ -1,5 +1,6 @@
 from django.test import override_settings
 from django.urls import reverse
+from django.utils.html import escapejs
 
 from sentry.testutils.cases import APITestCase
 from sentry.toolbar.views.iframe_view import TEMPLATE
@@ -26,8 +27,7 @@ def test_missing_project(self):
 
         self.assertTemplateUsed(res, TEMPLATE)
         assert f"const referrer = '{referrer}';" in res.content.decode("utf-8")
-        # TODO: 'missing-project' is the full string to check for
-        assert "const state = 'missing" in res.content.decode("utf-8")
+        assert f"const state = '{escapejs('missing-project')}';" in res.content.decode("utf-8")
 
     @override_settings(CSP_REPORT_ONLY=False)
     def test_default_no_allowed_origins(self):
@@ -41,8 +41,7 @@ def test_default_no_allowed_origins(self):
 
         self.assertTemplateUsed(res, TEMPLATE)
         assert f"const referrer = '{referrer}';" in res.content.decode("utf-8")
-        # TODO: 'invalid-domain' is the full string to check for
-        assert "const state = 'invalid" in res.content.decode("utf-8")
+        assert f"const state = '{escapejs('invalid-domain')}';" in res.content.decode("utf-8")
 
     @override_settings(CSP_REPORT_ONLY=False)
     def test_allowed_origins_basic(self):
@@ -57,7 +56,7 @@ def test_allowed_origins_basic(self):
 
         self.assertTemplateUsed(res, TEMPLATE)
         assert f"const referrer = '{referrer}';" in res.content.decode("utf-8")
-        assert "const state = 'success';" in res.content.decode("utf-8")
+        assert f"const state = '{escapejs('logged-in')}';" in res.content.decode("utf-8")
 
     @override_settings(CSP_REPORT_ONLY=False)
     def test_allowed_origins_wildcard_subdomain(self):
@@ -72,7 +71,7 @@ def test_allowed_origins_wildcard_subdomain(self):
 
         self.assertTemplateUsed(res, TEMPLATE)
         assert f"const referrer = '{referrer}';" in res.content.decode("utf-8")
-        assert "const state = 'success';" in res.content.decode("utf-8")
+        assert f"const state = '{escapejs('logged-in')}';" in res.content.decode("utf-8")
 
     @override_settings(CSP_REPORT_ONLY=False)
     def test_only_single_wildcard_subdomain(self):
@@ -87,8 +86,7 @@ def test_only_single_wildcard_subdomain(self):
 
         self.assertTemplateUsed(res, TEMPLATE)
         assert f"const referrer = '{referrer}';" in res.content.decode("utf-8")
-        # TODO: 'invalid-domain' is the full string to check for
-        assert "const state = 'invalid" in res.content.decode("utf-8")
+        assert f"const state = '{escapejs('invalid-domain')}';" in res.content.decode("utf-8")
 
     @override_settings(CSP_REPORT_ONLY=False)
     def test_no_referrer(self):
@@ -102,8 +100,7 @@ def test_no_referrer(self):
 
         self.assertTemplateUsed(res, TEMPLATE)
         assert "const referrer = '';" in res.content.decode("utf-8")
-        # TODO: 'invalid-domain' is the full string to check for
-        assert "const state = 'invalid" in res.content.decode("utf-8")
+        assert f"const state = '{escapejs('invalid-domain')}';" in res.content.decode("utf-8")
 
 
 def _get_csp_parts(response):
diff --git a/tests/sentry/types/test_region.py b/tests/sentry/types/test_region.py
index 473125801130da..174b10c5519ec0 100644
--- a/tests/sentry/types/test_region.py
+++ b/tests/sentry/types/test_region.py
@@ -20,6 +20,7 @@
     RegionResolutionError,
     find_all_multitenant_region_names,
     find_all_region_names,
+    find_regions_for_sentry_app,
     find_regions_for_user,
     get_local_region,
     get_region_by_name,
@@ -189,6 +190,39 @@ def test_find_regions_for_user(self) -> None:
         ):
             find_regions_for_user(user_id=user.id)
 
+    @override_settings(SILO_MODE=SiloMode.CONTROL)
+    def test_find_regions_for_sentry_app(self) -> None:
+        with override_settings(SENTRY_MONOLITH_REGION="us"):
+            directory = load_from_config(self._INPUTS)
+        with self._in_global_state(directory):
+            us_org_1 = self.create_organization(name="us test name 1", region="us")
+            us_org_2 = self.create_organization(name="us test name 2", region="us")
+
+            sentry_app = self.create_sentry_app(
+                organization=self.organization,
+                scopes=["project:write"],
+            )
+            actual_regions = find_regions_for_sentry_app(sentry_app=sentry_app)
+            assert actual_regions == set()
+
+            self.create_sentry_app_installation(slug=sentry_app.slug, organization=us_org_1)
+            self.create_sentry_app_installation(slug=sentry_app.slug, organization=us_org_2)
+            actual_regions = find_regions_for_sentry_app(sentry_app=sentry_app)
+            assert actual_regions == {"us"}
+
+            eu_org_1 = self.create_organization(name="eu test name", region="eu")
+            eu_org_2 = self.create_organization(name="eu test name", region="eu")
+            self.create_sentry_app_installation(slug=sentry_app.slug, organization=eu_org_1)
+            self.create_sentry_app_installation(slug=sentry_app.slug, organization=eu_org_2)
+            actual_regions = find_regions_for_sentry_app(sentry_app=sentry_app)
+            assert actual_regions == {"us", "eu"}
+
+        with (
+            override_settings(SILO_MODE=SiloMode.REGION),
+            pytest.raises(SiloLimit.AvailabilityError),
+        ):
+            find_regions_for_sentry_app(sentry_app=sentry_app)
+
     @override_settings(SILO_MODE=SiloMode.CONTROL)
     def test_find_all_region_names(self) -> None:
         with override_settings(SENTRY_MONOLITH_REGION="us"):
diff --git a/tests/sentry/uptime/endpoints/test_project_uptime_alert_details.py b/tests/sentry/uptime/endpoints/test_project_uptime_alert_details.py
index 17f9d7d117d8d0..6db87e43644b16 100644
--- a/tests/sentry/uptime/endpoints/test_project_uptime_alert_details.py
+++ b/tests/sentry/uptime/endpoints/test_project_uptime_alert_details.py
@@ -60,6 +60,7 @@ def test_all(self):
         assert uptime_sub.timeout_ms == 1500
         assert uptime_sub.headers == [["hello", "world"]]
         assert uptime_sub.body == "something"
+        assert uptime_sub.trace_sampling is False
 
         resp = self.get_success_response(
             self.organization.slug,
@@ -85,6 +86,7 @@ def test_all(self):
         assert uptime_sub.timeout_ms == 1500
         assert uptime_sub.headers == [["hello", "world"]]
         assert uptime_sub.body is None
+        assert uptime_sub.trace_sampling is False
 
     def test_enviroment(self):
         uptime_subscription = self.create_project_uptime_subscription()
diff --git a/tests/sentry/uptime/endpoints/test_project_uptime_alert_index.py b/tests/sentry/uptime/endpoints/test_project_uptime_alert_index.py
index 20e96fa466fbfd..29b0b7275deb44 100644
--- a/tests/sentry/uptime/endpoints/test_project_uptime_alert_index.py
+++ b/tests/sentry/uptime/endpoints/test_project_uptime_alert_index.py
@@ -40,6 +40,24 @@ def test(self):
         assert uptime_subscription.interval_seconds == 60
         assert uptime_subscription.timeout_ms == 1500
         assert uptime_subscription.body is None
+        assert uptime_subscription.trace_sampling is False
+
+    def test_set_trace_sampling(self):
+        resp = self.get_success_response(
+            self.organization.slug,
+            self.project.slug,
+            name="test",
+            environment="uptime-prod",
+            owner=f"user:{self.user.id}",
+            url="http://sentry.io",
+            interval_seconds=60,
+            timeout_ms=1500,
+            body=None,
+            trace_sampling=True,
+        )
+        uptime_monitor = ProjectUptimeSubscription.objects.get(id=resp.data["id"])
+        uptime_subscription = uptime_monitor.uptime_subscription
+        assert uptime_subscription.trace_sampling is True
 
     def test_no_environment(self):
         resp = self.get_success_response(
@@ -53,16 +71,7 @@ def test_no_environment(self):
             body=None,
         )
         uptime_monitor = ProjectUptimeSubscription.objects.get(id=resp.data["id"])
-        uptime_subscription = uptime_monitor.uptime_subscription
-        assert uptime_monitor.name == "test"
         assert uptime_monitor.environment is None
-        assert uptime_monitor.owner_user_id == self.user.id
-        assert uptime_monitor.owner_team_id is None
-        assert uptime_monitor.mode == ProjectUptimeSubscriptionMode.MANUAL
-        assert uptime_subscription.url == "http://sentry.io"
-        assert uptime_subscription.interval_seconds == 60
-        assert uptime_subscription.timeout_ms == 1000
-        assert uptime_subscription.body is None
 
     def test_no_owner(self):
         resp = self.get_success_response(
@@ -76,14 +85,8 @@ def test_no_owner(self):
             timeout_ms=1000,
         )
         uptime_monitor = ProjectUptimeSubscription.objects.get(id=resp.data["id"])
-        uptime_subscription = uptime_monitor.uptime_subscription
-        assert uptime_monitor.name == "test"
         assert uptime_monitor.owner_user_id is None
         assert uptime_monitor.owner_team_id is None
-        assert uptime_monitor.mode == ProjectUptimeSubscriptionMode.MANUAL
-        assert uptime_subscription.url == "http://sentry.io"
-        assert uptime_subscription.interval_seconds == 60
-        assert uptime_subscription.timeout_ms == 1000
 
         # Test without passing the owner
         resp = self.get_success_response(
@@ -155,13 +158,6 @@ def test_headers_body_method(self):
         )
         uptime_monitor = ProjectUptimeSubscription.objects.get(id=resp.data["id"])
         uptime_subscription = uptime_monitor.uptime_subscription
-        assert uptime_monitor.name == "test"
-        assert uptime_monitor.owner_user_id == self.user.id
-        assert uptime_monitor.owner_team_id is None
-        assert uptime_monitor.mode == ProjectUptimeSubscriptionMode.MANUAL
-        assert uptime_subscription.url == "http://sentry.io"
-        assert uptime_subscription.interval_seconds == 60
-        assert uptime_subscription.timeout_ms == 1000
         assert uptime_subscription.body == '{"key": "value"}'
         assert uptime_subscription.headers == [["header", "value"]]
 
diff --git a/tests/sentry/uptime/endpoints/test_serializers.py b/tests/sentry/uptime/endpoints/test_serializers.py
index 75eaf444428bdc..6ce5c0d872f306 100644
--- a/tests/sentry/uptime/endpoints/test_serializers.py
+++ b/tests/sentry/uptime/endpoints/test_serializers.py
@@ -21,6 +21,7 @@ def test(self):
             "intervalSeconds": uptime_monitor.uptime_subscription.interval_seconds,
             "timeoutMs": uptime_monitor.uptime_subscription.timeout_ms,
             "owner": None,
+            "traceSampling": False,
         }
 
     def test_default_name(self):
@@ -44,6 +45,7 @@ def test_default_name(self):
             "intervalSeconds": uptime_monitor.uptime_subscription.interval_seconds,
             "timeoutMs": uptime_monitor.uptime_subscription.timeout_ms,
             "owner": None,
+            "traceSampling": False,
         }
 
     def test_owner(self):
@@ -69,8 +71,16 @@ def test_owner(self):
                 "name": self.user.get_username(),
                 "type": "user",
             },
+            "traceSampling": False,
         }
 
+    def test_trace_sampling(self):
+        subscription = self.create_uptime_subscription(trace_sampling=True)
+        uptime_monitor = self.create_project_uptime_subscription(uptime_subscription=subscription)
+        result = serialize(uptime_monitor)
+
+        assert result["traceSampling"] is True
+
     def test_header_translation(self):
         """
         TODO(epurkhiser): This may be removed once we clean up the object-style
diff --git a/tests/sentry/uptime/migrations/__init__.py b/tests/sentry/uptime/migrations/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/tests/sentry/uptime/migrations/test_0016_translate_uptime_object_headers_to_lists.py b/tests/sentry/uptime/migrations/test_0016_translate_uptime_object_headers_to_lists.py
index 9b94c207d5295a..fbba92015a6a88 100644
--- a/tests/sentry/uptime/migrations/test_0016_translate_uptime_object_headers_to_lists.py
+++ b/tests/sentry/uptime/migrations/test_0016_translate_uptime_object_headers_to_lists.py
@@ -1,6 +1,9 @@
+import pytest
+
 from sentry.testutils.cases import TestMigrations
 
 
+@pytest.mark.skip("Migration is no longer runnable. Retain until migration is removed.")
 class TestTranslateUotimeHeaderObjectsToList(TestMigrations):
     app = "uptime"
     migrate_from = "0015_headers_deafult_empty_list"
diff --git a/tests/sentry/uptime/subscriptions/test_subscriptions.py b/tests/sentry/uptime/subscriptions/test_subscriptions.py
index 74b5ad912b0d8f..5a63570b65a42d 100644
--- a/tests/sentry/uptime/subscriptions/test_subscriptions.py
+++ b/tests/sentry/uptime/subscriptions/test_subscriptions.py
@@ -251,6 +251,7 @@ def test(self):
                 body="a body",
                 name="New name",
                 owner=Actor.from_orm_user(self.user),
+                trace_sampling=False,
             )
 
         with pytest.raises(UptimeSubscription.DoesNotExist):
@@ -293,6 +294,7 @@ def test_removes_old(self):
                 body=proj_sub.uptime_subscription.body,
                 name=proj_sub.name,
                 owner=proj_sub.owner,
+                trace_sampling=proj_sub.uptime_subscription.trace_sampling,
             )
 
         with pytest.raises(UptimeSubscription.DoesNotExist):
@@ -337,6 +339,7 @@ def test_already_exists(self):
                 body=other_proj_sub.uptime_subscription.body,
                 name=other_proj_sub.name,
                 owner=other_proj_sub.owner,
+                trace_sampling=other_proj_sub.uptime_subscription.trace_sampling,
             )
 
         assert (
diff --git a/tests/sentry/uptime/subscriptions/test_tasks.py b/tests/sentry/uptime/subscriptions/test_tasks.py
index 49420e022ad5df..7d4d3f753e7906 100644
--- a/tests/sentry/uptime/subscriptions/test_tasks.py
+++ b/tests/sentry/uptime/subscriptions/test_tasks.py
@@ -157,13 +157,16 @@ def test(self):
             "timeout_ms": sub.timeout_ms,
             "request_method": "GET",
             "request_headers": [],
+            "trace_sampling": False,
         }
 
     def test_request_fields(self):
         headers = [["hi", "bye"]]
         body = "some request body"
         method = "POST"
-        sub = self.create_uptime_subscription(method=method, headers=headers, body=body)
+        sub = self.create_uptime_subscription(
+            method=method, headers=headers, body=body, trace_sampling=True
+        )
         sub.refresh_from_db()
         subscription_id = uuid4().hex
         assert uptime_subscription_to_check_config(sub, subscription_id) == {
@@ -174,6 +177,7 @@ def test_request_fields(self):
             "request_method": method,
             "request_headers": headers,
             "request_body": body,
+            "trace_sampling": True,
         }
 
     def test_header_translation(self):
@@ -188,6 +192,7 @@ def test_header_translation(self):
             "timeout_ms": sub.timeout_ms,
             "request_method": "GET",
             "request_headers": [["hi", "bye"]],
+            "trace_sampling": False,
         }
 
 
diff --git a/tests/sentry/users/models/test_user.py b/tests/sentry/users/models/test_user.py
index da9ec4abf727d9..a4afd14471ce67 100644
--- a/tests/sentry/users/models/test_user.py
+++ b/tests/sentry/users/models/test_user.py
@@ -7,10 +7,10 @@
 from sentry.db.models.base import Model
 from sentry.deletions.tasks.hybrid_cloud import schedule_hybrid_cloud_foreign_key_jobs
 from sentry.incidents.models.alert_rule import AlertRule, AlertRuleActivity
-from sentry.incidents.models.incident import IncidentActivity, IncidentSubscription
+from sentry.incidents.models.incident import IncidentActivity
 from sentry.models.activity import Activity
 from sentry.models.authidentity import AuthIdentity
-from sentry.models.dashboard import Dashboard
+from sentry.models.dashboard import Dashboard, DashboardFavoriteUser
 from sentry.models.dynamicsampling import CustomDynamicSamplingRule
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.groupbookmark import GroupBookmark
@@ -325,6 +325,7 @@ def test_duplicate_memberships(self, expected_models: list[type[Model]]):
         AlertRuleActivity,
         CustomDynamicSamplingRule,
         Dashboard,
+        DashboardFavoriteUser,
         GroupAssignee,
         GroupBookmark,
         GroupSeen,
@@ -332,7 +333,6 @@ def test_duplicate_memberships(self, expected_models: list[type[Model]]):
         GroupSearchView,
         GroupSubscription,
         IncidentActivity,
-        IncidentSubscription,
         Monitor,
         OrganizationAccessRequest,
         OrganizationMember,
@@ -365,6 +365,7 @@ def test_only_source_user_is_member_of_organization(self, expected_models: list[
         AlertRuleActivity,
         CustomDynamicSamplingRule,
         Dashboard,
+        DashboardFavoriteUser,
         GroupAssignee,
         GroupBookmark,
         GroupSeen,
@@ -372,7 +373,6 @@ def test_only_source_user_is_member_of_organization(self, expected_models: list[
         GroupSearchView,
         GroupSubscription,
         IncidentActivity,
-        IncidentSubscription,
         Monitor,
         OrganizationAccessRequest,
         OrganizationMember,
diff --git a/tests/sentry/utils/sdk_crashes/conftest.py b/tests/sentry/utils/sdk_crashes/conftest.py
index ed0343d4fcd962..c8ded8cf181c45 100644
--- a/tests/sentry/utils/sdk_crashes/conftest.py
+++ b/tests/sentry/utils/sdk_crashes/conftest.py
@@ -23,8 +23,7 @@ def empty_cocoa_config() -> SDKCrashDetectionConfig:
         project_id=0,
         sample_rate=0.0,
         organization_allowlist=[],
-        sdk_names=[],
-        min_sdk_version="",
+        sdk_names={},
         report_fatal_errors=False,
         system_library_path_patterns=set(),
         sdk_frame_config=SDKFrameConfig(
diff --git a/tests/sentry/utils/sdk_crashes/test_event_stripper.py b/tests/sentry/utils/sdk_crashes/test_event_stripper.py
index 8cf5b71078e06c..99d638ece896ec 100644
--- a/tests/sentry/utils/sdk_crashes/test_event_stripper.py
+++ b/tests/sentry/utils/sdk_crashes/test_event_stripper.py
@@ -372,8 +372,8 @@ def test_strip_frames_with_keep_for_fields_path_replacer(store_and_strip_event,
 
     sentry_sdk_frame["module"] = "io.sentry.android.core.SentryAndroidOptions"
     sentry_sdk_frame["filename"] = "SentryAndroidOptions.java"
+    sentry_sdk_frame["package"] = "/apex/com.android.art/lib64/libart.so"
     sentry_sdk_frame["abs_path"] = "remove_me"
-    sentry_sdk_frame["package"] = "remove_me"
 
     event_data = get_crash_event_with_frames(frames)
 
@@ -389,6 +389,7 @@ def test_strip_frames_with_keep_for_fields_path_replacer(store_and_strip_event,
         "function": "register",
         "module": "io.sentry.android.core.SentryAndroidOptions",
         "filename": "SentryAndroidOptions.java",
+        "package": "/apex/com.android.art/lib64/libart.so",
         "in_app": True,
         "image_addr": "0x100304000",
     }
diff --git a/tests/sentry/utils/sdk_crashes/test_sdk_crash_detection_java.py b/tests/sentry/utils/sdk_crashes/test_sdk_crash_detection_java.py
index 7202376cda4e06..c25d055863d760 100644
--- a/tests/sentry/utils/sdk_crashes/test_sdk_crash_detection_java.py
+++ b/tests/sentry/utils/sdk_crashes/test_sdk_crash_detection_java.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from fixtures.sdk_crash_detection.crash_event_android import get_crash_event
+from fixtures.sdk_crash_detection.crash_event_android import get_apex_crash_event, get_crash_event
 from sentry.testutils.helpers.options import override_options
 from sentry.testutils.pytest.fixtures import django_db_all
 from sentry.utils.safe import get_path, set_path
@@ -143,6 +143,132 @@ def test_sdk_crash_is_reported_with_android_paths(
         assert mock_sdk_crash_reporter.report.call_count == 0
 
 
+@pytest.mark.parametrize(
+    ["apex_frame_function", "apex_frame_package", "system_frame_package", "detected"],
+    [
+        (
+            "pthread_getcpuclockid",
+            "/apex/com.android.art/lib64/bionic/libc.so",
+            "/apex/com.android.art/lib64/libart.so",
+            True,
+        ),
+        (
+            "__pthread_getcpuclockid",
+            "/apex/com.android.art/lib64/bionic/libc.so",
+            "/apex/com.android.art/lib64/libart.so",
+            True,
+        ),
+        (
+            "pthread_getcpuclockid(void*)",
+            "/apex/com.android.art/lib64/bionic/libc.so",
+            "/apex/com.android.art/lib64/libart.so",
+            True,
+        ),
+        (
+            "pthread_getcpuclocki",
+            "/apex/com.android.art/lib64/bionic/libc.so",
+            "/apex/com.android.art/lib64/libart.so",
+            False,
+        ),
+        (
+            "pthread_getcpuclockid",
+            "/apex/com.android.art/lib64/bionic/libc.s",
+            "/apex/com.android.art/lib64/libart.so",
+            False,
+        ),
+        (
+            "art::Trace::StopTracing",
+            "/apex/com.android.art/lib64/libart.so",
+            "/apex/com.android.art/lib64/bionic/libc.so",
+            True,
+        ),
+        (
+            "art::Trace::StopTracing_",
+            "/apex/com.android.art/lib64/libart.so",
+            "/apex/com.android.art/lib64/bionic/libc.so",
+            True,
+        ),
+        (
+            "art::Trace::StopTracing_",
+            "/apex/com.android.art/lib64/libart.s",
+            "/apex/com.android.art/lib64/bionic/libc.so",
+            False,
+        ),
+        (
+            "art::Thread::DumpState",
+            "/apex/com.android.art/lib64/libart.so",
+            "/apex/com.android.art/lib64/bionic/libc.so",
+            True,
+        ),
+        (
+            "_art::Thread::DumpState",
+            "/apex/com.android.art/lib64/libart.so",
+            "/apex/com.android.art/lib64/bionic/libc.so",
+            True,
+        ),
+        (
+            "_art::Thread::DumpState",
+            "/apex/com.android.art/lib64/libar.so",
+            "/apex/com.android.art/lib64/bionic/libc.so",
+            False,
+        ),
+    ],
+)
+@decorators
+def test_sdk_crash_is_reported_for_android_runtime_tracer_crashes(
+    mock_sdk_crash_reporter,
+    mock_random,
+    store_event,
+    configs,
+    apex_frame_function,
+    apex_frame_package,
+    system_frame_package,
+    detected,
+):
+    event = store_event(
+        data=get_apex_crash_event(
+            apex_frame_function=apex_frame_function,
+            apex_frame_package=apex_frame_package,
+            system_frame_package=system_frame_package,
+        )
+    )
+
+    configs[1].organization_allowlist = [event.project.organization_id]
+
+    sdk_crash_detection.detect_sdk_crash(event=event, configs=configs)
+
+    if detected:
+        assert mock_sdk_crash_reporter.report.call_count == 1
+        reported_event_data = mock_sdk_crash_reporter.report.call_args.args[0]
+
+        stripped_frames = get_path(
+            reported_event_data, "exception", "values", -1, "stacktrace", "frames"
+        )
+
+        assert len(stripped_frames) == 4
+
+        system_frame1 = stripped_frames[0]
+        assert system_frame1["function"] == "__pthread_start"
+        assert system_frame1["raw_function"] == "__pthread_start(void*)"
+        assert system_frame1["symbol"] == "_ZL15__pthread_startPv"
+        assert system_frame1["package"] == "/apex/com.android.runtime/lib/bionic/libc.so"
+        assert system_frame1["in_app"] is False
+
+        apex_frame = stripped_frames[2]
+        assert apex_frame["function"] == apex_frame_function
+        assert apex_frame["symbol"] == apex_frame_function
+        assert apex_frame["package"] == apex_frame_package
+        assert apex_frame["in_app"] is True
+
+        system_frame2 = stripped_frames[3]
+        assert system_frame2["function"] == "invoke"
+        assert system_frame2["package"] == system_frame_package
+        assert system_frame2["in_app"] is False
+
+    else:
+        assert mock_sdk_crash_reporter.report.call_count == 0
+
+
 @decorators
 def test_beta_sdk_version_detected(mock_sdk_crash_reporter, mock_random, store_event, configs):
     event_data = get_crash_event()
@@ -175,3 +301,39 @@ def test_too_low_min_sdk_version_not_detected(
     )
 
     assert mock_sdk_crash_reporter.report.call_count == 0
+
+
+@decorators
+def test_native_sdk_version_detected(mock_sdk_crash_reporter, mock_random, store_event, configs):
+    event_data = get_crash_event()
+    set_path(event_data, "sdk", "version", value="0.6.0")
+    set_path(event_data, "sdk", "name", value="sentry.native.android")
+    event = store_event(data=event_data)
+
+    configs[1].organization_allowlist = [event.project.organization_id]
+
+    sdk_crash_detection.detect_sdk_crash(
+        event=event,
+        configs=configs,
+    )
+
+    assert mock_sdk_crash_reporter.report.call_count == 1
+
+
+@decorators
+def test_native_sdk_version_too_low_not_detected(
+    mock_sdk_crash_reporter, mock_random, store_event, configs
+):
+    event_data = get_crash_event()
+    set_path(event_data, "sdk", "version", value="0.5.9")
+    set_path(event_data, "sdk", "name", value="sentry.native.android")
+    event = store_event(data=event_data)
+
+    configs[1].organization_allowlist = [event.project.organization_id]
+
+    sdk_crash_detection.detect_sdk_crash(
+        event=event,
+        configs=configs,
+    )
+
+    assert mock_sdk_crash_reporter.report.call_count == 0
diff --git a/tests/sentry/utils/test_concurrent.py b/tests/sentry/utils/test_concurrent.py
index 3e5b8c3b9e7e3b..fd69c28c1a8326 100644
--- a/tests/sentry/utils/test_concurrent.py
+++ b/tests/sentry/utils/test_concurrent.py
@@ -187,7 +187,7 @@ def test_timed_future_cancel():
 
 
 def test_synchronous_executor():
-    executor: SynchronousExecutor[object] = SynchronousExecutor()
+    executor = SynchronousExecutor()
 
     assert executor.submit(lambda: mock.sentinel.RESULT).result() is mock.sentinel.RESULT
 
@@ -204,7 +204,7 @@ def callable():
 
 
 def test_threaded_same_priority_Tasks():
-    executor: ThreadedExecutor[None] = ThreadedExecutor(worker_count=1)
+    executor = ThreadedExecutor(worker_count=1)
 
     def callable():
         pass
@@ -215,7 +215,7 @@ def callable():
 
 
 def test_threaded_executor():
-    executor: ThreadedExecutor[int] = ThreadedExecutor(worker_count=1, maxsize=3)
+    executor = ThreadedExecutor(worker_count=1, maxsize=3)
 
     def waiter(ready, waiting, result):
         ready.set()
diff --git a/tests/sentry/utils/test_event_tracker.py b/tests/sentry/utils/test_event_tracker.py
new file mode 100644
index 00000000000000..71a7551d76abf1
--- /dev/null
+++ b/tests/sentry/utils/test_event_tracker.py
@@ -0,0 +1,32 @@
+import unittest
+from unittest.mock import patch
+
+from sentry.ingest.types import ConsumerType
+from sentry.testutils.cases import TestCase
+from sentry.testutils.helpers.options import override_options
+from sentry.utils.event_tracker import TransactionStageStatus, track_sampled_event
+
+EVENT_ID = "9cdc4c32dff14fbbb012b0aa9e908126"
+CONSUMER_TYPE = ConsumerType.Transactions
+STATUS = TransactionStageStatus.REDIS_PUT
+
+
+class TestEventTracking(TestCase):
+
+    @patch("sentry.utils.event_tracker._do_record")
+    def test_track_sampled_event_logs_event(self, mock_do_record):
+        with override_options({"performance.event-tracker.sample-rate.transactions": 1.0}):
+            track_sampled_event(EVENT_ID, CONSUMER_TYPE, STATUS)
+            mock_do_record.assert_called_once_with(
+                {"event_id": EVENT_ID, "consumer_type": CONSUMER_TYPE, "status": STATUS}
+            )
+
+    @patch("sentry.utils.event_tracker._do_record")
+    def test_track_sampled_event_does_not_log_event(self, mock_do_record):
+        with override_options({"performance.event-tracker.sample-rate.transactions": 0.0}):
+            track_sampled_event(EVENT_ID, CONSUMER_TYPE, STATUS)
+            mock_do_record.assert_not_called()
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/sentry/utils/test_flag.py b/tests/sentry/utils/test_flag.py
deleted file mode 100644
index 2ed9a6357d77eb..00000000000000
--- a/tests/sentry/utils/test_flag.py
+++ /dev/null
@@ -1,129 +0,0 @@
-import asyncio
-import concurrent.futures as cf
-
-from django.urls import reverse
-
-from sentry.testutils.cases import APITestCase
-from sentry.utils import flag
-
-
-def test_flag_tracking():
-    """Assert the ring buffer works."""
-    flag.initialize_flag_manager(capacity=3)
-
-    flag.process_flag_result("a", True)
-    flags = flag.get_flags_serialized()
-    assert len(flags) == 1
-    assert flags == [{"flag": "feature.a", "result": True}]
-
-    flag.process_flag_result("b", True)
-    flags = flag.get_flags_serialized()
-    assert len(flags) == 2
-    assert flags == [{"flag": "feature.a", "result": True}, {"flag": "feature.b", "result": True}]
-
-    flag.process_flag_result("c", True)
-    flags = flag.get_flags_serialized()
-    assert len(flags) == 3
-    assert flags == [
-        {"flag": "feature.a", "result": True},
-        {"flag": "feature.b", "result": True},
-        {"flag": "feature.c", "result": True},
-    ]
-
-    flag.process_flag_result("d", False)
-    flags = flag.get_flags_serialized()
-    assert len(flags) == 3
-    assert flags == [
-        {"flag": "feature.b", "result": True},
-        {"flag": "feature.c", "result": True},
-        {"flag": "feature.d", "result": False},
-    ]
-
-    flag.process_flag_result("e", False)
-    flag.process_flag_result("f", False)
-    flags = flag.get_flags_serialized()
-    assert len(flags) == 3
-    assert flags == [
-        {"flag": "feature.d", "result": False},
-        {"flag": "feature.e", "result": False},
-        {"flag": "feature.f", "result": False},
-    ]
-
-
-def test_flag_manager_asyncio_isolation():
-    """Assert concurrently evaluated flags do not pollute one another."""
-
-    async def task(chars: str):
-        flag.initialize_flag_manager(capacity=3)
-        for char in chars:
-            flag.process_flag_result(char, True)
-        return flag.get_flags_serialized()
-
-    async def runner():
-        return asyncio.gather(
-            task("abc"),
-            task("de"),
-            task("fghijk"),
-        )
-
-    results = asyncio.run(runner()).result()
-
-    assert results[0] == [
-        {"flag": "feature.a", "result": True},
-        {"flag": "feature.b", "result": True},
-        {"flag": "feature.c", "result": True},
-    ]
-    assert results[1] == [
-        {"flag": "feature.d", "result": True},
-        {"flag": "feature.e", "result": True},
-    ]
-    assert results[2] == [
-        {"flag": "feature.i", "result": True},
-        {"flag": "feature.j", "result": True},
-        {"flag": "feature.k", "result": True},
-    ]
-
-
-def test_flag_manager_thread_isolation():
-    """Assert concurrently evaluated flags do not pollute one another."""
-
-    def task(chars: str):
-        flag.initialize_flag_manager(capacity=3)
-        for char in chars:
-            flag.process_flag_result(char, True)
-        return flag.get_flags_serialized()
-
-    with cf.ThreadPoolExecutor(max_workers=3) as pool:
-        results = list(pool.map(task, ["abc", "de", "fghijk"]))
-
-    assert results[0] == [
-        {"flag": "feature.a", "result": True},
-        {"flag": "feature.b", "result": True},
-        {"flag": "feature.c", "result": True},
-    ]
-    assert results[1] == [
-        {"flag": "feature.d", "result": True},
-        {"flag": "feature.e", "result": True},
-    ]
-    assert results[2] == [
-        {"flag": "feature.i", "result": True},
-        {"flag": "feature.j", "result": True},
-        {"flag": "feature.k", "result": True},
-    ]
-
-
-class E2EAPITestCase(APITestCase):
-    endpoint = "sentry-api-0-organization-replay-index"
-
-    def setUp(self):
-        super().setUp()
-        self.login_as(user=self.user)
-        self.url = reverse(self.endpoint, args=(self.organization.slug,))
-
-    def test_contextvar_initialized(self):
-        """Test replays must be used with a project(s)."""
-        self.client.get(self.url)
-
-        flags = flag.get_flags_serialized()
-        assert flags[-1]["flag"] == "feature.organizations:session-replay"
-        assert flags[-1]["result"] is False
diff --git a/tests/sentry/utils/test_services.py b/tests/sentry/utils/test_services.py
index daadca28b6d858..5006cea7d11d2d 100644
--- a/tests/sentry/utils/test_services.py
+++ b/tests/sentry/utils/test_services.py
@@ -34,7 +34,7 @@ def apply(self, x: int, y: int) -> int:
 
 @pytest.fixture
 def delegator_fixture() -> tuple[Delegator, Mock, Mock]:
-    executor: SynchronousExecutor[object] = SynchronousExecutor()
+    executor = SynchronousExecutor()
     selector = Mock()
     callback = Mock()
     delegator = Delegator(
@@ -187,16 +187,3 @@ def test_make_writebehind_selector_int_key(register_option):
     with override_options({"feature.rollout": 1.0}):
         result = selector(context, "do_thing", {})
         assert result == ["new", "old"]
-
-
-def test_make_writebehind_selector_invalid_key(register_option):
-    context = Mock()
-    selector = make_writebehind_selector(
-        option_name="feature.rollout",
-        move_to="new",
-        move_from="old",
-        key_fetch=lambda *args: {"lol": "nope"},  # type: ignore[arg-type]
-    )
-    with override_options({"feature.rollout": 1.0}):
-        result = selector(context, "do_thing", {})
-        assert result == ["old"]
diff --git a/tests/sentry/web/frontend/test_js_sdk_loader.py b/tests/sentry/web/frontend/test_js_sdk_loader.py
index accd733ff63c46..b90a0df0f86529 100644
--- a/tests/sentry/web/frontend/test_js_sdk_loader.py
+++ b/tests/sentry/web/frontend/test_js_sdk_loader.py
@@ -339,7 +339,7 @@ def test_headers(self, mock_load_version_from_file):
         assert "sdk-loader" in resp["Surrogate-Key"]
         assert "Content-Encoding" not in resp
         assert "Set-Cookie" not in resp
-        assert "Vary" not in resp
+        assert "Vary" not in resp, f"Found Vary header: {resp['Vary']}"
 
     def test_absolute_url(self):
         assert (
diff --git a/tests/sentry/web/frontend/test_oauth_authorize.py b/tests/sentry/web/frontend/test_oauth_authorize.py
index 15f78aee47a67b..eb33fba9d57cb1 100644
--- a/tests/sentry/web/frontend/test_oauth_authorize.py
+++ b/tests/sentry/web/frontend/test_oauth_authorize.py
@@ -358,6 +358,7 @@ def setUp(self):
         super().setUp()
         self.owner = self.create_user(email="admin@test.com")
         self.create_member(user=self.owner, organization=self.organization, role="owner")
+        self.another_organization = self.create_organization(owner=self.owner)
         self.application = ApiApplication.objects.create(
             owner=self.user,
             redirect_uris="https://example.com",
@@ -370,7 +371,7 @@ def test_no_orgs(self):
         user = self.create_user(email="user1@test.com")
         self.login_as(user)
         resp = self.client.get(
-            f"{self.path}?response_type=code&client_id={self.application.client_id}&scope=org%3write&state=foo"
+            f"{self.path}?response_type=code&client_id={self.application.client_id}&scope=org:read&state=foo"
         )
         assert resp.status_code == 400
         self.assertTemplateUsed("sentry/oauth-error.html")
@@ -382,9 +383,8 @@ def test_no_orgs(self):
     def test_rich_params(self):
         self.login_as(self.owner)
 
-        # Putting scope in the query string to show that this will be overridden by the scopes that are stored on the application model
         resp = self.client.get(
-            f"{self.path}?response_type=code&client_id={self.application.client_id}&scope=org%3write&state=foo"
+            f"{self.path}?response_type=code&client_id={self.application.client_id}&scope=org:read&state=foo"
         )
 
         assert resp.status_code == 200
@@ -398,8 +398,7 @@ def test_rich_params(self):
         grant = ApiGrant.objects.get(user=self.owner)
         assert grant.redirect_uri == self.application.get_default_redirect_uri()
         assert grant.application == self.application
-        assert grant.get_scopes() == ["org:read", "project:read"]
-        assert "org:write" not in grant.get_scopes()
+        assert grant.get_scopes() == ["org:read"]
         assert grant.organization_id == self.organization.id
 
         assert resp.status_code == 302
@@ -411,3 +410,77 @@ def test_rich_params(self):
         )
 
         assert not ApiToken.objects.filter(user=self.owner).exists()
+
+    def test_exceed_scope(self):
+        self.login_as(self.owner)
+
+        resp = self.client.get(
+            f"{self.path}?response_type=code&client_id={self.application.client_id}&scope=org:write&state=foo"
+        )
+
+        assert resp.status_code == 302
+        assert resp["Location"] == "https://example.com?error=invalid_scope&state=foo"
+
+    def test_second_time(self):
+        self.login_as(self.owner)
+
+        # before hitting the authorize endpoint we expect that ApiAuthorization does not exist
+        before_apiauth = ApiAuthorization.objects.filter(
+            user=self.owner, application=self.application
+        )
+        assert before_apiauth.exists() is False
+
+        # The first time the app hits the endpoint for the user, it is expected that
+        # 1. User sees the view to choose an organization
+        # 2. ApiAuthorization is created with the selected organization
+        resp = self.client.get(
+            f"{self.path}?response_type=code&client_id={self.application.client_id}&scope=org:read&state=foo"
+        )
+
+        assert resp.status_code == 200
+        self.assertTemplateUsed("sentry/oauth-authorize.html")
+        assert resp.context["application"] == self.application
+
+        resp = self.client.post(
+            self.path, {"op": "approve", "selected_organization_id": self.organization.id}
+        )
+
+        grant = ApiGrant.objects.get(user=self.owner)
+        assert grant.redirect_uri == self.application.get_default_redirect_uri()
+        # There is only one ApiAuthorization for this user and app which is related to the right organization
+        api_auth = ApiAuthorization.objects.get(user=self.owner, application=self.application)
+        assert api_auth.organization_id == self.organization.id
+
+        # The second time the app hits the endpoint for the user, it is expected that
+        # 1. User still sees the view to choose an organization
+        # 2. ApiAuthorization is not created again if the user chooses the same organization
+        resp = self.client.get(
+            f"{self.path}?response_type=code&client_id={self.application.client_id}&scope=org:read&state=foo"
+        )
+        assert resp.status_code == 200
+        self.assertTemplateUsed("sentry/oauth-authorize.html")
+        assert resp.context["application"] == self.application
+        resp = self.client.post(
+            self.path, {"op": "approve", "selected_organization_id": self.organization.id}
+        )
+        same_api_auth = ApiAuthorization.objects.get(user=self.owner, application=self.application)
+        assert api_auth.id == same_api_auth.id
+
+        # The other time the app hits the endpoint for the user, it is expected that
+        # 1. User still sees the view to choose an organization
+        # 2. New ApiAuthorization is created again if the user chooses another organization
+        resp = self.client.get(
+            f"{self.path}?response_type=code&client_id={self.application.client_id}&scope=org:read&state=foo"
+        )
+        assert resp.status_code == 200
+        self.assertTemplateUsed("sentry/oauth-authorize.html")
+        assert resp.context["application"] == self.application
+        resp = self.client.post(
+            self.path, {"op": "approve", "selected_organization_id": self.another_organization.id}
+        )
+        another_api_auth = ApiAuthorization.objects.get(
+            user=self.owner,
+            application=self.application,
+            organization_id=self.another_organization.id,
+        )
+        assert api_auth.id != another_api_auth.id
diff --git a/tests/sentry/web/frontend/test_react_page.py b/tests/sentry/web/frontend/test_react_page.py
index bd294f459075e1..d9f25f12b561e9 100644
--- a/tests/sentry/web/frontend/test_react_page.py
+++ b/tests/sentry/web/frontend/test_react_page.py
@@ -296,11 +296,14 @@ def _run_customer_domain_elevated_privileges(self, is_superuser: bool, is_staff:
                 assert response.redirect_chain == [
                     (f"http://{other_org.slug}.testserver/issues/", 302)
                 ]
-                assert self.client.session["activeorg"] == other_org.slug
             else:
                 assert response.redirect_chain == [
                     (f"http://{other_org.slug}.testserver/auth/login/{other_org.slug}/", 302)
                 ]
+
+            if is_superuser or is_staff:
+                assert self.client.session["activeorg"] == other_org.slug
+            else:
                 assert "activeorg" not in self.client.session
 
         # Accessing org without customer domain as superuser and/or staff.
diff --git a/tests/sentry/web/test_api.py b/tests/sentry/web/test_api.py
index 9f284ead205e9d..f1285d02730fdb 100644
--- a/tests/sentry/web/test_api.py
+++ b/tests/sentry/web/test_api.py
@@ -301,11 +301,13 @@ def _run_test_with_privileges(self, is_superuser: bool, is_staff: bool):
                 assert response.redirect_chain == [
                     (f"http://{other_org.slug}.testserver/issues/", 302)
                 ]
-                assert self.client.session["activeorg"] == other_org.slug
             else:
                 assert response.redirect_chain == [
                     (f"http://{other_org.slug}.testserver/auth/login/{other_org.slug}/", 302)
                 ]
+            if is_superuser or is_staff:
+                assert self.client.session["activeorg"] == other_org.slug
+            else:
                 assert "activeorg" not in self.client.session
 
         # lastOrganization is set
diff --git a/tests/sentry/workflow_engine/endpoints/test_project_detector_index.py b/tests/sentry/workflow_engine/endpoints/test_project_detector_index.py
new file mode 100644
index 00000000000000..17f029136d0115
--- /dev/null
+++ b/tests/sentry/workflow_engine/endpoints/test_project_detector_index.py
@@ -0,0 +1,186 @@
+from unittest import mock
+
+from sentry.api.serializers import serialize
+from sentry.incidents.grouptype import MetricAlertFire
+from sentry.models.environment import Environment
+from sentry.snuba.dataset import Dataset
+from sentry.snuba.models import (
+    QuerySubscription,
+    QuerySubscriptionDataSourceHandler,
+    SnubaQuery,
+    SnubaQueryEventType,
+)
+from sentry.testutils.cases import APITestCase
+from sentry.testutils.silo import region_silo_test
+from sentry.workflow_engine.models import DataCondition, DataConditionGroup, DataSource, Detector
+from sentry.workflow_engine.registry import data_source_type_registry
+from sentry.workflow_engine.types import DetectorPriorityLevel
+
+
+class ProjectDetectorIndexBaseTest(APITestCase):
+    endpoint = "sentry-api-0-project-detector-index"
+
+    def setUp(self):
+        super().setUp()
+        self.login_as(user=self.user)
+        self.environment = Environment.objects.create(
+            organization_id=self.organization.id, name="production"
+        )
+
+
+@region_silo_test
+class ProjectDetectorIndexGetTest(ProjectDetectorIndexBaseTest):
+    def test_simple(self):
+        detector = Detector.objects.create(
+            organization_id=self.organization.id,
+            name="Test Detector",
+            type=MetricAlertFire.slug,
+        )
+        detector_2 = Detector.objects.create(
+            organization_id=self.organization.id,
+            name="Test Detector 2",
+            type=MetricAlertFire.slug,
+        )
+        response = self.get_success_response(self.organization.slug, self.project.slug)
+        assert response.data == serialize([detector, detector_2])
+
+    def test_empty_result(self):
+        response = self.get_success_response(self.organization.slug, self.project.slug)
+        assert len(response.data) == 0
+
+
+@region_silo_test
+class ProjectDetectorIndexPostTest(ProjectDetectorIndexBaseTest):
+    method = "POST"
+
+    def setUp(self):
+        super().setUp()
+        self.valid_data = {
+            "name": "Test Detector",
+            "group_type": MetricAlertFire.slug,
+            "data_source": {
+                "query_type": SnubaQuery.Type.ERROR.value,
+                "dataset": Dataset.Events.name.lower(),
+                "query": "test query",
+                "aggregate": "count()",
+                "time_window": 60,
+                "environment": self.environment.name,
+                "event_types": [SnubaQueryEventType.EventType.ERROR.value],
+            },
+            "data_conditions": [
+                {
+                    "condition": "gt",
+                    "comparison": 100,
+                    "result": DetectorPriorityLevel.HIGH,
+                }
+            ],
+        }
+
+    def test_missing_group_type(self):
+        data = {**self.valid_data}
+        del data["group_type"]
+        response = self.get_error_response(
+            self.organization.slug,
+            self.project.slug,
+            **data,
+            status_code=400,
+        )
+        assert response.data == {"groupType": ["This field is required."]}
+
+    def test_invalid_group_type(self):
+        data = {**self.valid_data, "group_type": "invalid_type"}
+        response = self.get_error_response(
+            self.organization.slug,
+            self.project.slug,
+            **data,
+            status_code=400,
+        )
+        assert response.data == {"groupType": ["Unknown group type"]}
+
+    def test_incompatible_group_type(self):
+        with mock.patch("sentry.issues.grouptype.registry.get_by_slug") as mock_get:
+            mock_get.return_value = mock.Mock(detector_validator=None)
+            data = {**self.valid_data, "group_type": "incompatible_type"}
+            response = self.get_error_response(
+                self.organization.slug,
+                self.project.slug,
+                **data,
+                status_code=400,
+            )
+            assert response.data == {"groupType": ["Group type not compatible with detectors"]}
+
+    @mock.patch("sentry.workflow_engine.endpoints.validators.create_audit_entry")
+    def test_valid_creation(self, mock_audit):
+        with self.tasks():
+            response = self.get_success_response(
+                self.organization.slug,
+                self.project.slug,
+                **self.valid_data,
+                status_code=201,
+            )
+
+        detector = Detector.objects.get(id=response.data["id"])
+        assert response.data == serialize([detector])[0]
+        assert detector.name == "Test Detector"
+        assert detector.type == MetricAlertFire.slug
+        assert detector.organization_id == self.organization.id
+
+        # Verify data source
+        data_source = DataSource.objects.get(detector=detector)
+        assert data_source.type == data_source_type_registry.get_key(
+            QuerySubscriptionDataSourceHandler
+        )
+        assert data_source.organization_id == self.organization.id
+
+        # Verify query subscription
+        query_sub = QuerySubscription.objects.get(id=data_source.query_id)
+        assert query_sub.project == self.project
+        assert query_sub.snuba_query
+        assert query_sub.snuba_query.type == SnubaQuery.Type.ERROR.value
+        assert query_sub.snuba_query.dataset == Dataset.Events.value
+        assert query_sub.snuba_query.query == "test query"
+        assert query_sub.snuba_query.aggregate == "count()"
+        assert query_sub.snuba_query.time_window == 3600
+        assert query_sub.snuba_query.environment == self.environment
+        assert query_sub.snuba_query.event_types == [SnubaQueryEventType.EventType.ERROR]
+
+        # Verify condition group and conditions
+        condition_group = detector.workflow_condition_group
+        assert condition_group
+        assert condition_group.logic_type == DataConditionGroup.Type.ANY
+        assert condition_group.organization_id == self.organization.id
+
+        conditions = list(DataCondition.objects.filter(condition_group=condition_group))
+        assert len(conditions) == 1
+        condition = conditions[0]
+        assert condition.condition == "gt"
+        assert condition.comparison == 100
+        assert condition.condition_result == DetectorPriorityLevel.HIGH
+
+        # Verify audit log
+        mock_audit.assert_called_once_with(
+            request=mock.ANY,
+            organization=self.organization,
+            target_object=detector.id,
+            event=mock.ANY,
+            data=detector.get_audit_log_data(),
+        )
+
+    def test_missing_required_field(self):
+        response = self.get_error_response(
+            self.organization.slug,
+            self.project.slug,
+            status_code=400,
+        )
+        assert response.data == {"groupType": ["This field is required."]}
+
+    def test_missing_name(self):
+        data = {**self.valid_data}
+        del data["name"]
+        response = self.get_error_response(
+            self.organization.slug,
+            self.project.slug,
+            **data,
+            status_code=400,
+        )
+        assert response.data == {"name": ["This field is required."]}
diff --git a/tests/sentry/workflow_engine/handlers/detector/__init__.py b/tests/sentry/workflow_engine/handlers/detector/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/tests/sentry/workflow_engine/handlers/detector/test_base.py b/tests/sentry/workflow_engine/handlers/detector/test_base.py
new file mode 100644
index 00000000000000..127e7c780c4a6e
--- /dev/null
+++ b/tests/sentry/workflow_engine/handlers/detector/test_base.py
@@ -0,0 +1,156 @@
+from datetime import datetime, timezone
+from typing import Any
+from unittest import mock
+
+from sentry.issues.grouptype import GroupCategory, GroupType
+from sentry.issues.issue_occurrence import IssueOccurrence
+from sentry.issues.status_change_message import StatusChangeMessage
+from sentry.testutils.abstract import Abstract
+from sentry.types.group import PriorityLevel
+from sentry.workflow_engine.handlers.detector import DetectorEvaluationResult, DetectorHandler
+from sentry.workflow_engine.handlers.detector.stateful import StatefulDetectorHandler
+from sentry.workflow_engine.models import DataPacket, Detector
+from sentry.workflow_engine.types import DetectorGroupKey, DetectorPriorityLevel
+from tests.sentry.issues.test_grouptype import BaseGroupTypeTest
+
+
+def build_mock_occurrence_and_event(
+    handler: StatefulDetectorHandler,
+    group_key: DetectorGroupKey,
+    value: int,
+    new_status: PriorityLevel,
+) -> tuple[IssueOccurrence, dict[str, Any]]:
+    assert handler.detector.group_type is not None
+    occurrence = IssueOccurrence(
+        id="eb4b0acffadb4d098d48cb14165ab578",
+        project_id=handler.detector.project_id,
+        event_id="43878ab4419f4ab181f6379ac376d5aa",
+        fingerprint=handler.build_fingerprint(group_key),
+        issue_title="Some Issue",
+        subtitle="Some subtitle",
+        resource_id=None,
+        evidence_data={},
+        evidence_display=[],
+        type=handler.detector.group_type,
+        detection_time=datetime.now(timezone.utc),
+        level="error",
+        culprit="Some culprit",
+        initial_issue_priority=new_status.value,
+    )
+    event_data = {
+        "timestamp": occurrence.detection_time,
+        "project_id": occurrence.project_id,
+        "event_id": occurrence.event_id,
+        "platform": "python",
+        "received": occurrence.detection_time,
+        "tags": {},
+    }
+    return occurrence, event_data
+
+
+def status_change_comparator(self: StatusChangeMessage, other: StatusChangeMessage):
+    return (
+        isinstance(other, StatusChangeMessage)
+        and self.fingerprint == other.fingerprint
+        and self.project_id == other.project_id
+        and self.new_status == other.new_status
+        and self.new_substatus == other.new_substatus
+    )
+
+
+class MockDetectorStateHandler(StatefulDetectorHandler[dict]):
+    counter_names = ["test1", "test2"]
+
+    def get_dedupe_value(self, data_packet: DataPacket[dict]) -> int:
+        return data_packet.packet.get("dedupe", 0)
+
+    def get_group_key_values(self, data_packet: DataPacket[dict]) -> dict[str, int]:
+        return data_packet.packet.get("group_vals", {})
+
+    def build_occurrence_and_event_data(
+        self, group_key: DetectorGroupKey, value: int, new_status: PriorityLevel
+    ) -> tuple[IssueOccurrence, dict[str, Any]]:
+        return build_mock_occurrence_and_event(self, group_key, value, new_status)
+
+
+class BaseDetectorHandlerTest(BaseGroupTypeTest):
+    __test__ = Abstract(__module__, __qualname__)
+
+    def setUp(self):
+        super().setUp()
+        self.sm_comp_patcher = mock.patch.object(
+            StatusChangeMessage, "__eq__", status_change_comparator
+        )
+        self.sm_comp_patcher.__enter__()
+
+        class NoHandlerGroupType(GroupType):
+            type_id = 1
+            slug = "no_handler"
+            description = "no handler"
+            category = GroupCategory.METRIC_ALERT.value
+
+        class MockDetectorHandler(DetectorHandler[dict]):
+            def evaluate(
+                self, data_packet: DataPacket[dict]
+            ) -> dict[DetectorGroupKey, DetectorEvaluationResult]:
+                return {None: DetectorEvaluationResult(None, True, DetectorPriorityLevel.HIGH)}
+
+        class HandlerGroupType(GroupType):
+            type_id = 2
+            slug = "handler"
+            description = "handler"
+            category = GroupCategory.METRIC_ALERT.value
+            detector_handler = MockDetectorHandler
+
+        class HandlerStateGroupType(GroupType):
+            type_id = 3
+            slug = "handler_with_state"
+            description = "handler with state"
+            category = GroupCategory.METRIC_ALERT.value
+            detector_handler = MockDetectorStateHandler
+
+        self.no_handler_type = NoHandlerGroupType
+        self.handler_type = HandlerGroupType
+        self.handler_state_type = HandlerStateGroupType
+
+    def tearDown(self):
+        super().tearDown()
+        self.sm_comp_patcher.__exit__(None, None, None)
+
+    def create_detector_and_conditions(self, type: str | None = None):
+        if type is None:
+            type = "handler_with_state"
+        self.project = self.create_project()
+        detector = self.create_detector(
+            project=self.project,
+            workflow_condition_group=self.create_data_condition_group(),
+            type=type,
+        )
+        self.create_data_condition(
+            condition="gt",
+            comparison=5,
+            condition_result=DetectorPriorityLevel.HIGH,
+            condition_group=detector.workflow_condition_group,
+        )
+        return detector
+
+    def build_handler(
+        self, detector: Detector | None = None, detector_type=None
+    ) -> MockDetectorStateHandler:
+        if detector is None:
+            detector = self.create_detector_and_conditions(detector_type)
+        return MockDetectorStateHandler(detector)
+
+    def assert_updates(self, handler, group_key, dedupe_value, counter_updates, active, priority):
+        if dedupe_value is not None:
+            assert handler.dedupe_updates.get(group_key) == dedupe_value
+        else:
+            assert group_key not in handler.dedupe_updates
+        if counter_updates is not None:
+            assert handler.counter_updates.get(group_key) == counter_updates
+        else:
+            assert group_key not in handler.counter_updates
+        if active is not None or priority is not None:
+            assert handler.state_updates.get(group_key) == (active, priority)
+        else:
+            assert group_key not in handler.state_updates
diff --git a/tests/sentry/workflow_engine/models/test_action.py b/tests/sentry/workflow_engine/models/test_action.py
new file mode 100644
index 00000000000000..32251b47c2937a
--- /dev/null
+++ b/tests/sentry/workflow_engine/models/test_action.py
@@ -0,0 +1,70 @@
+from unittest.mock import Mock, patch
+
+import pytest
+from django.test import TestCase
+
+from sentry.eventstore.models import GroupEvent
+from sentry.utils.registry import NoRegistrationExistsError
+from sentry.workflow_engine.models import Action
+from sentry.workflow_engine.types import ActionHandler
+
+
+class TestAction(TestCase):
+    def setUp(self):
+        self.mock_event = Mock(spec=GroupEvent)
+        self.mock_detector = Mock(name="detector")
+        self.action = Action(type=Action.Type.NOTIFICATION)
+
+    def test_get_handler_notification_type(self):
+        with patch("sentry.workflow_engine.registry.action_handler_registry.get") as mock_get:
+            mock_handler = Mock(spec=ActionHandler)
+            mock_get.return_value = mock_handler
+
+            handler = self.action.get_handler()
+
+            mock_get.assert_called_once_with(Action.Type.NOTIFICATION)
+            assert handler == mock_handler
+
+    def test_get_handler_webhook_type(self):
+        self.action = Action(type=Action.Type.WEBHOOK)
+
+        with patch("sentry.workflow_engine.registry.action_handler_registry.get") as mock_get:
+            mock_handler = Mock(spec=ActionHandler)
+            mock_get.return_value = mock_handler
+
+            handler = self.action.get_handler()
+
+            mock_get.assert_called_once_with(Action.Type.WEBHOOK)
+            assert handler == mock_handler
+
+    def test_get_handler_unregistered_type(self):
+        with patch("sentry.workflow_engine.registry.action_handler_registry.get") as mock_get:
+            mock_get.side_effect = NoRegistrationExistsError(
+                "No handler registered for notification type"
+            )
+
+            with pytest.raises(
+                NoRegistrationExistsError, match="No handler registered for notification type"
+            ):
+                self.action.get_handler()
+
+            # Verify the registry was queried with the correct action type
+            mock_get.assert_called_once_with(Action.Type.NOTIFICATION)
+
+    def test_trigger_calls_handler_execute(self):
+        mock_handler = Mock(spec=ActionHandler)
+
+        with patch.object(self.action, "get_handler", return_value=mock_handler):
+            self.action.trigger(self.mock_event, self.mock_detector)
+
+            mock_handler.execute.assert_called_once_with(
+                self.mock_event, self.action, self.mock_detector
+            )
+
+    def test_trigger_with_failing_handler(self):
+        mock_handler = Mock(spec=ActionHandler)
+        mock_handler.execute.side_effect = Exception("Handler failed")
+
+        with patch.object(self.action, "get_handler", return_value=mock_handler):
+            with pytest.raises(Exception, match="Handler failed"):
+                self.action.trigger(self.mock_event, self.mock_detector)
diff --git a/tests/sentry/workflow_engine/models/test_data_condition.py b/tests/sentry/workflow_engine/models/test_data_condition.py
index 4736aae3b8d622..0c91a76b0fe285 100644
--- a/tests/sentry/workflow_engine/models/test_data_condition.py
+++ b/tests/sentry/workflow_engine/models/test_data_condition.py
@@ -1,5 +1,7 @@
 from unittest import mock
 
+import pytest
+
 from sentry.testutils.cases import TestCase
 from sentry.workflow_engine.types import DetectorPriorityLevel
 
@@ -46,17 +48,17 @@ def test_bad_condition(self):
         dc = self.create_data_condition(
             condition="invalid", comparison=1.0, condition_result=DetectorPriorityLevel.HIGH
         )
-        with mock.patch("sentry.workflow_engine.models.data_condition.logger") as mock_logger:
-            assert dc.evaluate_value(2) is None
-            assert mock_logger.exception.call_args[0][0] == "Invalid condition"
+        with pytest.raises(ValueError):
+            dc.evaluate_value(2)
 
     def test_bad_comparison(self):
         dc = self.create_data_condition(
             condition="gt", comparison="hi", condition_result=DetectorPriorityLevel.HIGH
         )
-        with mock.patch("sentry.workflow_engine.models.data_condition.logger") as mock_logger:
-            assert dc.evaluate_value(2) is None
-            assert mock_logger.exception.call_args[0][0] == "Invalid comparison value"
+
+        # Raises a TypeError because str vs int comparison
+        with pytest.raises(TypeError):
+            dc.evaluate_value(2)
 
     def test_bad_condition_result(self):
         dc = self.create_data_condition(condition="gt", comparison=1.0, condition_result="wrong")
diff --git a/tests/sentry/workflow_engine/models/test_workflow.py b/tests/sentry/workflow_engine/models/test_workflow.py
index 10cafc1b24f2de..9ae2d31e233130 100644
--- a/tests/sentry/workflow_engine/models/test_workflow.py
+++ b/tests/sentry/workflow_engine/models/test_workflow.py
@@ -1,19 +1,29 @@
-from sentry.testutils.cases import TestCase
-from sentry.workflow_engine.models import Workflow
+from sentry.workflow_engine.types import DetectorType
+from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
 
 
-class WorkflowTest(TestCase):
+class WorkflowTest(BaseWorkflowTest):
     def setUp(self):
-        self.org = self.create_organization()
+        self.workflow, self.detector, self.detector_workflow, self.data_condition_group = (
+            self.create_detector_and_workflow(detector_type=DetectorType.ERROR)
+        )
+        self.data_condition = self.data_condition_group.conditions.first()
+        self.group, self.event, self.group_event = self.create_group_event()
 
-    def tearDown(self):
-        self.org.delete()
+    def test_evaluate_trigger_conditions__condition_new_event__True(self):
+        evaluation = self.workflow.evaluate_trigger_conditions(self.group_event)
+        assert evaluation is True
 
-    def test_create_simple_workflow(self):
-        workflow = Workflow.objects.create(name="test_workflow", organization=self.org)
+    def test_evaluate_trigger_conditions__condition_new_event__False(self):
+        # Update event to have been seen before
+        self.group_event.group.times_seen = 5
 
-        workflow.save()
-        workflow.refresh_from_db()
+        evaluation = self.workflow.evaluate_trigger_conditions(self.group_event)
+        assert evaluation is False
 
-        assert workflow.name == "test_workflow"
-        assert workflow.organization == self.org
+    def test_evaluate_trigger_conditions__no_conditions(self):
+        self.workflow.when_condition_group = None
+        self.workflow.save()
+
+        evaluation = self.workflow.evaluate_trigger_conditions(self.group_event)
+        assert evaluation is True
diff --git a/tests/sentry/workflow_engine/processors/test_action.py b/tests/sentry/workflow_engine/processors/test_action.py
new file mode 100644
index 00000000000000..097890ab8fc535
--- /dev/null
+++ b/tests/sentry/workflow_engine/processors/test_action.py
@@ -0,0 +1,47 @@
+from sentry.workflow_engine.models.data_condition import Condition
+from sentry.workflow_engine.processors.action import evaluate_workflow_action_filters
+from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
+
+
+class TestEvaluateWorkflowActionFilters(BaseWorkflowTest):
+    def setUp(self):
+        (
+            self.workflow,
+            self.detector,
+            self.detector_workflow,
+            self.workflow_triggers,
+        ) = self.create_detector_and_workflow()
+
+        self.action_group, self.action = self.create_workflow_action(workflow=self.workflow)
+
+        self.group, self.event, self.group_event = self.create_group_event(
+            occurrence=self.build_occurrence_data(evidence_data={"detector_id": self.detector.id})
+        )
+
+    def test_basic__no_filter(self):
+        triggered_actions = evaluate_workflow_action_filters({self.workflow}, self.group_event)
+        assert set(triggered_actions) == {self.action}
+
+    def test_basic__with_filter__passes(self):
+        self.create_data_condition(
+            condition_group=self.action_group,
+            type=Condition.GROUP_EVENT_ATTR_COMPARISON,
+            condition="group.times_seen",
+            comparison=1,
+            condition_result=True,
+        )
+
+        triggered_actions = evaluate_workflow_action_filters({self.workflow}, self.group_event)
+        assert set(triggered_actions) == {self.action}
+
+    def test_basic__with_filter__filtered(self):
+        # Add a filter to the action's group
+        self.create_data_condition(
+            condition_group=self.action_group,
+            type=Condition.GROUP_EVENT_ATTR_COMPARISON,
+            condition="occurrence.evidence_data.detector_id",
+            comparison=self.detector.id + 1,
+        )
+
+        triggered_actions = evaluate_workflow_action_filters({self.workflow}, self.group_event)
+        assert not triggered_actions
diff --git a/tests/sentry/workflow_engine/processors/test_data_condition_group.py b/tests/sentry/workflow_engine/processors/test_data_condition_group.py
new file mode 100644
index 00000000000000..f01cae51903246
--- /dev/null
+++ b/tests/sentry/workflow_engine/processors/test_data_condition_group.py
@@ -0,0 +1,253 @@
+from unittest import mock
+
+from sentry.testutils.cases import TestCase
+from sentry.workflow_engine.models import DataConditionGroup
+from sentry.workflow_engine.processors.data_condition_group import (
+    evaluate_condition_group,
+    get_data_conditions_for_group,
+    process_data_condition_group,
+)
+from sentry.workflow_engine.types import DetectorPriorityLevel
+
+
+class TestGetDataConditionsForGroup(TestCase):
+    def test_get_data_conditions_for_group(self):
+        assert get_data_conditions_for_group(0) == []
+
+    def test_get_data_conditions_for_group__exists(self):
+        data_condition_group = self.create_data_condition_group()
+        data_condition = self.create_data_condition(condition_group=data_condition_group)
+        assert get_data_conditions_for_group(data_condition_group.id) == [data_condition]
+
+
+class TestProcessDataConditionGroup(TestCase):
+    def test_process_data_condition_group(self):
+        with mock.patch(
+            "sentry.workflow_engine.processors.data_condition_group.logger"
+        ) as mock_logger:
+            assert process_data_condition_group(1, 1) == (False, [])
+            assert mock_logger.exception.call_args[0][0] == "DataConditionGroup does not exist"
+
+    def test_process_data_condition_group__exists__fails(self):
+        data_condition_group = self.create_data_condition_group()
+        self.create_data_condition(
+            condition_group=data_condition_group, condition="gt", comparison=5
+        )
+
+        assert process_data_condition_group(data_condition_group.id, 1) == (False, [])
+
+    def test_process_data_condition_group__exists__passes(self):
+        data_condition_group = self.create_data_condition_group()
+        self.create_data_condition(
+            condition_group=data_condition_group,
+            condition="gt",
+            comparison=5,
+            condition_result=DetectorPriorityLevel.HIGH,
+        )
+        assert process_data_condition_group(data_condition_group.id, 10) == (
+            True,
+            [DetectorPriorityLevel.HIGH],
+        )
+
+
+class TestEvaluateConditionGroupTypeAny(TestCase):
+    def setUp(self):
+        self.data_condition_group = self.create_data_condition_group(
+            logic_type=DataConditionGroup.Type.ANY
+        )
+
+        self.data_condition = self.create_data_condition(
+            condition="gt",
+            comparison=5,
+            condition_result=DetectorPriorityLevel.HIGH,
+            condition_group=self.data_condition_group,
+        )
+
+        self.data_condition_two = self.create_data_condition(
+            condition="gt",
+            comparison=3,
+            condition_result=DetectorPriorityLevel.LOW,
+            condition_group=self.data_condition_group,
+        )
+
+        self.conditions = [self.data_condition, self.data_condition_two]
+
+    def test_evaluate_condition_group__passes_all(self):
+        assert evaluate_condition_group(
+            self.data_condition_group,
+            10,
+        ) == (
+            True,
+            [DetectorPriorityLevel.HIGH, DetectorPriorityLevel.LOW],
+        )
+
+    def test_evaluate_condition_group__passes_one(self):
+        assert evaluate_condition_group(
+            self.data_condition_group,
+            4,
+        ) == (
+            True,
+            [DetectorPriorityLevel.LOW],
+        )
+
+    def test_evaluate_condition_group__fails_all(self):
+        assert evaluate_condition_group(
+            self.data_condition_group,
+            1,
+        ) == (
+            False,
+            [],
+        )
+
+    def test_evaluate_condition_group__passes_without_conditions(self):
+        data_condition_group = self.create_data_condition_group(
+            logic_type=DataConditionGroup.Type.ANY
+        )
+        assert evaluate_condition_group(data_condition_group, 10) == (
+            True,
+            [],
+        )
+
+
+class TestEvaluateConditionGroupTypeAnyShortCircuit(TestCase):
+    def setUp(self):
+        self.data_condition_group = self.create_data_condition_group(
+            logic_type=DataConditionGroup.Type.ANY_SHORT_CIRCUIT
+        )
+
+        self.data_condition = self.create_data_condition(
+            condition="gt",
+            comparison=5,
+            condition_result=True,
+            condition_group=self.data_condition_group,
+        )
+
+        self.data_condition_two = self.create_data_condition(
+            condition="gt",
+            comparison=3,
+            condition_result=True,
+            condition_group=self.data_condition_group,
+        )
+
+        self.conditions = [self.data_condition, self.data_condition_two]
+
+    def test_evaluate_condition_group__passes_all(self):
+        assert evaluate_condition_group(self.data_condition_group, 10) == (
+            True,
+            [True],
+        )
+
+    def test_evaluate_condition_group__passes_one(self):
+        assert evaluate_condition_group(self.data_condition_group, 4) == (
+            True,
+            [True],
+        )
+
+    def test_evaluate_condition_group__fails_all(self):
+        assert evaluate_condition_group(
+            self.data_condition_group,
+            1,
+        ) == (
+            False,
+            [],
+        )
+
+    def test_evaluate_condition_group__passes_without_conditions(self):
+        data_condition_group = self.create_data_condition_group(
+            logic_type=DataConditionGroup.Type.ANY_SHORT_CIRCUIT
+        )
+        assert evaluate_condition_group(data_condition_group, 10) == (
+            True,
+            [],
+        )
+
+
+class TestEvaluateConditionGroupTypeAll(TestCase):
+    def setUp(self):
+        self.data_condition_group = self.create_data_condition_group(
+            logic_type=DataConditionGroup.Type.ALL
+        )
+
+        self.data_condition = self.create_data_condition(
+            condition="gt",
+            comparison=5,
+            condition_result=DetectorPriorityLevel.HIGH,
+            condition_group=self.data_condition_group,
+        )
+
+        self.data_condition_two = self.create_data_condition(
+            condition="gt",
+            comparison=3,
+            condition_result=DetectorPriorityLevel.LOW,
+            condition_group=self.data_condition_group,
+        )
+
+        self.conditions = [self.data_condition, self.data_condition_two]
+
+    def test_evaluate_condition_group__passes_all(self):
+        assert evaluate_condition_group(self.data_condition_group, 10) == (
+            True,
+            [DetectorPriorityLevel.HIGH, DetectorPriorityLevel.LOW],
+        )
+
+    def test_evaluate_condition_group__passes_one(self):
+        assert evaluate_condition_group(self.data_condition_group, 4) == (
+            False,
+            [],
+        )
+
+    def test_evaluate_condition_group__fails_all(self):
+        assert evaluate_condition_group(self.data_condition_group, 1) == (
+            False,
+            [],
+        )
+
+    def test_evaluate_condition_group__passes_without_conditions(self):
+        data_condition_group = self.create_data_condition_group(
+            logic_type=DataConditionGroup.Type.ALL
+        )
+        assert evaluate_condition_group(data_condition_group, 10) == (
+            True,
+            [],
+        )
+
+
+class TestEvaluateConditionGroupTypeNone(TestCase):
+    def setUp(self):
+        self.data_condition_group = self.create_data_condition_group(
+            logic_type=DataConditionGroup.Type.NONE
+        )
+
+        self.data_condition = self.create_data_condition(
+            condition="gt",
+            comparison=5,
+            condition_result=DetectorPriorityLevel.HIGH,
+            condition_group=self.data_condition_group,
+        )
+
+        self.data_condition_two = self.create_data_condition(
+            condition="gt",
+            comparison=3,
+            condition_result=DetectorPriorityLevel.LOW,
+            condition_group=self.data_condition_group,
+        )
+
+        self.conditions = [self.data_condition, self.data_condition_two]
+
+    def test_evaluate_condition_group__all_conditions_pass__fails(self):
+        assert evaluate_condition_group(self.data_condition_group, 10) == (
+            False,
+            [],
+        )
+
+    def test_evaluate_condition_group__one_condition_pass__fails(self):
+        assert evaluate_condition_group(self.data_condition_group, 4) == (
+            False,
+            [],
+        )
+
+    def test_evaluate_condition_group__no_conditions_pass__passes(self):
+        assert evaluate_condition_group(self.data_condition_group, 1) == (
+            True,
+            [],
+        )
diff --git a/tests/sentry/workflow_engine/processors/test_detector.py b/tests/sentry/workflow_engine/processors/test_detector.py
index 07ad0a2e5ecfcd..72ab028b74a6ae 100644
--- a/tests/sentry/workflow_engine/processors/test_detector.py
+++ b/tests/sentry/workflow_engine/processors/test_detector.py
@@ -1,123 +1,21 @@
 import unittest
-from datetime import datetime, timezone
-from typing import Any
 from unittest import mock
 from unittest.mock import call
 
-from sentry.issues.grouptype import GroupCategory, GroupType
-from sentry.issues.issue_occurrence import IssueOccurrence
 from sentry.issues.producer import PayloadType
 from sentry.issues.status_change_message import StatusChangeMessage
-from sentry.testutils.abstract import Abstract
 from sentry.testutils.helpers.datetime import freeze_time
 from sentry.types.group import PriorityLevel
+from sentry.workflow_engine.handlers.detector import DetectorEvaluationResult, DetectorStateData
+from sentry.workflow_engine.handlers.detector.stateful import get_redis_client
 from sentry.workflow_engine.models import DataPacket, Detector, DetectorState
-from sentry.workflow_engine.processors.detector import (
-    DetectorEvaluationResult,
-    DetectorHandler,
-    DetectorStateData,
-    StatefulDetectorHandler,
-    get_redis_client,
-    process_detectors,
+from sentry.workflow_engine.processors.detector import process_detectors
+from sentry.workflow_engine.types import DetectorPriorityLevel
+from tests.sentry.workflow_engine.handlers.detector.test_base import (
+    BaseDetectorHandlerTest,
+    MockDetectorStateHandler,
+    build_mock_occurrence_and_event,
 )
-from sentry.workflow_engine.types import DetectorGroupKey, DetectorPriorityLevel
-from tests.sentry.issues.test_grouptype import BaseGroupTypeTest
-
-
-class MockDetectorStateHandler(StatefulDetectorHandler[dict]):
-    counter_names = ["test1", "test2"]
-
-    def get_dedupe_value(self, data_packet: DataPacket[dict]) -> int:
-        return data_packet.packet.get("dedupe", 0)
-
-    def get_group_key_values(self, data_packet: DataPacket[dict]) -> dict[str, int]:
-        return data_packet.packet.get("group_vals", {})
-
-    def build_occurrence_and_event_data(
-        self, group_key: DetectorGroupKey, value: int, new_status: PriorityLevel
-    ) -> tuple[IssueOccurrence, dict[str, Any]]:
-        return build_mock_occurrence_and_event(self, group_key, value, new_status)
-
-
-class BaseDetectorHandlerTest(BaseGroupTypeTest):
-    __test__ = Abstract(__module__, __qualname__)
-
-    def setUp(self):
-        super().setUp()
-        self.sm_comp_patcher = mock.patch.object(
-            StatusChangeMessage, "__eq__", status_change_comparator
-        )
-        self.sm_comp_patcher.__enter__()
-
-        class NoHandlerGroupType(GroupType):
-            type_id = 1
-            slug = "no_handler"
-            description = "no handler"
-            category = GroupCategory.METRIC_ALERT.value
-
-        class MockDetectorHandler(DetectorHandler[dict]):
-            def evaluate(
-                self, data_packet: DataPacket[dict]
-            ) -> dict[DetectorGroupKey, DetectorEvaluationResult]:
-                return {None: DetectorEvaluationResult(None, True, DetectorPriorityLevel.HIGH)}
-
-        class HandlerGroupType(GroupType):
-            type_id = 2
-            slug = "handler"
-            description = "handler"
-            category = GroupCategory.METRIC_ALERT.value
-            detector_handler = MockDetectorHandler
-
-        class HandlerStateGroupType(GroupType):
-            type_id = 3
-            slug = "handler_with_state"
-            description = "handler with state"
-            category = GroupCategory.METRIC_ALERT.value
-            detector_handler = MockDetectorStateHandler
-
-        self.no_handler_type = NoHandlerGroupType
-        self.handler_type = HandlerGroupType
-        self.handler_state_type = HandlerStateGroupType
-
-    def tearDown(self):
-        super().tearDown()
-        self.sm_comp_patcher.__exit__(None, None, None)
-
-    def create_detector_and_conditions(self, type: str | None = None):
-        if type is None:
-            type = "handler_with_state"
-        detector = self.create_detector(
-            workflow_condition_group=self.create_data_condition_group(),
-            type=type,
-        )
-        self.create_data_condition(
-            condition="gt",
-            comparison=5,
-            condition_result=DetectorPriorityLevel.HIGH,
-            condition_group=detector.workflow_condition_group,
-        )
-        return detector
-
-    def build_handler(
-        self, detector: Detector | None = None, detector_type=None
-    ) -> MockDetectorStateHandler:
-        if detector is None:
-            detector = self.create_detector_and_conditions(detector_type)
-        return MockDetectorStateHandler(detector)
-
-    def assert_updates(self, handler, group_key, dedupe_value, counter_updates, active, priority):
-        if dedupe_value is not None:
-            assert handler.dedupe_updates.get(group_key) == dedupe_value
-        else:
-            assert group_key not in handler.dedupe_updates
-        if counter_updates is not None:
-            assert handler.counter_updates.get(group_key) == counter_updates
-        else:
-            assert group_key not in handler.counter_updates
-        if active is not None or priority is not None:
-            assert handler.state_updates.get(group_key) == (active, priority)
-        else:
-            assert group_key not in handler.state_updates
 
 
 @freeze_time()
@@ -242,40 +140,6 @@ def test_no_handler(self):
         assert results == []
 
 
-def build_mock_occurrence_and_event(
-    handler: StatefulDetectorHandler,
-    group_key: DetectorGroupKey,
-    value: int,
-    new_status: PriorityLevel,
-) -> tuple[IssueOccurrence, dict[str, Any]]:
-    assert handler.detector.group_type is not None
-    occurrence = IssueOccurrence(
-        id="eb4b0acffadb4d098d48cb14165ab578",
-        project_id=handler.detector.project_id,
-        event_id="43878ab4419f4ab181f6379ac376d5aa",
-        fingerprint=handler.build_fingerprint(group_key),
-        issue_title="Some Issue",
-        subtitle="Some subtitle",
-        resource_id=None,
-        evidence_data={},
-        evidence_display=[],
-        type=handler.detector.group_type,
-        detection_time=datetime.now(timezone.utc),
-        level="error",
-        culprit="Some culprit",
-        initial_issue_priority=new_status.value,
-    )
-    event_data = {
-        "timestamp": occurrence.detection_time,
-        "project_id": occurrence.project_id,
-        "event_id": occurrence.event_id,
-        "platform": "python",
-        "received": occurrence.detection_time,
-        "tags": {},
-    }
-    return occurrence, event_data
-
-
 class TestKeyBuilders(unittest.TestCase):
     def build_handler(self, detector: Detector | None = None) -> MockDetectorStateHandler:
         if detector is None:
@@ -314,17 +178,6 @@ def test_different_counter_value_keys(self):
         )
 
 
-def status_change_comparator(self: StatusChangeMessage, other: StatusChangeMessage):
-
-    return (
-        isinstance(other, StatusChangeMessage)
-        and self.fingerprint == other.fingerprint
-        and self.project_id == other.project_id
-        and self.new_status == other.new_status
-        and self.new_substatus == other.new_substatus
-    )
-
-
 class TestGetStateData(BaseDetectorHandlerTest):
     def test_new(self):
         handler = self.build_handler()
@@ -464,7 +317,7 @@ def test_above_below_threshold(self):
                 is_active=False,
                 result=StatusChangeMessage(
                     fingerprint=[f"{handler.detector.id}:val1"],
-                    project_id=1,
+                    project_id=self.project.id,
                     new_status=1,
                     new_substatus=None,
                 ),
@@ -475,7 +328,9 @@ def test_above_below_threshold(self):
     def test_no_condition_group(self):
         detector = self.create_detector()
         handler = MockDetectorStateHandler(detector)
-        with mock.patch("sentry.workflow_engine.processors.detector.metrics") as mock_metrics:
+        with mock.patch(
+            "sentry.workflow_engine.handlers.detector.stateful.metrics"
+        ) as mock_metrics:
             assert (
                 handler.evaluate(DataPacket("1", {"dedupe": 2, "group_vals": {"val1": 100}})) == {}
             )
@@ -521,7 +376,9 @@ def test_dedupe(self):
         }
         self.assert_updates(handler, "val1", 2, {}, True, DetectorPriorityLevel.HIGH)
         handler.commit_state_updates()
-        with mock.patch("sentry.workflow_engine.processors.detector.metrics") as mock_metrics:
+        with mock.patch(
+            "sentry.workflow_engine.handlers.detector.stateful.metrics"
+        ) as mock_metrics:
             assert handler.evaluate(DataPacket("1", {"dedupe": 2, "group_vals": {"val1": 0}})) == {}
             mock_metrics.incr.assert_called_once_with(
                 "workflow_engine.detector.skipping_already_processed_update"
@@ -533,7 +390,9 @@ def test_dedupe(self):
 class TestEvaluateGroupKeyValue(BaseDetectorHandlerTest):
     def test_dedupe(self):
         handler = self.build_handler()
-        with mock.patch("sentry.workflow_engine.processors.detector.metrics") as mock_metrics:
+        with mock.patch(
+            "sentry.workflow_engine.handlers.detector.stateful.metrics"
+        ) as mock_metrics:
             occurrence, event_data = build_mock_occurrence_and_event(
                 handler, "val1", 6, PriorityLevel.HIGH
             )
@@ -613,7 +472,7 @@ def test_status_change(self):
             DetectorPriorityLevel.OK,
             result=StatusChangeMessage(
                 fingerprint=[f"{handler.detector.id}:group_key"],
-                project_id=1,
+                project_id=self.project.id,
                 new_status=1,
                 new_substatus=None,
             ),
diff --git a/tests/sentry/workflow_engine/processors/test_workflow.py b/tests/sentry/workflow_engine/processors/test_workflow.py
new file mode 100644
index 00000000000000..8286157cc19db8
--- /dev/null
+++ b/tests/sentry/workflow_engine/processors/test_workflow.py
@@ -0,0 +1,113 @@
+from unittest import mock
+
+from sentry.workflow_engine.models import DataConditionGroup
+from sentry.workflow_engine.models.data_condition import Condition
+from sentry.workflow_engine.processors.workflow import evaluate_workflow_triggers, process_workflows
+from sentry.workflow_engine.types import DetectorType
+from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
+
+
+class TestProcessWorkflows(BaseWorkflowTest):
+    def setUp(self):
+        (
+            self.workflow,
+            self.detector,
+            self.detector_workflow,
+            self.workflow_triggers,
+        ) = self.create_detector_and_workflow()
+
+        self.error_workflow, self.error_detector, self.detector_workflow_error, _ = (
+            self.create_detector_and_workflow(
+                name_prefix="error",
+                workflow_triggers=self.create_data_condition_group(),
+                detector_type=DetectorType.ERROR,
+            )
+        )
+
+        self.group, self.event, self.group_event = self.create_group_event()
+
+    def test_error_event(self):
+        triggered_workflows = process_workflows(self.group_event)
+        assert triggered_workflows == {self.error_workflow}
+
+    def test_issue_occurrence_event(self):
+        issue_occurrence = self.build_occurrence(evidence_data={"detector_id": self.detector.id})
+        self.group_event.occurrence = issue_occurrence
+
+        triggered_workflows = process_workflows(self.group_event)
+        assert triggered_workflows == {self.workflow}
+
+    def test_no_detector(self):
+        self.group_event.occurrence = self.build_occurrence(evidence_data={})
+
+        with mock.patch("sentry.workflow_engine.processors.workflow.logger") as mock_logger:
+            with mock.patch("sentry.workflow_engine.processors.workflow.metrics") as mock_metrics:
+                triggered_workflows = process_workflows(self.group_event)
+
+                assert not triggered_workflows
+
+                mock_metrics.incr.assert_called_once_with("workflow_engine.process_workflows.error")
+                mock_logger.exception.assert_called_once_with(
+                    "Detector not found for event",
+                    extra={"event_id": self.event.event_id},
+                )
+
+
+class TestEvaluateWorkflowTriggers(BaseWorkflowTest):
+    def setUp(self):
+        (
+            self.workflow,
+            self.detector,
+            self.detector_workflow,
+            self.workflow_triggers,
+        ) = self.create_detector_and_workflow()
+
+        occurrence = self.build_occurrence_data(evidence_data={"detector_id": self.detector.id})
+        self.group, self.event, self.group_event = self.create_group_event(
+            occurrence=occurrence,
+        )
+
+    def test_workflow_trigger(self):
+        triggered_workflows = evaluate_workflow_triggers({self.workflow}, self.group_event)
+        assert triggered_workflows == {self.workflow}
+
+    def test_no_workflow_trigger(self):
+        triggered_workflows = evaluate_workflow_triggers(set(), self.group_event)
+        assert not triggered_workflows
+
+    def test_workflow_many_filters(self):
+        if self.workflow.when_condition_group is not None:
+            self.workflow.when_condition_group.logic_type = DataConditionGroup.Type.ALL
+
+        self.create_data_condition(
+            condition_group=self.workflow.when_condition_group,
+            type=Condition.GROUP_EVENT_ATTR_COMPARISON,
+            condition="occurrence.evidence_data.detector_id",
+            comparison=self.detector.id,
+            condition_result=75,
+        )
+
+        triggered_workflows = evaluate_workflow_triggers({self.workflow}, self.group_event)
+        assert triggered_workflows == {self.workflow}
+
+    def test_workflow_filterd_out(self):
+        if self.workflow.when_condition_group is not None:
+            self.workflow.when_condition_group.logic_type = DataConditionGroup.Type.ALL
+
+        self.create_data_condition(
+            condition_group=self.workflow.when_condition_group,
+            type=Condition.GROUP_EVENT_ATTR_COMPARISON,
+            condition="occurrence.evidence_data.detector_id",
+            comparison=self.detector.id + 1,
+        )
+
+        triggered_workflows = evaluate_workflow_triggers({self.workflow}, self.group_event)
+        assert not triggered_workflows
+
+    def test_many_workflows(self):
+        workflow_two, _, _, _ = self.create_detector_and_workflow(name_prefix="two")
+        triggered_workflows = evaluate_workflow_triggers(
+            {self.workflow, workflow_two}, self.group_event
+        )
+
+        assert triggered_workflows == {self.workflow, workflow_two}
diff --git a/tests/sentry/workflow_engine/test_base.py b/tests/sentry/workflow_engine/test_base.py
new file mode 100644
index 00000000000000..0109d3c051ac45
--- /dev/null
+++ b/tests/sentry/workflow_engine/test_base.py
@@ -0,0 +1,144 @@
+from datetime import datetime
+from uuid import uuid4
+
+from sentry.eventstore.models import Event, GroupEvent
+from sentry.models.group import Group
+from sentry.snuba.models import SnubaQuery
+from sentry.testutils.cases import TestCase
+from sentry.testutils.factories import EventType
+from sentry.workflow_engine.models import (
+    Action,
+    DataConditionGroup,
+    Detector,
+    DetectorWorkflow,
+    Workflow,
+)
+from sentry.workflow_engine.models.data_condition import Condition
+from sentry.workflow_engine.types import DetectorType
+from tests.sentry.issues.test_utils import OccurrenceTestMixin
+
+
+class BaseWorkflowTest(TestCase, OccurrenceTestMixin):
+    def create_snuba_query(self, **kwargs):
+        return SnubaQuery.objects.create(
+            type=SnubaQuery.Type.ERROR.value,
+            dataset="events",
+            aggregate="count()",
+            time_window=60,
+            resolution=60,
+            **kwargs,
+        )
+
+    def create_event(
+        self,
+        project_id: int,
+        timestamp: datetime,
+        fingerprint: str,
+        environment=None,
+        tags: list[list[str]] | None = None,
+    ) -> Event:
+        data = {
+            "timestamp": timestamp.isoformat(),
+            "environment": environment,
+            "fingerprint": [fingerprint],
+            "level": "error",
+            "user": {"id": uuid4().hex},
+            "exception": {
+                "values": [
+                    {
+                        "type": "IntegrationError",
+                        "value": "Identity not found.",
+                    }
+                ]
+            },
+        }
+        if tags:
+            data["tags"] = tags
+
+        return self.store_event(
+            data=data,
+            project_id=project_id,
+            assert_no_errors=False,
+            default_event_type=EventType.ERROR,
+        )
+
+    def create_detector_and_workflow(
+        self,
+        name_prefix="test",
+        workflow_triggers: DataConditionGroup | None = None,
+        detector_type: DetectorType | str = "TestDetector",
+        **kwargs,
+    ) -> tuple[Workflow, Detector, DetectorWorkflow, DataConditionGroup]:
+        workflow_triggers = workflow_triggers or self.create_data_condition_group()
+
+        if not workflow_triggers.conditions.exists():
+            # create a trigger condition for a new event
+            self.create_data_condition(
+                condition_group=workflow_triggers,
+                type=Condition.GROUP_EVENT_ATTR_COMPARISON,
+                condition="group.times_seen",
+                comparison=1,
+                condition_result=True,
+            )
+
+        workflow = self.create_workflow(
+            name=f"{name_prefix}_workflow",
+            when_condition_group=workflow_triggers,
+            **kwargs,
+        )
+
+        detector = self.create_detector(
+            name=f"{name_prefix}_detector",
+            type=detector_type,
+            project=self.project,
+        )
+
+        detector_workflow = self.create_detector_workflow(
+            detector=detector,
+            workflow=workflow,
+        )
+
+        return workflow, detector, detector_workflow, workflow_triggers
+
+    def create_workflow_action(
+        self,
+        workflow: Workflow,
+        **kwargs,
+    ) -> tuple[DataConditionGroup, Action]:
+        action_group = self.create_data_condition_group(logic_type="any-short")
+
+        action = self.create_action(
+            type=Action.Type.NOTIFICATION,
+            data={"message": "test"},
+            **kwargs,
+        )
+
+        self.create_data_condition_group_action(
+            condition_group=action_group,
+            action=action,
+        )
+
+        # Add the action group to the workflow
+        self.create_workflow_data_condition_group(workflow, action_group)
+
+        return action_group, action
+
+    def create_group_event(self, project=None, occurrence=None) -> tuple[Group, Event, GroupEvent]:
+        project = project or self.project
+        group = self.create_group(project)
+        event = self.create_event(
+            project.id,
+            datetime.now(),
+            "test_fingerprint",
+        )
+
+        group_event = GroupEvent(
+            self.project.id,
+            event.event_id,
+            group,
+            event.data,
+            event._snuba_data,
+            occurrence,
+        )
+
+        return group, event, group_event
diff --git a/tests/snuba/api/endpoints/test_discover_homepage_query.py b/tests/snuba/api/endpoints/test_discover_homepage_query.py
index 785a652b71758d..7bb393038fc0c0 100644
--- a/tests/snuba/api/endpoints/test_discover_homepage_query.py
+++ b/tests/snuba/api/endpoints/test_discover_homepage_query.py
@@ -1,10 +1,16 @@
+import pytest
 from django.urls import reverse
 
 from sentry.api.serializers import serialize
 from sentry.discover.models import DiscoverSavedQuery, DiscoverSavedQueryTypes
+from sentry.testutils.cases import BaseMetricsTestCase
+from sentry.testutils.helpers.datetime import before_now
 from tests.snuba.api.endpoints.test_discover_saved_queries import DiscoverSavedQueryBase
 
-FEATURES = ("organizations:discover-query",)
+FEATURES = ("organizations:discover-query", "organizations:performance-use-metrics")
+
+
+pytestmark = pytest.mark.sentry_metrics
 
 
 class DiscoverHomepageQueryTest(DiscoverSavedQueryBase):
@@ -89,7 +95,7 @@ def test_put_creates_new_discover_saved_query_if_none_exists(self):
         assert response.data == serialize(new_query)
         assert new_query.query["fields"] == homepage_query_payload["fields"]
         assert new_query.query["environment"] == homepage_query_payload["environment"]
-        assert new_query.dataset == DiscoverSavedQueryTypes.get_id_for_type_name("discover")
+        assert new_query.dataset == DiscoverSavedQueryTypes.get_id_for_type_name("error-events")
         assert set(new_query.projects.values_list("id", flat=True)) == set(self.project_ids)
 
     def test_put_responds_with_saved_empty_name_field(self):
@@ -164,3 +170,40 @@ def test_delete_resets_saved_query(self):
         assert not DiscoverSavedQuery.objects.filter(
             created_by_id=self.user.id, organization=self.org, is_homepage=True
         ).exists()
+
+    def test_put_allows_custom_measurements_in_equations_with_query(self):
+        # Having a custom measurement stored implies that a transaction with this measurement has been stored
+        BaseMetricsTestCase.store_metric(
+            self.org.id,
+            self.project_ids[0],
+            "d:transactions/measurements.custom_duration@millisecond",
+            {},
+            int(before_now(days=1).timestamp()),
+            1,
+        )
+
+        homepage_query_payload = {
+            "version": 2,
+            "name": "New Homepage Query",
+            "projects": [self.project_ids[0]],
+            "environment": ["alpha"],
+            "fields": [
+                "transaction.duration",
+                "measurements.custom_duration",
+                "equation|measurements.custom_duration / transaction.duration",
+            ],
+            "orderby": "-transaction.duration",
+            "query": "test",
+            "range": None,
+        }
+
+        with self.feature(FEATURES):
+            response = self.client.put(self.url, data=homepage_query_payload)
+
+        assert response.status_code == 201, response.content
+
+        new_query = DiscoverSavedQuery.objects.get(
+            created_by_id=self.user.id, organization=self.org, is_homepage=True
+        )
+        assert response.data == serialize(new_query)
+        assert list(new_query.projects.values_list("id", flat=True)) == [self.project_ids[0]]
diff --git a/tests/snuba/api/endpoints/test_discover_saved_query_detail.py b/tests/snuba/api/endpoints/test_discover_saved_query_detail.py
index 711679ab0573af..51c0dd1e25bb47 100644
--- a/tests/snuba/api/endpoints/test_discover_saved_query_detail.py
+++ b/tests/snuba/api/endpoints/test_discover_saved_query_detail.py
@@ -198,6 +198,34 @@ def test_put_dataset(self):
         assert response.data["limit"] == 20
         assert response.data["queryDataset"] == "transaction-like"
 
+    def test_put_dataset_with_discover_dataset_returns_validation_error(self):
+        with self.feature(self.feature_name):
+            url = reverse(
+                "sentry-api-0-discover-saved-query-detail", args=[self.org.slug, self.query_id]
+            )
+
+            with self.feature({"organizations:deprecate-discover-widget-type": True}):
+                response = self.client.put(
+                    url,
+                    {
+                        "name": "New query",
+                        "projects": self.project_ids,
+                        "fields": [],
+                        "range": "24h",
+                        "limit": 20,
+                        "conditions": [],
+                        "aggregations": [],
+                        "orderby": "-time",
+                        "queryDataset": "discover",
+                    },
+                )
+
+        assert response.status_code == 400, response.content
+        assert (
+            "Attribute value `discover` is deprecated. Please use `error-events` or `transaction-like`"
+            in response.content.decode()
+        )
+
     def test_dataset_set_to_discover_on_update(self):
         query = {"fields": ["event_id"], "query": "event.type:error", "limit": 10, "version": 2}
         model = DiscoverSavedQuery.objects.create(
@@ -229,7 +257,7 @@ def test_dataset_set_to_discover_on_update(self):
 
         assert response.status_code == 200, response.content
         assert response.data["id"] == str(model.id)
-        assert response.data["queryDataset"] == "discover"
+        assert response.data["queryDataset"] == "error-events"
         assert response.data["datasetSource"] == "unknown"
 
     def test_put_with_interval(self):
diff --git a/tests/snuba/api/endpoints/test_organization_events.py b/tests/snuba/api/endpoints/test_organization_events.py
index 7692685b094303..56f73b7b8e3d57 100644
--- a/tests/snuba/api/endpoints/test_organization_events.py
+++ b/tests/snuba/api/endpoints/test_organization_events.py
@@ -6732,16 +6732,16 @@ def test_all_events_fields(self):
         data = response.data["data"][0]
         assert data == {
             "id": event.event_id,
-            "events.transaction": "",
+            "transaction": "",
             "project.name": event.project.name.lower(),
-            "events.title": event.group.title,
+            "title": event.group.title,
             "release": event.release,
-            "events.environment": None,
+            "environment": None,
             "user.display": user_data["email"],
             "device": "Mac",
             "replayId": replay_id,
             "os": "",
-            "events.timestamp": event.datetime.replace(microsecond=0).isoformat(),
+            "timestamp": event.datetime.replace(microsecond=0).isoformat(),
         }
 
     def test_opportunity_score(self):
diff --git a/tests/snuba/api/endpoints/test_organization_events_profile_functions_metrics.py b/tests/snuba/api/endpoints/test_organization_events_profile_functions_metrics.py
deleted file mode 100644
index 85740c85316c29..00000000000000
--- a/tests/snuba/api/endpoints/test_organization_events_profile_functions_metrics.py
+++ /dev/null
@@ -1,243 +0,0 @@
-from datetime import timedelta
-
-import pytest
-from django.urls import reverse
-
-from sentry.testutils.cases import MetricsEnhancedPerformanceTestCase
-from sentry.testutils.helpers.datetime import before_now
-
-pytestmark = pytest.mark.sentry_metrics
-
-FUNCTION_DURATION_MRI = "d:profiles/function.duration@millisecond"
-
-
-class OrganizationEventsProfileFunctionsMetricsEndpointTest(MetricsEnhancedPerformanceTestCase):
-    viewname = "sentry-api-0-organization-events"
-
-    # Poor intentionally omitted for test_measurement_rating_that_does_not_exist
-    METRIC_STRINGS = [
-        "foo_transaction",
-        "bar_transaction",
-    ]
-
-    def setUp(self):
-        super().setUp()
-        self.min_ago = before_now(minutes=1)
-        self.six_min_ago = before_now(minutes=6)
-        self.three_days_ago = before_now(days=3)
-        self.features = {}
-
-    def do_request(self, query, features=None):
-        if features is None:
-            features = {"organizations:discover-basic": True}
-        features.update(self.features)
-        self.login_as(user=self.user)
-        url = reverse(
-            self.viewname,
-            kwargs={"organization_id_or_slug": self.organization.slug},
-        )
-        with self.feature(features):
-            return self.client.get(url, query, format="json")
-
-    def test_p50_with_no_data(self):
-        response = self.do_request(
-            {
-                "field": ["p50()"],
-                "query": "",
-                "project": self.project.id,
-                "dataset": "profileFunctionsMetrics",
-            }
-        )
-        assert response.status_code == 200, response.content
-        data = response.data["data"]
-        meta = response.data["meta"]
-        assert len(data) == 1
-        assert data[0]["p50()"] == 0
-        assert meta["dataset"] == "profileFunctionsMetrics"
-
-    @pytest.mark.querybuilder
-    def test_count(self):
-        self.store_profile_functions_metric(
-            1,
-            timestamp=self.three_days_ago,
-        )
-        response = self.do_request(
-            {
-                "field": ["count()"],
-                "query": "",
-                "project": self.project.id,
-                "dataset": "profileFunctionsMetrics",
-                "statsPeriod": "7d",
-            }
-        )
-        assert response.status_code == 200, response.content
-        data = response.data["data"]
-        meta = response.data["meta"]
-        assert len(data) == 1
-        assert data[0]["count()"] == 1
-        assert meta["dataset"] == "profileFunctionsMetrics"
-
-    def test_sum(self):
-        self.store_profile_functions_metric(
-            321,
-            timestamp=self.min_ago,
-        )
-        self.store_profile_functions_metric(
-            99,
-            timestamp=self.min_ago,
-        )
-        response = self.do_request(
-            {
-                "field": ["sum(function.duration)"],
-                "query": "",
-                "project": self.project.id,
-                "dataset": "profileFunctionsMetrics",
-            }
-        )
-        assert response.status_code == 200, response.content
-        data = response.data["data"]
-        meta = response.data["meta"]
-        assert len(data) == 1
-        assert data[0]["sum(function.duration)"] == 420
-        assert meta["dataset"] == "profileFunctionsMetrics"
-
-    def test_percentile(self):
-        self.store_profile_functions_metric(
-            1,
-            timestamp=self.min_ago,
-        )
-        response = self.do_request(
-            {
-                "field": ["percentile(function.duration, 0.95)"],
-                "query": "",
-                "project": self.project.id,
-                "dataset": "profileFunctionsMetrics",
-            }
-        )
-        assert response.status_code == 200, response.content
-        data = response.data["data"]
-        meta = response.data["meta"]
-        assert len(data) == 1
-        assert data[0]["percentile(function.duration, 0.95)"] == 1
-        assert meta["dataset"] == "profileFunctionsMetrics"
-
-    def test_fixed_percentile_functions(self):
-        self.store_profile_functions_metric(
-            1,
-            timestamp=self.min_ago,
-        )
-        for function in ["p50()", "p75()", "p95()", "p99()"]:
-            response = self.do_request(
-                {
-                    "field": [function],
-                    "query": "",
-                    "project": self.project.id,
-                    "dataset": "profileFunctionsMetrics",
-                }
-            )
-            assert response.status_code == 200, response.content
-            data = response.data["data"]
-            meta = response.data["meta"]
-            assert len(data) == 1
-            assert data[0][function] == 1, function
-            assert meta["dataset"] == "profileFunctionsMetrics", function
-            assert meta["fields"][function] == "duration", function
-
-    def test_fixed_percentile_functions_with_duration(self):
-        self.store_profile_functions_metric(
-            1,
-            timestamp=self.min_ago,
-        )
-        for function in [
-            "p50(function.duration)",
-            "p75(function.duration)",
-            "p95(function.duration)",
-            "p99(function.duration)",
-        ]:
-            response = self.do_request(
-                {
-                    "field": [function],
-                    "query": "",
-                    "project": self.project.id,
-                    "dataset": "profileFunctionsMetrics",
-                }
-            )
-            assert response.status_code == 200, response.content
-            data = response.data["data"]
-            meta = response.data["meta"]
-            assert len(data) == 1, function
-            assert data[0][function] == 1, function
-            assert meta["dataset"] == "profileFunctionsMetrics", function
-            assert meta["fields"][function] == "duration", function
-
-    def test_avg(self):
-        self.store_profile_functions_metric(
-            1,
-            timestamp=self.min_ago,
-        )
-        response = self.do_request(
-            {
-                "field": ["avg()"],
-                "query": "",
-                "project": self.project.id,
-                "dataset": "profileFunctionsMetrics",
-            }
-        )
-        assert response.status_code == 200, response.content
-        data = response.data["data"]
-        meta = response.data["meta"]
-        assert len(data) == 1
-        assert data[0]["avg()"] == 1
-        assert meta["dataset"] == "profileFunctionsMetrics"
-
-    # This needs to be revisited
-    # see --> Column name was not found in metrics indexer
-    def test_regression_score_regression(self):
-        # This function increases in duration
-        self.store_profile_functions_metric(
-            1,
-            timestamp=self.six_min_ago,
-            tags={"function": "func_a", "release": "Regressed"},
-            project=self.project.id,
-        )
-        self.store_profile_functions_metric(
-            100,
-            timestamp=self.min_ago,
-            tags={"function": "func_a", "release": "Regressed"},
-            project=self.project.id,
-        )
-
-        # This function stays the same
-        self.store_profile_functions_metric(
-            1,
-            timestamp=self.three_days_ago,
-            tags={"function": "func_a", "release": "Non-regressed"},
-            project=self.project.id,
-        )
-        self.store_profile_functions_metric(
-            1,
-            timestamp=self.min_ago,
-            tags={"function": "func_a", "release": "Non-regressed"},
-            project=self.project.id,
-        )
-
-        response = self.do_request(
-            {
-                "field": [
-                    "release",
-                    f"regression_score(function.duration,{int(self.two_min_ago.timestamp())}, 0.95)",
-                ],
-                "query": "function:func_a",
-                "dataset": "profileFunctionsMetrics",
-                "orderby": [
-                    f"-regression_score(function.duration,{int(self.two_min_ago.timestamp())}, 0.95)"
-                ],
-                "start": (self.six_min_ago - timedelta(minutes=1)).isoformat(),
-                "end": before_now(minutes=0),
-            }
-        )
-
-        assert response.status_code == 200, response.content
-        data = response.data["data"]
-        assert len(data) == 2
-        assert [row["release"] for row in data] == ["Regressed", "Non-regressed"]
diff --git a/tests/snuba/api/endpoints/test_organization_events_span_indexed.py b/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
index 1b44f20e094f93..d3d1a804e83377 100644
--- a/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
+++ b/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
@@ -1,4 +1,6 @@
 import uuid
+from datetime import datetime, timezone
+from unittest import mock
 
 import pytest
 
@@ -81,6 +83,38 @@ def test_simple(self):
         ]
         assert meta["dataset"] == self.dataset
 
+    def test_spm(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"status": "success"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+        response = self.do_request(
+            {
+                "field": ["description", "spm()"],
+                "query": "",
+                "orderby": "description",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        meta = response.data["meta"]
+        assert len(data) == 1
+        assert data == [
+            {
+                "description": "foo",
+                "spm()": 1 / (90 * 24 * 60),
+            },
+        ]
+        assert meta["dataset"] == self.dataset
+
     def test_id_fields(self):
         self.store_spans(
             [
@@ -529,6 +563,316 @@ def test_query_for_missing_tag(self):
         assert response.status_code == 200, response.content
         assert response.data["data"] == [{"foo": "", "count()": 1}]
 
+    def test_count_field_type(self):
+        response = self.do_request(
+            {
+                "field": ["count()"],
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+        assert response.status_code == 200, response.content
+        assert response.data["meta"]["fields"] == {"count()": "integer"}
+        assert response.data["meta"]["units"] == {"count()": None}
+        assert response.data["data"] == [{"count()": 0}]
+
+    def test_simple_measurements(self):
+        keys = [
+            ("app_start_cold", "duration", "millisecond"),
+            ("app_start_warm", "duration", "millisecond"),
+            ("frames_frozen", "number", None),  # should be integer but keeping it consistent
+            ("frames_frozen_rate", "percentage", None),
+            ("frames_slow", "number", None),  # should be integer but keeping it consistent
+            ("frames_slow_rate", "percentage", None),
+            ("frames_total", "number", None),  # should be integer but keeping it consistent
+            ("time_to_initial_display", "duration", "millisecond"),
+            ("time_to_full_display", "duration", "millisecond"),
+            ("stall_count", "number", None),  # should be integer but keeping it consistent
+            ("stall_percentage", "percentage", None),
+            ("stall_stall_longest_time", "number", None),
+            ("stall_stall_total_time", "number", None),
+            ("cls", "number", None),
+            ("fcp", "duration", "millisecond"),
+            ("fid", "duration", "millisecond"),
+            ("fp", "duration", "millisecond"),
+            ("inp", "duration", "millisecond"),
+            ("lcp", "duration", "millisecond"),
+            ("ttfb", "duration", "millisecond"),
+            ("ttfb.requesttime", "duration", "millisecond"),
+            ("score.cls", "number", None),
+            ("score.fcp", "number", None),
+            ("score.fid", "number", None),
+            ("score.inp", "number", None),
+            ("score.lcp", "number", None),
+            ("score.ttfb", "number", None),
+            ("score.total", "number", None),
+            ("score.weight.cls", "number", None),
+            ("score.weight.fcp", "number", None),
+            ("score.weight.fid", "number", None),
+            ("score.weight.inp", "number", None),
+            ("score.weight.lcp", "number", None),
+            ("score.weight.ttfb", "number", None),
+            ("cache.item_size", "number", None),
+            ("messaging.message.body.size", "number", None),
+            ("messaging.message.receive.latency", "number", None),
+            ("messaging.message.retry.count", "number", None),
+        ]
+
+        self.store_spans(
+            [
+                self.create_span(
+                    {
+                        "description": "foo",
+                        "sentry_tags": {"status": "success"},
+                        "tags": {"bar": "bar2"},
+                    },
+                    measurements={k: {"value": i + 1} for i, (k, _, _) in enumerate(keys)},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        for i, (k, type, unit) in enumerate(keys):
+            key = f"measurements.{k}"
+            response = self.do_request(
+                {
+                    "field": [key],
+                    "query": "description:foo",
+                    "project": self.project.id,
+                    "dataset": self.dataset,
+                }
+            )
+            assert response.status_code == 200, response.content
+            assert response.data["meta"] == {
+                "dataset": mock.ANY,
+                "datasetReason": "unchanged",
+                "fields": {
+                    key: type,
+                    "id": "string",
+                    "project.name": "string",
+                },
+                "isMetricsData": False,
+                "isMetricsExtractedData": False,
+                "tips": {},
+                "units": {
+                    key: unit,
+                    "id": None,
+                    "project.name": None,
+                },
+            }
+            assert response.data["data"] == [
+                {
+                    key: i + 1,
+                    "id": mock.ANY,
+                    "project.name": self.project.slug,
+                }
+            ]
+
+    def test_environment(self):
+        self.create_environment(self.project, name="prod")
+        self.create_environment(self.project, name="test")
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"environment": "prod"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"environment": "test"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+        response = self.do_request(
+            {
+                "field": ["environment", "count()"],
+                "project": self.project.id,
+                "environment": "prod",
+                "dataset": self.dataset,
+            }
+        )
+        assert response.status_code == 200, response.content
+        assert response.data["data"] == [
+            {"environment": "prod", "count()": 1},
+        ]
+
+    def test_transaction(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"transaction": "bar"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+        response = self.do_request(
+            {
+                "field": ["description", "count()"],
+                "query": "transaction:bar",
+                "orderby": "description",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        meta = response.data["meta"]
+        assert len(data) == 1
+        assert data == [
+            {
+                "description": "foo",
+                "count()": 1,
+            },
+        ]
+        assert meta["dataset"] == self.dataset
+
+    def test_orderby_alias(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"status": "success"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+                self.create_span(
+                    {"description": "bar", "sentry_tags": {"status": "invalid_argument"}},
+                    duration=2000,
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+        response = self.do_request(
+            {
+                "field": ["span.description", "sum(span.self_time)"],
+                "query": "",
+                "orderby": "sum_span_self_time",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        meta = response.data["meta"]
+        assert len(data) == 2
+        assert data == [
+            {
+                "span.description": "foo",
+                "sum(span.self_time)": 1000,
+            },
+            {
+                "span.description": "bar",
+                "sum(span.self_time)": 2000,
+            },
+        ]
+        assert meta["dataset"] == self.dataset
+
+    @pytest.mark.querybuilder
+    def test_explore_sample_query(self):
+        spans = [
+            self.create_span(
+                {"description": "foo", "sentry_tags": {"status": "success"}},
+                start_ts=self.ten_mins_ago,
+            ),
+            self.create_span(
+                {"description": "bar", "sentry_tags": {"status": "invalid_argument"}},
+                start_ts=self.nine_mins_ago,
+            ),
+        ]
+        self.store_spans(
+            spans,
+            is_eap=self.is_eap,
+        )
+        response = self.do_request(
+            {
+                "field": [
+                    "id",
+                    "project",
+                    "span.op",
+                    "span.description",
+                    "span.duration",
+                    "timestamp",
+                    "trace",
+                    "transaction.span_id",
+                ],
+                # This is to skip INP spans
+                "query": "!transaction.span_id:00",
+                "orderby": "timestamp",
+                "statsPeriod": "1h",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        meta = response.data["meta"]
+        assert len(data) == 2
+        for source, result in zip(spans, data):
+            assert result["id"] == source["span_id"], "id"
+            assert result["span.duration"] == 1000.0, "duration"
+            assert result["span.op"] == "", "op"
+            assert result["span.description"] == source["description"], "description"
+            ts = datetime.fromisoformat(result["timestamp"])
+            assert ts.tzinfo == timezone.utc
+            assert ts.timestamp() == pytest.approx(
+                source["end_timestamp_precise"], abs=5
+            ), "timestamp"
+            assert result["transaction.span_id"] == source["segment_id"], "transaction.span_id"
+            assert result["project"] == result["project.name"] == self.project.slug, "project"
+        assert meta["dataset"] == self.dataset
+
+    def test_span_status(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"status": "internal_error"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+        response = self.do_request(
+            {
+                "field": ["description", "count()"],
+                "query": "span.status:internal_error",
+                "orderby": "description",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        meta = response.data["meta"]
+        assert len(data) == 1
+        assert data == [
+            {
+                "description": "foo",
+                "count()": 1,
+            },
+        ]
+        assert meta["dataset"] == self.dataset
+
+    def test_handle_nans_from_snuba(self):
+        self.store_spans(
+            [self.create_span({"description": "foo"}, start_ts=self.ten_mins_ago)],
+            is_eap=self.is_eap,
+        )
+
+        response = self.do_request(
+            {
+                "field": ["description", "count()"],
+                "query": "span.status:internal_error",
+                "orderby": "description",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+        assert response.status_code == 200, response.content
+
 
 class OrganizationEventsEAPSpanEndpointTest(OrganizationEventsSpanIndexedEndpointTest):
     is_eap = True
@@ -622,7 +966,7 @@ def test_span_duration(self):
         ]
         assert meta["dataset"] == self.dataset
 
-    def test_aggregate_numeric_attr_weighted(self):
+    def test_aggregate_numeric_attr(self):
         self.store_spans(
             [
                 self.create_span(
@@ -658,21 +1002,21 @@ def test_aggregate_numeric_attr_weighted(self):
             {
                 "field": [
                     "description",
-                    "count_unique_weighted(bar)",
-                    "count_unique_weighted(tags[bar])",
-                    "count_unique_weighted(tags[bar,string])",
-                    "count_weighted()",
-                    "count_weighted(span.duration)",
-                    "count_weighted(tags[foo,     number])",
-                    "sum_weighted(tags[foo,number])",
-                    "avg_weighted(tags[foo,number])",
-                    "p50_weighted(tags[foo,number])",
-                    "p75_weighted(tags[foo,number])",
-                    "p95_weighted(tags[foo,number])",
-                    "p99_weighted(tags[foo,number])",
-                    "p100_weighted(tags[foo,number])",
-                    "min_weighted(tags[foo,number])",
-                    "max_weighted(tags[foo,number])",
+                    "count_unique(bar)",
+                    "count_unique(tags[bar])",
+                    "count_unique(tags[bar,string])",
+                    "count()",
+                    "count(span.duration)",
+                    "count(tags[foo,     number])",
+                    "sum(tags[foo,number])",
+                    "avg(tags[foo,number])",
+                    "p50(tags[foo,number])",
+                    "p75(tags[foo,number])",
+                    "p95(tags[foo,number])",
+                    "p99(tags[foo,number])",
+                    "p100(tags[foo,number])",
+                    "min(tags[foo,number])",
+                    "max(tags[foo,number])",
                 ],
                 "query": "",
                 "orderby": "description",
@@ -686,21 +1030,21 @@ def test_aggregate_numeric_attr_weighted(self):
         data = response.data["data"]
         assert data[0] == {
             "description": "foo",
-            "count_unique_weighted(bar)": 3,
-            "count_unique_weighted(tags[bar])": 3,
-            "count_unique_weighted(tags[bar,string])": 3,
-            "count_weighted()": 3,
-            "count_weighted(span.duration)": 3,
-            "count_weighted(tags[foo,     number])": 1,
-            "sum_weighted(tags[foo,number])": 5.0,
-            "avg_weighted(tags[foo,number])": 5.0,
-            "p50_weighted(tags[foo,number])": 5.0,
-            "p75_weighted(tags[foo,number])": 5.0,
-            "p95_weighted(tags[foo,number])": 5.0,
-            "p99_weighted(tags[foo,number])": 5.0,
-            "p100_weighted(tags[foo,number])": 5.0,
-            "min_weighted(tags[foo,number])": 5.0,
-            "max_weighted(tags[foo,number])": 5.0,
+            "count_unique(bar)": 3,
+            "count_unique(tags[bar])": 3,
+            "count_unique(tags[bar,string])": 3,
+            "count()": 3,
+            "count(span.duration)": 3,
+            "count(tags[foo,     number])": 1,
+            "sum(tags[foo,number])": 5.0,
+            "avg(tags[foo,number])": 5.0,
+            "p50(tags[foo,number])": 5.0,
+            "p75(tags[foo,number])": 5.0,
+            "p95(tags[foo,number])": 5.0,
+            "p99(tags[foo,number])": 5.0,
+            "p100(tags[foo,number])": 5.0,
+            "min(tags[foo,number])": 5.0,
+            "max(tags[foo,number])": 5.0,
         }
 
     def test_numeric_attr_without_space(self):
@@ -874,79 +1218,6 @@ def test_numeric_attr_orderby(self):
         assert data[2]["tags[foo,number]"] == 71
         assert data[2]["description"] == "baz"
 
-    def test_aggregate_numeric_attr(self):
-        self.store_spans(
-            [
-                self.create_span(
-                    {
-                        "description": "foo",
-                        "sentry_tags": {"status": "success"},
-                        "tags": {"bar": "bar1"},
-                    },
-                    start_ts=self.ten_mins_ago,
-                ),
-                self.create_span(
-                    {
-                        "description": "foo",
-                        "sentry_tags": {"status": "success"},
-                        "tags": {"bar": "bar2"},
-                    },
-                    measurements={"foo": {"value": 5}},
-                    start_ts=self.ten_mins_ago,
-                ),
-            ],
-            is_eap=self.is_eap,
-        )
-
-        response = self.do_request(
-            {
-                "field": [
-                    "description",
-                    "count_unique(bar)",
-                    "count_unique(tags[bar])",
-                    "count_unique(tags[bar,string])",
-                    "count()",
-                    "count(span.duration)",
-                    "count(tags[foo,     number])",
-                    "sum(tags[foo,number])",
-                    "avg(tags[foo,number])",
-                    "p50(tags[foo,number])",
-                    "p75(tags[foo,number])",
-                    "p95(tags[foo,number])",
-                    "p99(tags[foo,number])",
-                    "p100(tags[foo,number])",
-                    "min(tags[foo,number])",
-                    "max(tags[foo,number])",
-                ],
-                "query": "",
-                "orderby": "description",
-                "project": self.project.id,
-                "dataset": self.dataset,
-            }
-        )
-
-        assert response.status_code == 200, response.content
-        assert len(response.data["data"]) == 1
-        data = response.data["data"]
-        assert data[0] == {
-            "description": "foo",
-            "count_unique(bar)": 2,
-            "count_unique(tags[bar])": 2,
-            "count_unique(tags[bar,string])": 2,
-            "count()": 2,
-            "count(span.duration)": 2,
-            "count(tags[foo,     number])": 1,
-            "sum(tags[foo,number])": 5.0,
-            "avg(tags[foo,number])": 5.0,
-            "p50(tags[foo,number])": 5.0,
-            "p75(tags[foo,number])": 5.0,
-            "p95(tags[foo,number])": 5.0,
-            "p99(tags[foo,number])": 5.0,
-            "p100(tags[foo,number])": 5.0,
-            "min(tags[foo,number])": 5.0,
-            "max(tags[foo,number])": 5.0,
-        }
-
     def test_margin_of_error(self):
         total_samples = 10
         in_group = 5
@@ -984,7 +1255,7 @@ def test_margin_of_error(self):
                     "margin_of_error()",
                     "lower_count_limit()",
                     "upper_count_limit()",
-                    "count_weighted()",
+                    "count()",
                 ],
                 "query": "description:foo",
                 "project": self.project.id,
@@ -997,7 +1268,7 @@ def test_margin_of_error(self):
         margin_of_error = data["margin_of_error()"]
         lower_limit = data["lower_count_limit()"]
         upper_limit = data["upper_count_limit()"]
-        extrapolated = data["count_weighted()"]
+        extrapolated = data["count()"]
         assert margin_of_error == pytest.approx(0.306, rel=1e-1)
         # How to read this; these results mean that the extrapolated count is
         # 500k, with a lower estimated bound of ~200k, and an upper bound of 800k
@@ -1042,6 +1313,69 @@ def test_skip_aggregate_conditions_option(self):
         ]
         assert meta["dataset"] == self.dataset
 
+    def test_span_data_fields_http_resource(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {
+                        "op": "resource.img",
+                        "description": "/image/",
+                        "data": {
+                            "http.decoded_response_content_length": 1,
+                            "http.response_content_length": 2,
+                            "http.response_transfer_size": 3,
+                        },
+                    },
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        response = self.do_request(
+            {
+                "field": [
+                    "http.decoded_response_content_length",
+                    "http.response_content_length",
+                    "http.response_transfer_size",
+                ],
+                "project": self.project.id,
+                "dataset": self.dataset,
+                "allowAggregateConditions": "0",
+            }
+        )
+        assert response.status_code == 200, response.content
+        assert response.data["data"] == [
+            {
+                "http.decoded_response_content_length": 1,
+                "http.response_content_length": 2,
+                "http.response_transfer_size": 3,
+                "project.name": self.project.slug,
+                "id": mock.ANY,
+            },
+        ]
+        assert response.data["meta"] == {
+            "dataset": mock.ANY,
+            "datasetReason": "unchanged",
+            "fields": {
+                "http.decoded_response_content_length": "size",
+                "http.response_content_length": "size",
+                "http.response_transfer_size": "size",
+                "id": "string",
+                "project.name": "string",
+            },
+            "isMetricsData": False,
+            "isMetricsExtractedData": False,
+            "tips": {},
+            "units": {
+                "http.decoded_response_content_length": "byte",
+                "http.response_content_length": "byte",
+                "http.response_transfer_size": "byte",
+                "id": None,
+                "project.name": None,
+            },
+        }
+
 
 class OrganizationEventsEAPRPCSpanEndpointTest(OrganizationEventsEAPSpanEndpointTest):
     """These tests aren't fully passing yet, currently inheriting xfail from the eap tests"""
@@ -1049,6 +1383,51 @@ class OrganizationEventsEAPRPCSpanEndpointTest(OrganizationEventsEAPSpanEndpoint
     is_eap = True
     use_rpc = True
 
+    def test_extrapolation(self):
+        """Extrapolation only changes the number when there's a sample rate"""
+        spans = []
+        spans.append(
+            self.create_span(
+                {
+                    "description": "foo",
+                    "sentry_tags": {"status": "success"},
+                    "measurements": {"client_sample_rate": {"value": 0.1}},
+                },
+                start_ts=self.ten_mins_ago,
+            )
+        )
+        spans.append(
+            self.create_span(
+                {
+                    "description": "bar",
+                    "sentry_tags": {"status": "success"},
+                },
+                start_ts=self.ten_mins_ago,
+            )
+        )
+        self.store_spans(spans, is_eap=self.is_eap)
+        response = self.do_request(
+            {
+                "field": ["description", "count()"],
+                "orderby": "-count()",
+                "query": "",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        confidence = response.data["confidence"]
+        assert len(data) == 2
+        assert len(confidence) == 2
+        assert data[0]["count()"] == 10
+        assert confidence[0]["count()"] == "low"
+        assert data[1]["count()"] == 1
+        # While logically the confidence for 1 event at 100% sample rate should be high, we're going with low until we
+        # get customer feedback
+        assert confidence[1]["count()"] == "low"
+
     def test_span_duration(self):
         spans = [
             self.create_span(
@@ -1091,25 +1470,53 @@ def test_span_duration(self):
         ]
         assert meta["dataset"] == self.dataset
 
-    @pytest.mark.xfail(reason="extrapolation not implemented yet")
-    def test_aggregate_numeric_attr_weighted(self):
-        super().test_aggregate_numeric_attr_weighted()
-
-    @pytest.mark.xfail(reason="RPC failing because of aliasing")
-    def test_numeric_attr_without_space(self):
-        super().test_numeric_attr_without_space()
-
-    @pytest.mark.xfail(reason="RPC failing because of aliasing")
-    def test_numeric_attr_with_spaces(self):
-        super().test_numeric_attr_with_spaces()
-
-    @pytest.mark.xfail(reason="RPC failing because of aliasing")
-    def test_numeric_attr_filtering(self):
-        super().test_numeric_attr_filtering()
+    @pytest.mark.xfail(reason="sampling_factor is not a queryable column yet")
+    def test_average_sampling_rate(self):
+        spans = []
+        spans.append(
+            self.create_span(
+                {
+                    "description": "foo",
+                    "sentry_tags": {"status": "success"},
+                    "measurements": {"client_sample_rate": {"value": 0.1}},
+                },
+                start_ts=self.ten_mins_ago,
+            )
+        )
+        spans.append(
+            self.create_span(
+                {
+                    "description": "bar",
+                    "sentry_tags": {"status": "success"},
+                    "measurements": {"client_sample_rate": {"value": 0.85}},
+                },
+                start_ts=self.ten_mins_ago,
+            )
+        )
+        self.store_spans(spans, is_eap=self.is_eap)
+        response = self.do_request(
+            {
+                "field": [
+                    "avg_sample(sampling_rate)",
+                    "count()",
+                    "min(sampling_rate)",
+                    "count_sample()",
+                ],
+                "query": "",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
 
-    @pytest.mark.xfail(reason="RPC failing because of aliasing")
-    def test_numeric_attr_orderby(self):
-        super().test_numeric_attr_orderby()
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        confidence = response.data["confidence"]
+        assert len(data) == 1
+        assert data[0]["avg_sample(sampling_rate)"] == pytest.approx(0.475)
+        assert data[0]["min(sampling_rate)"] == pytest.approx(0.1)
+        assert data[0]["count_sample()"] == 2
+        assert data[0]["count()"] == 11
+        assert confidence[0]["count()"] == "low"
 
     def test_aggregate_numeric_attr(self):
         self.store_spans(
@@ -1148,8 +1555,7 @@ def test_aggregate_numeric_attr(self):
                     "sum(tags[foo,number])",
                     "avg(tags[foo,number])",
                     "p50(tags[foo,number])",
-                    # TODO: bring p75 back once its added to the rpc
-                    # "p75(tags[foo,number])",
+                    "p75(tags[foo,number])",
                     "p95(tags[foo,number])",
                     "p99(tags[foo,number])",
                     "p100(tags[foo,number])",
@@ -1177,8 +1583,7 @@ def test_aggregate_numeric_attr(self):
             "sum(tags[foo,number])": 5.0,
             "avg(tags[foo,number])": 5.0,
             "p50(tags[foo,number])": 5.0,
-            # TODO: bring p75 back once its added to the rpc
-            # "p75(tags[foo,number])": 5.0,
+            "p75(tags[foo,number])": 5.0,
             "p95(tags[foo,number])": 5.0,
             "p99(tags[foo,number])": 5.0,
             "p100(tags[foo,number])": 5.0,
@@ -1186,6 +1591,66 @@ def test_aggregate_numeric_attr(self):
             "max(tags[foo,number])": 5.0,
         }
 
-    @pytest.mark.xfail(reason="extrapolation not implemented yet")
+    @pytest.mark.xfail(reason="margin will not be moved to the RPC")
     def test_margin_of_error(self):
         super().test_margin_of_error()
+
+    @pytest.mark.xfail(reason="module not migrated over")
+    def test_module_alias(self):
+        super().test_module_alias()
+
+    @pytest.mark.xfail(reason="wip: not implemented yet")
+    def test_inp_span(self):
+        super().test_inp_span()
+
+    @pytest.mark.xfail(reason="wip: not implemented yet")
+    def test_network_span(self):
+        super().test_network_span()
+
+    @pytest.mark.xfail(reason="wip: not implemented yet")
+    def test_other_category_span(self):
+        super().test_other_category_span()
+
+    @pytest.mark.xfail(reason="wip: not implemented yet")
+    def test_sentry_tags_syntax(self):
+        super().test_sentry_tags_syntax()
+
+    @pytest.mark.xfail(reason="wip: not implemented yet")
+    def test_span_op_casing(self):
+        super().test_span_op_casing()
+
+    def test_tag_wildcards(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "foo", "tags": {"foo": "bar"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+                self.create_span(
+                    {"description": "qux", "tags": {"foo": "qux"}},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        for query in [
+            "foo:b*",
+            "foo:*r",
+            "foo:*a*",
+            "foo:b*r",
+        ]:
+            response = self.do_request(
+                {
+                    "field": ["foo", "count()"],
+                    "query": query,
+                    "project": self.project.id,
+                    "dataset": self.dataset,
+                }
+            )
+            assert response.status_code == 200, response.content
+            assert response.data["data"] == [{"foo": "bar", "count()": 1}]
+
+    @pytest.mark.xfail(reason="rate not implemented yet")
+    def test_spm(self):
+        super().test_spm()
diff --git a/tests/snuba/api/endpoints/test_organization_events_stats.py b/tests/snuba/api/endpoints/test_organization_events_stats.py
index 63809863c9d66a..11913f446464ac 100644
--- a/tests/snuba/api/endpoints/test_organization_events_stats.py
+++ b/tests/snuba/api/endpoints/test_organization_events_stats.py
@@ -486,6 +486,45 @@ def test_aggregate_invalid(self):
         )
         assert response.status_code == 400, response.content
 
+    def test_throughput_meta(self):
+        project = self.create_project()
+
+        for axis in ["epm()", "tpm()"]:
+            response = self.do_request(
+                data={
+                    "transformAliasToInputFormat": 1,
+                    "start": self.day_ago,
+                    "end": self.day_ago + timedelta(hours=6),
+                    "interval": "1h",
+                    "yAxis": axis,
+                    "project": project.id,
+                },
+            )
+            meta = response.data["meta"]
+            assert meta["fields"] == {
+                "time": "date",
+                axis: "rate",
+            }
+            assert meta["units"] == {"time": None, axis: "1/minute"}
+
+        for axis in ["eps()", "tps()"]:
+            response = self.do_request(
+                data={
+                    "transformAliasToInputFormat": 1,
+                    "start": self.day_ago,
+                    "end": self.day_ago + timedelta(hours=6),
+                    "interval": "1h",
+                    "yAxis": axis,
+                    "project": project.id,
+                },
+            )
+            meta = response.data["meta"]
+            assert meta["fields"] == {
+                "time": "date",
+                axis: "rate",
+            }
+            assert meta["units"] == {"time": None, axis: "1/second"}
+
     def test_throughput_epm_hour_rollup(self):
         project = self.create_project()
         # Each of these denotes how many events to create in each hour
diff --git a/tests/snuba/api/endpoints/test_organization_events_stats_profile_functions_metrics.py b/tests/snuba/api/endpoints/test_organization_events_stats_profile_functions_metrics.py
deleted file mode 100644
index d8b22cb5ea17a6..00000000000000
--- a/tests/snuba/api/endpoints/test_organization_events_stats_profile_functions_metrics.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import pytest
-from django.urls import reverse
-
-from sentry.testutils.cases import MetricsEnhancedPerformanceTestCase
-from sentry.testutils.helpers.datetime import before_now
-
-pytestmark = pytest.mark.sentry_metrics
-
-
-class OrganizationEventsStatsProfileFunctionsMetricsEndpointTest(
-    MetricsEnhancedPerformanceTestCase
-):
-    viewname = "sentry-api-0-organization-events-stats"
-
-    def setUp(self):
-        super().setUp()
-        self.three_days_ago = before_now(days=3)
-        self.features = {}
-
-    def do_request(self, query, features=None):
-        if features is None:
-            features = {"organizations:discover-basic": True}
-        features.update(self.features)
-        self.login_as(user=self.user)
-        url = reverse(
-            self.viewname,
-            kwargs={"organization_id_or_slug": self.organization.slug},
-        )
-        with self.feature(features):
-            return self.client.get(url, query, format="json")
-
-    def test_basic(self):
-        self.store_profile_functions_metric(
-            1,
-            timestamp=self.three_days_ago,
-        )
-
-        query = {
-            "dataset": "profileFunctionsMetrics",
-            "statsPeriod": "7d",
-            "yAxis": ["count()", "p95(function.duration)"],
-            "interval": "1d",
-            "excludeOther": 1,
-        }
-
-        response = self.do_request(query)
-        assert response.status_code == 200, response.content
diff --git a/tests/snuba/api/endpoints/test_organization_events_stats_span_indexed.py b/tests/snuba/api/endpoints/test_organization_events_stats_span_indexed.py
index 76f9a24358ddc2..670faa6cc5f8fb 100644
--- a/tests/snuba/api/endpoints/test_organization_events_stats_span_indexed.py
+++ b/tests/snuba/api/endpoints/test_organization_events_stats_span_indexed.py
@@ -12,6 +12,7 @@
 class OrganizationEventsStatsSpansMetricsEndpointTest(OrganizationEventsEndpointTestBase):
     endpoint = "sentry-api-0-organization-events-stats"
     is_eap = False
+    is_rpc = False
 
     @property
     def dataset(self):
@@ -24,6 +25,7 @@ def setUp(self):
         super().setUp()
         self.login_as(user=self.user)
         self.day_ago = before_now(days=1).replace(hour=10, minute=0, second=0, microsecond=0)
+        self.two_days_ago = self.day_ago - timedelta(days=1)
         self.DEFAULT_METRIC_TIMESTAMP = self.day_ago
 
         self.url = reverse(
@@ -34,10 +36,170 @@ def setUp(self):
     def _do_request(self, data, url=None, features=None):
         if features is None:
             features = {"organizations:discover-basic": True}
+        if self.is_rpc:
+            data["useRpc"] = "1"
         features.update(self.features)
         with self.feature(features):
             return self.client.get(self.url if url is None else url, data=data, format="json")
 
+    def test_count(self):
+        event_counts = [6, 0, 6, 3, 0, 3]
+        for hour, count in enumerate(event_counts):
+            for minute in range(count):
+                self.store_spans(
+                    [
+                        self.create_span(
+                            {"description": "foo", "sentry_tags": {"status": "success"}},
+                            start_ts=self.day_ago + timedelta(hours=hour, minutes=minute),
+                        ),
+                    ],
+                    is_eap=self.is_eap,
+                )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(hours=6),
+                "interval": "1h",
+                "yAxis": "count()",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            },
+        )
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        assert len(data) == 6
+        assert response.data["meta"]["dataset"] == self.dataset
+
+        rows = data[0:6]
+        for test in zip(event_counts, rows):
+            assert test[1][1][0]["count"] == test[0]
+
+    def test_handle_nans_from_snuba(self):
+        self.store_spans(
+            [self.create_span({"description": "foo"}, start_ts=self.day_ago)],
+            is_eap=self.is_eap,
+        )
+
+        response = self._do_request(
+            data={
+                "yAxis": "avg(measurements.lcp)",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            },
+        )
+        assert response.status_code == 200, response.content
+
+    def test_count_unique(self):
+        event_counts = [6, 0, 6, 3, 0, 3]
+        for hour, count in enumerate(event_counts):
+            for minute in range(count):
+                self.store_spans(
+                    [
+                        self.create_span(
+                            {
+                                "description": "foo",
+                                "sentry_tags": {"status": "success"},
+                                "tags": {"foo": f"foo-{minute}"},
+                            },
+                            start_ts=self.day_ago + timedelta(hours=hour, minutes=minute),
+                        ),
+                    ],
+                    is_eap=self.is_eap,
+                )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(hours=6),
+                "interval": "1h",
+                "yAxis": "count_unique(foo)",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            },
+        )
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        assert len(data) == 6
+        assert response.data["meta"]["dataset"] == self.dataset
+
+        rows = data[0:6]
+        for test in zip(event_counts, rows):
+            assert test[1][1][0]["count"] == test[0]
+
+    def test_p95(self):
+        event_durations = [6, 0, 6, 3, 0, 3]
+        for hour, duration in enumerate(event_durations):
+            self.store_spans(
+                [
+                    self.create_span(
+                        {"description": "foo", "sentry_tags": {"status": "success"}},
+                        duration=duration,
+                        start_ts=self.day_ago + timedelta(hours=hour, minutes=1),
+                    ),
+                ],
+                is_eap=self.is_eap,
+            )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(hours=6),
+                "interval": "1h",
+                "yAxis": "p95()",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            },
+        )
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        assert len(data) == 6
+        assert response.data["meta"]["dataset"] == self.dataset
+
+        rows = data[0:6]
+        for test in zip(event_durations, rows):
+            assert test[1][1][0]["count"] == test[0]
+
+    def test_multiaxis(self):
+        event_counts = [6, 0, 6, 3, 0, 3]
+        for hour, count in enumerate(event_counts):
+            for minute in range(count):
+                self.store_spans(
+                    [
+                        self.create_span(
+                            {
+                                "description": "foo",
+                                "sentry_tags": {"status": "success"},
+                            },
+                            duration=count,
+                            start_ts=self.day_ago + timedelta(hours=hour, minutes=minute),
+                        ),
+                    ],
+                    is_eap=self.is_eap,
+                )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(hours=6),
+                "interval": "1h",
+                "yAxis": ["count()", "p95()"],
+                "project": self.project.id,
+                "dataset": self.dataset,
+            },
+        )
+        assert response.status_code == 200, response.content
+        count_data = response.data["count()"]["data"]
+        p95_data = response.data["p95()"]["data"]
+        assert len(count_data) == len(p95_data) == 6
+
+        count_rows = count_data[0:6]
+        for test in zip(event_counts, count_rows):
+            assert test[1][1][0]["count"] == test[0]
+        p95_rows = p95_data[0:6]
+        for test in zip(event_counts, p95_rows):
+            assert test[1][1][0]["count"] == test[0]
+
     # These throughput tests should roughly match the ones in OrganizationEventsStatsEndpointTest
     @pytest.mark.querybuilder
     def test_throughput_epm_hour_rollup(self):
@@ -220,8 +382,427 @@ def test_top_events(self):
         assert "foo" in response.data
         assert "bar" in response.data
         assert len(response.data["Other"]["data"]) == 6
+        for key in ["Other", "foo", "bar"]:
+            rows = response.data[key]["data"][0:6]
+            for expected, result in zip([0, 1, 0, 0, 0, 0], rows):
+                assert result[1][0]["count"] == expected, key
+        assert response.data["Other"]["meta"]["dataset"] == self.dataset
+
+    def test_top_events_empty_other(self):
+        # Each of these denotes how many events to create in each minute
+        for transaction in ["foo", "bar"]:
+            self.store_spans(
+                [
+                    self.create_span(
+                        {"sentry_tags": {"transaction": transaction, "status": "success"}},
+                        start_ts=self.day_ago + timedelta(minutes=1),
+                        duration=2000,
+                    ),
+                ],
+                is_eap=self.is_eap,
+            )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(minutes=6),
+                "interval": "1m",
+                "yAxis": "count()",
+                "field": ["transaction", "sum(span.self_time)"],
+                "orderby": ["-sum_span_self_time"],
+                "project": self.project.id,
+                "dataset": self.dataset,
+                "excludeOther": 0,
+                "topEvents": 2,
+            },
+        )
+        assert response.status_code == 200, response.content
+        assert "Other" not in response.data
+        assert "foo" in response.data
+        assert "bar" in response.data
+        for key in ["foo", "bar"]:
+            rows = response.data[key]["data"][0:6]
+            for expected, result in zip([0, 1, 0, 0, 0, 0], rows):
+                assert result[1][0]["count"] == expected, key
+        assert response.data["foo"]["meta"]["dataset"] == self.dataset
+
+    def test_top_events_with_project(self):
+        # Each of these denotes how many events to create in each minute
+        projects = [self.create_project(), self.create_project()]
+        for project in projects:
+            self.store_spans(
+                [
+                    self.create_span(
+                        {"sentry_tags": {"status": "success"}},
+                        start_ts=self.day_ago + timedelta(minutes=1),
+                        project=project,
+                        duration=2000,
+                    ),
+                ],
+                is_eap=self.is_eap,
+            )
+        self.store_spans(
+            [
+                self.create_span(
+                    {"segment_name": "baz", "sentry_tags": {"status": "success"}},
+                    start_ts=self.day_ago + timedelta(minutes=1),
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(minutes=6),
+                "interval": "1m",
+                "yAxis": "count()",
+                "field": ["project", "sum(span.self_time)"],
+                "orderby": ["-sum_span_self_time"],
+                "dataset": self.dataset,
+                "excludeOther": 0,
+                "topEvents": 2,
+            },
+        )
+        assert response.status_code == 200, response.content
+        assert "Other" in response.data
+        assert projects[0].slug in response.data
+        assert projects[1].slug in response.data
+        assert len(response.data["Other"]["data"]) == 6
+        for key in ["Other", projects[0].slug, projects[1].slug]:
+            rows = response.data[key]["data"][0:6]
+            for expected, result in zip([0, 1, 0, 0, 0, 0], rows):
+                assert result[1][0]["count"] == expected, key
+        assert response.data["Other"]["meta"]["dataset"] == self.dataset
+
+    def test_top_events_with_project_and_project_id(self):
+        # Each of these denotes how many events to create in each minute
+        projects = [self.create_project(), self.create_project()]
+        for project in projects:
+            self.store_spans(
+                [
+                    self.create_span(
+                        {"sentry_tags": {"status": "success"}},
+                        start_ts=self.day_ago + timedelta(minutes=1),
+                        project=project,
+                        duration=2000,
+                    ),
+                ],
+                is_eap=self.is_eap,
+            )
+        self.store_spans(
+            [
+                self.create_span(
+                    {"segment_name": "baz", "sentry_tags": {"status": "success"}},
+                    start_ts=self.day_ago + timedelta(minutes=1),
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(minutes=6),
+                "interval": "1m",
+                "yAxis": "count()",
+                "field": ["project", "project.id", "sum(span.self_time)"],
+                "orderby": ["-sum_span_self_time"],
+                "dataset": self.dataset,
+                "excludeOther": 0,
+                "topEvents": 2,
+            },
+        )
+        assert response.status_code == 200, response.content
+        assert "Other" in response.data
+        key1 = f"{projects[0].slug},{projects[0].id}"
+        key2 = f"{projects[1].slug},{projects[1].id}"
+        assert key1 in response.data
+        assert key2 in response.data
+        assert len(response.data["Other"]["data"]) == 6
+        for key in ["Other", key1, key2]:
+            rows = response.data[key]["data"][0:6]
+            for expected, result in zip([0, 1, 0, 0, 0, 0], rows):
+                assert result[1][0]["count"] == expected, key
         assert response.data["Other"]["meta"]["dataset"] == self.dataset
 
 
 class OrganizationEventsEAPSpanEndpointTest(OrganizationEventsStatsSpansMetricsEndpointTest):
     is_eap = True
+
+    def test_count_extrapolation(self):
+        event_counts = [6, 0, 6, 3, 0, 3]
+        for hour, count in enumerate(event_counts):
+            for minute in range(count):
+                self.store_spans(
+                    [
+                        self.create_span(
+                            {
+                                "description": "foo",
+                                "sentry_tags": {"status": "success"},
+                                "measurements": {"client_sample_rate": {"value": 0.1}},
+                            },
+                            start_ts=self.day_ago + timedelta(hours=hour, minutes=minute),
+                        ),
+                    ],
+                    is_eap=self.is_eap,
+                )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(hours=6),
+                "interval": "1h",
+                "yAxis": "count()",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            },
+        )
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        assert len(data) == 6
+        assert response.data["meta"]["dataset"] == self.dataset
+
+        rows = data[0:6]
+        for test in zip(event_counts, rows):
+            assert test[1][1][0]["count"] == test[0] * 10
+
+
+class OrganizationEventsEAPRPCSpanEndpointTest(OrganizationEventsEAPSpanEndpointTest):
+    is_eap = True
+    is_rpc = True
+
+    def test_extrapolation(self):
+        event_counts = [6, 0, 6, 3, 0, 3]
+        for hour, count in enumerate(event_counts):
+            for minute in range(count):
+                self.store_spans(
+                    [
+                        self.create_span(
+                            {
+                                "description": "foo",
+                                "sentry_tags": {"status": "success"},
+                                "measurements": {"client_sample_rate": {"value": 0.1}},
+                            },
+                            start_ts=self.day_ago + timedelta(hours=hour, minutes=minute),
+                        ),
+                    ],
+                    is_eap=self.is_eap,
+                )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(hours=6),
+                "interval": "1h",
+                "yAxis": "count()",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            },
+        )
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        confidence = response.data["confidence"]
+        assert len(data) == 6
+        assert response.data["meta"]["dataset"] == self.dataset
+
+        for expected, actual in zip(event_counts, data[0:6]):
+            assert actual[1][0]["count"] == expected * 10
+
+        for expected, actual in zip(event_counts, confidence[0:6]):
+            if expected != 0:
+                assert actual[1][0]["count"] == "low"
+            else:
+                assert actual[1][0]["count"] is None
+
+    def test_extrapolation_with_multiaxis(self):
+        event_counts = [6, 0, 6, 3, 0, 3]
+        for hour, count in enumerate(event_counts):
+            for minute in range(count):
+                self.store_spans(
+                    [
+                        self.create_span(
+                            {
+                                "description": "foo",
+                                "sentry_tags": {"status": "success"},
+                                "measurements": {"client_sample_rate": {"value": 0.1}},
+                            },
+                            duration=count,
+                            start_ts=self.day_ago + timedelta(hours=hour, minutes=minute),
+                        ),
+                    ],
+                    is_eap=self.is_eap,
+                )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(hours=6),
+                "interval": "1h",
+                "yAxis": ["count()", "p95()"],
+                "project": self.project.id,
+                "dataset": self.dataset,
+            },
+        )
+        assert response.status_code == 200, response.content
+        count_data = response.data["count()"]["data"]
+        p95_data = response.data["p95()"]["data"]
+        assert len(count_data) == len(p95_data) == 6
+
+        count_rows = count_data[0:6]
+        for test in zip(event_counts, count_rows):
+            assert test[1][1][0]["count"] == test[0] * 10
+
+        for expected, actual in zip(event_counts, response.data["count()"]["confidence"][0:6]):
+            if expected != 0:
+                assert actual[1][0]["count"] == "low"
+            else:
+                assert actual[1][0]["count"] is None
+
+        p95_rows = p95_data[0:6]
+        for test in zip(event_counts, p95_rows):
+            assert test[1][1][0]["count"] == test[0]
+
+        for actual in response.data["p95()"]["confidence"][0:6]:
+            assert actual[1][0]["count"] is None
+
+    def test_top_events_with_extrapolation(self):
+        # Each of these denotes how many events to create in each minute
+        for transaction in ["foo", "bar"]:
+            self.store_spans(
+                [
+                    self.create_span(
+                        {"sentry_tags": {"transaction": transaction, "status": "success"}},
+                        start_ts=self.day_ago + timedelta(minutes=1),
+                        duration=2000,
+                    ),
+                ],
+                is_eap=self.is_eap,
+            )
+        self.store_spans(
+            [
+                self.create_span(
+                    {"segment_name": "baz", "sentry_tags": {"status": "success"}},
+                    start_ts=self.day_ago + timedelta(minutes=1),
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(minutes=6),
+                "interval": "1m",
+                "yAxis": "count()",
+                "field": ["transaction", "sum(span.self_time)"],
+                "orderby": ["-sum_span_self_time"],
+                "project": self.project.id,
+                "dataset": self.dataset,
+                "excludeOther": 0,
+                "topEvents": 2,
+            },
+        )
+        assert response.status_code == 200, response.content
+        assert "Other" in response.data
+        assert "foo" in response.data
+        assert "bar" in response.data
+        assert len(response.data["Other"]["data"]) == 6
+        for key in ["Other", "foo", "bar"]:
+            rows = response.data[key]["data"][0:6]
+            for expected, result in zip([0, 1, 0, 0, 0, 0], rows):
+                assert result[1][0]["count"] == expected, key
+        assert response.data["Other"]["meta"]["dataset"] == self.dataset
+
+    def test_comparison_delta(self):
+        event_counts = [6, 0, 6, 4, 0, 4]
+        for current_period in [True, False]:
+            for hour, count in enumerate(event_counts):
+                count = count if current_period else int(count / 2)
+                for minute in range(count):
+                    start_ts = (
+                        self.day_ago + timedelta(hours=hour, minutes=minute)
+                        if current_period
+                        else self.two_days_ago + timedelta(hours=hour, minutes=minute)
+                    )
+                    self.store_spans(
+                        [
+                            self.create_span(
+                                {"description": "foo", "sentry_tags": {"status": "success"}},
+                                start_ts=start_ts,
+                            ),
+                        ],
+                        is_eap=self.is_eap,
+                    )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(days=1),
+                "interval": "1h",
+                "yAxis": "count()",
+                "project": self.project.id,
+                "dataset": self.dataset,
+                "comparisonDelta": 24 * 60 * 60,
+            },
+        )
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        assert len(data) == 24
+        assert response.data["meta"]["dataset"] == self.dataset
+
+        rows = data[0:6]
+        for test in zip(event_counts, rows):
+            assert test[1][1][0]["count"] == test[0]
+            assert test[1][1][0]["comparisonCount"] == test[0] / 2
+
+    def test_comparison_delta_with_empty_comparison_values(self):
+        event_counts = [6, 0, 6, 4, 0, 4]
+        for hour, count in enumerate(event_counts):
+            for minute in range(count):
+                self.store_spans(
+                    [
+                        self.create_span(
+                            {"description": "foo", "sentry_tags": {"status": "success"}},
+                            start_ts=self.day_ago + timedelta(hours=hour, minutes=minute),
+                        ),
+                    ],
+                    is_eap=self.is_eap,
+                )
+
+        response = self._do_request(
+            data={
+                "start": self.day_ago,
+                "end": self.day_ago + timedelta(days=1),
+                "interval": "1h",
+                "yAxis": "count()",
+                "project": self.project.id,
+                "dataset": self.dataset,
+                "comparisonDelta": 24 * 60 * 60,
+            },
+        )
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        assert len(data) == 24
+        assert response.data["meta"]["dataset"] == self.dataset
+
+        rows = data[0:6]
+        for test in zip(event_counts, rows):
+            assert test[1][1][0]["count"] == test[0]
+            assert test[1][1][0]["comparisonCount"] == 0
+
+    @pytest.mark.xfail(reason="epm not implemented yet")
+    def test_throughput_epm_hour_rollup(self):
+        super().test_throughput_epm_hour_rollup()
+
+    @pytest.mark.xfail(reason="epm not implemented yet")
+    def test_throughput_epm_day_rollup(self):
+        super().test_throughput_epm_day_rollup()
+
+    @pytest.mark.xfail(reason="epm not implemented yet")
+    def test_throughput_epm_hour_rollup_offset_of_hour(self):
+        super().test_throughput_epm_hour_rollup_offset_of_hour()
+
+    @pytest.mark.xfail(reason="epm not implemented yet")
+    def test_throughput_eps_minute_rollup(self):
+        super().test_throughput_eps_minute_rollup()
diff --git a/tests/snuba/api/serializers/test_group.py b/tests/snuba/api/serializers/test_group.py
index 955cf14a5bcc4c..a8b2a3e96c84b4 100644
--- a/tests/snuba/api/serializers/test_group.py
+++ b/tests/snuba/api/serializers/test_group.py
@@ -13,7 +13,7 @@
 from sentry.models.groupresolution import GroupResolution
 from sentry.models.groupsnooze import GroupSnooze
 from sentry.models.groupsubscription import GroupSubscription
-from sentry.models.notificationsettingoption import NotificationSettingOption
+from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.types import NotificationSettingsOptionEnum
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase, PerformanceIssueTestCase, SnubaTestCase
diff --git a/yarn.lock b/yarn.lock
index bf87148162f22f..7f5e97950aaf7b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1103,13 +1103,20 @@
     "@babel/plugin-transform-modules-commonjs" "^7.25.9"
     "@babel/plugin-transform-typescript" "^7.25.9"
 
-"@babel/runtime@*", "@babel/runtime@7.4.5", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2", "@babel/runtime@~7.25.9":
+"@babel/runtime@*", "@babel/runtime@7.4.5", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2", "@babel/runtime@~7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.9.tgz#65884fd6dc255a775402cc1d9811082918f4bf00"
   integrity sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==
   dependencies:
     regenerator-runtime "^0.14.0"
 
+"@babel/runtime@^7.16.3":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
+  integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/template@^7.25.9", "@babel/template@^7.3.3":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016"
@@ -1226,25 +1233,25 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@csstools/css-parser-algorithms@^2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.5.0.tgz#0c03cd5418a9f404a05ff2ffcb1b69d04e8ec532"
-  integrity sha512-abypo6m9re3clXA00eu5syw+oaPHbJTPapu9C4pzNsJ4hdZDzushT50Zhu+iIYXgEe1CxnRMn7ngsbV+MLrlpQ==
-
-"@csstools/css-tokenizer@^2.2.3":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.3.tgz#b099d543ea57b64f495915a095ead583866c50c6"
-  integrity sha512-pp//EvZ9dUmGuGtG1p+n17gTHEOqu9jO+FiCUjNN3BDmyhdA2Jq9QsVeR7K8/2QCK17HSsioPlTW9ZkzoWb3Lg==
+"@csstools/css-parser-algorithms@^3.0.1":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356"
+  integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==
 
-"@csstools/media-query-list-parser@^2.1.7":
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.7.tgz#a4836e3dbd693081a30b32ce9c2a781e1be16788"
-  integrity sha512-lHPKJDkPUECsyAvD60joYfDmp8UERYxHGkFfyLJFTVK/ERJe0sVlIFLXU5XFxdjNDTerp5L4KeaKG+Z5S94qxQ==
+"@csstools/css-tokenizer@^3.0.1":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2"
+  integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==
 
-"@csstools/selector-specificity@^3.0.1":
+"@csstools/media-query-list-parser@^3.0.1":
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.1.tgz#d84597fbc0f897240c12fc0a31e492b036c70e40"
-  integrity sha512-NPljRHkq4a14YzZ3YD406uaxh7s0g6eAq3L9aLOWywoqe8PkYamAvtsh7KNX6c++ihDrJ0RiU+/z7rGnhlZ5ww==
+  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-3.0.1.tgz#9474e08e6d7767cf68c56bf1581b59d203360cb0"
+  integrity sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==
+
+"@csstools/selector-specificity@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz#7dfccb9df5499e627e7bfdbb4021a06813a45dba"
+  integrity sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==
 
 "@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0":
   version "0.5.7"
@@ -1282,6 +1289,11 @@
   dependencies:
     tslib "^2.0.0"
 
+"@dual-bundle/import-meta-resolve@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz#519c1549b0e147759e7825701ecffd25e5819f7b"
+  integrity sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==
+
 "@emmetio/abbreviation@^2.3.3":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz#ed2b88fe37b972292d6026c7c540aaf887cecb6e"
@@ -3164,23 +3176,23 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@sentry-internal/browser-utils@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.39.0-dev.0.tgz#79d4c38dcd1840fb9363479ccf05abd71040e0bb"
-  integrity sha512-AJqHoUIkuxgWVGrzM/PWMSoDALBR3eSqcGl+ja4Wqa3PTOQQWbyVcNGIIIkVsHC0652V+iDcPGERkuqh5HovYA==
+"@sentry-internal/browser-utils@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.39.0-beta.0.tgz#aaec8215fffb34e7906cdca87725b81b6da735aa"
+  integrity sha512-J92C1qjuzLtMPfFFs9gKMlphUEgrLXLwVPbnDujZhFhh+anxZhwUVVsCtUN7ivDjkrWiQO8+e1ZRDRPR9fXf9g==
   dependencies:
-    "@sentry/core" "8.39.0-dev.0"
-    "@sentry/types" "8.39.0-dev.0"
-    "@sentry/utils" "8.39.0-dev.0"
+    "@sentry/core" "8.39.0-beta.0"
+    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/utils" "8.39.0-beta.0"
 
-"@sentry-internal/feedback@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.39.0-dev.0.tgz#2b829674bdeeca5faabb10cdd84a8e8810d2c5d0"
-  integrity sha512-q1MOGasW6efRk1ZscFxPHsJCoo46L530qyLnRpBBly2oTTFjrxN6ksytAp5tdj9QqIZ54tbLkL/uy3bXfdW/XA==
+"@sentry-internal/feedback@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.39.0-beta.0.tgz#444c62e140656db70cc3574a9e60e2963291848b"
+  integrity sha512-eh4NMPbMzrevycp+DCGvfzYHe1biTNK9J6clEhgvqUbWbxzGLXzb6pP4paXNCx8KO/AeFYHlFiVPSOPE+baEvg==
   dependencies:
-    "@sentry/core" "8.39.0-dev.0"
-    "@sentry/types" "8.39.0-dev.0"
-    "@sentry/utils" "8.39.0-dev.0"
+    "@sentry/core" "8.39.0-beta.0"
+    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/utils" "8.39.0-beta.0"
 
 "@sentry-internal/global-search@^1.0.0":
   version "1.0.0"
@@ -3196,25 +3208,25 @@
     htmlparser2 "^4.1.0"
     title-case "^3.0.2"
 
-"@sentry-internal/replay-canvas@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.39.0-dev.0.tgz#915a0fe014cfb945dba67ea256b8f6ac0d5460de"
-  integrity sha512-xNebKFaZBuEtpSHUetZBNzt40ve3Ani3Zy30sfuiVCJ/Qjm9MYrGhbyWxBV8g9EMgjJgxPC5cgpnHP30PRVGCQ==
+"@sentry-internal/replay-canvas@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.39.0-beta.0.tgz#77c19dfd2f685dcbb18e50713d9aa1c1b122215b"
+  integrity sha512-axIAQsUX1VDGJwYibkcWvYNa9SvfrG1h2b8Nf1PGUwdiWVCVyq0D9FeLWhC/9CizwxrqJ84VOLs8OLRpJJTIqg==
   dependencies:
-    "@sentry-internal/replay" "8.39.0-dev.0"
-    "@sentry/core" "8.39.0-dev.0"
-    "@sentry/types" "8.39.0-dev.0"
-    "@sentry/utils" "8.39.0-dev.0"
+    "@sentry-internal/replay" "8.39.0-beta.0"
+    "@sentry/core" "8.39.0-beta.0"
+    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/utils" "8.39.0-beta.0"
 
-"@sentry-internal/replay@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.39.0-dev.0.tgz#37c497a6494816506e9dc27cfc8c1498c5bc5837"
-  integrity sha512-UMHdA362Y3r9tBSe+cAbyNtzNsMk0nL4mXs1gKw0VEQSfXISfXla83KqOCPJ/xfSdOJIHk4MhkIahffeo/gI2A==
+"@sentry-internal/replay@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.39.0-beta.0.tgz#2944e8431e798bea4b837d97fcc2bebe72522220"
+  integrity sha512-0Nf5S/8hcLg9BhpsgBQP9QZqVmHwG1EtA428JMauPHpHzUoR73VK1CLA0Kh4qAB86PzKuShFS+5L7BuRWM/Yow==
   dependencies:
-    "@sentry-internal/browser-utils" "8.39.0-dev.0"
-    "@sentry/core" "8.39.0-dev.0"
-    "@sentry/types" "8.39.0-dev.0"
-    "@sentry/utils" "8.39.0-dev.0"
+    "@sentry-internal/browser-utils" "8.39.0-beta.0"
+    "@sentry/core" "8.39.0-beta.0"
+    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/utils" "8.39.0-beta.0"
 
 "@sentry-internal/rrdom@2.26.0":
   version "2.26.0"
@@ -3263,18 +3275,18 @@
   resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.22.4.tgz#c5adef7201a799c971cdccc5ba11c97d4609b1a2"
   integrity sha512-hbSq067KwmeKIEkmyzkTNJbmbtx2KRqvpiy9Q/DynI5Z46Nko/ppvgIfyFXK9DelwvEPOqZic4WXTIhO4iv3DA==
 
-"@sentry/browser@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.39.0-dev.0.tgz#a206700672e33f9db0d99f1a174fffb41aa7ebea"
-  integrity sha512-RAjhvmLh52uSyq0dfvuihgccjxu/kLv5WZRO8CHNy/deaUFIKfVHaxvgEmir4gZiilordm6EA44UAjcAmEgRRg==
+"@sentry/browser@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.39.0-beta.0.tgz#3f02b9445adf7dfbe96f260fa19ee815d4799bf9"
+  integrity sha512-73xm8DrC9XKR4EJqBuhBrU1wgYUeLtt4ACYmL5/VRz1/UoJ50kjz6f1sgIisO6aScODKlEovp9qO822e72Z/hw==
   dependencies:
-    "@sentry-internal/browser-utils" "8.39.0-dev.0"
-    "@sentry-internal/feedback" "8.39.0-dev.0"
-    "@sentry-internal/replay" "8.39.0-dev.0"
-    "@sentry-internal/replay-canvas" "8.39.0-dev.0"
-    "@sentry/core" "8.39.0-dev.0"
-    "@sentry/types" "8.39.0-dev.0"
-    "@sentry/utils" "8.39.0-dev.0"
+    "@sentry-internal/browser-utils" "8.39.0-beta.0"
+    "@sentry-internal/feedback" "8.39.0-beta.0"
+    "@sentry-internal/replay" "8.39.0-beta.0"
+    "@sentry-internal/replay-canvas" "8.39.0-beta.0"
+    "@sentry/core" "8.39.0-beta.0"
+    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/utils" "8.39.0-beta.0"
 
 "@sentry/bundler-plugin-core@2.22.4":
   version "2.22.4"
@@ -3344,23 +3356,23 @@
     "@sentry/cli-win32-i686" "2.36.2"
     "@sentry/cli-win32-x64" "2.36.2"
 
-"@sentry/core@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.39.0-dev.0.tgz#eeccfc79497759c3b5fbaeca170f6a7a5f53160b"
-  integrity sha512-mRsxcm9tdOS+iKyilrCsUpimfhuCcCkgLDEtrClubYqRkQfsymhqqjtqv6HNIZBYSBatKygownOdKXosT1stGQ==
+"@sentry/core@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.39.0-beta.0.tgz#31f95bad5e53c9781a9a47116463569213631f2d"
+  integrity sha512-M680BSZJtnvQBlRknBZAoIoP6m+f9UDgp9+Fe7+Zf/lInpQs6XEt/MDa6gD+9AY7M5nkBK2k6gc+yVmFxbYMIg==
   dependencies:
-    "@sentry/types" "8.39.0-dev.0"
-    "@sentry/utils" "8.39.0-dev.0"
+    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/utils" "8.39.0-beta.0"
 
 "@sentry/jest-environment@6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@sentry/jest-environment/-/jest-environment-6.0.0.tgz#7d77ac2e18e3fe4f0da2c143bc0985ad3d3c2dcb"
   integrity sha512-e4ZTE/h1/wNITyIzZUqka3KOmLMICVYXLxGiM7OdQy8zS7J7j/HCKbUPIZ9ozk5RVQJDwG68U2pNB4YX2Ka3xQ==
 
-"@sentry/node@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-8.39.0-dev.0.tgz#d36dbecaf481a26a0a8341219697a4cf9ee1db6c"
-  integrity sha512-umxHEx8XPayoFRgsjLig85R7iIS//cY7N5TWV+hZwDX9ET5ez17/WL6fXxtAvGXqY6bIJhs+0/51SYJX0lQDCw==
+"@sentry/node@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-8.39.0-beta.0.tgz#b2187cda24a24dd698197253633f73fdc3a330b7"
+  integrity sha512-Uvv5j6VAdbFBMRrIzoE7U/qREr0HhcC+sRHHa6y5+rIEOasU8b5uGXe33vjghjJ1XE8lDGXMaPh5gvV6hpUYxg==
   dependencies:
     "@opentelemetry/api" "^1.9.0"
     "@opentelemetry/context-async-hooks" "^1.25.1"
@@ -3394,42 +3406,42 @@
     "@opentelemetry/sdk-trace-base" "^1.26.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
     "@prisma/instrumentation" "5.19.1"
-    "@sentry/core" "8.39.0-dev.0"
-    "@sentry/opentelemetry" "8.39.0-dev.0"
-    "@sentry/types" "8.39.0-dev.0"
-    "@sentry/utils" "8.39.0-dev.0"
+    "@sentry/core" "8.39.0-beta.0"
+    "@sentry/opentelemetry" "8.39.0-beta.0"
+    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/utils" "8.39.0-beta.0"
     import-in-the-middle "^1.11.2"
 
-"@sentry/opentelemetry@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-8.39.0-dev.0.tgz#28e9987b0a82466f64b0194c6ee879b0af5aff65"
-  integrity sha512-vaZEfUmOYIsPvM0oSUQdn9MV4qdpUTzH++lXxZvLFjT58gxkiT4UPpYwSCaHBe4+UFLVrWpx10WM3zWieQgbKw==
+"@sentry/opentelemetry@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-8.39.0-beta.0.tgz#76abbf1d7d329f881a90f63424e909f74d3ce725"
+  integrity sha512-0BNHhyEd38n0dgZAJ9UdYSkwruULU5Iej8pIsOmT5mciDOwrqLil1xwfjkvElUnRnz/igR7Ghl4vVByRzqGC9A==
   dependencies:
-    "@sentry/core" "8.39.0-dev.0"
-    "@sentry/types" "8.39.0-dev.0"
-    "@sentry/utils" "8.39.0-dev.0"
+    "@sentry/core" "8.39.0-beta.0"
+    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/utils" "8.39.0-beta.0"
 
-"@sentry/profiling-node@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry/profiling-node/-/profiling-node-8.39.0-dev.0.tgz#ba6af55b56cf7a3c89cfd77df3622def34456b9a"
-  integrity sha512-38DM57G318lEUtXg8rSj/4B8z7J9yrJUHqeVyBeqI1XnPL+aUk9/QI3fnUNu8t6l8kYsDTzwtkfTOJCNEUyn3g==
+"@sentry/profiling-node@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/profiling-node/-/profiling-node-8.39.0-beta.0.tgz#f25b701708d5806865a0c153c40f7307bf7f0678"
+  integrity sha512-qoOky56SqqxxhDabMkDJGLWjEbjrn6xY5MuGH8PZXHDtAX+vmnD1lln5Y4Ka0wFuqJM+/YvXCLijib5W/3zMRQ==
   dependencies:
-    "@sentry/core" "8.39.0-dev.0"
-    "@sentry/node" "8.39.0-dev.0"
-    "@sentry/types" "8.39.0-dev.0"
-    "@sentry/utils" "8.39.0-dev.0"
+    "@sentry/core" "8.39.0-beta.0"
+    "@sentry/node" "8.39.0-beta.0"
+    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/utils" "8.39.0-beta.0"
     detect-libc "^2.0.2"
     node-abi "^3.61.0"
 
-"@sentry/react@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-8.39.0-dev.0.tgz#84dd1cd79b507c37f7e9fbaa067b1593d1deffac"
-  integrity sha512-yXngt5b00E2cL4MEvHJemOZ/WyIlihOd6dt3oFY5LJGMlfqPMvsmKPeRz+H6PwV1NBVgDywTSKK5+4+UN2ZFuw==
+"@sentry/react@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-8.39.0-beta.0.tgz#e08f8de27c61656453bf8faac866f8a5fe36f017"
+  integrity sha512-iLxwSmVByNY4APUUWEfFu/nqgnB7I1j6xHdfql1wcI+mvTE7rLAneMa59dvvLFj6+0OqauKIAw22ZFT63b1ZKw==
   dependencies:
-    "@sentry/browser" "8.39.0-dev.0"
-    "@sentry/core" "8.39.0-dev.0"
-    "@sentry/types" "8.39.0-dev.0"
-    "@sentry/utils" "8.39.0-dev.0"
+    "@sentry/browser" "8.39.0-beta.0"
+    "@sentry/core" "8.39.0-beta.0"
+    "@sentry/types" "8.39.0-beta.0"
+    "@sentry/utils" "8.39.0-beta.0"
     hoist-non-react-statics "^3.3.2"
 
 "@sentry/release-parser@^1.3.1":
@@ -3442,17 +3454,17 @@
   resolved "https://registry.yarnpkg.com/@sentry/status-page-list/-/status-page-list-0.3.0.tgz#d5520057007be1a021933aae26dfa6a4a3981c40"
   integrity sha512-v/MkVOvs48QioXt7Ex8gmZEFGvjukWqx2DlIej+Ac4pVQJAfzF6/DFFVT3IK8/owIqv/IdEhY0XzHOcIB0yBIA==
 
-"@sentry/types@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-8.39.0-dev.0.tgz#f0aeb823d6669f73430502aa363a2c3fa3c41def"
-  integrity sha512-bksCGTht62M1+qcD6U+0ijvv5tns/m9epk1ZL8DdkOYORgdi0PY1vH6+/NvKgssdE6agBqP+vHKYBUFKPRbgww==
+"@sentry/types@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-8.39.0-beta.0.tgz#2e267f587d7ffa1b8cb7e21823c869efc09b893d"
+  integrity sha512-gJvUZNvbxlucEp3ktfgVRGMP6IJXofUN0Zqc0V1F6ia3cs43DRyW+k1E0KXFFMoIxg9EjkLthAor3TZd5Zw4fg==
 
-"@sentry/utils@8.39.0-dev.0":
-  version "8.39.0-dev.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-8.39.0-dev.0.tgz#c4c37f67f7f2faadc12520db0d053aecab4ecf83"
-  integrity sha512-6RXS3+JorwqBv1br0bB2xwg6LDIdOXzaPF3v2tM7s0d8xO0KyldDeJiVbwjv4uBTjdkifOafhg/zs9al6H9tPg==
+"@sentry/utils@8.39.0-beta.0":
+  version "8.39.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-8.39.0-beta.0.tgz#7312aa9c1c57121f8f853806485b1594b5f6587a"
+  integrity sha512-bSjvF/caPGMrhWDWZLR0irTYoHJQxatdHOzC5f6mq4sOQZ+Ah4ZSPLVtxeq9Q5A/kooY5xmjH8yFBb5dGnfUgQ==
   dependencies:
-    "@sentry/types" "8.39.0-dev.0"
+    "@sentry/types" "8.39.0-beta.0"
 
 "@sentry/webpack-plugin@^2.22.4":
   version "2.22.4"
@@ -3948,19 +3960,12 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@>=10.0.0":
-  version "22.7.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.9.tgz#2bf2797b5e84702d8262ea2cf843c3c3c880d0e9"
-  integrity sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg==
-  dependencies:
-    undici-types "~6.19.2"
-
-"@types/node@^20.14.9":
-  version "20.14.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.9.tgz#12e8e765ab27f8c421a1820c99f5f313a933b420"
-  integrity sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==
+"@types/node@*", "@types/node@>=10.0.0", "@types/node@^22.9.1":
+  version "22.9.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.1.tgz#bdf91c36e0e7ecfb7257b2d75bf1b206b308ca71"
+  integrity sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==
   dependencies:
-    undici-types "~5.26.4"
+    undici-types "~6.19.8"
 
 "@types/papaparse@^5.3.5":
   version "5.3.5"
@@ -4251,6 +4256,14 @@
     "@typescript-eslint/types" "5.62.0"
     "@typescript-eslint/visitor-keys" "5.62.0"
 
+"@typescript-eslint/scope-manager@8.15.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.15.0.tgz#28a1a0f13038f382424f45a988961acaca38f7c6"
+  integrity sha512-QRGy8ADi4J7ii95xz4UoiymmmMd/zuy9azCaamnZ3FM8T5fZcex8UfJcjkiEZjJSztKfEBe3dZ5T/5RHAmw2mA==
+  dependencies:
+    "@typescript-eslint/types" "8.15.0"
+    "@typescript-eslint/visitor-keys" "8.15.0"
+
 "@typescript-eslint/scope-manager@8.8.1":
   version "8.8.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.8.1.tgz#b4bea1c0785aaebfe3c4ab059edaea1c4977e7ff"
@@ -4274,6 +4287,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
   integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
+"@typescript-eslint/types@8.15.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.15.0.tgz#4958edf3d83e97f77005f794452e595aaf6430fc"
+  integrity sha512-n3Gt8Y/KyJNe0S3yDCD2RVKrHBC4gTUcLTebVBXacPy091E6tNspFLKRXlk3hwT4G55nfr1n2AdFqi/XMxzmPQ==
+
 "@typescript-eslint/types@8.8.1":
   version "8.8.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.8.1.tgz#ebe85e0fa4a8e32a24a56adadf060103bef13bd1"
@@ -4292,6 +4310,20 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@8.15.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.15.0.tgz#915c94e387892b114a2a2cc0df2d7f19412c8ba7"
+  integrity sha512-1eMp2JgNec/niZsR7ioFBlsh/Fk0oJbhaqO0jRyQBMgkz7RrFfkqF9lYYmBoGBaSiLnu8TAPQTwoTUiSTUW9dg==
+  dependencies:
+    "@typescript-eslint/types" "8.15.0"
+    "@typescript-eslint/visitor-keys" "8.15.0"
+    debug "^4.3.4"
+    fast-glob "^3.3.2"
+    is-glob "^4.0.3"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
 "@typescript-eslint/typescript-estree@8.8.1":
   version "8.8.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.1.tgz#34649f4e28d32ee49152193bc7dedc0e78e5d1ec"
@@ -4306,7 +4338,7 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.25.0", "@typescript-eslint/utils@^5.58.0":
+"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.25.0", "@typescript-eslint/utils@^5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
   integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
@@ -4320,7 +4352,7 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@typescript-eslint/utils@8.8.1", "@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0":
+"@typescript-eslint/utils@8.8.1":
   version "8.8.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.8.1.tgz#9e29480fbfa264c26946253daa72181f9f053c9d"
   integrity sha512-/QkNJDbV0bdL7H7d0/y0qBbV2HTtf0TIyjSDTvvmQEzeVx8jEImEbLuOA4EsvE8gIgqMitns0ifb5uQhMj8d9w==
@@ -4330,6 +4362,16 @@
     "@typescript-eslint/types" "8.8.1"
     "@typescript-eslint/typescript-estree" "8.8.1"
 
+"@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.15.0.tgz#ac04679ad19252776b38b81954b8e5a65567cef6"
+  integrity sha512-k82RI9yGhr0QM3Dnq+egEpz9qB6Un+WLYhmoNcvl8ltMEededhh7otBVVIDDsEEttauwdY/hQoSsOv13lxrFzQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@typescript-eslint/scope-manager" "8.15.0"
+    "@typescript-eslint/types" "8.15.0"
+    "@typescript-eslint/typescript-estree" "8.15.0"
+
 "@typescript-eslint/visitor-keys@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
@@ -4338,6 +4380,14 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@8.15.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.15.0.tgz#9ea5a85eb25401d2aa74ec8a478af4e97899ea12"
+  integrity sha512-h8vYOulWec9LhpwfAdZf2bjr8xIp0KNKnpgqSz0qqYYKAW/QZKw3ktRndbiAtUz4acH4QLQavwZBYCc0wulA/Q==
+  dependencies:
+    "@typescript-eslint/types" "8.15.0"
+    eslint-visitor-keys "^4.2.0"
+
 "@typescript-eslint/visitor-keys@8.8.1":
   version "8.8.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.1.tgz#0fb1280f381149fc345dfde29f7542ff4e587fc5"
@@ -4352,15 +4402,15 @@
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
 "@vscode/emmet-helper@^2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.9.2.tgz#cd5d1e64e7138ad76300e8cba5fd84f1c03e13ee"
-  integrity sha512-MaGuyW+fa13q3aYsluKqclmh62Hgp0BpKIqS66fCxfOaBcVQ1OnMQxRRgQUYnCkxFISAQlkJ0qWWPyXjro1Qrg==
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.10.0.tgz#a0add01dddce3e07b3f4169b559067096203263a"
+  integrity sha512-UHw1EQRgLbSYkyB73/7wR/IzV6zTBnbzEHuuU4Z6b95HKf2lmeTdGwBIwspWBSRrnIA1TI2x2tetBym6ErA7Gw==
   dependencies:
     emmet "^2.4.3"
     jsonc-parser "^2.3.0"
     vscode-languageserver-textdocument "^1.0.1"
     vscode-languageserver-types "^3.15.1"
-    vscode-uri "^2.1.2"
+    vscode-uri "^3.0.8"
 
 "@vscode/l10n@^0.0.18":
   version "0.0.18"
@@ -4608,14 +4658,14 @@ ajv@^6.12.4, ajv@^6.12.5:
     uri-js "^4.2.2"
 
 ajv@^8.0.0, ajv@^8.0.1, ajv@^8.9.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6"
+  integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==
   dependencies:
-    fast-deep-equal "^3.1.1"
+    fast-deep-equal "^3.1.3"
+    fast-uri "^3.0.1"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
-    uri-js "^4.2.2"
 
 algoliasearch@^4.13.1:
   version "4.13.1"
@@ -5179,11 +5229,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001283, caniuse-lite@^1.0.30001669:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001669:
   version "1.0.30001677"
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz"
   integrity sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==
 
+caniuse-lite@^1.0.30001283:
+  version "1.0.30001680"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz#5380ede637a33b9f9f1fc6045ea99bd142f3da5e"
+  integrity sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==
+
 cbor-web@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/cbor-web/-/cbor-web-8.1.0.tgz#c1148e91ca6bfc0f5c07c1df164854596e2e33d6"
@@ -5597,9 +5652,9 @@ cross-fetch@^3.0.4:
     node-fetch "^2.6.12"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -5610,10 +5665,10 @@ css-declaration-sorter@^7.2.0:
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz#6dec1c9523bc4a643e088aab8f09e67a54961024"
   integrity sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==
 
-css-functions-list@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.1.tgz#2eb205d8ce9f9ce74c5c1d7490b66b77c45ce3ea"
-  integrity sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==
+css-functions-list@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.3.tgz#95652b0c24f0f59b291a9fc386041a19d4f40dbe"
+  integrity sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==
 
 css-loader@^7.1.2:
   version "7.1.2"
@@ -5671,6 +5726,14 @@ css-tree@^2.3.1:
     mdn-data "2.0.30"
     source-map-js "^1.0.1"
 
+css-tree@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-3.0.1.tgz#bea6deaea60bb5bcf416adfb1ecf607a8d9471f6"
+  integrity sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==
+  dependencies:
+    mdn-data "2.12.1"
+    source-map-js "^1.0.1"
+
 css-tree@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
@@ -5840,7 +5903,7 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.7, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4:
   version "4.3.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
   integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
@@ -6189,9 +6252,9 @@ emittery@^0.13.1:
   integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
 emmet@^2.4.3:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.4.4.tgz#801aad64659dc76f3003130db767d77a78ac298e"
-  integrity sha512-v8Mwpjym55CS3EjJgiCLWUB3J2HSR93jhzXW325720u8KvYxdI2voYLstW3pHBxFz54H6jFjayR9G4LfTG0q+g==
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.4.11.tgz#b331f572df37a252360ebee7dc4462c8d2e32f5c"
+  integrity sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==
   dependencies:
     "@emmetio/abbreviation" "^2.3.3"
     "@emmetio/css-abbreviation" "^2.1.8"
@@ -6307,9 +6370,9 @@ error-stack-parser@^2.0.6:
     stackframe "^1.1.1"
 
 es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
-  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
+  version "1.23.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.5.tgz#f4599a4946d57ed467515ed10e4f157289cd52fb"
+  integrity sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==
   dependencies:
     array-buffer-byte-length "^1.0.1"
     arraybuffer.prototype.slice "^1.0.3"
@@ -6326,7 +6389,7 @@ es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23
     function.prototype.name "^1.1.6"
     get-intrinsic "^1.2.4"
     get-symbol-description "^1.0.2"
-    globalthis "^1.0.3"
+    globalthis "^1.0.4"
     gopd "^1.0.1"
     has-property-descriptors "^1.0.2"
     has-proto "^1.0.3"
@@ -6342,10 +6405,10 @@ es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23
     is-string "^1.0.7"
     is-typed-array "^1.1.13"
     is-weakref "^1.0.2"
-    object-inspect "^1.13.1"
+    object-inspect "^1.13.3"
     object-keys "^1.1.1"
     object.assign "^4.1.5"
-    regexp.prototype.flags "^1.5.2"
+    regexp.prototype.flags "^1.5.3"
     safe-array-concat "^1.1.2"
     safe-regex-test "^1.0.3"
     string.prototype.trim "^1.2.9"
@@ -6370,10 +6433,10 @@ es-errors@^1.2.1, es-errors@^1.3.0:
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es-iterator-helpers@^1.0.19:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz#117003d0e5fec237b4b5c08aded722e0c6d50ca8"
-  integrity sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==
+es-iterator-helpers@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz#2f1a3ab998b30cb2d10b195b587c6d9ebdebf152"
+  integrity sha512-tpxqxncxnpw3c93u8n3VOzACmRFoVmWJqbWXvX/JfKbkhBw1oslgPrUfeSt2psuqyEJFD6N/9lg5i7bsKpoq+Q==
   dependencies:
     call-bind "^1.0.7"
     define-properties "^1.2.1"
@@ -6382,12 +6445,13 @@ es-iterator-helpers@^1.0.19:
     es-set-tostringtag "^2.0.3"
     function-bind "^1.1.2"
     get-intrinsic "^1.2.4"
-    globalthis "^1.0.3"
+    globalthis "^1.0.4"
+    gopd "^1.0.1"
     has-property-descriptors "^1.0.2"
     has-proto "^1.0.3"
     has-symbols "^1.0.3"
     internal-slot "^1.0.7"
-    iterator.prototype "^1.1.2"
+    iterator.prototype "^1.1.3"
     safe-array-concat "^1.1.2"
 
 es-module-lexer@^1.2.1:
@@ -6499,40 +6563,6 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-sentry-app@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-sentry-app/-/eslint-config-sentry-app-2.9.0.tgz#3d6c14687f6cd7d55e0894c5aeafa36553488f4f"
-  integrity sha512-m/7BEmoirmHt4Y2yQtVZ3o8zitonojD86Odg1aBYLSAH4Gh/aBYU3csOKOA6BDR9ZVuWVWXd0lwi0+LMv9/bMA==
-  dependencies:
-    "@emotion/eslint-plugin" "^11.12.0"
-    "@typescript-eslint/eslint-plugin" "^8.8.1"
-    "@typescript-eslint/parser" "^8.8.1"
-    eslint-config-sentry "^2.9.0"
-    eslint-config-sentry-react "^2.9.0"
-    eslint-import-resolver-typescript "^3.6.3"
-    eslint-plugin-import "^2.31.0"
-    eslint-plugin-jest "^28.8.3"
-    eslint-plugin-no-lookahead-lookbehind-regexp "0.1.0"
-    eslint-plugin-react "^7.37.1"
-    eslint-plugin-sentry "^2.9.0"
-    eslint-plugin-simple-import-sort "^12.1.1"
-
-eslint-config-sentry-react@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-sentry-react/-/eslint-config-sentry-react-2.9.0.tgz#ebdd832bbcca3d6a06b42ad6ada12aa153a8a896"
-  integrity sha512-Tx95YVNUMEJQm9SMeVubCCWgIuB8Y826rgCM7PVCejU7v5EkqCMiB3tZ83zdI8aPLoQrMWphYroMrBAXz0dloA==
-  dependencies:
-    eslint-config-sentry "^2.9.0"
-    eslint-plugin-jest-dom "^5.4.0"
-    eslint-plugin-react-hooks "^4.6.2"
-    eslint-plugin-testing-library "^6.3.0"
-    eslint-plugin-typescript-sort-keys "^3.3.0"
-
-eslint-config-sentry@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-sentry/-/eslint-config-sentry-2.9.0.tgz#bea7877f3952ec38493d21c683c26e25df895f3d"
-  integrity sha512-ZPQuF0Lt6e8J6qCj6r6z/ok/3m7EogrW0Hb7BIvofdlAvFyKzXnS+4ms8VC25QmSBywRrPV8Kn3HSU4hPCP94g==
-
 eslint-import-resolver-node@^0.3.9:
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
@@ -6589,17 +6619,17 @@ eslint-plugin-import@^2.31.0:
     tsconfig-paths "^3.15.0"
 
 eslint-plugin-jest-dom@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-5.4.0.tgz#03a5ea600f8af63f4fcd5de49ae83dc0e6aca325"
-  integrity sha512-yBqvFsnpS5Sybjoq61cJiUsenRkC9K32hYQBFS9doBR7nbQZZ5FyO+X7MlmfM1C48Ejx/qTuOCgukDUNyzKZ7A==
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-5.5.0.tgz#3ccdfe197eddb4108f390db583057a5dacccd4a0"
+  integrity sha512-CRlXfchTr7EgC3tDI7MGHY6QjdJU5Vv2RPaeeGtkXUHnKZf04kgzMPIJUXt4qKCvYWVVIEo9ut9Oq1vgXAykEA==
   dependencies:
     "@babel/runtime" "^7.16.3"
     requireindex "^1.2.0"
 
 eslint-plugin-jest@^28.8.3:
-  version "28.8.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.8.3.tgz#c5699bba0ad06090ad613535e4f1572f4c2567c0"
-  integrity sha512-HIQ3t9hASLKm2IhIOqnu+ifw7uLZkIlR7RYNv7fMcEi/p0CIiJmfriStQS2LDkgtY4nyLbIZAD+JL347Yc2ETQ==
+  version "28.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.9.0.tgz#19168dfaed124339cd2252c4c4d1ac3688aeb243"
+  integrity sha512-rLu1s1Wf96TgUUxSw6loVIkNtUjq1Re7A9QdCCHSohnvXEBAjuL420h0T/fMmkQlNsQP2GhQzEUpYHPfxBkvYQ==
   dependencies:
     "@typescript-eslint/utils" "^6.0.0 || ^7.0.0 || ^8.0.0"
 
@@ -6617,16 +6647,16 @@ eslint-plugin-react-hooks@^4.6.2:
   integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
 
 eslint-plugin-react@^7.37.1:
-  version "7.37.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.1.tgz#56493d7d69174d0d828bc83afeffe96903fdadbd"
-  integrity sha512-xwTnwDqzbDRA8uJ7BMxPs/EXRB3i8ZfnOIp8BsxEQkT0nHPp+WWceqGgo6rKb9ctNi8GJLDT4Go5HAWELa/WMg==
+  version "7.37.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz#cd0935987876ba2900df2f58339f6d92305acc7a"
+  integrity sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==
   dependencies:
     array-includes "^3.1.8"
     array.prototype.findlast "^1.2.5"
     array.prototype.flatmap "^1.3.2"
     array.prototype.tosorted "^1.1.4"
     doctrine "^2.1.0"
-    es-iterator-helpers "^1.0.19"
+    es-iterator-helpers "^1.1.0"
     estraverse "^5.3.0"
     hasown "^2.0.2"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
@@ -6640,10 +6670,10 @@ eslint-plugin-react@^7.37.1:
     string.prototype.matchall "^4.0.11"
     string.prototype.repeat "^1.0.0"
 
-eslint-plugin-sentry@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-sentry/-/eslint-plugin-sentry-2.9.0.tgz#9c8382a934f395c2a72078bb2c17c9a7b6dac022"
-  integrity sha512-YqSZV/d/qQnlAqvfdjpdGw/PsCXFqdXwBKdZEEmJR4sKpIQ4SSJhqxeGryKB1cirs32UVu153RWjt9qwKMQp9g==
+eslint-plugin-sentry@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-sentry/-/eslint-plugin-sentry-2.10.0.tgz#f8785792f9e067a61e2a12816ce7d1c5631745f1"
+  integrity sha512-QuCUr2B78Onr2GdXM4ncPlS2IBAB+lL5QwSPNvX5LcAoBtV7iFuhEY7DS4WqwgmJcRnI6g3/dKARpFuOILR35A==
   dependencies:
     requireindex "~1.2.0"
 
@@ -6653,11 +6683,11 @@ eslint-plugin-simple-import-sort@^12.1.1:
   integrity sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==
 
 eslint-plugin-testing-library@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-6.3.0.tgz#9c31a9941a860efdff3c06180151ab9c8142f685"
-  integrity sha512-GYcEErTt6EGwE0bPDY+4aehfEBpB2gDBFKohir8jlATSUvzStEyzCx8QWB/14xeKc/AwyXkzScSzMHnFojkWrA==
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-6.4.0.tgz#1ba8a7422e3e31cc315a73ff17c34908f56f9838"
+  integrity sha512-yeWF+YgCgvNyPNI9UKnG0FjeE2sk93N/3lsKqcmR8dSfeXJwFT5irnWo7NjLf152HkRzfoFjh3LsBUrhvFz4eA==
   dependencies:
-    "@typescript-eslint/utils" "^5.58.0"
+    "@typescript-eslint/utils" "^5.62.0"
 
 eslint-plugin-typescript-sort-keys@^3.3.0:
   version "3.3.0"
@@ -6689,6 +6719,11 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
+eslint-visitor-keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
+  integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
+
 eslint@8.57.1:
   version "8.57.1"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
@@ -6890,6 +6925,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
+fast-uri@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.3.tgz#892a1c91802d5d7860de728f18608a0573142241"
+  integrity sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==
+
 fastest-levenshtein@^1.0.12, fastest-levenshtein@^1.0.16:
   version "1.0.16"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
@@ -6928,12 +6968,12 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-entry-cache@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
-  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
+file-entry-cache@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-9.1.0.tgz#2e66ad98ce93f49aed1b178c57b0b5741591e075"
+  integrity sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==
   dependencies:
-    flat-cache "^4.0.0"
+    flat-cache "^5.0.0"
 
 filesize@^10.1.6:
   version "10.1.6"
@@ -7024,24 +7064,23 @@ flat-cache@^3.0.4:
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flat-cache@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.0.tgz#d12437636f83bb8a12b8f300c36fd1614e1c7224"
-  integrity sha512-EryKbCE/wxpxKniQlyas6PY1I9vwtF3uCBweX+N8KYTCn3Y12RTGtQAJ/bd5pl7kxUAc8v/R3Ake/N17OZiFqA==
+flat-cache@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-5.0.0.tgz#26c4da7b0f288b408bb2b506b2cb66c240ddf062"
+  integrity sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==
   dependencies:
-    flatted "^3.2.9"
+    flatted "^3.3.1"
     keyv "^4.5.4"
-    rimraf "^5.0.5"
 
 flat@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
-flatted@^3.2.9:
-  version "3.2.9"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
-  integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
+flatted@^3.2.9, flatted@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
 focus-trap@^7.3.1:
   version "7.3.1"
@@ -7152,7 +7191,7 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.5, function.prototype.name@^1.1.6:
+function.prototype.name@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
   integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
@@ -7264,7 +7303,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^10.3.3, glob@^10.3.7:
+glob@^10.3.3:
   version "10.3.10"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
   integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
@@ -7325,7 +7364,7 @@ globals@^13.19.0:
   dependencies:
     type-fest "^0.20.2"
 
-globalthis@^1.0.3:
+globalthis@^1.0.3, globalthis@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
   integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
@@ -7360,7 +7399,7 @@ globby@^14.0.0:
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
-  integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
+  integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==
 
 gopd@^1.0.1:
   version "1.0.1"
@@ -7627,11 +7666,16 @@ ieee754@^1.2.1:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.0, ignore@^5.3.1:
+ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
+ignore@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-6.0.2.tgz#77cccb72a55796af1b6d2f9eb14fa326d24f4283"
+  integrity sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==
+
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
@@ -8096,10 +8140,10 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-iterator.prototype@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0"
-  integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==
+iterator.prototype@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.3.tgz#016c2abe0be3bbdb8319852884f60908ac62bf9c"
+  integrity sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==
   dependencies:
     define-properties "^1.2.1"
     get-intrinsic "^1.2.1"
@@ -8704,10 +8748,10 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-known-css-properties@^0.29.0:
-  version "0.29.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.29.0.tgz#e8ba024fb03886f23cb882e806929f32d814158f"
-  integrity sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==
+known-css-properties@^0.34.0:
+  version "0.34.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.34.0.tgz#ccd7e9f4388302231b3f174a8b1d5b1f7b576cea"
+  integrity sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==
 
 launch-editor@^2.6.1:
   version "2.9.1"
@@ -8927,7 +8971,7 @@ lodash.merge@^4.6.2:
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
+  integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
@@ -9024,6 +9068,11 @@ mdn-data@2.0.30:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
   integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
 
+mdn-data@2.12.1:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.12.1.tgz#10cb462215c13d95c92ff60d0fb3becac1bbb924"
+  integrity sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -9051,7 +9100,7 @@ memoize-one@^5.0.0:
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
   integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA==
 
-meow@^13.1.0:
+meow@^13.2.0:
   version "13.2.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-13.2.0.tgz#6b7d63f913f984063b3cc261b6e8800c4cd3474f"
   integrity sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==
@@ -9076,7 +9125,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -9368,6 +9417,11 @@ object-inspect@^1.13.1:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
   integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
 
+object-inspect@^1.13.3:
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a"
+  integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==
+
 object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -9723,7 +9777,7 @@ pg-types@^4.0.1:
     postgres-interval "^3.0.0"
     postgres-range "^1.1.1"
 
-picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0:
+picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0, picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
@@ -9994,17 +10048,17 @@ postcss-reduce-transforms@^7.0.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-resolve-nested-selector@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
-  integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
+postcss-resolve-nested-selector@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz#3d84dec809f34de020372c41b039956966896686"
+  integrity sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==
 
-postcss-safe-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz#6273d4e5149e286db5a45bc6cf6eafcad464014a"
-  integrity sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==
+postcss-safe-parser@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz#36e4f7e608111a0ca940fd9712ce034718c40ec0"
+  integrity sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==
 
-postcss-selector-parser@^6.0.15, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.1.1, postcss-selector-parser@^6.1.2:
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.1.1, postcss-selector-parser@^6.1.2:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
   integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
@@ -10012,12 +10066,12 @@ postcss-selector-parser@^6.0.15, postcss-selector-parser@^6.0.2, postcss-selecto
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-styled-syntax@0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/postcss-styled-syntax/-/postcss-styled-syntax-0.6.4.tgz#16c07d2c55261a435031b6a9c7f1d5c2daa2246c"
-  integrity sha512-uWiLn+9rKgIghUYmTHvXMR6MnyPULMe9Gv3bV537Fg4FH6CA6cn21WMjKss2Qb98LUhT847tKfnRGG3FhSOgUQ==
+postcss-styled-syntax@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/postcss-styled-syntax/-/postcss-styled-syntax-0.7.0.tgz#7ae2f5e9af36af3e81fc96f0e92c98d27b21be9d"
+  integrity sha512-OeStzPkHJ1/WDGRKm/JuVK8UdJbjt3U7AFC+zUc9omJ79SaXSxWoy+PXxJz7t8vOO8HcUgCLndNEQfLvZ74TuQ==
   dependencies:
-    typescript "^5.3.3"
+    typescript "^5.6.3"
 
 postcss-svgo@^7.0.1:
   version "7.0.1"
@@ -10039,14 +10093,14 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.33, postcss@^8.4.38:
-  version "8.4.41"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
-  integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
+postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.47:
+  version "8.4.49"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.0.1"
-    source-map-js "^1.2.0"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
 
 postgres-array@~2.0.0:
   version "2.0.0"
@@ -10555,15 +10609,15 @@ regenerator-transform@^0.15.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp.prototype.flags@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
-  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
+regexp.prototype.flags@^1.5.2, regexp.prototype.flags@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz#b3ae40b1d2499b8350ab2c3fe6ef3845d3a96f42"
+  integrity sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==
   dependencies:
-    call-bind "^1.0.6"
+    call-bind "^1.0.7"
     define-properties "^1.2.1"
     es-errors "^1.3.0"
-    set-function-name "^2.0.1"
+    set-function-name "^2.0.2"
 
 regexpu-core@^6.1.1:
   version "6.1.1"
@@ -10696,13 +10750,6 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf"
-  integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==
-  dependencies:
-    glob "^10.3.7"
-
 rslog@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/rslog/-/rslog-1.2.3.tgz#9114d93056312fbe35c11b3fea3f2774a7debe56"
@@ -11053,10 +11100,10 @@ source-map-generator@0.8.0:
   resolved "https://registry.yarnpkg.com/source-map-generator/-/source-map-generator-0.8.0.tgz#10d5ca0651e2c9302ea338739cbd4408849c5d00"
   integrity sha512-psgxdGMwl5MZM9S3FWee4EgsEaIjahYV5AzGnwUvPhWeITz/j6rKpysQHlQ4USdxvINlb8lKfWGIXwfkrgtqkA==
 
-source-map-js@^1.0.1, source-map-js@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
-  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
+source-map-js@^1.0.1, source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
 
 source-map-support@0.5.13:
   version "0.5.13"
@@ -11266,7 +11313,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^7.0.1, strip-ansi@^7.1.0:
+strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
   integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
@@ -11313,53 +11360,53 @@ stylehacks@^7.0.3:
     browserslist "^4.23.3"
     postcss-selector-parser "^6.1.1"
 
-stylelint-config-recommended@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-14.0.0.tgz#b395c7014838d2aaca1755eebd914d0bb5274994"
-  integrity sha512-jSkx290CglS8StmrLp2TxAppIajzIBZKYm3IxT89Kg6fGlxbPiTiyH9PS5YUuVAFwaJLl1ikiXX0QWjI0jmgZQ==
-
-stylelint@16.2.1:
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.2.1.tgz#895d6d42523c5126ec0895f0ca2a58febeb77e89"
-  integrity sha512-SfIMGFK+4n7XVAyv50CpVfcGYWG4v41y6xG7PqOgQSY8M/PgdK0SQbjWFblxjJZlN9jNq879mB4BCZHJRIJ1hA==
-  dependencies:
-    "@csstools/css-parser-algorithms" "^2.5.0"
-    "@csstools/css-tokenizer" "^2.2.3"
-    "@csstools/media-query-list-parser" "^2.1.7"
-    "@csstools/selector-specificity" "^3.0.1"
+stylelint-config-recommended@^14.0.1:
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz#d25e86409aaf79ee6c6085c2c14b33c7e23c90c6"
+  integrity sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==
+
+stylelint@16.10.0:
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.10.0.tgz#452b42a5d82f2ad910954eb2ba2b3a2ec583cd75"
+  integrity sha512-z/8X2rZ52dt2c0stVwI9QL2AFJhLhbPkyfpDFcizs200V/g7v+UYY6SNcB9hKOLcDDX/yGLDsY/pX08sLkz9xQ==
+  dependencies:
+    "@csstools/css-parser-algorithms" "^3.0.1"
+    "@csstools/css-tokenizer" "^3.0.1"
+    "@csstools/media-query-list-parser" "^3.0.1"
+    "@csstools/selector-specificity" "^4.0.0"
+    "@dual-bundle/import-meta-resolve" "^4.1.0"
     balanced-match "^2.0.0"
     colord "^2.9.3"
     cosmiconfig "^9.0.0"
-    css-functions-list "^3.2.1"
-    css-tree "^2.3.1"
-    debug "^4.3.4"
+    css-functions-list "^3.2.3"
+    css-tree "^3.0.0"
+    debug "^4.3.7"
     fast-glob "^3.3.2"
     fastest-levenshtein "^1.0.16"
-    file-entry-cache "^8.0.0"
+    file-entry-cache "^9.1.0"
     global-modules "^2.0.0"
     globby "^11.1.0"
     globjoin "^0.1.4"
     html-tags "^3.3.1"
-    ignore "^5.3.0"
+    ignore "^6.0.2"
     imurmurhash "^0.1.4"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.29.0"
+    known-css-properties "^0.34.0"
     mathml-tag-names "^2.1.3"
-    meow "^13.1.0"
-    micromatch "^4.0.5"
+    meow "^13.2.0"
+    micromatch "^4.0.8"
     normalize-path "^3.0.0"
-    picocolors "^1.0.0"
-    postcss "^8.4.33"
-    postcss-resolve-nested-selector "^0.1.1"
-    postcss-safe-parser "^7.0.0"
-    postcss-selector-parser "^6.0.15"
+    picocolors "^1.0.1"
+    postcss "^8.4.47"
+    postcss-resolve-nested-selector "^0.1.6"
+    postcss-safe-parser "^7.0.1"
+    postcss-selector-parser "^6.1.2"
     postcss-value-parser "^4.2.0"
     resolve-from "^5.0.0"
     string-width "^4.2.3"
-    strip-ansi "^7.1.0"
-    supports-hyperlinks "^3.0.0"
+    supports-hyperlinks "^3.1.0"
     svg-tags "^1.0.0"
-    table "^6.8.1"
+    table "^6.8.2"
     write-file-atomic "^5.0.1"
 
 stylis@4.2.0:
@@ -11396,10 +11443,10 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-hyperlinks@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz#c711352a5c89070779b4dad54c05a2f14b15c94b"
-  integrity sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==
+supports-hyperlinks@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz#b56150ff0173baacc15f21956450b61f2b18d3ac"
+  integrity sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==
   dependencies:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
@@ -11412,7 +11459,7 @@ supports-preserve-symlinks-flag@^1.0.0:
 svg-tags@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
-  integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
+  integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
 
 svgo@^3.3.2:
   version "3.3.2"
@@ -11437,10 +11484,10 @@ tabbable@^6.1.1:
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.1.1.tgz#40cfead5ed11be49043f04436ef924c8890186a0"
   integrity sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg==
 
-table@^6.8.1:
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf"
-  integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
+table@^6.8.2:
+  version "6.8.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58"
+  integrity sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==
   dependencies:
     ajv "^8.0.1"
     lodash.truncate "^4.4.2"
@@ -11715,7 +11762,7 @@ typescript-template-language-service-decorator@^2.3.2:
   resolved "https://registry.yarnpkg.com/typescript-template-language-service-decorator/-/typescript-template-language-service-decorator-2.3.2.tgz#095c1b5ea88c839d9b202fad3ec8c87c1b062953"
   integrity sha512-hN0zNkr5luPCeXTlXKxsfBPlkAzx86ZRM1vPdL7DbEqqWoeXSxplACy98NpKpLmXsdq7iePUzAXloCAoPKBV6A==
 
-typescript@^5.3.3, typescript@^5.6.3:
+typescript@^5.6.3:
   version "5.6.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
   integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
@@ -11735,15 +11782,10 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-undici-types@~6.19.2:
-  version "6.19.6"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.6.tgz#e218c3df0987f4c0e0008ca00d6b6472d9b89b36"
-  integrity sha512-e/vggGopEfTKSvj4ihnOLTsqhrKRN3LeO6qSN/GxohhuRv8qH9bNQ4B8W7e/vFL+0XTnmHPB4/kegunZGA4Org==
+undici-types@~6.19.8:
+  version "6.19.8"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
+  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
 
 undici@^5.25.4:
   version "5.28.4"
@@ -11895,30 +11937,25 @@ vary@^1, vary@~1.1.2:
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
 vscode-css-languageservice@^6.2.11:
-  version "6.2.12"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.12.tgz#f8f9f335fb4b433f557c51c62e687b4f62c0c786"
-  integrity sha512-PS9r7HgNjqzRl3v91sXpCyZPc8UDotNo6gntFNtGCKPhGA9Frk7g/VjX1Mbv3F00pn56D+rxrFzR9ep4cawOgA==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz#56733c90686db56855ccc156a534a68b8c1f2187"
+  integrity sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==
   dependencies:
     "@vscode/l10n" "^0.0.18"
-    vscode-languageserver-textdocument "^1.0.11"
+    vscode-languageserver-textdocument "^1.0.12"
     vscode-languageserver-types "3.17.5"
     vscode-uri "^3.0.8"
 
-vscode-languageserver-textdocument@^1.0.1, vscode-languageserver-textdocument@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
+vscode-languageserver-textdocument@^1.0.1, vscode-languageserver-textdocument@^1.0.11, vscode-languageserver-textdocument@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz#457ee04271ab38998a093c68c2342f53f6e4a631"
+  integrity sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==
 
 vscode-languageserver-types@3.17.5, vscode-languageserver-types@^3.15.1, vscode-languageserver-types@^3.17.5:
   version "3.17.5"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz#3273676f0cf2eab40b3f44d085acbb7f08a39d8a"
   integrity sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==
 
-vscode-uri@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c"
-  integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==
-
 vscode-uri@^3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
@@ -12167,12 +12204,12 @@ which-boxed-primitive@^1.0.2:
     is-symbol "^1.0.3"
 
 which-builtin-type@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b"
-  integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.4.tgz#592796260602fc3514a1b5ee7fa29319b72380c3"
+  integrity sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==
   dependencies:
-    function.prototype.name "^1.1.5"
-    has-tostringtag "^1.0.0"
+    function.prototype.name "^1.1.6"
+    has-tostringtag "^1.0.2"
     is-async-function "^2.0.0"
     is-date-object "^1.0.5"
     is-finalizationregistry "^1.0.2"
@@ -12181,10 +12218,10 @@ which-builtin-type@^1.1.3:
     is-weakref "^1.0.2"
     isarray "^2.0.5"
     which-boxed-primitive "^1.0.2"
-    which-collection "^1.0.1"
-    which-typed-array "^1.1.9"
+    which-collection "^1.0.2"
+    which-typed-array "^1.1.15"
 
-which-collection@^1.0.1:
+which-collection@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
   integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
@@ -12194,7 +12231,7 @@ which-collection@^1.0.1:
     is-weakmap "^2.0.2"
     is-weakset "^2.0.3"
 
-which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.9:
+which-typed-array@^1.1.14, which-typed-array@^1.1.15:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
   integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==